Merge pull request #1295 from esx-framework/main

sync main to dev
esx-framework · Jan 27, 2024 · 4eab575 · 4eab575
2 parents 9d90c9d + d41ac35
commit 4eab575
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 18 deletions.
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'cron'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/common.lua b/[core]/es_extended/client/common.lua
@@ -2,8 +2,6 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-Config.OxInventory = GetResourceState("ox_inventory"):find("start") and true
-
 AddEventHandler("esx:getSharedObject", function()
     local Invoke = GetInvokingResource()
     print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))

diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
@@ -1,6 +1,8 @@
 Config = {}
 Config.Locale = GetConvar("esx:locale", "en")
 
+Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing' 
+
 Config.Accounts = {
     bank = {
         label = TranslateCap("account_bank"),

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 description 'ES Extended'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 shared_scripts {
 	'locale.lua',

diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
@@ -27,8 +27,7 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-if GetResourceState("ox_inventory"):find("start") then
-    Config.OxInventory = true
+if Config.OxInventory then
     Config.PlayerFunctionOverride = "OxInventory"
     SetConvarReplicated("inventory:framework", "esx")
     SetConvarReplicated("inventory:weight", Config.MaxWeight * 1000)

diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'Offical ESX Legacy Context Menu'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 ui_page 'index.html'
 

diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Identity'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -1,6 +1,6 @@
 game 'common'
 
-version '1.10.2'
+version '1.10.3'
 fx_version 'cerulean'
 author 'ESX-Framework'
 lua54 'yes'

diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Menu Default'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
 

diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Menu Dialog'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'ESX Menu List'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 
 
 client_scripts {

diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Official Multicharacter System For ESX Legacy'
-version '1.10.2'
+version '1.10.3'
 lua54 'yes'
 
 dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }

diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 lua54 'yes'
 game 'gta5'
-version '1.10.2'
+version '1.10.3'
 author 'ESX-Framework'
 description 'Official NUI Notification system for ESX'
 

diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 lua54 'yes'
-version '1.10.2'
+version '1.10.3'
 description 'ESX Progressbar'
 
 client_scripts { 'Progress.lua' }

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'ESX Skin'
-version '1.10.2'
+version '1.10.3'
 lua54 'yes'
 
 shared_script '@es_extended/imports.lua'

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 author 'ESX-Framework'
-version '1.10.2'
+version '1.10.3'
 description 'ESX TextUI'
 lua54 'yes'
 

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 lua54 'yes'
 description 'Official ESX-Legacy resource for handling the Player`s Skin'
-version '1.10.2'
+version '1.10.3'
 
 client_scripts {
 	'@es_extended/locale.lua',