From 6ccd047cb6fa42e61af734a12627d93717a4af56 Mon Sep 17 00:00:00 2001
From: RoadToSix <92928205+RoadPhone@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:46:45 +0100
Subject: [PATCH 1/4] Update fxmanifest.lua

---
 [esx_addons]/esx_atm/fxmanifest.lua | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/[esx_addons]/esx_atm/fxmanifest.lua b/[esx_addons]/esx_atm/fxmanifest.lua
index 9d6f4325..bae5d469 100644
--- a/[esx_addons]/esx_atm/fxmanifest.lua
+++ b/[esx_addons]/esx_atm/fxmanifest.lua
@@ -6,33 +6,18 @@ description 'ESX Atm'
 
 version '1.6.5'
 
-shared_script '@es_extended/imports.lua'
+shared_scripts {
+	'@es_extended/imports.lua',
+	'@es_extended/locale.lua',
+	'locales/*.lua',
+	'config.lua'
+}
 
 server_scripts {
-	'@es_extended/locale.lua',
-	'locales/de.lua',
-	'locales/br.lua',
-	'locales/en.lua',
-	'locales/fi.lua',
-	'locales/fr.lua',
-	'locales/es.lua',
-	'locales/sv.lua',
-	'locales/cs.lua',
-	'config.lua',
 	'server/main.lua'
 }
 
 client_scripts {
-	'@es_extended/locale.lua',
-	'locales/de.lua',
-	'locales/br.lua',
-	'locales/en.lua',
-	'locales/fi.lua',
-	'locales/fr.lua',
-	'locales/es.lua',
-	'locales/sv.lua',
-	'locales/cs.lua',
-	'config.lua',
 	'client/main.lua'
 }
 

From 7cfa2035f1f31b4b895567eaeb01834d3fb33c4d Mon Sep 17 00:00:00 2001
From: Haroki <rbtomas89@gmail.com>
Date: Mon, 28 Mar 2022 16:30:43 +0100
Subject: [PATCH 2/4] Bug Fix: Someone forgot do :)

---
 [esx_addons]/esx_weaponshop/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[esx_addons]/esx_weaponshop/server/main.lua b/[esx_addons]/esx_weaponshop/server/main.lua
index 75a7d5ca..969558ae 100644
--- a/[esx_addons]/esx_weaponshop/server/main.lua
+++ b/[esx_addons]/esx_weaponshop/server/main.lua
@@ -53,7 +53,7 @@ end)
 
 function GetPrice(weaponName, zone)
 	local weapon = nil
-	for k,v in pairs(Config.Zones[zone].items)
+	for k,v in pairs(Config.Zones[zone].items) do
 		if v.name == weaponName then
 			weapon  = v
 			break

From 89eb52f5f6dba8bba81238f07c439e0c164eb354 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Tue, 29 Mar 2022 16:30:38 +0100
Subject: [PATCH 3/4] Fix(esx_property): Fix Broken Loop

---
 [esx_addons]/esx_property/client/main.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/[esx_addons]/esx_property/client/main.lua b/[esx_addons]/esx_property/client/main.lua
index 66f1df7d..185416bd 100644
--- a/[esx_addons]/esx_property/client/main.lua
+++ b/[esx_addons]/esx_property/client/main.lua
@@ -867,8 +867,10 @@ end)
 
 -- Key controls
 CreateThread(function()
-	while CurrentAction do
-		Wait(0)
+	while true do
+		local Sleep = 1500
+		if CurrentAction then 
+			Sleep = 0
 			ESX.ShowHelpNotification(CurrentActionMsg)
 
 			if IsControlJustReleased(0, 38) then
@@ -888,5 +890,6 @@ CreateThread(function()
 
 				CurrentAction = nil
 			end
+		Wait(Sleep)
 	end
 end)

From 1c945de12a8d51e8b56c3865c918df896592dba4 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Tue, 29 Mar 2022 16:34:55 +0100
Subject: [PATCH 4/4] Fix(esx_jobs):Fix Blips not showing

---
 [esx_addons]/esx_jobs/client/main.lua | 2 +-
 [esx_addons]/esx_jobs/fxmanifest.lua  | 2 ++
 [esx_addons]/esx_jobs/locales/en.lua  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[esx_addons]/esx_jobs/client/main.lua b/[esx_addons]/esx_jobs/client/main.lua
index 5ae6b9a3..5915ba6c 100644
--- a/[esx_addons]/esx_jobs/client/main.lua
+++ b/[esx_addons]/esx_jobs/client/main.lua
@@ -246,7 +246,7 @@ function refreshBlips()
 						local blip = AddBlipForCoord(_Pos.x, _Pos.y, _Pos.z)
 						SetBlipSprite  (blip, jobValues.BlipInfos.Sprite)
 						SetBlipDisplay (blip, 4)
-						SetBlipScale   (blip, 0.0)
+						SetBlipScale   (blip, 0.8)
 						SetBlipCategory(blip, 3)
 						SetBlipColour  (blip, jobValues.BlipInfos.Color)
 						SetBlipAsShortRange(blip, true)
diff --git a/[esx_addons]/esx_jobs/fxmanifest.lua b/[esx_addons]/esx_jobs/fxmanifest.lua
index 1ddcb7ee..92e3e7b0 100644
--- a/[esx_addons]/esx_jobs/fxmanifest.lua
+++ b/[esx_addons]/esx_jobs/fxmanifest.lua
@@ -19,6 +19,8 @@ server_scripts {
 }
 
 client_scripts {
+	'@es_extended/locale.lua',
+	'locales/*.lua',
 	'client/main.lua'
 }
 
diff --git a/[esx_addons]/esx_jobs/locales/en.lua b/[esx_addons]/esx_jobs/locales/en.lua
index aaca224f..2bf8792e 100644
--- a/[esx_addons]/esx_jobs/locales/en.lua
+++ b/[esx_addons]/esx_jobs/locales/en.lua
@@ -112,4 +112,4 @@ Locales['en'] = {
   ['dd_clothing'] = 'clothing',
   ['dd_makeclothing'] = 'press ~INPUT_PICKUP~ to retrieve clothing.',
   ['dd_deliver_clothes'] = 'press ~INPUT_PICKUP~ to deliver the clothes.',
- }
+}