starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 04:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1295 from esx-framework/main

Browse Source 
sync main to dev
This commit is contained in:
Arctos2win
2024-01-27 14:49:21 +01:00
committed by GitHub
parent 9d90c9d674 d41ac35f92
commit 4eab57589f
17 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/cron/fxmanifest.lua
+1 -1
View File
@@ -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'
[core]/es_extended/client/common.lua
-2
View File
@@ -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))
[core]/es_extended/config.lua
+2
View File
@@ -1,6 +1,8 @@
Config = {}
Config.Locale = GetConvar("esx:locale", "en")
Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing'
Config.Accounts = {
bank = {
label = TranslateCap("account_bank"),
[core]/es_extended/fxmanifest.lua
+1 -1
View File
@@ -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',
[core]/es_extended/server/common.lua
+1 -2
View File
@@ -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)
[core]/esx_context/fxmanifest.lua
+1 -1
View File
@@ -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'
[core]/esx_identity/fxmanifest.lua
+1 -1
View File
@@ -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',
[core]/esx_loadingscreen/fxmanifest.lua
+1 -1
View File
@@ -1,6 +1,6 @@
game 'common'
version '1.10.2'
version '1.10.3'
fx_version 'cerulean'
author 'ESX-Framework'
lua54 'yes'
[core]/esx_menu_default/fxmanifest.lua
+1 -1
View File
@@ -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' }
[core]/esx_menu_dialog/fxmanifest.lua
+1 -1
View File
@@ -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',
[core]/esx_menu_list/fxmanifest.lua
+1 -1
View File
@@ -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 {
[core]/esx_multicharacter/fxmanifest.lua
+1 -1
View File
@@ -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' }
[core]/esx_notify/fxmanifest.lua
+1 -1
View File
@@ -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'
[core]/esx_progressbar/fxmanifest.lua
+1 -1
View File
@@ -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' }
[core]/esx_skin/fxmanifest.lua
+1 -1
View File
@@ -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'
[core]/esx_textui/fxmanifest.lua
+1 -1
View File
@@ -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'
[core]/skinchanger/fxmanifest.lua
+1 -1
View File
@@ -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',