Merge branch 'main' into dev

This commit is contained in:
Jean-Baptiste
2023-07-10 23:40:07 +02:00
committed by GitHub
12 changed files with 8 additions and 11 deletions
-2
View File
@@ -1,9 +1,7 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
description 'ES Extended' description 'ES Extended'
lua54 'yes' lua54 'yes'
version '1.10.1' version '1.10.1'
-1
View File
@@ -1,7 +1,6 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
description 'ESX Identity' description 'ESX Identity'
lua54 'yes' lua54 'yes'
version '1.10.1' version '1.10.1'
+1
View File
@@ -1,4 +1,5 @@
game 'common' game 'common'
version '1.10.1' version '1.10.1'
fx_version 'cerulean' fx_version 'cerulean'
author 'ESX-Framework' author 'ESX-Framework'
-1
View File
@@ -1,7 +1,6 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
description 'ESX Menu Default' description 'ESX Menu Default'
lua54 'yes' lua54 'yes'
version '1.10.1' version '1.10.1'
-1
View File
@@ -1,7 +1,6 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
description 'ESX Menu Dialog' description 'ESX Menu Dialog'
lua54 'yes' lua54 'yes'
version '1.10.1' version '1.10.1'
+1 -1
View File
@@ -1,11 +1,11 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
description 'ESX Menu List' description 'ESX Menu List'
lua54 'yes' lua54 'yes'
version '1.10.1' version '1.10.1'
client_scripts { client_scripts {
'@es_extended/imports.lua', '@es_extended/imports.lua',
'@es_extended/client/wrapper.lua', '@es_extended/client/wrapper.lua',
+1
View File
@@ -1,4 +1,5 @@
fx_version 'cerulean' fx_version 'cerulean'
game 'gta5' game 'gta5'
author 'ESX-Framework - Linden - KASH' author 'ESX-Framework - Linden - KASH'
description 'Official Multicharacter System For ESX Legacy' description 'Official Multicharacter System For ESX Legacy'
+1
View File
@@ -1,4 +1,5 @@
fx_version 'adamant' fx_version 'adamant'
lua54 'yes' lua54 'yes'
game 'gta5' game 'gta5'
version '1.10.1' version '1.10.1'
+1
View File
@@ -1,4 +1,5 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
author 'ESX-Framework' author 'ESX-Framework'
lua54 'yes' lua54 'yes'
+1 -2
View File
@@ -1,11 +1,10 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
description 'ESX Skin' description 'ESX Skin'
version '1.10.1' version '1.10.1'
lua54 'yes' lua54 'yes'
shared_script '@es_extended/imports.lua' shared_script '@es_extended/imports.lua'
server_scripts { server_scripts {
+2
View File
@@ -1,9 +1,11 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
author 'ESX-Framework' author 'ESX-Framework'
version '1.10.1' version '1.10.1'
description 'ESX TextUI' description 'ESX TextUI'
lua54 'yes' lua54 'yes'
client_scripts { 'TextUI.lua' } client_scripts { 'TextUI.lua' }
shared_script '@es_extended/imports.lua' shared_script '@es_extended/imports.lua'
ui_page 'nui/index.html' ui_page 'nui/index.html'
-3
View File
@@ -1,11 +1,8 @@
fx_version 'adamant' fx_version 'adamant'
game 'gta5' game 'gta5'
lua54 'yes' lua54 'yes'
description 'Official ESX-Legacy resource for handling the Player`s Skin' description 'Official ESX-Legacy resource for handling the Player`s Skin'
version '1.10.1' version '1.10.1'
client_scripts { client_scripts {