Merge branch 'develop' into society-refactor

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: General Support
+    url:  http://discord.esx-framework.org/
+    about: Please ask general questions on our Discord!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature Request
+about: Help us improve esx with your ideas
+title: "[Feature Request] - esx_script - Add better configuration"
+labels: enhancement
+assignees: Benzo00
+
+---
+
+**Describe the Feature**
+A simple description of the new feature.
+
+**Screenshots**
+You can also add some screenshots.
+
+**Additional context**
+If you want to add something more.

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx-legacy
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx-legacy  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx-legacy  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[SQL]/legacy.sql

@@ -329,7 +329,8 @@ INSERT INTO `licenses` (`type`, `label`) VALUES
 ('drive', 'Drivers License'),
 ('drive_bike', 'Motorcycle License'),
 ('drive_truck', 'Commercial Drivers License'),
-('weed_processing', 'Weed Processing License');
+('weed_processing', 'Weed Processing License'),
+('boat', 'Boat License');
 
 -- --------------------------------------------------------
 
@@ -709,12 +710,13 @@ INSERT INTO `vehicle_categories` (`name`, `label`) VALUES
 --
 
 CREATE TABLE `vehicle_sold` (
-  `id` INT(11) NOT NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `client` varchar(50) NOT NULL,
   `model` varchar(50) NOT NULL,
   `plate` varchar(50) NOT NULL,
   `soldby` varchar(50) NOT NULL,
-  `date` varchar(50) NOT NULL
+  `date` varchar(50) NOT NULL,
+   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB;
 
 --
@@ -846,24 +848,12 @@ ALTER TABLE `user_licenses`
 ALTER TABLE `vehicle_categories`
   ADD PRIMARY KEY (`name`);
 
---
--- Indexes for table `vehicle_sold`
---
-ALTER TABLE `vehicle_sold`
- ADD PRIMARY KEY (`id`);
-
 --
 -- Indexes for table `whitelist`
 --
 ALTER TABLE `whitelist`
   ADD PRIMARY KEY (`identifier`);
 
---
--- Indexes for table `vehicle_sold`
---
-ALTER TABLE `vehicle_sold`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
-  
 --
 -- AUTO_INCREMENT for table `addon_account_data`
 --
@@ -1038,5 +1028,4 @@ CREATE TABLE IF NOT EXISTS `banking` (
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 
-ALTER TABLE `users` ADD COLUMN `pincode` INT NULL;
+ALTER TABLE `users` ADD COLUMN `pincode` INT NULL;
-

[esx]/async/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     async
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    async  Copyright (C) 2015-2022 Jérémie N'gadi
+    async  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/async/README.md

@@ -6,7 +6,7 @@ A very Simple resource that allows resources to run tasks asynchronously.
 
 async - asynchronous tasks.
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/cron/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     cron
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    cron  Copyright (C) 2015-2022 Jérémie N'gadi
+    cron  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/cron/README.md

@@ -28,7 +28,7 @@ TriggerEvent('cron:runAt', 18, 30, CronTask)
 
 cron - run tasks at specific intervals!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/es_extended/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     es_extended
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    es_extended  Copyright (C) 2015-2022 Jérémie N'gadi
+    es_extended  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/es_extended/client/common.lua

@@ -5,3 +5,8 @@ end)
 if GetResourceState('ox_inventory') ~= 'missing' then
 	Config.OxInventory = true
 end
+
+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/sharedevent for how to fix!"):format(Invoke))
+end)

[esx]/es_extended/client/functions.lua

@@ -1087,6 +1087,10 @@ function ESX.Game.Utils.DrawText3D(coords, text, size, font)
 end
 
 function ESX.ShowInventory()
+    if not Config.EnableDefaultInventory then
+        return
+    end
+
     local playerPed = ESX.PlayerData.ped
     local elements = {
         {unselectable = true, icon = 'fas fa-box', title = 'Player Inventory'}

[esx]/es_extended/locales/de.lua

@@ -1,15 +1,15 @@
 Locales['de'] = {
   -- Inventory
-  ['inventory'] = 'inventar %s / %s',
+  ['inventory'] = 'Inventar %s / %s',
   ['use'] = 'benutzen',
   ['give'] = 'geben',
   ['remove'] = 'entfernen',
   ['return'] = 'zurück',
   ['give_to'] = 'geben an',
-  ['amount'] = 'betrag',
+  ['amount'] = 'Betrag',
-  ['giveammo'] = 'munition geben',
+  ['giveammo'] = 'Munition geben',
-  ['amountammo'] = 'anzahl der munition',
+  ['amountammo'] = 'Anzahl der Munition',
-  ['noammo'] = 'du hast keine munition!',
+  ['noammo'] = 'du hast keine Munition!',
   ['gave_item'] = 'du gibst %sx %s an %s',
   ['received_item'] = 'du empfängst %sx %s von %s',
   ['gave_weapon'] = 'du gibst %s an %s',
@@ -26,9 +26,9 @@ Locales['de'] = {
   ['received_account_money'] = 'du empfängst $%s (%s) von %s',
   ['amount_invalid'] = 'ungültiger Betrag',
   ['players_nearby'] = 'keine Spieler in der Nähe',
-  ['ex_inv_lim'] = 'aktion nicht möglich, Inventarlimit überschritten für %s',
+  ['ex_inv_lim'] = 'Aktion nicht möglich, Inventarlimit überschritten für %s',
-  ['imp_invalid_quantity'] = 'aktion nicht möglich, ungültige Anzahl',
+  ['imp_invalid_quantity'] = 'Aktion nicht möglich, ungültige Anzahl',
-  ['imp_invalid_amount'] = 'aktion nicht möglich, ungültiger Betrag',
+  ['imp_invalid_amount'] = 'Aktion nicht möglich, ungültiger Betrag',
   ['threw_standard'] = 'du wirfst %sx %s',
   ['threw_account'] = 'du wirfst $%s %s weg',
   ['threw_weapon'] = 'du wirfst %s weg',
@@ -38,71 +38,71 @@ Locales['de'] = {
   ['threw_pickup_prompt'] = 'drücke E um aufzuheben',
 
   -- Key mapping
-  ['keymap_showinventory'] = 'inventar anzeigen',
+  ['keymap_showinventory'] = 'Inventar anzeigen',
 
   -- Salary related
   ['received_salary'] = 'du hast dein Gehalt erhalten: $%s',
   ['received_help'] = 'du hast deine Sozialhilfe erhalten: $%s',
-  ['company_nomoney'] = 'die Firma in der du angestellt bist, ist zu arm um dein Gehalt zu zahlen',
+  ['company_nomoney'] = 'die Firma in der du angestellt bist, ist zu arm um dir dein Gehalt zu zahlen',
   ['received_paycheck'] = 'erhaltener Gehaltsscheck',
-  ['bank'] = 'bank',
+  ['bank'] = 'Bank',
-  ['account_bank'] = 'bank',
+  ['account_bank'] = 'Bank',
-  ['account_black_money'] = 'schwarzgeld',
+  ['account_black_money'] = 'Schwarzgeld',
-  ['account_money'] = 'geld',
+  ['account_money'] = 'Geld',
 
   ['act_imp'] = 'Aktion nicht möglich',
   ['in_vehicle'] = 'du kannst keine Items in einem Fahrzeug weitergeben',
 
   -- Commands
-  ['command_car'] = 'fahrzeug spawnen',
+  ['command_car'] = 'Fahrzeug spawnen',
-  ['command_car_car'] = 'fahrzeug spawn name oder hash',
+  ['command_car_car'] = 'Fahrzeug spawnname oder hash',
-  ['command_cardel'] = 'fahrzeuge in der nähe löschen',
+  ['command_cardel'] = 'Fahrzeuge in der nähe löschen',
-  ['command_cardel_radius'] = 'optional, jedes fahrzeug innerhalb des angegebenen radius löschen',
+  ['command_cardel_radius'] = 'Optional, jedes Fahrzeug innerhalb des angegebenen Radius löschen',
-  ['command_clear'] = 'chat leeren',
+  ['command_clear'] = 'Chat leeren',
-  ['command_clearall'] = 'chat leeren für alle spieler',
+  ['command_clearall'] = 'Chat leeren für alle spieler',
-  ['command_clearinventory'] = 'spieler inventar leeren',
+  ['command_clearinventory'] = 'Spielerinventar leeren',
-  ['command_clearloadout'] = 'spieler ausstattung löschen',
+  ['command_clearloadout'] = 'Spielerausstattung löschen',
-  ['command_giveaccountmoney'] = 'gebe guthaben',
+  ['command_giveaccountmoney'] = 'Geld aufs Konto laden',
-  ['command_giveaccountmoney_account'] = 'gültiger account name',
+  ['command_giveaccountmoney_account'] = 'gültiger Kontoname',
-  ['command_giveaccountmoney_amount'] = 'anzahl zum hinzufügen',
+  ['command_giveaccountmoney_amount'] = 'Anzahl zum hinzufügen',
-  ['command_giveaccountmoney_invalid'] = 'ungültiger account name',
+  ['command_giveaccountmoney_invalid'] = 'Ungültiger Kontoname',
-  ['command_giveitem'] = 'gebe ein item zu einem spieler',
+  ['command_giveitem'] = 'Item an Spieler geben',
-  ['command_giveitem_item'] = 'item name',
+  ['command_giveitem_item'] = 'Itemname',
-  ['command_giveitem_count'] = 'item anzahl',
+  ['command_giveitem_count'] = 'item Anzahl',
-  ['command_giveweapon'] = 'gebe waffe zu einem spieler',
+  ['command_giveweapon'] = 'Spieler eine Waffe geben',
-  ['command_giveweapon_weapon'] = 'waffen name',
+  ['command_giveweapon_weapon'] = 'Waffenname',
-  ['command_giveweapon_ammo'] = 'munition anzahl',
+  ['command_giveweapon_ammo'] = 'Munitionsanzahl',
-  ['command_giveweapon_hasalready'] = 'spieler hat bereits diese waffe',
+  ['command_giveweapon_hasalready'] = 'Spieler bereits im Besitz dieser Waffe',
-  ['command_giveweaponcomponent'] = 'gebe waffen component',
+  ['command_giveweaponcomponent'] = 'Spieler Waffenaufsatz geben',
-  ['command_giveweaponcomponent_component'] = 'component name',
+  ['command_giveweaponcomponent_component'] = 'Waffenaufsatz Name',
-  ['command_giveweaponcomponent_invalid'] = 'ungültiges waffen component',
+  ['command_giveweaponcomponent_invalid'] = 'ungültiger Waffenaufsatz',
-  ['command_giveweaponcomponent_hasalready'] = 'spieler hat bereits dieses waffen komponent',
+  ['command_giveweaponcomponent_hasalready'] = 'Spieler hat bereits diesen Waffenaufsatz',
-  ['command_giveweaponcomponent_missingweapon'] = 'spieler hat diese waffe nicht',
+  ['command_giveweaponcomponent_missingweapon'] = 'Der Spieler besitzt diese Waffe nicht',
-  ['command_save'] = 'spieler in die datenbank sichern',
+  ['command_save'] = 'Spieler in der Datenbank sichern',
-  ['command_saveall'] = 'alle spieler in die datenbank sichern',
+  ['command_saveall'] = 'Sichern von allen Spielern auf der Datenbank',
-  ['command_setaccountmoney'] = 'guthaben für den spieler setzen',
+  ['command_setaccountmoney'] = 'Kontosumme des Spielers setzen',
-  ['command_setaccountmoney_amount'] = 'guthaben zum setzen',
+  ['command_setaccountmoney_amount'] = 'Summe',
-  ['command_setcoords'] = 'teleportieren zu koordinaten',
+  ['command_setcoords'] = 'Zu den Koordinaten Teleportieren',
-  ['command_setcoords_x'] = 'x axis',
+  ['command_setcoords_x'] = 'x Position',
-  ['command_setcoords_y'] = 'y axis',
+  ['command_setcoords_y'] = 'y Position',
-  ['command_setcoords_z'] = 'z axis',
+  ['command_setcoords_z'] = 'z Position',
-  ['command_setjob'] = 'job für einen spieler setzen',
+  ['command_setjob'] = 'Dem Spieler einen Job setzen',
-  ['command_setjob_job'] = 'job name',
+  ['command_setjob_job'] = 'Name des Jobs',
-  ['command_setjob_grade'] = 'job rang',
+  ['command_setjob_grade'] = 'Rang des Jobs',
-  ['command_setjob_invalid'] = 'der job, rang oder beides ist ungültig',
+  ['command_setjob_invalid'] = 'Der Rang oder der Job ist nicht gültigt.',
-  ['command_setgroup'] = 'setze spieler gruppe',
+  ['command_setgroup'] = 'Spielergruppe setzen',
-  ['command_setgroup_group'] = 'gruppen name',
+  ['command_setgroup_group'] = 'Gruppenname',
-  ['commanderror_argumentmismatch'] = 'argumentanzahl stimmt nicht überein (übergeben %s, gesucht %s)',
+  ['commanderror_argumentmismatch'] = 'Die Anzahl der Argumente stimmen nicht überein (übergeben %s, gesucht %s)',
   ['commanderror_argumentmismatch_number'] = 'argument #%s typ stimmt nicht überein (übergeben string, gewünscht zahl)',
-  ['commanderror_invaliditem'] = 'falscher item name',
+  ['commanderror_invaliditem'] = 'falscher Itemname',
-  ['commanderror_invalidweapon'] = 'ungültige waffe',
+  ['commanderror_invalidweapon'] = 'ungültige Waffe',
-  ['commanderror_console'] = 'der command kann nicht von der konsole ausgeführt werden',
+  ['commanderror_console'] = 'Der Befehl kann nicht in der Konsole genutzt werden',
-  ['commanderror_invalidcommand'] = '/%s ist kein verfügbarer command!',
+  ['commanderror_invalidcommand'] = '/%s ist kein verfügbarer Befehl!',
-  ['commanderror_invalidplayerid'] = 'kein spieler ist online mit dieser id',
+  ['commanderror_invalidplayerid'] = 'Kein Spieler mit dieser ID scheint online zu sein',
-  ['commandgeneric_playerid'] = 'spieler id',
+  ['commandgeneric_playerid'] = 'Spieler ID',
-  ['command_giveammo_noweapon_found'] = '%s does not have that weapon',
+  ['command_giveammo_noweapon_found'] = '%s besitzt diese Waffe nicht',
-  ['command_giveammo_weapon'] = 'Weapon name',
+  ['command_giveammo_weapon'] = 'Waffenname',
-  ['command_giveammo_ammo'] = 'Ammo Quantity',
+  ['command_giveammo_ammo'] = 'Munitionsanzahl',
 
   -- Locale settings
   ['locale_digit_grouping_symbol'] = ' ',
@@ -187,34 +187,34 @@ Locales['de'] = {
   -- Weapon Components
   ['component_clip_default'] = 'standart Griff',
   ['component_clip_extended'] = 'erweiterter Griff',
-  ['component_clip_drum'] = 'trommelmagazin',
+  ['component_clip_drum'] = 'Trommelmagazin',
-  ['component_clip_box'] = 'kastenmagazin',
+  ['component_clip_box'] = 'Kastenmagazin',
-  ['component_flashlight'] = 'taschenlampe',
+  ['component_flashlight'] = 'Taschenlampe',
-  ['component_scope'] = 'zielfernrohr',
+  ['component_scope'] = 'Zielfernrohr',
   ['component_scope_advanced'] = 'erweitertes Zielfernrohr',
-  ['component_suppressor'] = 'schalldämpfer',
+  ['component_suppressor'] = 'Schalldämpfer',
-  ['component_grip'] = 'griff',
+  ['component_grip'] = 'Griff',
-  ['component_luxary_finish'] = 'luxus Waffen Design',
+  ['component_luxary_finish'] = 'luxus Waffendesign',
 
   -- Weapon Ammo
-  ['ammo_rounds'] = 'kugel(n)',
+  ['ammo_rounds'] = 'Kugel(n)',
-  ['ammo_shells'] = 'schrotpatrone(n)',
+  ['ammo_shells'] = 'Schrotpatrone(n)',
-  ['ammo_charge'] = 'ladung',
+  ['ammo_charge'] = 'Ladung',
-  ['ammo_petrol'] = 'liter Benzin',
+  ['ammo_petrol'] = 'Benzinkanister',
-  ['ammo_firework'] = 'feuerwerksrakete(n)',
+  ['ammo_firework'] = 'Feuerwerksrakete(n)',
-  ['ammo_rockets'] = 'rakete(n)',
+  ['ammo_rockets'] = 'Rakete(n)',
-  ['ammo_grenadelauncher'] = 'granate(n)',
+  ['ammo_grenadelauncher'] = 'Granate(n)',
-  ['ammo_grenade'] = 'granate(n)',
+  ['ammo_grenade'] = 'Granate(n)',
-  ['ammo_stickybomb'] = 'bombe(n)',
+  ['ammo_stickybomb'] = 'C4(s)',
-  ['ammo_pipebomb'] = 'bombe(n)',
+  ['ammo_pipebomb'] = 'Rohrbombe(n)',
-  ['ammo_smokebomb'] = 'bombe(n)',
+  ['ammo_smokebomb'] = 'Rauchgranate(n)',
-  ['ammo_molotov'] = 'cocktail(s)',
+  ['ammo_molotov'] = 'Molotovcocktail(s)',
-  ['ammo_proxmine'] = 'mine(n)',
+  ['ammo_proxmine'] = 'Annäherungsmine(n)',
-  ['ammo_bzgas'] = 'can(n)',
+  ['ammo_bzgas'] = 'Bzgas',
-  ['ammo_ball'] = 'ball',
+  ['ammo_ball'] = 'Ball',
-  ['ammo_snowball'] = 'schneebälle',
+  ['ammo_snowball'] = 'Schneebälle',
-  ['ammo_flare'] = 'signalfackel(n)',
+  ['ammo_flare'] = 'Signalfackel(n)',
-  ['ammo_flaregun'] = 'signalfackeln(munition)',
+  ['ammo_flaregun'] = 'Signalfackeln(munition)',
 
   -- Weapon Tints
   ['tint_default'] = 'standard',

[esx]/es_extended/server/common.lua

@@ -14,6 +14,10 @@ Core.Pickups = {}
 Core.PickupId = 0
 Core.PlayerFunctionOverrides = {}
 
+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/sharedevent for how to fix!"):format(Invoke))
+end)
 
 exports('getSharedObject', function()
   return ESX

[esx]/es_extended/server/main.lua

@@ -99,14 +99,14 @@ if not Config.Multichar then
     if identifier then
       if ESX.GetPlayerFromIdentifier(identifier) then
         deferrals.done(
-          ('There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
+          ('[ESX] There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
             identifier))
       else
         deferrals.done()
       end
     else
       deferrals.done(
-        'There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
+        '[ESX] There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
     end
   end)
 end
@@ -133,9 +133,9 @@ function loadESXPlayer(identifier, playerId, isNew)
     end
     local index = #userData.accounts + 1
     userData.accounts[index] = {
-      name = account, 
+      name = account,
       money = foundAccounts[account] or Config.StartingAccountMoney[account] or 0,
-      label = data.label, 
+      label = data.label,
       round = data.round,
       index = index
     }
@@ -299,13 +299,13 @@ function loadESXPlayer(identifier, playerId, isNew)
 
   xPlayer.triggerEvent('esx:playerLoaded',
     {
-      accounts = xPlayer.getAccounts(), 
+      accounts = xPlayer.getAccounts(),
-      coords = xPlayer.getCoords(), 
+      coords = xPlayer.getCoords(),
-      identifier = xPlayer.getIdentifier(), 
+      identifier = xPlayer.getIdentifier(),
       inventory = xPlayer.getInventory(),
-      job = xPlayer.getJob(), 
+      job = xPlayer.getJob(),
-      loadout = xPlayer.getLoadout(), 
+      loadout = xPlayer.getLoadout(),
-      maxWeight = xPlayer.getMaxWeight(), 
+      maxWeight = xPlayer.getMaxWeight(),
       money = xPlayer.getMoney(),
       sex = xPlayer.get("sex") or "m",
 	  firstName = xPlayer.get("firstName") or "John",

[esx]/esx_context/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_boat
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_boat  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_boat  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_identity/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_identity
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_identity  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_identity  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_identity/README.md

@@ -21,7 +21,7 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, H
 
 esx_identity - Make your Character a Person!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_identity/config.lua

@@ -17,7 +17,7 @@ Config.MaxNameLength    = 20 -- Max Name Length.
 Config.MinHeight        = 120 -- 120 cm lowest height
 Config.MaxHeight        = 220 -- 220 cm max height.
 Config.LowestYear       = 1900 -- 112 years old is the oldest you can be.
-Config.HighestYear      = 2003 -- 18 years old is the youngest you can be.
+Config.HighestYear      = 2005 -- 18 years old is the youngest you can be.
 
 Config.FullCharDelete   = true -- Delete all reference to character.
 Config.EnableDebugging  = ESX.GetConfig().EnableDebug -- prints for debugging :)

[esx]/esx_loadingscreen/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_menu_default
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_menu_default  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_menu_default  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_loadingscreen/README.md

@@ -6,7 +6,7 @@ A simple but beautiful Loading Screen for your server!
 
 esx_loadingscreen - Loading in style!
 
-Copyright (C) 2022 ESX-Framework
+Copyright (C) 2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_loadingscreen/css/index.css

@@ -12,102 +12,106 @@
  *   This copyright should appear in every part of the project code
  */
 
-html,body {
+html,
-
+body {
-    margin: 0;
+  margin: 0;
-    padding: 0;
+  padding: 0;
-    font-family: 'Quicksand', sans-serif;
+  font-family: "Quicksand", sans-serif;
-    overflow: hidden;
+  overflow: hidden;
-
 }
 
 #esx_intro {
-
+  z-index: 2;
-    z-index: 2;
-
 }
 
 #esx_loop {
-
+  z-index: 1;
-    z-index: 1;
-
 }
 
 #loading_txt {
+  bottom: 5%;
+  left: 50%;
+  margin-left: -80px;
+  position: absolute;
+  z-index: 999;
 
-    bottom: 5%;
+  -webkit-animation: fadein 5s;
-    left: 50%;
+  -moz-animation: fadein 5s;
-    margin-left: -80px;
+  -ms-animation: fadein 5s;
-    position: absolute;
+  -o-animation: fadein 5s;
-    z-index: 999;
+  animation: fadein 5s;
-
-    -webkit-animation: fadein 5s;
-       -moz-animation: fadein 5s;
-        -ms-animation: fadein 5s;
-         -o-animation: fadein 5s;
-            animation: fadein 5s;
-
 }
 
 p {
-
+  color: white;
-    color: white;
+  font-size: 32px;
-    font-size: 32px;
-
 }
 
 .text_thing:after {
-    content: ' .';
+  content: " .";
-    animation: dots 2s steps(5, end) infinite;
+  animation: dots 2s steps(5, end) infinite;
 }
 
 @keyframes dots {
-    0%, 20% {
+  0%,
-      color: rgba(0,0,0,0);
+  20% {
-      text-shadow:
+    color: rgba(0, 0, 0, 0);
-        .25em 0 0 rgba(0,0,0,0),
+    text-shadow: 0.25em 0 0 rgba(0, 0, 0, 0), 0.5em 0 0 rgba(0, 0, 0, 0);
-        .5em 0 0 rgba(0,0,0,0);
+  }
-    }
+  40% {
-    40% {
+    color: white;
-      color: white;
+    text-shadow: 0.25em 0 0 rgba(0, 0, 0, 0), 0.5em 0 0 rgba(0, 0, 0, 0);
-      text-shadow:
+  }
-        .25em 0 0 rgba(0,0,0,0),
+  60% {
-        .5em 0 0 rgba(0,0,0,0);
+    text-shadow: 0.25em 0 0 white, 0.5em 0 0 rgba(0, 0, 0, 0);
-    }
+  }
-    60% {
+  80%,
-      text-shadow:
+  100% {
-        .25em 0 0 white,
+    text-shadow: 0.25em 0 0 white, 0.5em 0 0 white;
-        .5em 0 0 rgba(0,0,0,0);
+  }
-    }
-    80%, 100% {
-      text-shadow:
-        .25em 0 0 white,
-        .5em 0 0 white;
-    }
 }
 
-
 @keyframes fadein {
-    from { opacity: 0; }
+  from {
-    to   { opacity: 1; }
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 @-moz-keyframes fadein {
-    from { opacity: 0; }
+  from {
-    to   { opacity: 1; }
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 @-webkit-keyframes fadein {
-    from { opacity: 0; }
+  from {
-    to   { opacity: 1; }
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 @-ms-keyframes fadein {
-    from { opacity: 0; }
+  from {
-    to   { opacity: 1; }
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 @-o-keyframes fadein {
-    from { opacity: 0; }
+  from {
-    to   { opacity: 1; }
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }

[esx]/esx_loadingscreen/index.html

@@ -1,28 +1,25 @@
 <html lang="en">
-
+  <head>
-<head>
-
     <link rel="stylesheet" href="css/index.css" type="text/css" />
-    <link href="https://fonts.googleapis.com/css2?family=Quicksand&display=swap" rel="stylesheet">
+    <link
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js" type="text/javascript"></script>
+      href="https://fonts.googleapis.com/css2?family=Quicksand&display=swap"
+      rel="stylesheet"
+    />
     <script src="./js/index.js" type="text/javascript"></script>
-</head>
+  </head>
-
-<body>
 
+  <body>
     <div id="wrapper">
-        <div id="loading_txt">
+      <div id="loading_txt">
-            <p class="text_thing">Loading</p>
+        <p class="text_thing">Loading</p>
-        </div>
+      </div>
 
-        <video id="esx_intro" width="100%" autoplay>
+      <video id="esx_intro" width="100%" autoplay>
-            <source src="vid/esx_intro.mp4" type="video/webm">
+        <source src="vid/esx_intro.mp4" type="video/webm" />
-        </video>
+      </video>
-        <video id="esx_loop" width="100%" loop>
+      <video id="esx_loop" width="100%" loop>
-            <source src="vid/esx_loop.mp4" type="video/webm">
+        <source src="vid/esx_loop.mp4" type="video/webm" />
-        </video>
+      </video>
     </div>
-
+  </body>
-</body>
+</html>
-
-</html>

[esx]/esx_loadingscreen/js/index.js

@@ -10,13 +10,13 @@
 //   If you redistribute this software, you must link to ORIGINAL repository at https://github.com/esx-framework/esx-reborn
 //   This copyright should appear in every part of the project code
 
-$(document).ready(function(){
+document.addEventListener("DOMContentLoaded", () => {
-    const introTag = document.getElementById('esx_intro');
+  const introTag = document.getElementById("esx_intro");
-    const loopTag = document.getElementById('esx_loop');
+  const loopTag = document.getElementById("esx_loop");
 
-    introTag.onended = (event) => {
+  introTag.onended = () => {
-        introTag.style.display = "none";
+    introTag.style.display = "none";
-        loopTag.loop = true; // true
+    loopTag.loop = true; // true
-        loopTag.play()
+    loopTag.play();
-      };
+  };
-})
+});

[esx]/esx_menu_default/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_menu_default
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_menu_default  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_menu_default  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_menu_default/README.md

@@ -9,7 +9,7 @@ A defualt List type menu for ESX.
 
 esx_menu_defualt - Default Menu!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_menu_default/client/main.lua

@@ -1,7 +1,8 @@
-local GUI, MenuType, OpenedMenus = {}, 'default', 0
+local GUI, MenuType, OpenedMenus, CurrentNameSpace = {}, 'default', 0, nil
 GUI.Time = 0
 
 local function openMenu(namespace, name, data)
+    CurrentNameSpace = namespace
     OpenedMenus += 1
     SendNUIMessage({
         action = 'openMenu',
@@ -12,6 +13,7 @@ local function openMenu(namespace, name, data)
 end
 
 local function closeMenu(namespace, name)
+    CurrentNameSpace = namespace
     OpenedMenus -= 1
     SendNUIMessage({
         action = 'closeMenu',
@@ -20,6 +22,14 @@ local function closeMenu(namespace, name)
     })
 end
 
+AddEventHandler('onResourceStop', function(resource)
+    if GetCurrentResourceName() == resource and OpenedMenus > 0  then
+        ESX.UI.Menu.CloseAll()
+    elseif CurrentNameSpace ~= nil and CurrentNameSpace == resource and OpenedMenus > 0 then
+        ESX.UI.Menu.CloseAll()
+    end
+end)
+
 ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu)
 
 RegisterNUICallback('menu_submit', function(data, cb)
@@ -58,60 +68,62 @@ RegisterNUICallback('menu_change', function(data, cb)
     cb('OK')
 end)
 
-CreateThread(function()
+ESX.RegisterInput('menu_default_enter', 'Submit menu item', 'keyboard', 'RETURN', function()
-    while true do
+    if OpenedMenus > 0 and (GetGameTimer() - GUI.Time) > 200 then
-        local Sleep = 500
+        SendNUIMessage({
-
+            action = 'controlPressed',
-        if OpenedMenus > 0 then
+            control = 'ENTER'
-            Sleep = 10
+        })
-            if IsControlPressed(0, 18) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then
+        GUI.Time = GetGameTimer()
-                SendNUIMessage({
-                    action = 'controlPressed',
-                    control = 'ENTER'
-                })
-                GUI.Time = GetGameTimer()
-            end
-
-            if IsControlPressed(0, 177) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then
-                SendNUIMessage({
-                    action = 'controlPressed',
-                    control = 'BACKSPACE'
-                })
-                GUI.Time = GetGameTimer()
-            end
-
-            if IsControlPressed(0, 27) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then
-                SendNUIMessage({
-                    action = 'controlPressed',
-                    control = 'TOP'
-                })
-                GUI.Time = GetGameTimer()
-            end
-
-            if IsControlPressed(0, 173) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then
-                SendNUIMessage({
-                    action = 'controlPressed',
-                    control = 'DOWN'
-                })
-                GUI.Time = GetGameTimer()
-            end
-
-            if IsControlPressed(0, 174) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then
-                SendNUIMessage({
-                    action = 'controlPressed',
-                    control = 'LEFT'
-                })
-                GUI.Time = GetGameTimer()
-            end
-
-            if IsControlPressed(0, 175) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then
-                SendNUIMessage({
-                    action = 'controlPressed',
-                    control = 'RIGHT'
-                })
-                GUI.Time = GetGameTimer()
-            end
-        end
-        Wait(Sleep)
     end
 end)
+
+ESX.RegisterInput('menu_default_backspace', 'Close menu', 'keyboard', 'BACK', function()
+    if OpenedMenus > 0 then
+        SendNUIMessage({
+            action = 'controlPressed',
+            control = 'BACKSPACE'
+        })
+        GUI.Time = GetGameTimer()
+    end
+end)
+
+ESX.RegisterInput('menu_default_top', 'Change menu focus to top item', 'keyboard', 'UP', function()
+    if OpenedMenus > 0 then
+        SendNUIMessage({
+            action = 'controlPressed',
+            control = 'TOP'
+        })
+        GUI.Time = GetGameTimer()
+    end
+end)
+
+ESX.RegisterInput('menu_default_down', 'Change menu focus to down item', 'keyboard', 'DOWN', function()
+    if OpenedMenus > 0 then
+        SendNUIMessage({
+            action = 'controlPressed',
+            control = 'DOWN'
+        })
+        GUI.Time = GetGameTimer()
+    end
+end)
+
+ESX.RegisterInput('menu_default_left', 'Change menu slider to left', 'keyboard', 'LEFT', function()
+    if OpenedMenus > 0 then
+        SendNUIMessage({
+            action = 'controlPressed',
+            control = 'LEFT'
+        })
+        GUI.Time = GetGameTimer()
+    end
+end)
+
+ESX.RegisterInput('menu_default_right', 'Change menu slider to right', 'keyboard', 'RIGHT', function()
+    if OpenedMenus > 0 then
+        SendNUIMessage({
+            action = 'controlPressed',
+            control = 'RIGHT'
+        })
+        GUI.Time = GetGameTimer()
+    end
+end)

[esx]/esx_menu_dialog/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_menu_dialog
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_menu_dialog  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_menu_dialog  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_menu_dialog/README.md

@@ -29,7 +29,7 @@ start esx_menu_dialog
 ### License
 esx_menu_dialog - input dialog for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_menu_list/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_menu_list
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_menu_list  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_menu_list  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_menu_list/README.md

@@ -29,7 +29,7 @@ start esx_menu_list
 ### License
 esx_menu_list - advanced menu inputs for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_multicharacter/client/main.lua

@@ -140,6 +140,24 @@ if ESX.GetConfig().Multichar then
 		})
 	end
 
+	function CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, value)
+		local elements = {
+			{title = TranslateCap('char_delete_confirmation'), icon = "fa-solid fa-users", description = TranslateCap('char_delete_confirmation_description'), unselectable = true},
+			{title = TranslateCap('char_delete'), icon ="fa-solid fa-xmark", description = TranslateCap('char_delete_yes_description'), action = 'delete', value = value},
+			{title = TranslateCap('return'), unselectable = false, icon = "fa-solid fa-arrow-left", description = TranslateCap('char_delete_no_description'), action = "return"}
+		}
+	
+		ESX.OpenContext("left", elements, function(element, Action)
+			if Action.action == "delete" then
+				ESX.CloseContext()
+				TriggerServerEvent('esx_multicharacter:DeleteCharacter', Action.value)
+				spawned = false
+			elseif Action.action == "return" then
+				CharacterOptions(Characters, slots, SelectedCharacter)
+			end
+		end, nil, false)
+	end
+
 	function CharacterOptions(Characters, slots, SelectedCharacter)
 		local elements = {{title = TranslateCap('character', Characters[SelectedCharacter.value].firstname .. " ".. Characters[SelectedCharacter.value].lastname),icon = "fa-regular fa-user", unselectable = true}, 
 		{title = TranslateCap('return'), unselectable = false,icon = "fa-solid fa-arrow-left",description = TranslateCap('return_description'), action = "return"}}
@@ -157,9 +175,7 @@ if ESX.GetConfig().Multichar then
 				ESX.CloseContext()
 				TriggerServerEvent('esx_multicharacter:CharacterChosen', Action.value, false)
 			elseif Action.action == "delete" then
-					ESX.CloseContext()
+				CharacterDeleteConfirmation(Characters, slots, SelectedCharacter, Action.value)
-					TriggerServerEvent('esx_multicharacter:DeleteCharacter', Action.value)
-					spawned = false
 			elseif Action.action == "return" then
 				SelectCharacterMenu(Characters, slots)
 			end

[esx]/esx_multicharacter/html/locales/es.js

@@ -0,0 +1,8 @@
+const translate = new Object();
+
+translate.name = "Nombre";
+translate.job = "Trabajo";
+translate.bank = "Banco";
+translate.money = "Dinero";
+translate.gender = "Género";
+translate.dob = "Fecha de nacimiento";

[esx]/esx_multicharacter/locales/en.lua

@@ -10,6 +10,10 @@ Locales["en"] = {
 	["char_disabled_description"] = "This Character Is Unusable.",
 	["char_delete"] = "Delete",
 	["char_delete_description"] = "Permanently Remove This Character.",
+	["char_delete_confirmation"] = "Delete Confirmation",
+	["char_delete_confirmation_description"] = "Are you sure removing selected character?",
+	["char_delete_yes_description"] = "Yes, I am sure removing selected character",
+	["char_delete_no_description"] = "No, return to character options",
 	["character"] = "Character: %s",
 	["return"] = "Return",
 	["return_description"] = "Return To Character Selection.",

[esx]/esx_multicharacter/readme.md

@@ -23,7 +23,7 @@ A Simple, Easy to Use resource, that allows Players to have multiple Characters,
 
 ## Notice
 
-Copyright © 2022 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH
+Copyright © 2023 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

[esx]/esx_notify/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_menu_default
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_menu_default  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_menu_default  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_notify/readme.md

@@ -55,7 +55,7 @@ ESX.ShowNotification("I i ~r~love~s~ donuts", "success", 3000)
 
 esx_notify- Notify!
 
-Copyright (C) 2022 ESX-Framework
+Copyright (C) 2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_skin/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_skin
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_skin  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_skin  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_skin/README.md

@@ -32,7 +32,7 @@ start esx_skin
 ### License
 esx_skin - skin selector for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/esx_textui/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_menu_default
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_menu_default  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_menu_default  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/esx_textui/readme.md

@@ -43,7 +43,7 @@ ESX.TextUI("i ~r~love~s~ donuts", "error")
 
 esx_textui - Persistant Notifications!
 
-Copyright (C) 2022 ESX-Framework
+Copyright (C) 2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx]/skinchanger/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     skinchanger
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    skinchanger  Copyright (C) 2015-2022 Jérémie N'gadi
+    skinchanger  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx]/skinchanger/README.md

@@ -73,7 +73,7 @@ end)
 
 skinchanger - Own your skin!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_accessories/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_accessories
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-20202322 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_accessories  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_accessories  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_accessories/README.md

@@ -13,7 +13,7 @@ Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can p
 
 esx_accessories - accessories 4 you!
 
-Copyright (C) 2015-2022 ESX-Framework
+Copyright (C) 2015-2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_addonaccount/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_addonaccount
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_addonaccount  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_addonaccount  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_addonaccount/README.md

@@ -31,7 +31,7 @@ end)
 
 esx_addonaccount - addon account for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_addoninventory/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_addoninventory
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_addoninventory  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_addoninventory  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_addoninventory/README.md

@@ -52,7 +52,7 @@ end)
 ### License
 esx_addoninventory - inventories!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_allowlist/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_whitelist
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_whitelist  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_whitelist  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_allowlist/README.md

@@ -7,7 +7,7 @@ This Script allows you to block all players from joining and specify the only pl
 
 esx_allowlist- block those evil intruders!
 
-Copyright (C) 2022 ESX-Framework
+Copyright (C) 2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_allowlist/server/main.lua

@@ -29,11 +29,11 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals)
 	local identifier = ESX.GetIdentifier(playerId)
 
 	if ESX.Table.SizeOf(AllowList) == 0 then
-		kickReason = TranslateCap('allowlist_empty')
+		kickReason = "[ESX] " .. TranslateCap('allowlist_empty')
 	elseif not identifier then
-		kickReason = TranslateCap('license_missing')
+		kickReason = "[ESX] " .. TranslateCap('license_missing')
 	elseif not AllowList[identifier] then
-		kickReason = TranslateCap('not_allowlist')
+		kickReason = "[ESX] " .. TranslateCap('not_allowlist')
 	end
 
 	if kickReason then

[esx_addons]/esx_ambulancejob/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_ambulancejob
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_ambulancejob  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_ambulancejob  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_ambulancejob/README.md

@@ -22,7 +22,7 @@ ESX Ambulance Job is an plugin for ESX with features:
 
 esx_ambulancejob - ambulance script for fivem
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_ambulancejob/fxmanifest.lua

@@ -29,5 +29,6 @@ client_scripts {
 dependencies {
 	'es_extended',
 	'esx_skin',
+	'esx_society',
 	'esx_vehicleshop'
 }

[esx_addons]/esx_ambulancejob/locales/hu.lua

@@ -5,54 +5,54 @@ Locales['hu'] = {
   ['ems_clothes_ems'] = 'Munkaruha',
   -- Vehicles
   ['ambulance'] = 'Mentőautó',
-  ['helicopter_prompt'] = ' [Információ]:omd meg az [E] gombot a helikopter listához.',
+  ['helicopter_prompt'] = 'Nyomd meg az [E] gombot a helikopter listához.',
-  ['garage_prompt'] = ' [Információ]:omd meg az [E] gombot a kocsi listához.',
+  ['garage_prompt'] = 'Nyomd meg az [E] gombot a kocsi listához.',
   ['garage_title'] = 'Autó funkciók',
   ['garage_stored'] = 'Garázsba',
   ['garage_notstored'] = 'Ismeretlen helyen',
   ['garage_storing'] = 'Próbáljuk betteni a kocsid a garázsodba, de előtte nézz körül, hogy biztos nincs melletted senki',
-  ['garage_has_stored'] = ' [Információ]:keresen tároltad a garázsba!',
+  ['garage_has_stored'] = ' Sikeresen tároltad a garázsba!',
-  ['garage_has_notstored'] = ' máció]:ncs a közeledben semmi!',
+  ['garage_has_notstored'] = 'Nincs a közeledben semmi!',
-  ['garage_notavailable'] = ' máció]:m tárolhatod a garázsba!',
+  ['garage_notavailable'] = 'Nemm tárolhatod a garázsba!',
-  ['garage_blocked'] = ' máció]:lami gátolja a kocsi lehívását!',
+  ['garage_blocked'] = 'Valami gátolja a kocsi lehívását!',
-  ['garage_empty'] = ' máció]:m teheted a garázsba!',
+  ['garage_empty'] = 'Nem teheted a garázsba!',
-  ['garage_released'] = ' [Információ]:keresen kivetted!',
+  ['garage_released'] = 'Sikeresen kivetted!',
-  ['garage_store_nearby'] = ' máció]:ncs a közeledben semmi!',
+  ['garage_store_nearby'] = 'Nincs a közeledben semmi!',
   ['garage_storeditem'] = 'Garázs megnyitása',
   ['garage_storeitem'] = 'Kocsi berakása a garázsba',
   ['garage_buyitem'] = 'Kocsi igénylés',
   ['shop_item'] = '$%s',
   ['vehicleshop_title'] = 'Autókereskedés',
   ['vehicleshop_confirm'] = 'Megszeretnéd venni ezt a járművet?',
-  ['vehicleshop_bought'] = ' [Információ]:keresen igényeltél egy  %s enért:  ',
+  ['vehicleshop_bought'] = 'Sikeresen igényeltél egy  %s ennyiért:  ',
-  ['vehicleshop_money'] = ' máció]:t most nem tudod megtenni!',
+  ['vehicleshop_money'] = 'Ezt most nem tudod megtenni!',
   ['vehicleshop_awaiting_model'] = 'Betöltés..',
   ['confirm_no'] = 'Vissza',
   ['confirm_yes'] = 'Igényel',
   -- Action Menu
-  ['revive_inprogress'] = ' [Információ]:kezdted az újraélesztést!',
+  ['revive_inprogress'] = 'Elkezdted az újraélesztést!',
-  ['revive_complete'] = ' [Információ]:raélesztetted:  %s',
+  ['revive_complete'] = 'Újraélesztetted:  %s',
-  ['revive_complete_award'] = ' [Információ]:raélesztetted:  %s jáost.',
+  ['revive_complete_award'] = 'Újraélesztetted:  %s játékost.',
   ['revive_fail_offline'] = 'A játékos nem elérhető',
-  ['heal_inprogress'] = ' [Információ]:kezdted a gyógyítást!',
+  ['heal_inprogress'] = 'Elkezdted a gyógyítást!',
-  ['heal_complete'] = ' [Információ]:ggyógyítottad:  %s jáost.',
+  ['heal_complete'] = 'Meggyógyítottad: %s játékost.',
-  ['no_players'] = ' máció]:ncs a közeledben senki!',
+  ['no_players'] = 'Nincs a közeledben senki!',
-  ['player_not_unconscious'] = ' [Információ]:játékos nincs öntudatánál!',
+  ['player_not_unconscious'] = 'A játékos nincs öntudatánál!',
-  ['player_not_conscious'] = ' [Információ]:játékos nincs öntudatánál!',
+  ['player_not_conscious'] = 'A játékos nincs öntudatánál!',
   -- Boss Menu
   ['boss_actions'] = 'Leader panel',
   -- Misc
-  ['invalid_amount'] = ' telen mennyiség',
+  ['invalid_amount'] = 'Érvénytelen mennyiség',
-  ['actions_prompt'] = ' [Információ]:omd meg az [E] gombot a panel megnyitásához.',
+  ['actions_prompt'] = 'Nyomd meg az [E] gombot a panel megnyitásához.',
   ['deposit_amount'] = 'Összeg betétele',
   ['money_withdraw'] = 'Összeg kivétele',
   ['fast_travel'] = 'Nyomj [E] hogy használd a liftet',
-  ['open_pharmacy'] = ' [Információ]:omd meg az [E] gombot a gyógyszer kivételéhez.',
+  ['open_pharmacy'] = 'Nyomd meg az [E] gombot a gyógyszer kivételéhez.',
   ['pharmacy_menu_title'] = 'Kellékek',
   ['pharmacy_take'] = 'Kivétel: <span style="color:red;">%s</span>',
   ['medikit'] = 'Elsősegély készlet',
   ['bandage'] = 'Kötszer',
-  ['max_item'] = ' máció]:m fér már el nálad!',
+  ['max_item'] = 'Nem fér már el nálad!',
   -- F6 Menu
   ['ems_menu'] = 'EMS menü',
   ['ems_menu_title'] = 'EMS Menu',
@@ -65,20 +65,20 @@ Locales['hu'] = {
   ['alert_ambulance'] = 'EMS értesités',
   -- Death
   ['respawn_available_in'] = 'Újraéledés: %s',
-  ['respawn_bleedout_in'] = 'Elfogsz vérezni  %s perc %s másodperclva...\n',
+  ['respawn_bleedout_in'] = 'Elfogsz vérezni  %s perc %s másodperc múlva...\n',
-  ['respawn_bleedout_prompt'] = 'Nyomd meg az [E]mbot az újraéledéshez',
+  ['respawn_bleedout_prompt'] = 'Nyomd meg az [E] gombot az újraéledéshez',
   ['respawn_bleedout_fine'] = 'Újraéledéshez: [E]',
-  ['respawn_bleedout_fine_msg'] = '[Információ]:Ennyit fizettél, hogy újraéledj',
+  ['respawn_bleedout_fine_msg'] = 'Ennyit fizettél, hogy újraéledj',
-  ['distress_send'] = 'Nyomd meg a   gombot a segítségkéréshez',
+  ['distress_send'] = 'Nyomd meg a G gombot a segítségkéréshez',
-  ['distress_sent'] = ' [Információ]:y civil értesítette az illetékes szervezetet!',
+  ['distress_sent'] = 'Egy civil értesítette az illetékes szervezetet!',
   -- Revive
-  ['revive_help'] = 'újraéleszteni egy játékos',
+  ['revive_help'] = 'újraéleszteni egy játékost',
   -- Item
-  ['used_medikit'] = ' [Információ]:használtál 1x segélytáskát.',
+  ['used_medikit'] = 'Elhasználtál 1x segélytáskát.',
-  ['used_bandage'] = ' [Információ]:használtál 1x kötszert.',
+  ['used_bandage'] = 'Elhasználtál 1x kötszert.',
-  ['not_enough_medikit'] = '[Információ]:ncs nálad: Defibrillátor.',
+  ['not_enough_medikit'] = 'Nincs nálad: Defibrillátor.',
-  ['not_enough_bandage'] = '[Információ]:ncs nálad: Kötszer.',
+  ['not_enough_bandage'] = 'Nincs nálad: Kötszer.',
-  ['healed'] = ' [Információ]:ggyógyítottak!',
+  ['healed'] = 'Meggyógyítottak!',
   -- Blips
   ['blip_hospital'] = 'Korház',
   ['blip_dead'] = 'Eszméletlen játékos',

[esx_addons]/esx_ambulancejob/server/main.lua

@@ -4,9 +4,9 @@ if GetResourceState("esx_phone") ~= 'missing' then
 TriggerEvent('esx_phone:registerNumber', 'ambulance', TranslateCap('alert_ambulance'), true, true)
 end
 
-if GetResourceState("esx_society") ~= 'missing' then
+CreateThread(function()
-TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'})
+	exports["esx_society"]:registerSociety('ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'})
-end
+end)
 
 RegisterNetEvent('esx_ambulancejob:revive')
 AddEventHandler('esx_ambulancejob:revive', function(playerId)

[esx_addons]/esx_animations/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_animations
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_animations  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_animations  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_animations/README.md

@@ -28,7 +28,7 @@ start esx_animations
 ### License
 esx_animations - play anims!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_bankerjob/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_bankerjob
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_bankerjob  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_bankerjob  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_bankerjob/README.md

@@ -35,7 +35,7 @@ start esx_bankerjob
 ### License
 esx_bankerjob - bank script
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_bankerjob/fxmanifest.lua

@@ -24,4 +24,7 @@ client_scripts {
 	'client/main.lua'
 }
 
-dependency 'es_extended'
+dependencies {
+	'es_extended',
+	'esx_society'
+}

[esx_addons]/esx_bankerjob/server/main.lua

@@ -1,5 +1,7 @@
 TriggerEvent('esx_phone:registerNumber', 'banker', _('phone_receive'), false, false)
-TriggerEvent('esx_society:registerSociety', 'banker', TranslateCap('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'})
+CreateThread(function()
+	exports["esx_society"]:registerSociety('banker', TranslateCap('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'})
+end)
 
 RegisterServerEvent('esx_bankerjob:customerDeposit')
 AddEventHandler('esx_bankerjob:customerDeposit', function (target, amount)

[esx_addons]/esx_banking/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_banking
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_banking  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_banking  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_banking/README.md

@@ -44,7 +44,7 @@ For example: exports["esx_banking"]:logTransaction(source,"WITHDRAW",200)
 ### License
 esx_banking - banking script for ESX
 
-Copyright (C) 2022 ESX-Framework
+Copyright (C) 2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_banking/client/main.lua

@@ -107,9 +107,9 @@ local function StartThread()
         while PlayerLoaded do
             _PlayerPedId = PlayerPedId()
             _GetEntityCoords = GetEntityCoords(_PlayerPedId)
+            local closestBank = {}
 
             if IsPedOnFoot(PlayerPedId()) then
-                local closestBank = {}
 
                 for i = 1, #Config.AtmModels do
                     local atm = GetClosestObjectOfType(_GetEntityCoords, 8.0, Config.AtmModels[i], false)
@@ -151,6 +151,9 @@ local function StartThread()
                         isInMarker = false
                         ESX.HideUI()
                     end
+                elseif not next(closestBank) and isInMarker then
+                    isInMarker = false
+                    ESX.HideUI()
                 end
 
             end
@@ -199,7 +202,7 @@ end)
 local function loadNPC(index, netID)
     CreateThread(function()
         while not NetworkDoesEntityExistWithNetworkId(netID) do
-            Wait(1)
+            Wait(200)
         end
         local npc = NetworkGetEntityFromNetworkId(netID)
         
@@ -247,6 +250,7 @@ end)
 AddEventHandler('onResourceStop', function(resource)
     if resource ~= GetCurrentResourceName() then return end
     RemoveBlips()
+    ESX.HideUI()
     if isInMenu then
         CloseUi()
     end

[esx_addons]/esx_banking/html/config.json

@@ -292,5 +292,102 @@
                 "tableFullLanguage":"Italian" 
             }
         }
+    },
+"ES":{
+        "DYNAMIC_FORM_DATA":[
+            {
+                "componentName":"moreGraph",
+                "elementID":"#wrapper",
+                "title":"",
+                "closeButtonText":"Cerrar",
+                "bankTitle":"Banco Fleeca",
+                "mainExitButtonText": "Cerrar sesión"
+            },
+            {
+                "elementID":"#cpincode",
+                "name":"cpincode",
+                "buttonText":"Aprobar",
+                "inputPlaceholder": "Introduzca 4 dígitos...",
+                "title":"CONFIGURACIÓN DEL PIN",
+                "description": "Aquí puede establecer o cambiar el código PIN.",
+                "type":"password"
+            },
+            {
+                "elementID":"#withdraw",
+                "name":"withdraw",
+                "buttonText":"Aprobar",
+                "inputPlaceholder": "Importe",
+                "title":"RETIRAR",
+                "description": "Aquí puede retirar su dinero del banco.",
+                "type":"number"
+            },
+            {
+                "elementID":"#deposit",
+                "name":"deposit",
+                "buttonText":"Aprobación",
+                "inputPlaceholder": "Importe",
+                "title":"DEPOSITO",
+                "description": "Aquí puede ingresar su dinero en el banco.",
+                "type":"number"
+            },
+            {
+                "elementID":"#transfer",
+                "name":"transfer",
+                "buttonText":"Transfererir",
+                "inputPlaceholder": "Importe",
+                "inputPlaceholder2": "ID del jugador",
+                "title":"TRANSFERENCIA",
+                "description": "Aquí puedes transferir tu dinero a otra persona."
+            },
+            {
+                "componentName":"trans",
+                "elementID":"#third-column",
+                "title":"HISTORIAL DE TRANSACCIONES",
+                "description": "Aquí puede ver su historial de transacciones.",
+                "moreHistoryText": "Mostrar más historial",
+                "moreGraphText": "Mostrar el gráfico"
+            },
+            {
+                "componentName":"pincodePanel",
+                "elementID":"#wrapper",
+                "title":"Introducir PIN",
+                "deleteButtonText": "<i class='fa-solid fa-ban'></i>",
+                "loginButtonText": "<i class='fa-solid fa-right-to-bracket'></i>",
+                "closeButtonText": "Close"
+            },
+            {
+                "componentName":"atmComponent",
+                "elementID":"#wrapper",
+                "title":"Banco Fleeca",
+                "closeButtonText":"Cerrar sesión"
+            }
+        ],
+        "LAUNGAGE": {
+            "your_money_title":"Saldo",
+            "your_money_desc":"Aquí puedes ver tu saldo actual y tu efectivo.",
+            "your_money_cash_label":"Su dinero en mano",
+            "your_money_bank_label":"Su saldo bancario",
+            "withdraw":"RETIRAR",
+            "deposit":"DEPÓSITO",
+            "transfer":"TRANSFERENCIA",
+            "transferReceive":"TRANSFERENCIA RECIBIDA",
+            "moneyFormat":"$__replaceData__",
+            "graphTitle":"Su saldo",
+            "moreGraphTitle": "Gráfico grande",
+            "moreHistoryTitle":"Mostrar más historial",
+            "inputErrorTitle":"Data is incorrect",
+            "inputErrorMessage":"No puede estar vacío ni tener un valor inferior a 1.",
+            "showPincodeErrorTitle":"PIN incorrecto",
+            "showPincodeErrorMessage":"El pin debe tener al menos 4 caracteres.",
+            "tableLang":{
+                "typeLabel": "Tipo de transacción",
+                "balanceLabel":"Saldo",
+                "amountLabel":"Importe",
+                "timeLabel":"Tiempo",
+                "searchInputPlaceholder":"Buscar...",
+                "_comment": "tableFullLanguage options: English,Hungarian you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/",
+                "tableFullLanguage":"Spanish" 
+            }
+        }
     }
 }

[esx_addons]/esx_barbershop/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_barbershop
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_barbershop  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_barbershop  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_barbershop/README.md

@@ -31,7 +31,7 @@ start esx_barbershop
 ### License
 esx_barbershop - barber shop!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_basicneeds/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_basicneeds
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_basicneeds  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_basicneeds  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_basicneeds/README.md

@@ -34,7 +34,7 @@ start esx_basicneeds
 ### License
 esx_basicneeds - thirst and hunger system
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_basicneeds/client/main.lua

@@ -108,6 +108,7 @@ end)
 RegisterNetEvent('esx_basicneeds:onEat')
 AddEventHandler('esx_basicneeds:onEat', function(prop_name)
     local Invoke = GetInvokingResource()
+
     print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onEat^7, this method is deprecated and should not be used! Refer to ^5https://documentation.esx-framework.org/addons/esx_basicneeds/events/oneat^7 for more info!'):format(Invoke))
 
     if not prop_name then
@@ -119,10 +120,12 @@ end)
 RegisterNetEvent('esx_basicneeds:onDrink')
 AddEventHandler('esx_basicneeds:onDrink', function(prop_name)
     local Invoke = GetInvokingResource()
+
     print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onDrink^7, this method is deprecated and should not be used! Refer to ^5https://documentation.esx-framework.org/addons/esx_basicneeds/events/ondrink^7 for more info!'):format(Invoke))
 
+
     if not prop_name then
         prop_name = 'prop_ld_flow_bottle'
     end
     TriggerEvent('esx_basicneeds:onUse', 'drink', prop_name)
-end)
+end)

[esx_addons]/esx_billing/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_billing
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_billing  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_billing  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_billing/README.md

@@ -48,7 +48,7 @@ end
 ### License
 esx_billing - billing for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_boat/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_boat
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_boat  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_boat  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_boat/README.md

@@ -33,7 +33,7 @@ start esx_boat
 ### License
 esx_boat - Boat shop and garage for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_clotheshop/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_clotheshop
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_clotheshop  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_clotheshop  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_clotheshop/README.md

@@ -6,7 +6,7 @@ It`s time to shine! Head over to the variety of stores this resource adds - to G
 
 esx_clotheshop - clothing store
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_cruisecontrol/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     async
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    async  Copyright (C) 2015-2022 Jérémie N'gadi
+    async  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_cruisecontrol/README.md

@@ -4,7 +4,7 @@
 
 esx_cruisecontrol - relaxing driving
 
-Copyright (C) 2015-2022 ESX-Framework
+Copyright (C) 2015-2023 ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_datastore/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_datastore
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_datastore  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_datastore  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_datastore/README.md

@@ -34,7 +34,7 @@ end)
 
 esx_datastore - Datastore for ESX-Framework
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_dmvschool/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_dmvschool
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_dmvschool  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_dmvschool  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_dmvschool/README.md

@@ -6,7 +6,7 @@ Tired of waiting for your local DMV to be free so you can get your driving licen
 
 esx_dmvschool - realistic DMV school for ESX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_dmvschool/html/questions_hu.js

@@ -0,0 +1,81 @@
+var tableauQuestion = [
+	{
+		question: "Mit jelent a közlekedésben a bizalmi elv?",
+		propositionA: "Számíthat arra, hogy a KRESZ minden helyzetben és helyen szabályozza a közlekedésben résztvevők jogait és kötelességeit.",
+		propositionB: "Számíthat arra, hogy a közlekedési szabályokat mások is megtartják.",
+		propositionC: "Számíthat arra, hogy a szabálysértők mindig megkapják a megérdemelt büntetésüket.",
+		reponse: "B"
+	},
+
+	{
+		question: "Haladhat-e a villamospályán, ha az út vonalvezetése vagy a látási viszonyok akadályozzák a villamos kellő távolságból való észlelését?",
+		propositionA: "Igen",
+		propositionB: "Nem",
+		propositionC: "Nem tudom",
+		reponse: "B"
+	},
+
+	{
+		question: "Balra kíván bekanyarodni. Általában hová kell besorolni kétirányú forgalmú úton?",
+		propositionA: "Az úttest felezővonala mellé.",
+		propositionB: "Az úttest bal szélére.",
+		propositionC: "Az úttest jobb szélére.",
+		reponse: "B"
+	},
+
+	{
+		question: "Lakott területen kívül elsöbbséget kell adnia az autóbuszöblöt elhagyó autóbusz részére?",
+		propositionA: "Igen",
+		propositionB: "Nem",
+		propositionC: "Ha féktávon kivül vagyok, akkor nem",
+		reponse: "B"
+	},
+
+	{
+		question: "Miként befolyásolja a vezetõ reakcióidejét az alkohol és a fáradtság hatása?",
+		propositionA: "A reakcióideje többszörösére növekedhet.",
+		propositionB: "A reakcióideje kismértékben csökken.",
+		propositionC: "A reakcióideje csak kismértékben növekszik.",
+		reponse: "A"
+	},
+
+	{
+		question: "Mikor szabad hirtelen fékezni?",
+		propositionA: "Csak akkor, ha ezt a személy- és vagyonbiztonság megóvása szükségessé teszi.",
+		propositionB: "Csak akkor, ha Ön mögött haladó jármû helyes követési távolságot tart.",
+		propositionC: "Csak akkor, ha a jármü gumija nem kopik el fékezés közben.",
+		reponse: "A"
+	},
+
+	{
+		question: "Hogyan változik a látása a sebesség növekedésével?",
+		propositionA: "Nagy sebességgel haladva csak a közeli tárgyakat látja élesen; távolra csak homályosan lát.",
+		propositionB: "Nagy sebességgel haladva csak a távoli tárgyak képe éles; a közeli tárgyak képe elmosódik.",
+		propositionC: "Nagy sebességgel haladva, olyan mintha belennék állva.",
+		reponse: "A"
+	},
+
+	{
+		question: "A  megkülönböztetõ jelzéseket használó gépjármû részére",
+		propositionA: "Minden helyzetben elsõbbséget kell adnia.",
+		propositionB: "Csak akkor kell elsõbbséget adnia, ha azzal más közlekedõt nem akadályoz jelentõsen.",
+		propositionC: "Csak akkor ha rámdudál.",
+		reponse: "A"
+	},
+
+	{
+		question: "Az előzés megkezdése előtt miként ellenőrízzük a mögöttes forgalmat?",
+		propositionA: "Oldalra-hátranézve.",
+		propositionB: "A belső, valamint a külső visszapillantó tükrök segítségével, és ha szükséges, akkor hátratekintéssel is.",
+		propositionC: "A külső visszapillantó tükör segítségével.",
+		reponse: "B"
+	},
+
+	{
+		question: "Be kell-e sorolni a járművel az úttest jobb szélén lévő autóbusz forgalmi sávba jobbra kanyarodáskor?",
+		propositionA: "Igen",
+		propositionB: "Nem",
+		propositionC: "Néha",
+		reponse: "B"
+	},
+]

[esx_addons]/esx_dmvschool/html/ui_hu.html

@@ -0,0 +1,118 @@
+<head>
+	<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
+	<link rel="stylesheet" href="styles.css" type="text/css">
+</head>
+
+<body>
+	<div class="full-screen">
+		<div class="question-container">
+			<!-- header -->
+			<div class="header">
+				<h1>Autós Iskola</h1>
+			</div>
+			<!-- home -->
+			<div class="body home">
+				<div class="content">
+					<!-- ICI BREVE PRESENTATION -->
+					<center>
+						<img src="dmv.png" class="logo">
+						<br>
+						<p class="bold-text">Üdvözöljük a Los Santos Autosiskolánál!
+						</center>
+						<br>
+						<center>Los Santos összes polgárának meg kell csinálni a KRESZ vizsgát a forgalmi vizsa elött
+							<br>A válaszoknál ne kapkodjon, használja ki a teljes idöt, gondolkodjon jozan ésszel.
+							<br>
+							<br>
+						</center>
+						KRESZ Vizsga
+						<br> - A KRESZ vizsga 1.000$-ba kerül, ami nem visszatéritendö!
+						<br> - Az autosiskola elfogadja a bankkártyás fizetést is de vigyázz, ne kerülj adosságba!
+						<br> - Ha nem sikerülne a teszt, ne aggodjon, ismét megprobálhatja!
+						<br>
+						<br> Forgalmi Vizsga
+						<br> - A Forgalmi vizsga 1.500$-ba kerül, ami szintén nem visszatéritendö összeg!
+						<br> - A Forgalmi vizsgánál figyelj oda, hogy ne okozz balesetet!
+						</p>
+					</center>
+				</div>
+				<div class="buttonspot">
+					<a href="#" class="button btnQuestion">Kezdés</a>
+				</div>
+				<div style="visibility: hidden;" class="barre-progression">
+					<h2>Folyamat</h2>
+					<progress class="progression" value="0" max="10">
+				</div>
+			</div>
+			<!-- Question-->
+			<div class="body questionnaire-container">
+				<div class="content">
+					<h2 id="questionNumero"></h2>
+					<p id="question"></p>
+					<form class="form" id="question-form">
+						<div>
+							<input class="option-input radio" type="radio" name="question" id="answerA" value="A">
+							<label class="answerA"></label>
+						</div>
+						<div>
+							<input class="option-input radio" type="radio" name="question" id="answerB" value="B">
+							<label class="answerB"></label>
+						</div>
+						<div>
+							<input class="option-input radio" type="radio" name="question" id="answerC" value="C">
+							<label class="answerC"></label>
+						</div>
+						<button type="submit" id="submit" class="submit">Következő kérdés</button>
+					</form>
+				</div>
+				<div class="barre-progression">
+					<h2>Folyamat</h2>
+					<progress class="progression" value="0" max="10">
+				</div>
+			</div>
+			<!-- Results -->
+			<div class="body resultGood">
+				<div class="content">
+					<center>
+						<p class="bold-text">Sikeres KRESZ Vizsga!</p>
+						<br>
+						<br>Gratulálok a sikeres KRESZ vizsgához!
+						<br>
+						<br>Most már elkezdheted a vezetést!
+					</center>
+				</div>
+				<div class="buttonspot">
+					<a href="#" class="button btnClose">Bezár</a>
+				</div>
+				<div style="visibility: hidden;" class="barre-progression">
+					<h2>Progress</h2>
+					<progress class="progression" value="10" max="10">
+				</div>
+			</div>
+			<div class="body resultBad">
+				<div class="content">
+					<center>
+						<p class="bold-text">Sajnos nem sikerült a vizsga!</p>
+						<br>
+						<br>Sajnálattal közlöm, de nem sikerült a KRESZ vizsga, kérlek probáld ujra késöbb...
+						<br>
+						<br>
+					</center>
+				</div>
+				<div class="buttonspot">
+					<a href="#" class="button btnKick">Bezár</a>
+				</div>
+				<div style="visibility: hidden;" class="barre-progression">
+					<h2>Folyamat</h2>
+					<progress class="progression" value="10" max="10">
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
+	<script src="questions.js" type="text/javascript"></script>
+	<script src="scripts.js" type="text/javascript"></script>
+	<script src="debounce.min.js" type="text/javascript"></script>
+
+</body>

[esx_addons]/esx_drugs/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_drugs
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_drugs  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_drugs  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_drugs/README.md

@@ -6,7 +6,7 @@ Who loves some good old Marijuana? I hope you do! Cause this resource lets you g
 
 esx_drugs - Drugs Job
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_garage/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_garage
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-      esx_garage  Copyright (C) 2015-2022 Jérémie N'gadi
+      esx_garage  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_holdup/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_holdup
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_holdup  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_holdup  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_holdup/README.md

@@ -6,7 +6,7 @@
 
 esx_holdup - rob stores!
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_joblisting/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_joblisting
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_joblisting  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_joblisting  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_joblisting/README.md

@@ -6,7 +6,7 @@ This Simple resource lets you finally contribute to Society and make a differenc
 
 esx_joblisting - virtual Job Center!
 
-Copyright (C) 2015-2022 Jérémie N'gadi, ESX-Framework
+Copyright (C) 2015-2023 Jérémie N'gadi, ESX-Framework
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_jobs/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_jobs
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_jobs  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_jobs  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_jobs/README.md

@@ -39,7 +39,7 @@ CloakRoom = {
 
 esx_jobs - jobs
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_license/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_license
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_license  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_license  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_lscustom/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     esx_lscustom
-    Copyright (C) 2015-2022 Jérémie N'gadi
+    Copyright (C) 2015-2023 Jérémie N'gadi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    esx_lscustom  Copyright (C) 2015-2022 Jérémie N'gadi
+    esx_lscustom  Copyright (C) 2015-2023 Jérémie N'gadi
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

[esx_addons]/esx_lscustom/README.md

@@ -8,7 +8,7 @@
 
 esx_lscustoms - The best LS Custom out there for FX
 
-Copyright (C) 2015-2022 Jérémie N'gadi
+Copyright (C) 2015-2023 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

[esx_addons]/esx_lscustom/client/main.lua

@@ -2,9 +2,7 @@ local Vehicles, myCar = {}, {}
 local lsMenuIsShowed, HintDisplayed, isInLSMarker = false, false, false
 
 RegisterNetEvent('esx:playerLoaded')
-AddEventHandler('esx:playerLoaded', function(xPlayer)
+AddEventHandler('esx:playerLoaded', function()
-    ESX.PlayerLoaded = true
-	ESX.PlayerData = xPlayer
     ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles)
         Vehicles = vehicles
     end)
@@ -13,8 +11,9 @@ end)
 RegisterNetEvent('esx_lscustom:installMod')
 AddEventHandler('esx_lscustom:installMod', function()
     local vehicle = GetVehiclePedIsIn(PlayerPedId(), false)
+    local NetId = NetworkGetNetworkIdFromEntity(vehicle)
     myCar = ESX.Game.GetVehicleProperties(vehicle)
-    TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar)
+    TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar, NetId)
 end)
 
 RegisterNetEvent('esx_lscustom:restoreMods', function(netId, props)
@@ -79,8 +78,8 @@ function OpenLSMenu(elems, menuName, menuTitle, parent)
 
                 if data.current.label == TranslateCap('by_default') or string.match(data.current.label, TranslateCap('installed')) then
                     ESX.ShowNotification(TranslateCap('already_own', data.current.label))
-										myCar = ESX.Game.GetVehicleProperties(vehicle)
+                    myCar = ESX.Game.GetVehicleProperties(vehicle)
-										TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar)
+                    TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar, NetworkGetNetworkIdFromEntity(vehicle))
                 else
                     local vehiclePrice = 50000
 

[esx_addons]/esx_lscustom/config.lua

@@ -483,19 +483,19 @@ Config.Menus = {
 		label = TranslateCap('engine'),
 		parent = 'upgrades',
 		modType = 11,
-		price = {13.95, 32.56, 65.12, 139.53}
+		price = {13.95, 27.9, 55.8, 111.6, 139.53}
 	},
 	modBrakes = {
 		label = TranslateCap('brakes'),
 		parent = 'upgrades',
 		modType = 12,
-		price = {4.65, 9.3, 18.6, 13.95}
+		price = {4.65, 9.3, 13.95, 18.6}
 	},
 	modTransmission = {
 		label = TranslateCap('transmission'),
 		parent = 'upgrades',
 		modType = 13,
-		price = {13.95, 20.93, 46.51}
+		price = {13.95, 20.93, 46.51, 63.55}
 	},
 	modSuspension = {
 		label = TranslateCap('suspension'),

[esx_addons]/esx_lscustom/server/main.lua

@@ -4,10 +4,10 @@ local Customs = {}
 RegisterNetEvent('esx_lscustom:startModing', function(props, netId)
 	local src = tostring(source)
 	if Customs[src] then
-		Customs[src][props.plate] = {props = props, netId = netId}
+		Customs[src][tostring(props.plate)] = {props = props, netId = netId}
 	else
 		Customs[src] = {}
-		Customs[src][props.plate] = {props = props, netId = netId}
+		Customs[src][tostring(props.plate)] = {props = props, netId = netId}
 	end
 end)
 
@@ -70,16 +70,30 @@ AddEventHandler('esx_lscustom:buyMod', function(price)
 end)
 
 RegisterServerEvent('esx_lscustom:refreshOwnedVehicle')
-AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps)
+AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps, netId)
+	local src = tostring(source)
 	local xPlayer = ESX.GetPlayerFromId(source)
-
 	MySQL.single('SELECT vehicle FROM owned_vehicles WHERE plate = ?', {vehicleProps.plate},
 	function(result)
 		if result then
 			local vehicle = json.decode(result.vehicle)
 			if vehicleProps.model == vehicle.model then
 				MySQL.update('UPDATE owned_vehicles SET vehicle = ? WHERE plate = ?', {json.encode(vehicleProps), vehicleProps.plate})
-				Customs[tostring(source)][tostring(vehicleProps.plate)].props = vehicleProps
+				if Customs[src] then
+					if Customs[src][tostring(vehicleProps.plate)]  then
+						Customs[src][tostring(vehicleProps.plate)].props = vehicleProps
+					else
+						Customs[src][tostring(vehicleProps.plate)] = {props = vehicleProps, netId = netId}
+					end
+				else
+					Customs[src] = {}
+					Customs[src][tostring(vehicleProps.plate)] = {props = vehicleProps, netId = netId}
+				end
+        local veh = NetworkGetEntityFromNetworkId(netId)
+				local Veh_State = Entity(veh).state.VehicleProperties
+				if Veh_State then
+					Entity(veh).state:set("VehicleProperties", vehicleProps, true)
+        end
 			else
 				print(('[^3WARNING^7] Player ^5%s^7 Attempted To upgrade with mismatching vehicle model'):format(xPlayer.source))
 			end