From 59100f8672f952c19b3460938a10fdc85fe00084 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Fri, 7 Jul 2023 02:41:54 +0200 Subject: [PATCH 01/12] Add new workflow --- .github/workflows/main.yml | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..b75c6ea4 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,39 @@ +name: Add issue or pull request to project board + +on: + issues: + types: + - opened + pull_request: + types: + - opened + +jobs: + add-to-project: + name: Add issue or pull request to project + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v3 + - name: Get event creation date + id: date + run: | + if [[ "${{ github.event_name }}" == "issues" ]]; then + echo "date=${{ github.event.issue.created_at }}" >> $GITHUB_ENV + elif [[ "${{ github.event_name }}" == "pull_request" ]]; then + echo "date=${{ github.event.pull_request.created_at }}" >> $GITHUB_ENV + fi + - name: Add to project + uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/esx-framework/projects/9 + github-token: ${{ secrets.MY_GITHUB_TOKEN }} + id: add-project + - name: Update project fields + uses: titoportas/update-project-fields@v0.1.0 + with: + project-url: https://github.com/orgs/esx-framework/projects/9 + github-token: ${{ secrets.MY_GITHUB_TOKEN }} + item-id: ${{ steps.add-project.outputs.itemId }} + field-keys: Date + field-values: ${{ env.date }}, \ No newline at end of file From 92070525e5e9253e213390692a43df047b6ebaa9 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Sun, 9 Jul 2023 01:30:31 +0200 Subject: [PATCH 02/12] :package: Add format-all and editorconfig. --- .editorconfig | 10 ++++++++ .github/workflows/format-all.yml | 43 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .editorconfig create mode 100644 .github/workflows/format-all.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..383d3ca5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true +max_line_length = 300 +indent_size = 4 +indent_style = space \ No newline at end of file diff --git a/.github/workflows/format-all.yml b/.github/workflows/format-all.yml new file mode 100644 index 00000000..b94e1342 --- /dev/null +++ b/.github/workflows/format-all.yml @@ -0,0 +1,43 @@ +name: formatter-all + +on: + push: + branches: [ main ] + pull_request: + types: [ labeled ] + +jobs: + formatter: + name: formatter + runs-on: ubuntu-latest + permissions: + contents: write + if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.label.name == 'format_all') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref }} + fetch-depth: 0 + - uses: actions/setup-node@v3 + with: + node-version: "16" + - name: Install stylua and format files + uses: JohnnyMorganz/stylua-action@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + version: v0.18.0 + args: -- . + - name: Format files with Prettier + run: | + npx prettier --write '**/*.{ts,js,css,html}' + - name: Update repo before push + run: | + git pull + - name: Commit changes and push current branch + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_user_name: ESX GITHUB ACTIONS BOT + commit_user_email: esx-github-actions-bot@users.noreply.github.com + commit_message: :art:Code formatted in all files From 4187b709bac14fbe82e109dbccf80569352938cc Mon Sep 17 00:00:00 2001 From: nexis Date: Mon, 10 Jul 2023 16:08:22 +0200 Subject: [PATCH 03/12] Update functions.lua drift tyres were not working because of a typo --- [core]/es_extended/client/functions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua index 7ba5dcc3..00d22e7e 100644 --- a/[core]/es_extended/client/functions.lua +++ b/[core]/es_extended/client/functions.lua @@ -689,7 +689,7 @@ function ESX.Game.GetVehicleProperties(vehicle) neonColor = table.pack(GetVehicleNeonLightsColour(vehicle)), extras = extras, - dirftTyresEnabled = driftTyresEnabled, + driftTyresEnabled = driftTyresEnabled, tyreSmokeColor = table.pack(GetVehicleTyreSmokeColor(vehicle)), modSpoilers = GetVehicleMod(vehicle, 0), From a63e75cd9896d2f83a1b8354e76a45308cab964a Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:06:18 +0200 Subject: [PATCH 04/12] fix(rpc): remove esx:removeWeapon --- [core]/es_extended/client/main.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 93c95429..7cc84fc9 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -332,9 +332,7 @@ if not Config.OxInventory then RegisterNetEvent('esx:removeWeapon') AddEventHandler('esx:removeWeapon', function(weapon) - local playerPed = ESX.PlayerData.ped - RemoveWeaponFromPed(playerPed, joaat(weapon)) - SetPedAmmo(ESX.PlayerData.ped, joaat(weapon), 0) + print("[^1ERROR^7] event ^5'esx:removeWeapon'^7 Has Been Removed. Please use ^5xPlayer.removeWeapon^7 Instead!") end) RegisterNetEvent('esx:removeWeaponComponent') From a2ca81d6ff5d765cdc50ce3196b0b2cd801a6035 Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:07:52 +0200 Subject: [PATCH 05/12] fix(rpc): .removeWeapon function use rpc natives --- [core]/es_extended/server/classes/player.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 52b72225..ae515d7b 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -470,13 +470,17 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.removeWeaponComponent(weaponName, v2) end + local weaponHash = joaat(weaponName) + + RemoveWeaponFromPed(GetPlayerPed(self.source), weaponHash) + SetPedAmmo(GetPlayerPed(self.source), weaponHash, 0) + table.remove(self.loadout, k) break end end if weaponLabel then - self.triggerEvent('esx:removeWeapon', weaponName) self.triggerEvent('esx:removeInventoryItem', weaponLabel, false, true) end end From 518d7340d70a22b92a704546658ff82a81448886 Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:35:26 +0200 Subject: [PATCH 06/12] fix: move weaponHash outside of loop --- [core]/es_extended/server/classes/player.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index ae515d7b..03746914 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -460,7 +460,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end function self.removeWeapon(weaponName) - local weaponLabel + local weaponLabel, weaponHash + local weaponHash = joaat(weaponName) for k, v in ipairs(self.loadout) do if v.name == weaponName then @@ -469,8 +470,6 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, for _, v2 in ipairs(v.components) do self.removeWeaponComponent(weaponName, v2) end - - local weaponHash = joaat(weaponName) RemoveWeaponFromPed(GetPlayerPed(self.source), weaponHash) SetPedAmmo(GetPlayerPed(self.source), weaponHash, 0) From b744d3f69a07d06233e41c3e6dfbe8fbbb27417c Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:37:17 +0200 Subject: [PATCH 07/12] fix: move playerPed outside of loop --- [core]/es_extended/server/classes/player.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 03746914..9dd6f38c 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -462,6 +462,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, function self.removeWeapon(weaponName) local weaponLabel, weaponHash local weaponHash = joaat(weaponName) + local playerPed = GetPlayerPed(self.source) for k, v in ipairs(self.loadout) do if v.name == weaponName then @@ -471,8 +472,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.removeWeaponComponent(weaponName, v2) end - RemoveWeaponFromPed(GetPlayerPed(self.source), weaponHash) - SetPedAmmo(GetPlayerPed(self.source), weaponHash, 0) + RemoveWeaponFromPed(playerPed, weaponHash) + SetPedAmmo(playerPed, weaponHash, 0) table.remove(self.loadout, k) break From f47979917d2bdf8de284a8ca574a5512487c9e99 Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Mon, 10 Jul 2023 19:38:40 +0200 Subject: [PATCH 08/12] Update player.lua --- [core]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 9dd6f38c..10fd67a1 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -460,7 +460,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end function self.removeWeapon(weaponName) - local weaponLabel, weaponHash + local weaponLabel = nil local weaponHash = joaat(weaponName) local playerPed = GetPlayerPed(self.source) From 5c5b6be5a9d96f59b997b826cfb0f55021f7bbc7 Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Mon, 10 Jul 2023 20:00:28 +0200 Subject: [PATCH 09/12] fix: handling playerPed & weaponHash variable --- [core]/es_extended/server/classes/player.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 10fd67a1..62c12cf1 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -460,9 +460,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end function self.removeWeapon(weaponName) - local weaponLabel = nil - local weaponHash = joaat(weaponName) - local playerPed = GetPlayerPed(self.source) + local weaponLabel, playerPed = nil, GetPlayerPed(self.source) + + if not playerPed then + return print("[^1ERROR^7] xPlayer.removeWeapon ^5invalid^7 player ped!") + end for k, v in ipairs(self.loadout) do if v.name == weaponName then @@ -472,6 +474,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.removeWeaponComponent(weaponName, v2) end + local weaponHash = joaat(v.name) + RemoveWeaponFromPed(playerPed, weaponHash) SetPedAmmo(playerPed, weaponHash, 0) From 9ce6ba1b83dea2d29bc5daebe9e2f83971a0197c Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:40:32 +0200 Subject: [PATCH 10/12] refactor!(es_extended): Fix wheel saving (customWheels) --- [core]/es_extended/client/functions.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua index 00d22e7e..af1c9183 100644 --- a/[core]/es_extended/client/functions.lua +++ b/[core]/es_extended/client/functions.lua @@ -913,16 +913,10 @@ function ESX.Game.SetVehicleProperties(vehicle, props) ToggleVehicleMod(vehicle, 22, props.modXenon) end if props.modFrontWheels ~= nil then - SetVehicleMod(vehicle, 23, props.modFrontWheels, false) - end - if props.modCustomFrontWheels ~= nil then - SetVehicleMod(vehicle, 23, props.modCustomFrontWheels, false) + SetVehicleMod(vehicle, 23, props.modFrontWheels, props.modCustomFrontWheels) end if props.modBackWheels ~= nil then - SetVehicleMod(vehicle, 24, props.modBackWheels, false) - end - if props.modCustomBackWheels ~= nil then - SetVehicleMod(vehicle, 24, props.modCustomBackWheels, false) + SetVehicleMod(vehicle, 24, props.modBackWheels, props.modCustomBackWheels) end if props.modPlateHolder ~= nil then SetVehicleMod(vehicle, 25, props.modPlateHolder, false) From e85f6ed1359af7ca8276bb5d47abba2feceb9dc7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Mon, 10 Jul 2023 23:21:58 +0200 Subject: [PATCH 11/12] versioning changes to comply with conventions --- [core]/cron/fxmanifest.lua | 2 +- [core]/es_extended/fxmanifest.lua | 2 +- [core]/esx_context/fxmanifest.lua | 2 +- [core]/esx_identity/fxmanifest.lua | 2 +- [core]/esx_loadingscreen/fxmanifest.lua | 2 +- [core]/esx_menu_default/fxmanifest.lua | 2 +- [core]/esx_menu_dialog/fxmanifest.lua | 2 +- [core]/esx_menu_list/fxmanifest.lua | 2 +- [core]/esx_multicharacter/fxmanifest.lua | 2 +- [core]/esx_notify/fxmanifest.lua | 2 +- [core]/esx_progressbar/fxmanifest.lua | 2 +- [core]/esx_skin/fxmanifest.lua | 2 +- [core]/esx_textui/fxmanifest.lua | 2 +- [core]/skinchanger/fxmanifest.lua | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua index 97d75c99..cb631252 100644 --- 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.9.5' +version '1.10' server_script 'server/main.lua' diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index 193f9518..0fc34d85 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -5,7 +5,7 @@ game 'gta5' description 'ES Extended' lua54 'yes' -version '1.9.5' +version '1.10' shared_scripts { 'locale.lua', diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua index 2841b9b3..ae8c3a1b 100644 --- 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.9.5' +version '1.10' ui_page 'index.html' diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua index 2a916e95..9fcb376f 100644 --- a/[core]/esx_identity/fxmanifest.lua +++ b/[core]/esx_identity/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Identity' lua54 'yes' -version '1.9.5' +version '1.10' shared_scripts { '@es_extended/imports.lua', diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua index d0d9a914..f96153a0 100644 --- a/[core]/esx_loadingscreen/fxmanifest.lua +++ b/[core]/esx_loadingscreen/fxmanifest.lua @@ -1,5 +1,5 @@ game 'common' -version '1.9.5' +version '1.10' fx_version 'cerulean' author 'ESX-Framework' lua54 'yes' diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua index 7b82980b..a4de7080 100644 --- a/[core]/esx_menu_default/fxmanifest.lua +++ b/[core]/esx_menu_default/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Default' lua54 'yes' -version '1.9.5' +version '1.10' 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 index 62188ede..a2b3b6fe 100644 --- a/[core]/esx_menu_dialog/fxmanifest.lua +++ b/[core]/esx_menu_dialog/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Dialog' lua54 'yes' -version '1.9.5' +version '1.10' client_scripts { '@es_extended/imports.lua', diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua index 09340c9b..fa79546b 100644 --- a/[core]/esx_menu_list/fxmanifest.lua +++ b/[core]/esx_menu_list/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu List' lua54 'yes' -version '1.9.5' +version '1.10' client_scripts { '@es_extended/imports.lua', diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua index 62cf6896..ea46518e 100644 --- a/[core]/esx_multicharacter/fxmanifest.lua +++ b/[core]/esx_multicharacter/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'cerulean' game 'gta5' author 'ESX-Framework - Linden - KASH' description 'Official Multicharacter System For ESX Legacy' -version '1.9.5' +version '1.10' 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 index a8719b76..9801664b 100644 --- a/[core]/esx_notify/fxmanifest.lua +++ b/[core]/esx_notify/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' lua54 'yes' game 'gta5' -version '1.9.5' +version '1.10' author 'ESX-Framework' description 'Official NUI Notification system for ESX' diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua index 5982fb01..b4a5b903 100644 --- a/[core]/esx_progressbar/fxmanifest.lua +++ b/[core]/esx_progressbar/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' lua54 'yes' -version '1.9.5' +version '1.10' description 'ESX Progressbar' client_scripts { 'Progress.lua' } diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua index 2af52b09..5e860956 100644 --- a/[core]/esx_skin/fxmanifest.lua +++ b/[core]/esx_skin/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Skin' -version '1.9.5' +version '1.10' lua54 'yes' shared_script '@es_extended/imports.lua' diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua index 3c276e99..863d37de 100644 --- a/[core]/esx_textui/fxmanifest.lua +++ b/[core]/esx_textui/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' -version '1.9.5' +version '1.10' description 'ESX TextUI' lua54 'yes' client_scripts { 'TextUI.lua' } diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua index b10e3fb3..d612d46b 100644 --- a/[core]/skinchanger/fxmanifest.lua +++ b/[core]/skinchanger/fxmanifest.lua @@ -6,7 +6,7 @@ lua54 'yes' description 'Official ESX-Legacy resource for handling the Player`s Skin' -version '1.9.5' +version '1.10' client_scripts { '@es_extended/locale.lua', From 815945de5d99e3272bf0bdf85910eae545fb13bd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Mon, 10 Jul 2023 23:30:14 +0200 Subject: [PATCH 12/12] change version name to 1.10.1 --- [core]/cron/fxmanifest.lua | 2 +- [core]/es_extended/fxmanifest.lua | 2 +- [core]/esx_context/fxmanifest.lua | 2 +- [core]/esx_identity/fxmanifest.lua | 2 +- [core]/esx_loadingscreen/fxmanifest.lua | 2 +- [core]/esx_menu_default/fxmanifest.lua | 2 +- [core]/esx_menu_dialog/fxmanifest.lua | 2 +- [core]/esx_menu_list/fxmanifest.lua | 2 +- [core]/esx_multicharacter/fxmanifest.lua | 2 +- [core]/esx_notify/fxmanifest.lua | 2 +- [core]/esx_progressbar/fxmanifest.lua | 2 +- [core]/esx_skin/fxmanifest.lua | 2 +- [core]/esx_textui/fxmanifest.lua | 2 +- [core]/skinchanger/fxmanifest.lua | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua index 97d75c99..4d8a3165 100644 --- 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.9.5' +version '1.10.1' server_script 'server/main.lua' diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index 193f9518..3f8ebd5e 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -5,7 +5,7 @@ game 'gta5' description 'ES Extended' lua54 'yes' -version '1.9.5' +version '1.10.1' shared_scripts { 'locale.lua', diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua index 2841b9b3..7e52d224 100644 --- 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.9.5' +version '1.10.1' ui_page 'index.html' diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua index 2a916e95..6b15326a 100644 --- a/[core]/esx_identity/fxmanifest.lua +++ b/[core]/esx_identity/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Identity' lua54 'yes' -version '1.9.5' +version '1.10.1' shared_scripts { '@es_extended/imports.lua', diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua index d0d9a914..b056e9c9 100644 --- a/[core]/esx_loadingscreen/fxmanifest.lua +++ b/[core]/esx_loadingscreen/fxmanifest.lua @@ -1,5 +1,5 @@ game 'common' -version '1.9.5' +version '1.10.1' fx_version 'cerulean' author 'ESX-Framework' lua54 'yes' diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua index 7b82980b..0cbfb6cb 100644 --- a/[core]/esx_menu_default/fxmanifest.lua +++ b/[core]/esx_menu_default/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Default' lua54 'yes' -version '1.9.5' +version '1.10.1' 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 index 62188ede..70650536 100644 --- a/[core]/esx_menu_dialog/fxmanifest.lua +++ b/[core]/esx_menu_dialog/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Dialog' lua54 'yes' -version '1.9.5' +version '1.10.1' client_scripts { '@es_extended/imports.lua', diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua index 09340c9b..9e8b96f9 100644 --- a/[core]/esx_menu_list/fxmanifest.lua +++ b/[core]/esx_menu_list/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu List' lua54 'yes' -version '1.9.5' +version '1.10.1' client_scripts { '@es_extended/imports.lua', diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua index 62cf6896..17bf7ddf 100644 --- a/[core]/esx_multicharacter/fxmanifest.lua +++ b/[core]/esx_multicharacter/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'cerulean' game 'gta5' author 'ESX-Framework - Linden - KASH' description 'Official Multicharacter System For ESX Legacy' -version '1.9.5' +version '1.10.1' 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 index a8719b76..03158fa8 100644 --- a/[core]/esx_notify/fxmanifest.lua +++ b/[core]/esx_notify/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' lua54 'yes' game 'gta5' -version '1.9.5' +version '1.10.1' author 'ESX-Framework' description 'Official NUI Notification system for ESX' diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua index 5982fb01..e693ee26 100644 --- a/[core]/esx_progressbar/fxmanifest.lua +++ b/[core]/esx_progressbar/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' lua54 'yes' -version '1.9.5' +version '1.10.1' description 'ESX Progressbar' client_scripts { 'Progress.lua' } diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua index 2af52b09..ad6cd319 100644 --- a/[core]/esx_skin/fxmanifest.lua +++ b/[core]/esx_skin/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Skin' -version '1.9.5' +version '1.10.1' lua54 'yes' shared_script '@es_extended/imports.lua' diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua index 3c276e99..dcbf2864 100644 --- a/[core]/esx_textui/fxmanifest.lua +++ b/[core]/esx_textui/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' author 'ESX-Framework' -version '1.9.5' +version '1.10.1' description 'ESX TextUI' lua54 'yes' client_scripts { 'TextUI.lua' } diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua index b10e3fb3..53256461 100644 --- a/[core]/skinchanger/fxmanifest.lua +++ b/[core]/skinchanger/fxmanifest.lua @@ -6,7 +6,7 @@ lua54 'yes' description 'Official ESX-Legacy resource for handling the Player`s Skin' -version '1.9.5' +version '1.10.1' client_scripts { '@es_extended/locale.lua',