From 64e665bbae068f2261aa1d9c6bf46f531c50dea9 Mon Sep 17 00:00:00 2001
From: ElPumpo <samo_kol@hotmail.com>
Date: Sat, 10 Nov 2018 23:52:00 +0100
Subject: [PATCH] Updated readme, final commit v1.1.0

---
 README.md       | 41 +++++++++++++++++++++++++++++++----------
 __resource.lua  |  7 +++++--
 client/main.lua |  4 ++--
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 886ee230..ea1dceab 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,40 @@
-# fxserver-esx_barbershop
-FXServer ESX Barber Shop
+# esx_barbershop
 
-[REQUIREMENTS]
+## Requirements
+- [esx_skin](https://github.com/ESX-Org/esx_skin)
 
-- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin
+## Download & Installation
 
-[INSTALLATION]
-
-1) CD in your resources/[esx] folder
-2) Clone the repository
+### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-git clone https://github.com/FXServer-ESX/fxserver-esx_barbershop esx_barbershop
+fvm install --save --folder=esx esx-org/esx_barbershop
 ```
-3) Add this in your server.cfg :
+
+### Using Git
+```
+cd resources
+git clone https://github.com/ESX-Org/esx_barbershop [esx]/esx_barbershop
+```
+
+### Manually
+- Download https://github.com/ESX-Org/esx_barbershop/archive/master.zip
+- Put it in the `[esx]` directory
+
+## Installation
+- Add this in your `server.cfg`:
 
 ```
 start esx_barbershop
 ```
+
+# Legal
+### License
+esx_barbershop - barber shop!
+
+Copyright (C) 2015-2018 Jérémie N'gadi
+
+This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+
+You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/.
\ No newline at end of file
diff --git a/__resource.lua b/__resource.lua
index a31bfb4d..243ffac2 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
 
 description 'ESX Barber Shop'
 
-version '1.0.1'
+version '1.1.0'
 
 server_scripts {
 	'@mysql-async/lib/MySQL.lua',
@@ -29,4 +29,7 @@ client_scripts {
 	'client/main.lua'
 }
 
-dependency 'es_extended'
\ No newline at end of file
+dependencies {
+	'es_extended',
+	'esx_skin'
+}
diff --git a/client/main.lua b/client/main.lua
index ccc1c905..39afd32c 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -174,8 +174,8 @@ end)
 -- Enter / Exit marker events
 Citizen.CreateThread(function()
 	while true do
-		Citizen.Wait(0)
-		
+		Citizen.Wait(200)
+
 		local coords      = GetEntityCoords(PlayerPedId())
 		local isInMarker  = false
 		local currentZone = nil