Merge branch 'esx-framework:main' into main

[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'
 }
 

[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)

[esx_addons]/esx_jobs/fxmanifest.lua

@@ -19,6 +19,8 @@ server_scripts {
 }
 
 client_scripts {
+	'@es_extended/locale.lua',
+	'locales/*.lua',
 	'client/main.lua'
 }
 

[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.',
- }
+}

[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)

[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