Merge pull request #1328 from esx-framework/fix-dev-to-main

🔀 Main to dev sync

[core]/cron/fxmanifest.lua

@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 server_script 'server/main.lua'

[core]/es_extended/client/main.lua

@@ -24,8 +24,7 @@ function ESX.SpawnPlayer(skin, coords, cb)
         p:resolve()
     end)
     Citizen.Await(p)
-    TriggerEvent('playerSpawned', coords)
-
+    
     local playerPed = PlayerPedId()
     FreezeEntityPosition(playerPed, true)
     SetEntityCoordsNoOffset(playerPed, coords.x, coords.y, coords.z, false, false, false, true)
@@ -35,6 +34,7 @@ function ESX.SpawnPlayer(skin, coords, cb)
     end
     FreezeEntityPosition(playerPed, false)
     NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, coords.heading, true, true, false)
+    TriggerEvent('playerSpawned', coords)
     cb()
 end
 

[core]/es_extended/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 description 'The Core resource that provides the functionalities for all other resources.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 shared_scripts {
 	'locale.lua',

[core]/esx_context/fxmanifest.lua

@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'A simplistic context menu for ESX.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 ui_page 'index.html'
 

[core]/esx_identity/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 shared_scripts {
 	'@es_extended/imports.lua',

[core]/esx_loadingscreen/fxmanifest.lua

@@ -2,9 +2,10 @@ game 'common'
 
 fx_version 'cerulean'
 author 'ESX-Framework'
-description 'A simple but beautiful Loading Screen for your server!'
-
+description 'Allows resources to Run tasks at specific intervals.'
+version '1.10.5'
 lua54 'yes'
+
 loadscreen 'index.html'
 
 shared_script 'config.lua'

[core]/esx_menu_default/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic menu system for ESX Legacy.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
 

[core]/esx_menu_dialog/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic input dialog for ESX Legacy.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 client_scripts {
 	'@es_extended/imports.lua',

[core]/esx_menu_list/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic table-based menu system for ESX Legacy.'
 lua54 'yes'
-version '1.10.4'
+version '1.10.5'
 
 
 client_scripts {

[core]/esx_multicharacter/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Allows players to have multiple characters on the same account.'
-version '1.10.4'
+version '1.10.5'
 lua54 'yes'
 
 dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }

[core]/esx_notify/fxmanifest.lua

@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 lua54 'yes'
 game 'gta5'
-version '1.10.4'
+version '1.10.5'
 author 'ESX-Framework'
 description 'A beautiful and simple NUI notification system for ESX'
 

[core]/esx_progressbar/fxmanifest.lua

@@ -2,9 +2,9 @@ fx_version 'adamant'
 
 game 'gta5'
 author 'ESX-Framework'
+description 'A beautiful and simple NUI progress bar for ESX'
+version '1.10.5'
 lua54 'yes'
-version '1.10.4'
-description 'a beautiful and simple NUI progress bar for ESX'
 
 client_scripts { 'Progress.lua' }
 shared_script '@es_extended/imports.lua'

[core]/esx_skin/fxmanifest.lua

@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'Allows players to customise their character\'s appearance'
-version '1.10.4'
+version '1.10.5'
 lua54 'yes'
 
 shared_script '@es_extended/imports.lua'

[core]/esx_textui/fxmanifest.lua

@@ -2,8 +2,8 @@ fx_version 'adamant'
 
 game 'gta5'
 author 'ESX-Framework'
-version '1.10.4'
 description 'A beautiful and simple Persistent Notification system for ESX.'
+version '1.10.5'
 lua54 'yes'
 
 client_scripts { 'TextUI.lua' }

[core]/skinchanger/fxmanifest.lua

@@ -1,9 +1,9 @@
 fx_version 'adamant'
 
 game 'gta5'
-lua54 'yes'
 description 'Saves/loads character appearances for ESX Legacy.'
-version '1.10.4'
+version '1.10.5'
+lua54 'yes'
 
 client_scripts {
 	'@es_extended/locale.lua',