From c7ae67bd44773ca5d035b1c5215fd778c4d04c60 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 30 Jan 2024 09:39:35 +0100
Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/[maps]/CayoTwoIslands/fxmanifest.lua | 14 +++++++-------
 .../[maps]/CayoTwoIslands/scripts/blips.lua        | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua
index 387496b19..2831137b2 100644
--- a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua
+++ b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua
@@ -13,11 +13,11 @@ this_is_a_map("yes")
 data_file("DLC_ITYP_REQUEST")("stream/ytyp/mads_no_exp_pumps.ytyp") -- Stops petrol pumps from exploding. Credit to MadsL on the FiveM Forums for this
 
 client_scripts({
-	"scripts/twoislands.lua", -- Both Islands Visible At One Time
-	"scripts/cayo_perico_entitysets.lua", -- Responsible for spawning in heist props in El Rubio's Mansion safe. You can use this file to change the prop that appears.
-	"scripts/blips.lua", -- Map Blips
-	"scripts/zones.lua", -- Displays all map zones, fixing the 'bug' of showing North Yankton, and instead, showing Cayo Perico
-	"scripts/peds_config.lua", -- Invincible peds that appear on the island, ie merryweather
-	"scripts/main_peds.lua", -- Don't touch this
-	"scripts/static_emitters.lua", -- Disables annoying 'cheering' SFXs from Arena Wars location near North Yankton / Cayo Perico
+    "scripts/twoislands.lua", -- Both Islands Visible At One Time
+    "scripts/cayo_perico_entitysets.lua", -- Responsible for spawning in heist props in El Rubio's Mansion safe. You can use this file to change the prop that appears.
+    "scripts/blips.lua", -- Map Blips
+    "scripts/zones.lua", -- Displays all map zones, fixing the 'bug' of showing North Yankton, and instead, showing Cayo Perico
+    "scripts/peds_config.lua", -- Invincible peds that appear on the island, ie merryweather
+    "scripts/main_peds.lua", -- Don't touch this
+    "scripts/static_emitters.lua", -- Disables annoying 'cheering' SFXs from Arena Wars location near North Yankton / Cayo Perico
 })
\ No newline at end of file
diff --git a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua
index b07665527..fd3a008d7 100644
--- a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua
+++ b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua
@@ -1,13 +1,13 @@
 local blips = {
-	-- Airports --
-	{ title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 },
+    -- Airports --
+    { title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 },
 
-	-- Cayo Perico Island Blips --
-	-- Island Beach Party
-	{ title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 },
+    -- Cayo Perico Island Blips --
+    -- Island Beach Party
+    { title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 },
 
-	-- Island Weed Farm
-	{ title = "Island Weed Farm", colour = 25, id = 496, x = 5319.28, y = -5248.54, z = 32.58 },
+    -- Island Weed Farm
+    { title = "Island Weed Farm", colour = 25, id = 496, x = 5319.28, y = -5248.54, z = 32.58 },
 
 	-- Island Helipad 1 --
 	{ title = "Island Helipad", colour = 26, id = 542, x = 4890.52, y = -5736.66, z = 26.35 },

From e577cadd08103aa3ab621a5c8ca45bf8d6ec79d1 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 30 Jan 2024 09:47:08 +0100
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../[bpt_addons]/bpt_crafting/LICENSE         |  4 +--
 .../[bpt_addons]/bpt_crafting/README.md       |  2 +-
 .../[bpt_addons]/bpt_crafting/config.lua      |  8 ++---
 .../[bpt_addons]/bpt_crafting/fxmanifest.lua  | 30 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/LICENSE b/server-data/resources/[bpt_addons]/bpt_crafting/LICENSE
index c0e9f4dba..74e5f48d7 100644
--- a/server-data/resources/[bpt_addons]/bpt_crafting/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_crafting/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/README.md b/server-data/resources/[bpt_addons]/bpt_crafting/README.md
index e265397c3..511179e98 100644
--- a/server-data/resources/[bpt_addons]/bpt_crafting/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_crafting/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_crafting</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
index ad8e41fe8..ff1a73bf7 100644
--- a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
+++ b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
@@ -1,8 +1,8 @@
 Config = {
-	UseLimitSystem = false, -- Enable if your esx uses limit system
-	CraftingStopWithDistance = false, -- Crafting will stop when not near workbench
-	ExperiancePerCraft = 5, -- The amount of experiance added per craft (100 Experiance is 1 level)
-	HideWhenCantCraft = false, -- Instead of lowering the opacity it hides the item that is not craftable due to low level or wrong job
+    UseLimitSystem = false, -- Enable if your esx uses limit system
+    CraftingStopWithDistance = false, -- Crafting will stop when not near workbench
+    ExperiancePerCraft = 5, -- The amount of experiance added per craft (100 Experiance is 1 level)
+    HideWhenCantCraft = false, -- Instead of lowering the opacity it hides the item that is not craftable due to low level or wrong job
 
 	Categories = {
 		["medical"] = {
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_crafting/fxmanifest.lua
index 2178e681c..8aeecc42c 100644
--- a/server-data/resources/[bpt_addons]/bpt_crafting/fxmanifest.lua
+++ b/server-data/resources/[bpt_addons]/bpt_crafting/fxmanifest.lua
@@ -7,24 +7,24 @@ shared_script("@es_extended/imports.lua")
 ui_page("html/form.html")
 
 files({
-	"html/form.html",
-	"html/css.css",
-	"html/script.js",
-	"html/jquery-3.4.1.min.js",
-	"html/img/*.png",
+    "html/form.html",
+    "html/css.css",
+    "html/script.js",
+    "html/jquery-3.4.1.min.js",
+    "html/img/*.png",
 })
 
 client_scripts({
-	"@es_extended/locale.lua",
-	"locales/*.lua",
-	"config.lua",
-	"client/main.lua",
+    "@es_extended/locale.lua",
+    "locales/*.lua",
+    "config.lua",
+    "client/main.lua",
 })
 
 server_scripts({
-	"@es_extended/locale.lua",
-	"locales/*.lua",
-	"@oxmysql/lib/MySQL.lua",
-	"config.lua",
-	"server/main.lua",
-})
\ No newline at end of file
+    "@es_extended/locale.lua",
+    "locales/*.lua",
+    "@oxmysql/lib/MySQL.lua",
+    "config.lua",
+    "server/main.lua",
+})

From 23642cddd8ffdf73a8cabd3869c29d0b9879e60e Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:49:29 +0100
Subject: [PATCH 3/5] refactor: esx_mechanicjob inventory implementation

---
 .github/CHANGELOG.md                          |   3 +-
 .../[esx_addons]/esx_mechanicjob/LICENSE      |  14 +-
 .../[esx_addons]/esx_mechanicjob/README.md    |  10 +-
 .../esx_mechanicjob/client/main.lua           | 197 ++++++++++++++++--
 .../[esx_addons]/esx_mechanicjob/config.lua   |   7 +
 .../esx_mechanicjob/fxmanifest.lua            |   2 +-
 .../esx_mechanicjob/locales/br.lua            |  80 -------
 .../esx_mechanicjob/locales/de.lua            | 140 +++++++------
 .../esx_mechanicjob/locales/en.lua            |   7 +-
 .../esx_mechanicjob/locales/es.lua            |   7 +-
 .../esx_mechanicjob/locales/et.lua            |  81 -------
 .../esx_mechanicjob/locales/fi.lua            |   7 +-
 .../esx_mechanicjob/locales/fr.lua            |   7 +-
 .../esx_mechanicjob/locales/hu.lua            |   7 +-
 .../esx_mechanicjob/locales/it.lua            |   5 +
 .../esx_mechanicjob/locales/nl.lua            |  27 ++-
 .../esx_mechanicjob/locales/pl.lua            |   7 +-
 .../esx_mechanicjob/locales/si.lua            |  80 -------
 .../esx_mechanicjob/locales/sr.lua            |  86 ++++++++
 .../esx_mechanicjob/locales/sv.lua            |  80 -------
 .../localization/de_esx_mechanicjob.sql       |  32 +++
 .../localization/en_esx_mecanojob.sql         |   2 -
 .../localization/fi_esx_mecanojob.sql         |   2 -
 .../localization/fr_esx_mecanojob.sql         |  32 +++
 .../localization/hu_esx_mecanojob.sql         |   2 -
 .../localization/it_esx_mecanojob.sql         |  33 +++
 .../localization/nl_esx_mechanicjob.sql       |   2 +-
 .../localization/pl_esx_mecanojob.sql         |   2 -
 ...esx_mecanojob.sql => sl_esx_mecanojob.sql} |  22 +-
 .../localization/sr_esx_mechanicjob.sql       |  33 +++
 .../localization/sv_esx_mecanojob.sql         |  34 ---
 .../esx_mechanicjob/server/main.lua           | 150 ++++++++++++-
 .../[ox]/ox_inventory/data/stashes.lua        |  21 +-
 33 files changed, 707 insertions(+), 514 deletions(-)
 delete mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/locales/br.lua
 delete mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/locales/et.lua
 delete mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/locales/si.lua
 create mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/locales/sr.lua
 delete mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/locales/sv.lua
 create mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/localization/de_esx_mechanicjob.sql
 create mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/localization/fr_esx_mecanojob.sql
 create mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/localization/it_esx_mecanojob.sql
 rename server-data/resources/[esx_addons]/esx_mechanicjob/localization/{si_esx_mecanojob.sql => sl_esx_mecanojob.sql} (57%)
 create mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/localization/sr_esx_mechanicjob.sql
 delete mode 100644 server-data/resources/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 8da6d0d0b..b1d5a665a 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -105,4 +105,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
 79. [esx_society]: refactor: (esx_society):  complete rebuild for esx_society @bitpredator
 80. [npwd]: fix: database error npwd @bitpredator
 81. [CayoTwoIslands]: fix: nil value (global 'Config') @bitpredator
-82. [esx_vehicleshop]fix: globalstate rewrite + inventory removal via ox_inventory @bitpredator
\ No newline at end of file
+82. [esx_vehicleshop]: fix: globalstate rewrite + inventory removal via ox_inventory @bitpredator
+83. [esx_mechanicjob]: refactor: esx_mechanicjob inventory implementation @bitpredator
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/LICENSE b/server-data/resources/[esx_addons]/esx_mechanicjob/LICENSE
index 557475602..f8fd31393 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/LICENSE
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/LICENSE
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 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.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <2022>  <bitpredator>
+    esx_mechanicjob
+     Copyright (C) 2022-2024 bitpredator
 
     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
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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:
 
-    <program>  Copyright (C) <2022>  <bitpredator>
+    esx_mechanicjob  Copyright (C) 2022-2024 bitpredator
     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.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/README.md b/server-data/resources/[esx_addons]/esx_mechanicjob/README.md
index 70abf8495..cf4d2e07c 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/README.md
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/README.md
@@ -1,8 +1,12 @@
-# esx_mechanicjob
+<h1 align='center'>esx_mechanicjob</a></h1>
+<p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022 bitpredator
+### License
+Copyright (C) 2022-2024 bitpredator
 
-This program is a project for the fivem community, you have legal permission to distribute and / or modify it only if you have forked this repository, if it is not a fork repository, the version will be removed from the DMCA request.
+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.
+
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
 
 ATTENTION:
 You are not authorized to change the name of the resource and the resources within it.
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/client/main.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/client/main.lua
index 343786950..2d402f2a0 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/client/main.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/client/main.lua
@@ -48,7 +48,7 @@ function StopNPCJob(cancel)
 	if cancel then
 		ESX.ShowNotification(_U('mission_canceled'), "error")
 	else
-		TriggerServerEvent('esx_mechanicjob:onNPCJobCompleted')
+		--TriggerServerEvent('esx_mechanicjob:onNPCJobCompleted')
 	end
 end
 
@@ -57,18 +57,20 @@ function OpenMechanicActionsMenu()
 		{unselectable = true, icon = "fas fa-gear", title = _U('mechanic')},
 		{icon = "fas fa-car",   title = _U('vehicle_list'),   value = 'vehicle_list'},
 		{icon = "fas fa-shirt", title = _U('work_wear'),      value = 'cloakroom'},
-		{icon = "fas fa-shirt", title = _U('civ_wear'),       value = 'cloakroom2'}
+		{icon = "fas fa-shirt", title = _U('civ_wear'),       value = 'cloakroom2'},
+		{icon = "fas fa-box",   title = _U('deposit_stock'),  value = 'put_stock'},
+		{icon = "fas fa-box",   title = _U('withdraw_stock'), value = 'get_stock'}
 	}
 
 	if Config.EnablePlayerManagement and ESX.PlayerData.job and ESX.PlayerData.job.grade_name == 'boss' then
 		elements[#elements+1] = {
 			icon = 'fas fa-boss',
-			title = _U('boss_actions'),
+			title = _U('boss_actions'), 
 			value = 'boss_actions'
 		}
 	end
 
-	ESX.OpenContext("right", elements, function(_,element)
+	ESX.OpenContext("right", elements, function(menu,element)
 		if element.value == 'vehicle_list' then
 			if Config.EnableSocietyOwnedVehicles then
 				local elements2 = {
@@ -84,9 +86,9 @@ function OpenMechanicActionsMenu()
 						}
 					end
 
-					ESX.OpenContext("right", elements2, function()
+					ESX.OpenContext("right", elements2, function(menu2,element2)
 						ESX.CloseContext()
-						local vehicleProps = element.value
+						local vehicleProps = element2.value
 
 						ESX.Game.SpawnVehicle(vehicleProps.model, Config.Zones.VehicleSpawnPoint.Pos, 270.0, function(vehicle)
 							ESX.Game.SetVehicleProperties(vehicle, vehicleProps)
@@ -107,12 +109,12 @@ function OpenMechanicActionsMenu()
 				if Config.EnablePlayerManagement and ESX.PlayerData.job and (ESX.PlayerData.job.grade_name == 'boss' or ESX.PlayerData.job.grade_name == 'chief' or ESX.PlayerData.job.grade_name == 'experimente') then
 					elements2[#elements2+1] = {
 						icon = 'fas fa-truck',
-						title = 'Slamvan',
+						title = 'Slamvan', 
 						value = 'slamvan3'
 					}
 				end
 
-				ESX.OpenContext("right", elements2, function(_,element2)
+				ESX.OpenContext("right", elements2, function(menu2,element2)
 					if Config.MaxInService == -1 then
 						ESX.CloseContext()
 						ESX.Game.SpawnVehicle(element2.value, Config.Zones.VehicleSpawnPoint.Pos, 90.0, function(vehicle)
@@ -145,17 +147,22 @@ function OpenMechanicActionsMenu()
 			end)
 		elseif element.value == 'cloakroom2' then
 			ESX.CloseContext()
-			ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
+			ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
 				TriggerEvent('skinchanger:loadSkin', skin)
 			end)
 		elseif Config.OxInventory and (element.value == 'put_stock' or element.value == 'get_stock') then
 			exports.ox_inventory:openInventory('stash', 'society_mechanic')
+			return ESX.CloseContext()
+		elseif element.value == 'put_stock' then
+			OpenPutStocksMenu()
+		elseif element.value == 'get_stock' then
+			OpenGetStocksMenu()
 		elseif element.value == 'boss_actions' then
-			TriggerEvent('esx_society:openBossMenu', 'mechanic', function(_, menu)
-				menu.close()
+			TriggerEvent('esx_society:openBossMenu', 'mechanic', function(data, menu)
+			      ESX.CloseContext()
 			end)
 		end
-	end, function()
+	end, function(menu)
 		CurrentAction     = 'mechanic_actions_menu'
 		CurrentActionMsg  = _U('open_actions')
 		CurrentActionData = {}
@@ -171,7 +178,7 @@ function OpenMechanicHarvestMenu()
 			{icon = "fas fa-gear", title = _U('body_work_tools'), value = 'caro_tool'}
 		}
 
-		ESX.OpenContext("right", elements, function(_,element)
+		ESX.OpenContext("right", elements, function(menu,element)
 			if element.value == 'gaz_bottle' then
 				TriggerServerEvent('esx_mechanicjob:startHarvest')
 			elseif element.value == 'fix_tool' then
@@ -179,7 +186,7 @@ function OpenMechanicHarvestMenu()
 			elseif element.value == 'caro_tool' then
 				TriggerServerEvent('esx_mechanicjob:startHarvest3')
 			end
-		end, function()
+		end, function(menu)
 			CurrentAction     = 'mechanic_harvest_menu'
 			CurrentActionMsg  = _U('harvest_menu')
 			CurrentActionData = {}
@@ -189,6 +196,33 @@ function OpenMechanicHarvestMenu()
 	end
 end
 
+function OpenMechanicCraftMenu()
+	if Config.EnablePlayerManagement and ESX.PlayerData.job and ESX.PlayerData.job.grade_name ~= 'recrue' then
+		local elements = {
+			{unselectable = true, icon = "fas fa-gear", title = "Mechanic Craft Menu"},
+			{icon = "fas fa-gear", title = _U('blowtorch'),  value = 'blow_pipe'},
+			{icon = "fas fa-gear", title = _U('repair_kit'), value = 'fix_kit'},
+			{icon = "fas fa-gear", title = _U('body_kit'),   value = 'caro_kit'}
+		}
+
+		ESX.OpenContext("right", elements, function(menu,element)
+			if element.value == 'blow_pipe' then
+				TriggerServerEvent('esx_mechanicjob:startCraft')
+			elseif element.value == 'fix_kit' then
+				TriggerServerEvent('esx_mechanicjob:startCraft2')
+			elseif element.value == 'caro_kit' then
+				TriggerServerEvent('esx_mechanicjob:startCraft3')
+			end
+		end, function(menu)
+			CurrentAction     = 'mechanic_craft_menu'
+			CurrentActionMsg  = _U('craft_menu')
+			CurrentActionData = {}
+		end)
+	else
+		ESX.ShowNotification(_U('not_experienced_enough'))
+	end
+end
+
 function OpenMobileMechanicActionsMenu()
 	local elements = {
 		{unselectable = true, icon = "fas fa-gear", title = _U('mechanic')},
@@ -221,7 +255,7 @@ function OpenMobileMechanicActionsMenu()
 					if closestPlayer == -1 or closestDistance > 3.0 then
 						ESX.ShowNotification(_U('no_players_nearby'), "error")
 					else
-						menu.close()
+						ESX.CloseContext()
 						TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(closestPlayer), 'society_mechanic', _U('mechanic'), amount)
 					end
 				end
@@ -428,6 +462,91 @@ function OpenMobileMechanicActionsMenu()
 	end)
 end
 
+function OpenGetStocksMenu()
+	ESX.TriggerServerCallback('esx_mechanicjob:getStockItems', function(items)
+		local elements = {
+			{unselectable = true, icon = "fas fa-box", title = _U('mechanic_stock')}
+		}
+
+		for i=1, #items, 1 do
+			elements[#elements+1] = {
+				icon = 'fas fa-box',
+				title = 'x' .. items[i].count .. ' ' .. items[i].label,
+				value = items[i].name
+			}
+		end
+
+		ESX.OpenContext("right", elements, function(menu,element)
+			local itemName = element.value
+
+			local elements2 = {
+				{unselectable = true, icon = "fas fa-box", title = element.title},
+				{title = "Amount", input = true, inputType = "number", inputMin = 1, inputMax = 100, inputPlaceholder = "Amount to withdraw.."},
+				{icon = "fas fa-check-double", title = "Confirm", value = "confirm"}
+			}
+
+			ESX.OpenContext("right", elements2, function(menu2,element2)
+				local count = tonumber(menu2.eles[2].inputValue)
+
+				if count == nil then
+					ESX.ShowNotification(_U('invalid_quantity'))
+				else
+					ESX.CloseContext()
+					TriggerServerEvent('esx_mechanicjob:getStockItem', itemName, count)
+
+					Wait(1000)
+					OpenGetStocksMenu()
+				end
+			end)
+		end)
+	end)
+end
+
+function OpenPutStocksMenu()
+	ESX.TriggerServerCallback('esx_mechanicjob:getPlayerInventory', function(inventory)
+		local elements = {
+			{unselectable = true, icon = "fas fa-box", title = _U('inventory')}
+		}
+
+		for i=1, #inventory.items, 1 do
+			local item = inventory.items[i]
+
+			if item.count > 0 then
+				elements[#elements+1] = {
+					icon = 'fas fa-box',
+					title = item.label .. ' x' .. item.count,
+					type  = 'item_standard',
+					value = item.name
+				}
+			end
+		end
+
+		ESX.OpenContext("right", elements, function(menu,element)
+			local itemName = element.value
+
+			local elements2 = {
+				{unselectable = true, icon = "fas fa-box", title = element.title},
+				{title = "Amount", input = true, inputType = "number", inputMin = 1, inputMax = 100, inputPlaceholder = "Amount to deposit.."},
+				{icon = "fas fa-check-double", title = "Confirm", value = "confirm"}
+			}
+
+			ESX.OpenContext("right", elements2, function(menu2,element2)
+				local count = tonumber(menu2.eles[2].inputValue)
+
+				if count == nil then
+					ESX.ShowNotification(_U('invalid_quantity'))
+				else
+					ESX.CloseContext()
+					TriggerServerEvent('esx_mechanicjob:putStockItems', itemName, count)
+
+					Wait(1000)
+					OpenPutStocksMenu()
+				end
+			end)
+		end)
+	end)
+end
+
 RegisterNetEvent('esx_mechanicjob:onHijack')
 AddEventHandler('esx_mechanicjob:onHijack', function()
 	local playerPed = PlayerPedId()
@@ -548,6 +667,10 @@ AddEventHandler('esx_mechanicjob:hasEnteredMarker', function(zone)
 		CurrentAction     = 'mechanic_harvest_menu'
 		CurrentActionMsg  = _U('harvest_menu')
 		CurrentActionData = {}
+	elseif zone == 'Craft' then
+		CurrentAction     = 'mechanic_craft_menu'
+		CurrentActionMsg  = _U('craft_menu')
+		CurrentActionData = {}
 	elseif zone == 'VehicleDeleter' then
 		local playerPed = PlayerPedId()
 
@@ -559,6 +682,25 @@ AddEventHandler('esx_mechanicjob:hasEnteredMarker', function(zone)
 			CurrentActionData = {vehicle = vehicle}
 		end
 	end
+	ESX.TextUI(CurrentActionMsg)
+end)
+
+AddEventHandler('esx_mechanicjob:hasExitedMarker', function(zone)
+	if zone =='VehicleDelivery' then
+		NPCTargetDeleterZone = false
+	elseif zone == 'Craft' then
+		TriggerServerEvent('esx_mechanicjob:stopCraft')
+		TriggerServerEvent('esx_mechanicjob:stopCraft2')
+		TriggerServerEvent('esx_mechanicjob:stopCraft3')
+	elseif zone == 'Garage' then
+		TriggerServerEvent('esx_mechanicjob:stopHarvest')
+		TriggerServerEvent('esx_mechanicjob:stopHarvest2')
+		TriggerServerEvent('esx_mechanicjob:stopHarvest3')
+	end
+
+	CurrentAction = nil
+	ESX.CloseContext()
+	ESX.HideUI()
 end)
 
 AddEventHandler('esx_mechanicjob:hasEnteredEntityZone', function(entity)
@@ -568,13 +710,26 @@ AddEventHandler('esx_mechanicjob:hasEnteredEntityZone', function(entity)
 		CurrentAction     = 'remove_entity'
 		CurrentActionMsg  = _U('press_remove_obj')
 		CurrentActionData = {entity = entity}
+		ESX.TextUI(CurrentActionMsg)
 	end
 end)
 
-AddEventHandler('esx_mechanicjob:hasExitedEntityZone', function()
+AddEventHandler('esx_mechanicjob:hasExitedEntityZone', function(entity)
 	if CurrentAction == 'remove_entity' then
 		CurrentAction = nil
 	end
+	ESX.HideUI()
+end)
+
+RegisterNetEvent('esx_phone:loaded')
+AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts)
+	local specialContact = {
+		name       = _U('mechanic'),
+		number     = 'mechanic',
+		base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA4BJREFUWIXtll9oU3cUx7/nJA02aSSlFouWMnXVB0ejU3wcRteHjv1puoc9rA978cUi2IqgRYWIZkMwrahUGfgkFMEZUdg6C+u21z1o3fbgqigVi7NzUtNcmsac40Npltz7S3rvUHzxQODec87vfD+/e0/O/QFv7Q0beV3QeXqmgV74/7H7fZJvuLwv8q/Xeux1gUrNBpN/nmtavdaqDqBK8VT2RDyV2VHmF1lvLERSBtCVynzYmcp+A9WqT9kcVKX4gHUehF0CEVY+1jYTTIwvt7YSIQnCTvsSUYz6gX5uDt7MP7KOKuQAgxmqQ+neUA+I1B1AiXi5X6ZAvKrabirmVYFwAMRT2RMg7F9SyKspvk73hfrtbkMPyIhA5FVqi0iBiEZMMQdAui/8E4GPv0oAJkpc6Q3+6goAAGpWBxNQmTLFmgL3jSJNgQdGv4pMts2EKm7ICJB/aG0xNdz74VEk13UYCx1/twPR8JjDT8wttyLZtkoAxSb8ZDCz0gdfKxWkFURf2v9qTYH7SK7rQIDn0P3nA0ehixvfwZwE0X9vBE/mW8piohhl1WH18UQBhYnre8N/L8b8xQvlx4ACbB4NnzaeRYDnKm0EALCMLXy84hwuTCXL/ExoB1E7qcK/8NCLIq5HcTT0i6u8TYbXUM1cAyyveVq8Xls7XhYrvY/4n3gC8C+dsmAzL1YUiyfWxvHzsy/w/dNd+KjhW2yvv/RfXr7x9QDcmo1he2RBiCCI1Q8jVj9szPNixVfgz+UiIGyDSrcoRu2J16d3I6e1VYvNSQjXpnucAcEPUOkGYZs/l4uUhowt/3kqu1UIv9n90fAY9jT3YBlbRvFTD4fw++wHjhiTRL/bG75t0jI2ITcHb5om4Xgmhv57xpGOg3d/NIqryOR7z+r+MC6qBJB/ZB2t9Om1D5lFm843G/3E3HI7Yh1xDRAfzLQr5EClBf/HBHK462TG2J0OABXeyWDPZ8VqxmBWYscpyghwtTd4EKpDTjCZdCNmzFM9k+4LHXIFACJN94Z6FiFEpKDQw9HndWsEuhnADVMhAUaYJBp9XrcGQKJ4qFE9k+6r2+MG3k5N8VQ22TVglbX2ZwOzX2VvNKr91zmY6S7N6zqZicVT2WNLyVSehESaBhxnOALfMeYX+K/S2yv7wmMAlvwyuR7FxQUyf0fgc/jztfkJr7XeGgC8BJJgWNV8ImT+AAAAAElFTkSuQmCC'
+	}
+
+	TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon)
 end)
 
 -- Pop NPC mission vehicle when inside area
@@ -637,7 +792,7 @@ CreateThread(function()
 			Sleep = 500
 			local coords, letSleep = GetEntityCoords(PlayerPedId()), true
 
-			for _,v in pairs(Config.Zones) do
+			for k,v in pairs(Config.Zones) do
 				if v.Type ~= -1 and #(coords - v.Pos) < Config.DrawDistance then
 					Sleep = 0
 					DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, true, true, 2, true, nil, nil, false)
@@ -732,13 +887,13 @@ CreateThread(function()
 	local sleep = 500
 		if CurrentAction then
 			sleep = 0
-			ESX.ShowHelpNotification(CurrentActionMsg)
-
 			if IsControlJustReleased(0, 38) and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
 				if CurrentAction == 'mechanic_actions_menu' then
 					OpenMechanicActionsMenu()
 				elseif CurrentAction == 'mechanic_harvest_menu' then
 					OpenMechanicHarvestMenu()
+				elseif CurrentAction == 'mechanic_craft_menu' then
+					OpenMechanicCraftMenu()
 				elseif CurrentAction == 'delete_vehicle' then
 			if Config.EnableSocietyOwnedVehicles then
 
@@ -793,5 +948,5 @@ end, false)
 RegisterKeyMapping('mechanicMenu', 'Open Mechanic Menu', 'keyboard', 'F6')
 RegisterKeyMapping('mechanicjob', 'Togggle NPC Job', 'keyboard', 'F6')
 
-AddEventHandler('esx:onPlayerDeath', function() isDead = true end)
-AddEventHandler('esx:onPlayerSpawn', function() isDead = false end)
+AddEventHandler('esx:onPlayerDeath', function(data) isDead = true end)
+AddEventHandler('esx:onPlayerSpawn', function(spawn) isDead = false end)
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/config.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/config.lua
index 0dc15b950..a46c6e7fe 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/config.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/config.lua
@@ -38,6 +38,13 @@ Config.Zones = {
 		Type  = 21
 	},
 
+	--[[Craft = {
+		Pos   = vector3( -323.140, -129.882, 38.999 ),
+		Size  = { x = 1.0, y = 1.0, z = 1.0 },
+		Color = { r = 50, g = 200, b = 50 },
+		Type  = 21
+	},]]--
+
 	VehicleSpawnPoint = {
 		Pos   = vector3(-366.354, -110.766, 37.696 ),
 		Size  = { x = 1.5, y = 1.5, z = 1.0 },
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/fxmanifest.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/fxmanifest.lua
index 9d59c77b5..1927b4291 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/fxmanifest.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Mechanic Job'
 lua54 'yes'
-version '0.0.4'
+version '1.0.0'
 
 shared_script '@es_extended/imports.lua'
 
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/br.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/br.lua
deleted file mode 100644
index 9f87bc669..000000000
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/br.lua
+++ /dev/null
@@ -1,80 +0,0 @@
-Locales['br'] = {
-  ['mechanic']                  = 'Mecânico',
-  ['drive_to_indicated']        = 'Dirija para a localização indicada.',
-  ['mission_canceled']          = 'Missão ~r~cancelada',
-  ['vehicle_list']              = 'Lista de veículos',
-  ['work_wear']                 = 'Vestuário de trabalho',
-  ['civ_wear']                  = 'Roupas normal',
-  ['boss_actions']              = 'Administração',
-  ['service_vehicle']           = 'Veículo de serviço',
-  ['flat_bed']                  = 'Reboque Pranha',
-  ['tow_truck']                 = 'Reboque Guincho',
-  ['service_full']              = 'Serviço cheio: ',
-  ['open_actions']              = 'Aperte [E] para acessar menu.',
-  ['harvest']                   = 'Processando',
-  ['harvest_menu']              = 'Aperte [E] para acessar o menu de processamento.',
-  ['not_experienced_enough']    = 'Você não é ~r~experiente o suficiente para executar está ação.',
-  ['gas_can']                   = 'Lata de gás',
-  ['repair_tools']              = 'Ferramentas de reparo',
-  ['body_work_tools']           = 'Ferramentas de carroçaria',
-  ['blowtorch']                 = 'Maçarico',
-  ['repair_kit']                = 'Kit de reparação',
-  ['body_kit']                  = 'Kit de corpo',
-  ['billing']                   = 'Faturamento',
-  ['hijack']                    = 'Sequestro',
-  ['repair']                    = 'Reparar',
-  ['clean']                     = 'Limpar',
-  ['imp_veh']                   = 'Veículo rebocado',
-  ['place_objects']             = 'Objetos de trabalho',
-  ['invoice_amount']            = 'Valor da fatura',
-  ['amount_invalid']            = 'Valor inválido',
-  ['no_players_nearby']         = 'Sem jogadores nas proximidades',
-  ['no_vehicle_nearby']         = 'there is no nearby vehicle',
-  ['inside_vehicle']            = 'you can\'t do this from inside the vehicle!',
-  ['vehicle_unlocked']          = 'Veículo Destrancado',
-  ['vehicle_repaired']          = 'Veículo Reparado',
-  ['vehicle_cleaned']           = 'Veículo Limpo',
-  ['vehicle_impounded']         = 'Veículo ~r~removido',
-  ['must_seat_driver']          = 'Você deve estar sentado ~r~no banco do motorista!',
-  ['must_near']                 = 'Você deve estar perto de um ~r~veículo para rebocalo.',
-  ['vehicle_success_attached']  = 'Veículo foi rebocado com sucesso!.',
-  ['please_drop_off']           = 'Por favor, deixe o veículo na oficina mecânica',
-  ['cant_attach_own_tt']        = '~r~Você não pode rebocar seu próprio veículo!',
-  ['no_veh_att']                = 'Não há ~r~veículo para ser rebocado!',
-  ['not_right_veh']             = 'Este não é o veículo certo',
-  ['veh_det_succ']              = 'Veículo foi entregue com sucesso...',
-  ['imp_flatbed']               = '~r~Ação impossível! você precisa de um reboque de prancha para isso.',
-  ['objects']                   = 'Objetos',
-  ['roadcone']                  = 'Cone',
-  ['toolbox']                   = 'Caixa de ferramentas',
-  ['quantity']                  = 'Quantidade',
-  ['invalid_quantity']          = 'Quantidade inválida',
-  ['inventory']                 = 'Inventário',
-  ['veh_unlocked']              = 'Veículo destrancado',
-  ['hijack_failed']             = '~r~Destrava falhou',
-  ['body_repaired']             = 'Carro reparado',
-  ['veh_repaired']              = 'Veículo reparado',
-  ['veh_stored']                = 'Aperte [E] para armazenar o veículo.',
-  ['press_remove_obj']          = 'Aperte [E] para remover o objeto',
-  ['please_tow']                = 'Por favor reboque este veículo!',
-  ['wait_five']                 = 'Você deve ~r~aguardar 5 minutos',
-  ['must_in_flatbed']           = 'Você deve estar em um caminhão de mecânico para iniciar a missão',
-  ['mechanic_customer']         = 'Cliente mecânico',
-  ['you_do_not_room']           = '~r~Você não tem mais espaço',
-  ['recovery_gas_can']          = 'Lata de gâs fabricado...',
-  ['recovery_repair_tools']     = 'Ferramentas de reparo fabricado...',
-  ['recovery_body_tools']       = 'Ferramentas de capo fabricado...',
-  ['not_enough_gas_can']        = 'Você não tem ~r~lata de gás  o suficiente.',
-  ['assembling_blowtorch']      = 'Montagem Maçarico...',
-  ['not_enough_repair_tools']   = 'Você não tem ~r~ferramentas de reparo o suficiente.',
-  ['assembling_repair_kit']     = 'Fabricando Kit de reparação...',
-  ['not_enough_body_tools']     = 'Você não tem ~r~ferramentas corporais o suficiente.',
-  ['assembling_body_kit']       = 'Fabricando Kit de corpo...',
-  ['your_comp_earned']          = 'Sua empresa recebeu $',
-  ['you_used_blowtorch']        = 'Você usou um maçarico',
-  ['you_used_repair_kit']       = 'Você usou um Kit de reparação',
-  ['you_used_body_kit']         = 'Você usou um Kit de corpo',
-  ['have_withdrawn']            = 'você retirou x%s %s',
-  ['have_deposited']            = 'você depositou x%s %s',
-  ['player_cannot_hold']        = 'you do ~r~not have enough free space in your inventory!',
-}
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/de.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/de.lua
index 8c7c68cb5..b21d4800a 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/de.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/de.lua
@@ -1,80 +1,86 @@
 Locales['de'] = {
   ['mechanic']                  = 'Mechaniker',
-  ['drive_to_indicated']        = 'Fahre zum markierten Bereich',
+  ['drive_to_indicated']        = 'Fahre zum Makierten Standort',
   ['mission_canceled']          = 'Mission abgebrochen',
-  ['vehicle_list']              = 'Fahrzeugliste',
+  ['vehicle_list']              = 'Fahrzeug Liste',
   ['work_wear']                 = 'Arbeitskleidung',
-  ['civ_wear']                  = 'Zivilkleidung',
-  ['boss_actions']              = 'Inhaber Aktionen',
+  ['civ_wear']                  = 'Zivilisten Kleidung',
+  ['deposit_stock']             = 'Item einlagern',
+  ['withdraw_stock']            = 'Item auslagern',
+  ['boss_actions']              = 'Boss Aktionen',
   ['service_vehicle']           = 'Service Fahrzeug',
-  ['flat_bed']                  = 'Pritschenwagen',
+  ['flat_bed']                  = 'Pritsche',
   ['tow_truck']                 = 'Abschleppwagen',
-  ['service_full']              = 'Gesamt Service: ',
-  ['open_actions']              = 'Drücke [E] um Menü zu öffnen',
-  ['harvest']                   = 'Sammeln',
-  ['harvest_menu']              = 'Drücke [E] um Farm Menü aufzurufen',
-  ['not_experienced_enough']    = 'Du bist nicht erfahren genug um dies zu tun!',
+  ['service_full']              = 'Service Voll: ',
+  ['open_actions']              = 'Drücke [E] um auf das Menü zuzugreifen.',
+  ['harvest']                   = 'Ernten',
+  ['harvest_menu']              = 'Drücke [E] um das Ernte Menü zu öffnen.',
+  ['not_experienced_enough']    = 'Du bist zu unerfahren um dass zu machen!.',
   ['gas_can']                   = 'Benzinkanister',
-  ['repair_tools']              = 'Reparaturwerkzeug',
-  ['body_work_tools']           = 'Karosseriewerkzeug',
-  ['blowtorch']                 = 'Schweißgerät',
-  ['repair_kit']                = 'Reparatur Kit',
-  ['body_kit']                  = 'Karosserie Kit',
-  ['billing']                   = 'Rechnungen',
-  ['hijack']                    = 'Aufgebrochen',
+  ['repair_tools']              = 'Reparier Tools',
+  ['body_work_tools']           = 'bodywork Tools',
+  ['blowtorch']                 = 'Zündkerze',
+  ['repair_kit']                = 'Werkzeugkasten',
+  ['body_kit']                  = 'Fahrzeugkit',
+  ['craft']                     = 'Craften',
+  ['craft_menu']                = 'Drücke [E] um das Crafting Menü zu öffnen.',
+  ['billing']                   = 'Rechnung',
+  ['hijack']                    = 'Aufbrechen',
   ['repair']                    = 'Reparieren',
-  ['clean']                     = 'Reinigen',
-  ['imp_veh']                   = 'Fahrzeug einziehen',
-  ['place_objects']             = 'Objekte platzieren',
-  ['invoice_amount']            = 'Rechnungsbetrag',
-  ['amount_invalid']            = 'Ungültiger Betrag',
-  ['no_players_nearby']         = 'Es ist kein Spieler in der Nähe',
-  ['no_vehicle_nearby']         = 'Es ist kein Fahrzeug in der Nähe',
-  ['inside_vehicle']            = 'Du musst vorher aussteigen!',
-  ['vehicle_unlocked']          = 'Fahrzeug geöffnet',
-  ['vehicle_repaired']          = 'Fahrzeug repariert',
-  ['vehicle_cleaned']           = 'Fahrzeug gereinigt',
-  ['vehicle_impounded']         = 'Fahrzeug wurde eingezogen',
-  ['must_seat_driver']          = 'Setz dich als Fahrer hinein!',
-  ['must_near']                 = 'In die Nähe des Fahrzeugs stellen was eingezogen werden soll',
-  ['vehicle_success_attached']  = 'Fahrzeug fixiert',
-  ['please_drop_off']           = 'Stelle Fahrzeug in der Garage ab',
-  ['cant_attach_own_tt']        = 'Du kannst nicht den eigenen Abschleppwagen fixieren',
-  ['no_veh_att']                = 'Kein Fahrzeug zum fixieren gefunden',
-  ['not_right_veh']             = 'Falsches Fahrzeug',
-  ['veh_det_succ']              = 'Fahrzeug gelöst!',
-  ['imp_flatbed']               = 'Nicht möglich! Du benötigst einen Pritschenwagen',
+  ['clean']                     = 'Sauber machen',
+  ['imp_veh']                   = 'Abschleppen',
+  ['place_objects']             = 'Objekt Platzieren',
+  ['invoice_amount']            = 'Rechnungsanzahl',
+  ['amount_invalid']            = 'Ungültige Anzahl',
+  ['no_players_nearby']         = 'Es gibt keine Person in der Nähe',
+  ['no_vehicle_nearby']         = 'Es gibt kein Fahrzeug in der Nähe',
+  ['inside_vehicle']            = 'Du kannst das nicht außerhalb eines Fahrzeugs tun!', 
+  ['vehicle_unlocked']          = 'Das Fahrzeug wurde aufgebrochen',
+  ['vehicle_repaired']          = 'Das Fahrzeug wurde repariert',
+  ['vehicle_cleaned']           = 'Das Fahrzeug wurde sauber gemacht',
+  ['vehicle_impounded']         = 'Das Fahrzeug wurde abgeschleppt',
+  ['must_seat_driver']          = 'Du musst auf dem Fahrersitz sein!',
+  ['must_near']                 = 'Du musst in der nähe eines Fahrzeugs sein, um es abzuschleppen',
+  ['vehicle_success_attached']  = 'Fahrzeug erfolgreich aufgeladen',
+  ['please_drop_off']           = 'Bitte lade das Fahrzeug an der Garage ab!',
+  ['cant_attach_own_tt']        = 'Du kannst deinen eigenen Abschleppwagen nicht abschleppen!',
+  ['no_veh_att']                = 'Es gibt kein Fahrzeug was abgeschleppt werden kann!',
+  ['not_right_veh']             = 'Dies ist nicht das richtige Fahrzeug',
+  ['not_right_place']           = 'Dies ist nicht die richtige Position',
+  ['veh_det_succ']              = 'Fahrzeug erfolgreich abgeladen!',
+  ['imp_flatbed']               = 'Aktion unmöglich! Du benötigst einen Abschleppwagen um das zu tun!',
   ['objects']                   = 'Objekte',
-  ['roadcone']                  = 'Verkehrskegel',
+  ['roadcone']                  = 'Leitkegel',
   ['toolbox']                   = 'Werkzeugkasten',
+  ['mechanic_stock']            = 'Mechanikerlager',
   ['quantity']                  = 'Anzahl',
-  ['invalid_quantity']          = 'Anzahl ungültig!',
+  ['invalid_quantity']          = 'Ungültige Anzahl',
   ['inventory']                 = 'Inventar',
-  ['veh_unlocked']              = 'Fahrzeug geöffnet',
-  ['hijack_failed']             = 'Aufbrechen gescheitert',
-  ['body_repaired']             = 'Karosserie repariert',
-  ['veh_repaired']              = 'Fahrzueg repariert',
-  ['veh_stored']                = 'Drücke [E] um Fahrzeug einzuparken',
-  ['press_remove_obj']          = 'Drücke [E] um Objekt zu entfernen',
-  ['please_tow']                = 'Fahrzeug abschleppen',
-  ['wait_five']                 = 'Warte 5 Minuten',
-  ['must_in_flatbed']           = 'Du musst dich im Pritschenwagen befinden',
-  ['mechanic_customer']         = 'Kunde',
-  ['you_do_not_room']           = 'Kein Platz mehr',
-  ['recovery_gas_can']          = 'Abholung Bezinkanister...',
-  ['recovery_repair_tools']     = 'Abholung Reparaturwerkzeug...',
-  ['recovery_body_tools']       = 'Abholung Karosseriewerkzeug...',
-  ['not_enough_gas_can']        = 'Du hast nicht genug Benzinkanister',
-  ['assembling_blowtorch']      = 'Schweißgerät zusammenbauen...',
-  ['not_enough_repair_tools']   = 'Du hast nicht genug Reparaturwerkzeuge.',
-  ['assembling_repair_kit']     = 'Reparatur Kit zusammenbauen...',
-  ['not_enough_body_tools']     = 'Du hast nicht genug Karosseriewerkzeug',
-  ['assembling_body_kit']       = 'Karosseriewerkzeug zusammenbauen...',
-  ['your_comp_earned']          = 'Deine Firma hat $ verdient',
-  ['you_used_blowtorch']        = 'Schweißgerät genutzt',
-  ['you_used_repair_kit']       = 'Reparatur Kit genutzt',
-  ['you_used_body_kit']         = 'Karosserie Kit genutzt',
-  ['have_withdrawn']            = 'Du hast x%s %s abgehoben',
-  ['have_deposited']            = 'Du hast x%s %s eingezahlt',
-  ['player_cannot_hold']        = 'Kein Platz im Inventar!',
+  ['veh_unlocked']              = 'Fahrzeug aufgebrochen',
+  ['hijack_failed']             = 'Aufbrechen fehlgeschlagen',
+  ['body_repaired']             = 'Körper repariert',
+  ['veh_repaired']              = 'Fahrzeug repariert',
+  ['veh_stored']                = 'Drücke [E] um das Fahrzeug einzuparken.',
+  ['press_remove_obj']          = 'Drücke [E] um das Objekt zu entfernen',
+  ['please_tow']                = 'Bitte Schlepp das Fahrzeug ab',
+  ['wait_five']                 = 'Du musst 5 Minuten warten',
+  ['must_in_flatbed']           = 'Du musst dafür in einem Abschleppwagen sitzen',
+  ['mechanic_customer']         = 'Mechaniker Kunde',
+  ['you_do_not_room']           = 'Du hast nicht genügend Platz',
+  ['recovery_gas_can']          = 'Benzin Kanister wird abgerufen...',
+  ['recovery_repair_tools']     = 'Reparierungstools werden abgerufen...',
+  ['recovery_body_tools']       = 'Body Tools Abruf...',
+  ['not_enough_gas_can']        = 'Du hast nicht genügend Benzinkanister.',
+  ['assembling_blowtorch']      = 'Schweißbrenner wird angebracht...',
+  ['not_enough_repair_tools']   = 'Du hast nicht genug Reparierungstools.',
+  ['assembling_repair_kit']     = 'Zusammenbau des Reparatursatzes...',
+  ['not_enough_body_tools']     = 'Du haben nicht genügend Bodytools.',
+  ['assembling_body_kit']       = 'Zusammenbau des Bodykits...',
+  ['your_comp_earned']          = 'Deine Firma verdient €',
+  ['you_used_blowtorch']        = 'Du nutzt einen Schweißbrenner',
+  ['you_used_repair_kit']       = 'Du nutzt ein Reparierungskit',
+  ['you_used_body_kit']         = 'Du nutzt ein Body Kit',
+  ['have_withdrawn']            = 'Du zahlst aus x%s %s',
+  ['have_deposited']            = 'Du zahlst ein x%s %s',
+  ['player_cannot_hold']        = 'Du hast nicht genügend freien Platz im Inventar!',
 }
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/en.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/en.lua
index efa9d5246..14921c470 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/en.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/en.lua
@@ -5,6 +5,8 @@ Locales['en'] = {
   ['vehicle_list']              = 'vehicle List',
   ['work_wear']                 = 'workwear',
   ['civ_wear']                  = 'civilian clothes',
+  ['deposit_stock']             = 'deposit Stock',
+  ['withdraw_stock']            = 'withdraw Stock',
   ['boss_actions']              = 'boss Actions',
   ['service_vehicle']           = 'service Vehicle',
   ['flat_bed']                  = 'flatbed',
@@ -20,6 +22,8 @@ Locales['en'] = {
   ['blowtorch']                 = 'blowtorch',
   ['repair_kit']                = 'repair Kit',
   ['body_kit']                  = 'body Kit',
+  ['craft']                     = 'craft',
+  ['craft_menu']                = 'press [E] to access the crafting menu.',
   ['billing']                   = 'billing',
   ['hijack']                    = 'hijack',
   ['repair']                    = 'repair',
@@ -30,7 +34,7 @@ Locales['en'] = {
   ['amount_invalid']            = 'invalid amount',
   ['no_players_nearby']         = 'there is no nearby player',
   ['no_vehicle_nearby']         = 'there is no nearby vehicle',
-  ['inside_vehicle']            = 'you can\'t do this from inside the vehicle!',
+  ['inside_vehicle']            = 'you can\'t do this from inside the vehicle!', 
   ['vehicle_unlocked']          = 'the vehicle has been unlocked',
   ['vehicle_repaired']          = 'the vehicle has been repaired',
   ['vehicle_cleaned']           = 'the vehicle has been cleaned',
@@ -48,6 +52,7 @@ Locales['en'] = {
   ['objects']                   = 'objects',
   ['roadcone']                  = 'roadcone',
   ['toolbox']                   = 'toolbox',
+  ['mechanic_stock']            = 'mechanic Stock',
   ['quantity']                  = 'quantity',
   ['invalid_quantity']          = 'invalid quantity',
   ['inventory']                 = 'inventory',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/es.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/es.lua
index 54ecc7378..dbe223485 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/es.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/es.lua
@@ -5,6 +5,8 @@ Locales['es'] = {
   ['vehicle_list']              = 'Lista de vehículos',
   ['work_wear']                 = 'Ropa de trabajo',
   ['civ_wear']                  = 'Ropa de civil',
+  ['deposit_stock']             = 'Depositar stock',
+  ['withdraw_stock']            = 'Retirar stock',
   ['boss_actions']              = 'Acciones del jefe',
   ['service_vehicle']           = 'Vehículo de servicio',
   ['flat_bed']                  = 'Plataforma',
@@ -20,6 +22,8 @@ Locales['es'] = {
   ['blowtorch']                 = 'Soplete',
   ['repair_kit']                = 'kit de reparación',
   ['body_kit']                  = 'kit de carrocería',
+  ['craft']                     = 'Fabricar',
+  ['craft_menu']                = 'Presiona [E] para acceder al menú de crafteo.',
   ['billing']                   = 'Facturación',
   ['hijack']                    = 'Forzar',
   ['repair']                    = 'Reparar',
@@ -30,7 +34,7 @@ Locales['es'] = {
   ['amount_invalid']            = 'Cantidad Inválida',
   ['no_players_nearby']         = 'No hay un jugador/a cercano',
   ['no_vehicle_nearby']         = 'No hay ningún vehículo cercano',
-  ['inside_vehicle']            = '¡No puedes hacer esto desde el interior del vehículo!',
+  ['inside_vehicle']            = '¡No puedes hacer esto desde el interior del vehículo!', 
   ['vehicle_unlocked']          = 'El vehículo ha sido desbloqueado',
   ['vehicle_repaired']          = 'El vehículo ha sido reparado',
   ['vehicle_cleaned']           = 'El vehículo ha sido limpiado',
@@ -48,6 +52,7 @@ Locales['es'] = {
   ['objects']                   = 'Objetos',
   ['roadcone']                  = 'Cono',
   ['toolbox']                   = 'Caja de herramientas',
+  ['mechanic_stock']            = 'Stock mecánico',
   ['quantity']                  = 'Cantidad',
   ['invalid_quantity']          = 'Cantidad inválida',
   ['inventory']                 = 'Inventario',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/et.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/et.lua
deleted file mode 100644
index 2f10171c0..000000000
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/et.lua
+++ /dev/null
@@ -1,81 +0,0 @@
-Locales['et'] = {
-  ['mechanic']                  = 'Mehaanik',
-  ['drive_to_indicated']        = 'Sõida ettenähtud kohta.',
-  ['mission_canceled']          = 'Töö katkestatud',
-  ['vehicle_list']              = 'Sõidukite list',
-  ['work_wear']                 = 'Töö riided',
-  ['civ_wear']                  = 'Tava riided',
-  ['boss_actions']              = 'Bossi menüü',
-  ['service_vehicle']           = 'Teenindussõiduk',
-  ['flat_bed']                  = 'Pardaauto',
-  ['tow_truck']                 = 'Puksiirauto',
-  ['service_full']              = 'Täis teenus: ',
-  ['open_actions']              = 'Vajuta [E], et avada menüü.',
-  ['harvest']                   = 'Korja',
-  ['harvest_menu']              = 'Vajuta [E], et avada korjamis menüü.',
-  ['not_experienced_enough']    = 'Sa pole piisavalt kogenud, et seda teha.',
-  ['gas_can']                   = 'Bensiini kanister',
-  ['repair_tools']              = 'Parandus tööriistad',
-  ['body_work_tools']           = 'Kere tööriistad',
-  ['blowtorch']                 = 'keevitaja',
-  ['repair_kit']                = 'Parandus komplekt',
-  ['body_kit']                  = 'Kere',
-  ['billing']                   = 'Arved',
-  ['hijack']                    = 'Varasta',
-  ['repair']                    = 'Paranda',
-  ['clean']                     = 'Puhasta',
-  ['imp_veh']                   = 'Aresti',
-  ['place_objects']             = 'Aseta objekt',
-  ['invoice_amount']            = 'Arve',
-  ['amount_invalid']            = 'Vale kogus',
-  ['no_players_nearby']         = 'Ligiduses pole ühtegi isikut',
-  ['no_vehicle_nearby']         = 'Ligiduses pole ühtegi sõidukit',
-  ['inside_vehicle']            = 'Sa ei saa seda teha autost seest!',
-  ['vehicle_unlocked']          = 'Auto on lukust lahti',
-  ['vehicle_repaired']          = 'Auto on parandatud',
-  ['vehicle_cleaned']           = 'Auto on pestud',
-  ['vehicle_impounded']         = 'Auto on arreteeritud',
-  ['must_seat_driver']          = 'Sa pead olema juhi istmel!',
-  ['must_near']                 = 'Sa pead olema auto ligidal, et seda arreteerida.',
-  ['vehicle_success_attached']  = 'sõiduk edukalt ühendatud',
-  ['please_drop_off']           = 'Palun viige sõiduk garaaži',
-  ['cant_attach_own_tt']        = 'Sa ei saa teist puksiiri puksiirida',
-  ['no_veh_att']                = 'Ühtegi sõidukit pole ligidal millega ühendada',
-  ['not_right_veh']             = 'See pole õige sõiduk',
-  ['not_right_place']           = 'See pole õige koht',
-  ['veh_det_succ']              = 'Sõiduk edukalt lahti tehtud!',
-  ['imp_flatbed']               = 'Sa ei saa seda teha! Sul on selle jaoks vaja pardaautot',
-  ['objects']                   = 'objekt',
-  ['roadcone']                  = 'Koonus',
-  ['toolbox']                   = 'Tööriista komplekt',
-  ['quantity']                  = 'Kogus',
-  ['invalid_quantity']          = 'iVale kogus',
-  ['inventory']                 = 'Kapp',
-  ['veh_unlocked']              = 'Auto lukust lahti tehtud',
-  ['hijack_failed']             = 'Ukse muukimine ebaõnnestus',
-  ['body_repaired']             = 'Kere parandatud',
-  ['veh_repaired']              = 'Sõiduk parandatud',
-  ['veh_stored']                = 'Vajuta [E], et hoistada ese.',
-  ['press_remove_obj']          = 'Vajuta [E], et võtta ese.',
-  ['please_tow']                = 'Palun puksiiri see sõiduk',
-  ['wait_five']                 = 'Sa pead ootama 5 minutit',
-  ['must_in_flatbed']           = 'Sul peab olema pardaauto, et alustada tööga.',
-  ['mechanic_customer']         = 'Mehaaniku klient',
-  ['you_do_not_room']           = 'Sul pole rohkem ruumi',
-  ['recovery_gas_can']          = 'Bensiini kanistri tagastamine...',
-  ['recovery_repair_tools']     = 'Parandus tööriistade tagastamine...',
-  ['recovery_body_tools']       = 'Kere tööriistade tagastamine...',
-  ['not_enough_gas_can']        = 'Sul pole piisavalt bensiini kanistreid.',
-  ['assembling_blowtorch']      = 'Paned keevitajat kokku...',
-  ['not_enough_repair_tools']   = 'Sul pole piisavalt parandus tööriistu.',
-  ['assembling_repair_kit']     = 'Paned paranduskomplekti kokku...',
-  ['not_enough_body_tools']     = 'Sul pole piisavalt kere tööriistu.',
-  ['assembling_body_kit']       = 'Valmistad kere...',
-  ['your_comp_earned']          = 'Teie firma teenis $',
-  ['you_used_blowtorch']        = 'Sa kasutasid keevitaja',
-  ['you_used_repair_kit']       = 'Sa kasutasid paranduskomplekti',
-  ['you_used_body_kit']         = 'Sa kasutasid kere',
-  ['have_withdrawn']            = 'Sa võtsid firma arvelt x%s %s',
-  ['have_deposited']            = 'Sa panid firma arvele x%s %s',
-  ['player_cannot_hold']        = 'Sul pole piisavalt ruumi seljakotis!',
-}
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fi.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fi.lua
index 6373d634d..a6738bc6b 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fi.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fi.lua
@@ -5,6 +5,8 @@ Locales['fi'] = {
   ['vehicle_list']              = 'ajoneuvo lista',
   ['work_wear']                 = 'työvaatteet',
   ['civ_wear']                  = 'siviilivaatteet',
+  ['deposit_stock']             = 'talleta varastoon',
+  ['withdraw_stock']            = 'ota varastosta',
   ['boss_actions']              = 'pomo toiminnot',
   ['service_vehicle']           = 'huoltoajoneuvo',
   ['flat_bed']                  = 'flatbed',
@@ -20,6 +22,8 @@ Locales['fi'] = {
   ['blowtorch']                 = 'polttoleikkuri',
   ['repair_kit']                = 'korjauskitti',
   ['body_kit']                  = 'korikitti',
+  ['craft']                     = 'valmista',
+  ['craft_menu']                = 'paina [E] avataksesi valmistus menu',
   ['billing']                   = 'laskutus',
   ['hijack']                    = 'avaa lukot',
   ['repair']                    = 'korjaa',
@@ -30,7 +34,7 @@ Locales['fi'] = {
   ['amount_invalid']            = 'virheellinen summa',
   ['no_players_nearby']         = 'ei pelaajia lähettyvillä',
   ['no_vehicle_nearby']         = 'there is no nearby vehicle',
-  ['inside_vehicle']            = 'you can\'t do this from inside the vehicle!',
+  ['inside_vehicle']            = 'you can\'t do this from inside the vehicle!', 
   ['vehicle_unlocked']          = 'ajoneuvo Avattu',
   ['vehicle_repaired']          = 'ajoneuvo Korjattu',
   ['vehicle_cleaned']           = 'ajoneuvo pesty',
@@ -47,6 +51,7 @@ Locales['fi'] = {
   ['objects']                   = 'objektit',
   ['roadcone']                  = 'kartio',
   ['toolbox']                   = 'työkalupakki',
+  ['mechanic_stock']            = 'mekaanikon varasto',
   ['quantity']                  = 'määrä',
   ['invalid_quantity']          = 'virheellinen summa',
   ['inventory']                 = 'reppu',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fr.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fr.lua
index 9386cde11..eb9283bd4 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fr.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/fr.lua
@@ -5,6 +5,8 @@ Locales['fr'] = {
   ['vehicle_list']              = 'sortir véhicule',
   ['work_wear']                 = 'tenue de travail',
   ['civ_wear']                  = 'Tenue civile',
+  ['deposit_stock']             = 'Déposer Stock',
+  ['withdraw_stock']            = 'Prendre Stock',
   ['boss_actions']              = 'action patron',
   ['service_vehicle']           = 'Véhicule de service',
   ['flat_bed']                  = 'plateau',
@@ -20,6 +22,8 @@ Locales['fr'] = {
   ['blowtorch']                 = 'chalumeaux',
   ['repair_kit']                = 'kit réparation',
   ['body_kit']                  = 'kit carosserie',
+  ['craft']                     = 'établi',
+  ['craft_menu']                = 'appuyez sur [E] pour accéder au menu établi.',
   ['billing']                   = 'facturation',
   ['hijack']                    = 'crocheter',
   ['repair']                    = 'réparer',
@@ -30,7 +34,7 @@ Locales['fr'] = {
   ['amount_invalid']            = 'montant invalide',
   ['no_players_nearby']         = 'aucun joueur à proximité',
   ['no_vehicle_nearby']         = 'aucun véhicule à proximité',
-  ['inside_vehicle']            = 'vous ne pouvez pas effectuer cette action depuis un véhicule!',
+  ['inside_vehicle']            = 'vous ne pouvez pas effectuer cette action depuis un véhicule!', 
   ['vehicle_unlocked']          = 'véhicule déverrouillé',
   ['vehicle_repaired']          = 'véhicule réparé',
   ['vehicle_cleaned']           = 'véhicule nettoyé',
@@ -47,6 +51,7 @@ Locales['fr'] = {
   ['objects']                   = 'objets',
   ['roadcone']                  = 'plot',
   ['toolbox']                   = 'boîte à outils',
+  ['mechanic_stock']            = 'coffre de l\'entreprise',
   ['quantity']                  = 'quantité',
   ['invalid_quantity']          = 'quantité invalide',
   ['inventory']                 = 'inventaire',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/hu.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/hu.lua
index 47c9c70fc..2255cc257 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/hu.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/hu.lua
@@ -5,6 +5,8 @@ Locales['hu'] = {
   ['vehicle_list']              = 'Munkajárművek',
   ['work_wear']                 = 'Munkaruha',
   ['civ_wear']                  = 'Civil ruházat',
+  ['deposit_stock']             = 'Készlet berakás',
+  ['withdraw_stock']            = 'Készlet kivétel',
   ['boss_actions']              = 'Leader Panel',
   ['service_vehicle']           = 'szervíz jármű',
   ['flat_bed']                  = 'Platós kocsi',
@@ -20,6 +22,8 @@ Locales['hu'] = {
   ['blowtorch']                 = 'fújólámpa',
   ['repair_kit']                = 'javítókészlet',
   ['body_kit']                  = 'body Kit',
+  ['craft']                     = 'barkácsolás',
+  ['craft_menu']                = 'nyomd meg a  [E] gombot a barkácsolás menü elérséhez',
   ['billing']                   = 'Munkadíj átadása',
   ['hijack']                    = 'Kocsi feltörése',
   ['repair']                    = 'Javítás',
@@ -30,7 +34,7 @@ Locales['hu'] = {
   ['amount_invalid']            = '~r~[Információ]: Ismeretlen érték!',
   ['no_players_nearby']         = '~r~[Információ]: Nincs a közeledben játékos!',
   ['no_vehicle_nearby']         = '~r~[Információ]: Nincs a közeledben kocsi!',
-  ['inside_vehicle']            = 'Jármű belsejéből nem csinálhatod!',
+  ['inside_vehicle']            = 'Jármű belsejéből nem csinálhatod!', 
   ['vehicle_unlocked']          = '[Információ]: Sikeresen feltörted a kijelölt kocsit!',
   ['vehicle_repaired']          = '[Információ]: Kocsi sikeresen megjavítva! Oszd ki a munkadíjat!',
   ['vehicle_cleaned']           = '[Információ]: Kocsi sikeresen lemosva!',
@@ -48,6 +52,7 @@ Locales['hu'] = {
   ['objects']                   = 'objectek',
   ['roadcone']                  = 'útkúp',
   ['toolbox']                   = 'eszköztár',
+  ['mechanic_stock']            = 'Szerelő készlet',
   ['quantity']                  = 'mennyiség',
   ['invalid_quantity']          = 'érvénytelen mennyiség',
   ['inventory']                 = 'leltár',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/it.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/it.lua
index d4eb13be4..ed92d14e1 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/it.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/it.lua
@@ -5,6 +5,8 @@ Locales['it'] = {
   ['vehicle_list']              = 'elenco veicoli',
   ['work_wear']                 = 'abbigliamento da lavoro',
   ['civ_wear']                  = 'abiti civili',
+  ['deposit_stock']             = 'deposito',
+  ['withdraw_stock']            = 'ritira',
   ['boss_actions']              = 'azioni boss',
   ['service_vehicle']           = 'veicoli di servizio',
   ['flat_bed']                  = 'flatbed',
@@ -20,6 +22,8 @@ Locales['it'] = {
   ['blowtorch']                 = 'fiamma ossidrica',
   ['repair_kit']                = 'kit di riparazione',
   ['body_kit']                  = 'body Kit',
+  ['craft']                     = 'creazione',
+  ['craft_menu']                = 'premi [E] per accedere al menu di creazione.',
   ['billing']                   = 'fattura',
   ['hijack']                    = 'trasportare',
   ['repair']                    = 'riparazione',
@@ -48,6 +52,7 @@ Locales['it'] = {
   ['objects']                   = 'oggetti',
   ['roadcone']                  = 'cono stradale',
   ['toolbox']                   = 'cassetta degli attrezzi',
+  ['mechanic_stock']            = 'deposito meccanico',
   ['quantity']                  = 'quantità',
   ['invalid_quantity']          = 'quantità non valida',
   ['inventory']                 = 'inventario',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/nl.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/nl.lua
index bc69b3528..8c52001d5 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/nl.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/nl.lua
@@ -1,15 +1,17 @@
 Locales['nl'] = {
   ['mechanic']                  = 'monteur',
   ['drive_to_indicated']        = 'Rij naar de aangegeven locatie',
-  ['mission_canceled']          = 'opdracht ~r~Geannuleerd',
+  ['mission_canceled']          = 'opdracht ~r~geannuleerd',
   ['vehicle_list']              = 'voertuigenlijst',
   ['work_wear']                 = 'werk kleding',
   ['civ_wear']                  = 'burger kleding',
+  ['deposit_stock']             = 'vooraad wegleggen',
+  ['withdraw_stock']            = 'vooraad opbergen',
   ['boss_actions']              = 'baas acties',
   ['service_vehicle']           = 'service voertuig',
   ['flat_bed']                  = 'oprijwagen',
-  ['tow_truck']                 = 'sleep wagen',
-  ['service_full']              = 'dienst voledig: ',
+  ['tow_truck']                 = 'sleepwagen',
+  ['service_full']              = 'dienst volledig: ',
   ['open_actions']              = 'Druk op [E] om in het menu te komen.',
   ['harvest']                   = 'oogsten',
   ['harvest_menu']              = 'druk op [E] om in het oogst menu te komen.',
@@ -17,10 +19,12 @@ Locales['nl'] = {
   ['gas_can']                   = 'jerrycan',
   ['repair_tools']              = 'reparatie gereedschap',
   ['body_work_tools']           = 'plaatwerk gereedschap',
-  ['blowtorch']                 = 'gasbrannder',
+  ['blowtorch']                 = 'gasbrander',
   ['repair_kit']                = 'reparatie set',
   ['body_kit']                  = 'plaatwerk set',
-  ['billing']                   = 'facturen',
+  ['craft']                     = 'maken',
+  ['craft_menu']                = 'druk op [E] om in het maak menu te komen.',
+  ['billing']                   = 'factureren',
   ['hijack']                    = 'openbreken',
   ['repair']                    = 'repareer',
   ['clean']                     = 'maak schoon',
@@ -30,7 +34,7 @@ Locales['nl'] = {
   ['amount_invalid']            = 'ongeldig aantal',
   ['no_players_nearby']         = 'er is geen speler in de buurt',
   ['no_vehicle_nearby']         = 'er is geen voertuig in de buurt',
-  ['inside_vehicle']            = 'je kan dit niet doen in een voertuig!',
+  ['inside_vehicle']            = 'je kan dit niet doen in een voertuig!', 
   ['vehicle_unlocked']          = 'het voortuig is opengebroken',
   ['vehicle_repaired']          = 'het voortuig is gerepareerd',
   ['vehicle_cleaned']           = 'het voortuig is schoongemaakt',
@@ -43,10 +47,11 @@ Locales['nl'] = {
   ['no_veh_att']                = 'er zijn geen ~r~voertuigen om vast te maken',
   ['not_right_veh']             = 'dit is niet het juiste voertuig',
   ['veh_det_succ']              = 'voertuig succesvol losgekoppeld!',
-  ['imp_flatbed']               = '~r~Actie onmogelijk! je moet een oprijwagen nodig om deze te laden',
+  ['imp_flatbed']               = '~r~Actie onmogelijk! je hebt een oprijwagen nodig om deze te laden',
   ['objects']                   = 'objecten',
   ['roadcone']                  = 'pion',
   ['toolbox']                   = 'gereedschaps kist',
+  ['mechanic_stock']            = 'monteurs opslag',
   ['quantity']                  = 'hoeveelheid',
   ['invalid_quantity']          = 'ongeldige hoeveelheid',
   ['inventory']                 = 'inventaris',
@@ -58,14 +63,14 @@ Locales['nl'] = {
   ['press_remove_obj']          = 'Druk op [E] om object weg te halen',
   ['please_tow']                = 'graag voertuig afslepen',
   ['wait_five']                 = 'je moet 5 minuten ~r~wachten',
-  ['must_in_flatbed']           = 'je bent een oprijwagen nodig voor deze klant',
+  ['must_in_flatbed']           = 'je hebt een oprijwagen nodig voor deze klant',
   ['mechanic_customer']         = 'klant van garage',
   ['you_do_not_room']           = '~r~Je hebt geen ruimte',
   ['recovery_gas_can']          = 'Jerrycan Ophalen...',
   ['recovery_repair_tools']     = 'Reparatie gereedschap Ophalen...',
   ['recovery_body_tools']       = 'Plaatwerk gereedschap Ophalen...',
   ['not_enough_gas_can']        = 'je hebt ~r~niet genoeg jerrycans.',
-  ['assembling_blowtorch']      = 'In elkaar aan het zetten gasbrannder...',
+  ['assembling_blowtorch']      = 'In elkaar aan het zetten gasbrander...',
   ['not_enough_repair_tools']   = 'je hebt ~r~niet genoeg reparatie gereedschap.',
   ['assembling_repair_kit']     = 'In elkaar aan het zetten reparatie set...',
   ['not_enough_body_tools']     = 'je hebt ~r~niet genoeg plaatwerk gereedschap.',
@@ -74,7 +79,7 @@ Locales['nl'] = {
   ['you_used_blowtorch']        = 'je gebruikte een gasbrannder',
   ['you_used_repair_kit']       = 'je gebruikte een reparatie set',
   ['you_used_body_kit']         = 'je gebruikte een plaatwerk set',
-  ['have_withdrawn']            = 'je hebt opgenomen x%s %s',
-  ['have_deposited']            = 'je hebt gestort x%s %s',
+  ['have_withdrawn']            = 'je hebt x%s %s opgenomen',
+  ['have_deposited']            = 'je hebt x%s %s gestort ',
   ['player_cannot_hold']        = 'je hebt ~r~niet genoeg vrije ruimte in je inventaris!',
 }
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/pl.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/pl.lua
index fa5be3483..6e9b67cbe 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/pl.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/pl.lua
@@ -5,6 +5,8 @@ Locales['pl'] = {
   ['vehicle_list']              = 'lista pojazdów',
   ['work_wear']                 = 'ubrania robocze',
   ['civ_wear']                  = 'ubrania cywilne',
+  ['deposit_stock']             = 'deponuj przedmioty',
+  ['withdraw_stock']            = 'wyciągnij przedmioty',
   ['boss_actions']              = 'akcje szefa',
   ['service_vehicle']           = 'serwisuj pojazd',
   ['flat_bed']                  = 'laweta',
@@ -20,6 +22,8 @@ Locales['pl'] = {
   ['blowtorch']                 = 'palnik',
   ['repair_kit']                = 'narzedzia naprawcze',
   ['body_kit']                  = 'karoseria',
+  ['craft']                     = 'twórz',
+  ['craft_menu']                = 'wcisnij [E] aby otworzyc menu tworzenia.',
   ['billing']                   = 'faktury',
   ['hijack']                    = 'forsowanie',
   ['repair']                    = 'naprawa',
@@ -30,7 +34,7 @@ Locales['pl'] = {
   ['amount_invalid']            = 'nieprawidłowa suma',
   ['no_players_nearby']         = 'brak gracza w pobliżu',
   ['no_vehicle_nearby']         = 'brak pojazdu w pobliżu',
-  ['inside_vehicle']            = 'nie możesz tego zrobić z środka pojazdu!',
+  ['inside_vehicle']            = 'nie możesz tego zrobić z środka pojazdu!', 
   ['vehicle_unlocked']          = 'pojazd został odblokowany',
   ['vehicle_repaired']          = 'pojazd został naprawiony',
   ['vehicle_cleaned']           = 'pojazd został umyty',
@@ -47,6 +51,7 @@ Locales['pl'] = {
   ['objects']                   = 'objekty',
   ['roadcone']                  = 'pachołek',
   ['toolbox']                   = 'skrzynka z narzędziami',
+  ['mechanic_stock']            = 'magazyn mechanika',
   ['quantity']                  = 'ilość',
   ['invalid_quantity']          = 'nieprawidłowa ilość',
   ['inventory']                 = 'ekwipunek',
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/si.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/si.lua
deleted file mode 100644
index f64b639e5..000000000
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/si.lua
+++ /dev/null
@@ -1,80 +0,0 @@
-Locales['si'] = {
-  ['mechanic'] = 'mehanik',
-  ['drive_to_indicated'] = 'Odpeljite se na navedeno lokacijo.',
-  ['mission_canceled'] = 'Misija je odpovedana',
-  ['vehicle_list'] = 'seznam vozil',
-  ['work_wear'] = 'delovna oblačila',
-  ['civ_wear'] = 'civilna oblačila',
-  ['boss_actions'] = 'dejanja šefa',
-  ['service_vehicle'] = 'službeno vozilo',
-  ['flat_bed'] = 'flatbed',
-  ['tow_truck'] = 'vlečno vozilo',
-  ['service_full'] = 'storitev v celoti: ',
-  ['open_actions'] = "Za dostop do menija pritisnite [E].",
-  ['harvest'] = 'pridelek',
-  ['harvest_menu'] = "pritisnite [E] za dostop do menija žetve.",
-  ['not_experienced_enough'] = 'niste dovolj izkušeni za izvedbo tega dejanja.',
-  ['gas_can'] = 'plinska pločevinka',
-  ['repair_tools'] = 'orodja za popravila',
-  ['body_work_tools'] = 'orodja za karoserijo',
-  ['blowtorch'] = 'gorilnik',
-  ['repair_kit'] = 'komplet za popravila',
-  ['body_kit'] = 'komplet za popravilo',
-  ['billing'] = 'zaračunavanje',
-  ['hijack'] = 'ugrabiti',
-  ['repair'] = 'popravilo',
-  ['clean'] = 'čist',
-  ['imp_veh'] = 'impound',
-  ['place_objects'] = 'place Objects',
-  ['invoice_amount'] = 'znesek računa',
-  ['amount_invalid'] = 'neveljaven znesek',
-  ['no_players_nearby'] = 'v bližini ni nobenega igralca',
-  ['no_vehicle_nearby'] = 'v bližini ni vozila',
-  ['inside_vehicle'] = 'tega ne moreš storiti iz vozila!',
-  ['vehicle_unlocked'] = 'vozilo je bilo odklenjeno',
-  ['vehicle_repaired'] = 'vozilo je bilo popravljeno',
-  ['vehicle_cleaned'] = 'vozilo je bilo očiščeno',
-  ['vehicle_impounded'] = 'vozilo je bilo zaseženo',
-  ['must_seat_driver'] = 'moraš sedeti na voznikovem sedežu!',
-  ['must_near'] = 'morate biti v bližini vozila, da ga lahko zasežete',
-  ['vehicle_success_attached'] = 'vozilo je bilo uspešno pripeto',
-  ['please_drop_off'] = 'pustite vozilo v garaži',
-  ['cant_attach_own_tt'] = 'ne morete priključiti lastnega vlečnega vozila',
-  ['no_veh_att'] = 'ni vozila, ki bi ga bilo treba priključiti',
-  ['not_right_veh'] = 'to ni pravo vozilo',
-  ['veh_det_succ'] = "vozilo je bilo uspešno priključeno!",
-  ['imp_flatbed'] = "Ukrep ni mogoč! Za natovarjanje vozila potrebujete ploščato vozilo",
-  ['objects'] = 'objects',
-  ['roadcone'] = 'roadcone',
-  ['toolbox'] = 'toolbox',
-  ["quantity"] = "quantity",
-  ["invalid_quantity"] = "invalid quantity",
-  ['inventory'] = 'inventar',
-  ['veh_unlocked'] = 'Vozilo odklenjeno',
-  ['hijack_failed'] = 'Ugrabitev ni uspela',
-  ['body_repaired'] = 'Popravljeno telo',
-  ['veh_repaired'] = 'Vozilo popravljeno',
-  ['veh_stored'] = "pritisnite [E], da shranite vozilo.",
-  ['press_remove_obj'] = 'pritisnite [E], da odstranite predmet',
-  ['please_tow'] = "prosimo, odvlecite vozilo",
-  ['wait_five'] = 'počakajte 5 minut',
-  ['must_in_flatbed'] = 'za opravljanje naloge morate biti v vozilu z ravnim tovorom',
-  ['mechanic_customer'] = 'mehanik stranka',
-  ['you_do_not_room'] = 'nimate več prostora',
-  ['recovery_gas_can'] = 'Prevzem plinske posode...',
-  ['recovery_repair_tools'] = 'Pridobitev orodja za popravilo...',
-  ['recovery_body_tools'] = 'Pridobitev orodij za popravila...',
-  ['not_enough_gas_can'] = 'Nimate dovolj pločevink za plin.',
-  ['assembling_blowtorch'] = 'Sestavljanje gorilnika...',
-  ['not_enough_repair_tools'] = 'Nimate dovolj orodja za popravilo.',
-  ['assembling_repair_kit'] = 'Sestavljaš komplet za popravila...',
-  ['not_enough_body_tools'] = 'Nimate dovolj orodja za sestavljanje karoserije.',
-  ['assembling_body_kit'] = 'Sestavljanje kompleta za karoserijo...',
-  ['your_comp_earned'] = 'vaše podjetje je zaslužilo $',
-  ['you_used_blowtorch'] = 'uporabili ste gorilnik',
-  ['you_used_repair_kit'] = 'uporabili ste komplet za popravilo',
-  ['you_used_body_kit'] = 'uporabili ste komplet za popravilo',
-  ['have_withdrawn'] = 'umaknili ste x%s %s',
-  ['have_deposited'] = 'vplačali ste x%s %s %s',
-  ['player_cannot_hold'] = 'v inventarju nimate dovolj prostega prostora!',
-}
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/sr.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/sr.lua
new file mode 100644
index 000000000..e34062c2e
--- /dev/null
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/sr.lua
@@ -0,0 +1,86 @@
+Locales['sr'] = {
+  ['mechanic']                  = 'mehaničar',
+  ['drive_to_indicated']        = 'Vozite do označene lokacije.',
+  ['mission_canceled']          = 'Misija prekinuta',
+  ['vehicle_list']              = 'Lista vozila',
+  ['work_wear']                 = 'Radno odelo',
+  ['civ_wear']                  = 'Civilno odelo',
+  ['deposit_stock']             = 'Ostavite novac',
+  ['withdraw_stock']            = 'Podignite novac',
+  ['boss_actions']              = 'Upravljanje kompjuterom',
+  ['service_vehicle']           = 'Servisiranje vozila',
+  ['flat_bed']                  = 'flatbed',
+  ['tow_truck']                 = 'tow Truck',
+  ['service_full']              = 'service full: ',
+  ['open_actions']              = 'Pritisnite [E] da pristupite menu.',
+  ['harvest']                   = 'berba',
+  ['harvest_menu']              = 'Pritisnite [E] da pristupite berbi.',
+  ['not_experienced_enough']    = 'niste dovoljno iskusni da bi uradili to.',
+  ['gas_can']                   = 'gas Can',
+  ['repair_tools']              = 'repair Tools',
+  ['body_work_tools']           = 'bodywork Tools',
+  ['blowtorch']                 = 'blowtorch',
+  ['repair_kit']                = 'repair Kit',
+  ['body_kit']                  = 'body Kit',
+  ['craft']                     = 'kraft',
+  ['craft_menu']                = 'pritisni [E] da pristupis kraftu.',
+  ['billing']                   = 'račun',
+  ['hijack']                    = 'obijanje',
+  ['repair']                    = 'popravka',
+  ['clean']                     = 'čišćenje',
+  ['imp_veh']                   = 'zaplena',
+  ['place_objects']             = 'Objekti',
+  ['invoice_amount']            = 'Količina',
+  ['amount_invalid']            = 'Nevažeća kolićina',
+  ['no_players_nearby']         = 'nema igrača u blizini',
+  ['no_vehicle_nearby']         = 'nema vozila u blizini',
+  ['inside_vehicle']            = 'ne možete uraditi to iz vozila!', 
+  ['vehicle_unlocked']          = 'vozilo je otključano',
+  ['vehicle_repaired']          = 'vozilo je popravljeno',
+  ['vehicle_cleaned']           = 'vozilo je očišćeno',
+  ['vehicle_impounded']         = 'vozilo je zaplenjeno',
+  ['must_seat_driver']          = 'morate biti na vozačevom mestu!',
+  ['must_near']                 = 'morate biti u blizini vozila.',
+  ['vehicle_success_attached']  = 'vozilo prikačeno',
+  ['please_drop_off']           = 'ostavite vozilo u garaži',
+  ['cant_attach_own_tt']        = 'ne možete prikačiti to vozilo',
+  ['no_veh_att']                = 'nema vozila u blizini',
+  ['not_right_veh']             = 'to nije pravo vozilo',
+  ['not_right_place']           = 'to nije pravo mesto',
+  ['veh_det_succ']              = 'vozilo otkačeno!',
+  ['imp_flatbed']               = 'Akcija nemoguća! Treba Vam flatbed da zakačite vozilo',
+  ['objects']                   = 'objekti',
+  ['roadcone']                  = 'čunj',
+  ['toolbox']                   = 'toolbox',
+  ['mechanic_stock']            = 'mechanic Stock',
+  ['quantity']                  = 'količina',
+  ['invalid_quantity']          = 'nevažeća količina',
+  ['inventory']                 = 'inventar',
+  ['veh_unlocked']              = 'Vozilo otključano',
+  ['hijack_failed']             = 'Niste uspeli da obijete vozilo',
+  ['body_repaired']             = 'Body popravljen',
+  ['veh_repaired']              = 'Vozilo popravljeno',
+  ['veh_stored']                = 'pritisni [E] da vratiš vozilo.',
+  ['press_remove_obj']          = 'pritisni [E] da skloniš objekat',
+  ['please_tow']                = 'zakačite vozilo',
+  ['wait_five']                 = 'morate sačekati 5 minuta',
+  ['must_in_flatbed']           = 'Morate biti u flatbedu da započnete misiju',
+  ['mechanic_customer']         = 'Mehaničar kupac',
+  ['you_do_not_room']           = 'Nemate više mesta',
+  ['recovery_gas_can']          = 'Povraćaj gasa...',
+  ['recovery_repair_tools']     = 'Repair Tools povraćaj...',
+  ['recovery_body_tools']       = 'Body Tools povraćaj...',
+  ['not_enough_gas_can']        = 'Nemate dovoljno gas cans.',
+  ['assembling_blowtorch']      = 'Sastavljanje Blowtorch...',
+  ['not_enough_repair_tools']   = 'Nemate dovoljno repair tools.',
+  ['assembling_repair_kit']     = 'Sastavljanje Repair Kit...',
+  ['not_enough_body_tools']     = 'Nemate dovoljno body tools.',
+  ['assembling_body_kit']       = 'Sastavljanje Body Kit...',
+  ['your_comp_earned']          = 'Vaša firma je zaradila $',
+  ['you_used_blowtorch']        = 'iskoristili ste blowtorch',
+  ['you_used_repair_kit']       = 'iskoristili ste Repair Kit',
+  ['you_used_body_kit']         = 'iskoristili ste Body Kit',
+  ['have_withdrawn']            = 'podigli ste x%s %s',
+  ['have_deposited']            = 'ostavili ste x%s %s',
+  ['player_cannot_hold']        = 'Nemate više mesta u inventaru!',
+}
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/sv.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/locales/sv.lua
deleted file mode 100644
index f22f20cff..000000000
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/locales/sv.lua
+++ /dev/null
@@ -1,80 +0,0 @@
-Locales['sv'] = {
-  ['mechanic']                  = 'mekaniker',
-  ['drive_to_indicated']        = 'Vänligen kör till den angivna platsen.',
-  ['mission_canceled']          = '~r~Uppdraget har avbrutits',
-  ['vehicle_list']              = 'Fordon',
-  ['work_wear']                 = 'arbetskläder',
-  ['civ_wear']                  = 'civil klädsel',
-  ['boss_actions']              = 'Chef meny',
-  ['service_vehicle']           = 'service fordon',
-  ['flat_bed']                  = 'flatbed',
-  ['tow_truck']                 = 'bärgningsbil',
-  ['service_full']              = 'service full: ',
-  ['open_actions']              = 'Tryck [E] för att öppna menyn.',
-  ['harvest']                   = 'skörda',
-  ['harvest_menu']              = 'Tryck [E] för att öppna menyn.',
-  ['not_experienced_enough']    = 'Du är inte ~r~erfaren nog att utföra uppgiften.',
-  ['gas_can']                   = 'gasbehållare',
-  ['repair_tools']              = 'reparationsverktyg',
-  ['body_work_tools']           = 'karossverktyg',
-  ['blowtorch']                 = 'blåslampa',
-  ['repair_kit']                = 'reparationssats',
-  ['body_kit']                  = 'kroppssats',
-  ['billing']                   = 'fakturering',
-  ['hijack']                    = 'kapa',
-  ['repair']                    = 'reparera',
-  ['clean']                     = 'tvätta',
-  ['imp_veh']                   = 'beslagta fordon',
-  ['place_objects']             = 'placera objekt',
-  ['invoice_amount']            = 'fakturabelopp',
-  ['amount_invalid']            = 'ogiltigt belopp',
-  ['no_players_nearby']         = 'det finns inga spelare i närheten',
-  ['no_vehicle_nearby']         = 'det finns inget fordon i närheten',
-  ['inside_vehicle']            = 'du kan inte göra detta i det trånga utrymmet!',
-  ['vehicle_unlocked']          = 'fordonet har olåsts upp',
-  ['vehicle_repaired']          = 'fordonet har reparerats',
-  ['vehicle_cleaned']           = 'fordonet har rengjorts',
-  ['vehicle_impounded']         = 'fordonet har ~r~beslagtagits',
-  ['must_seat_driver']          = 'du måste sitta i ~r~förarsätet!',
-  ['must_near']                 = 'du måste vara ~r~nära ett fordon för att beslagta det.',
-  ['vehicle_success_attached']  = 'fordonet är bundet!',
-  ['please_drop_off']           = 'vänligen släpp av fordonet hos garaget',
-  ['cant_attach_own_tt']        = 'du kan ~r~inte binda din egna truck!',
-  ['no_veh_att']                = 'det finns inget ~r~fordon i närheten',
-  ['not_right_veh']             = 'detta är ~r~inte rätt fordon',
-  ['veh_det_succ']              = 'fordonet har lossnat!',
-  ['imp_flatbed']               = '~r~Det går inte! Du måste ha en Flatbed för det!',
-  ['objects']                   = 'objekt',
-  ['roadcone']                  = 'kona',
-  ['toolbox']                   = 'verktygslåda',
-  ['quantity']                  = 'kvantitet',
-  ['invalid_quantity']          = 'ogiltig kvantitet',
-  ['inventory']                 = 'förråd',
-  ['veh_unlocked']              = 'Fordon har låsts upp',
-  ['hijack_failed']             = '~r~Kapningen misslyckades',
-  ['body_repaired']             = 'Karossen har lagats',
-  ['veh_repaired']              = 'Fordonet har lagats',
-  ['veh_stored']                = 'tryck [E] för att förvara fordonet.',
-  ['press_remove_obj']          = 'tryck [E] för att ta bort objektet.',
-  ['please_tow']                = 'Vänligen bogsera fordonet',
-  ['wait_five']                 = 'Du måste ~r~vänta 5 minuter',
-  ['must_in_flatbed']           = 'Du måste vara i en flatbed för att starta uppdraget',
-  ['mechanic_customer']         = 'mekaniker kund',
-  ['you_do_not_room']           = '~r~Du har inte mer plats',
-  ['recovery_gas_can']          = 'Gasbehållare återvinns...',
-  ['recovery_repair_tools']     = 'Reparationsverktyg återvinns...',
-  ['recovery_body_tools']       = 'Karossverktyg återvinns...',
-  ['not_enough_gas_can']        = 'Du har ~r~inte tillräckligt många gasbehållare!',
-  ['assembling_blowtorch']      = 'Tillverkar blåslampa...',
-  ['not_enough_repair_tools']   = 'Du har ~r~inte tillräckligt många reparationsverktyg!',
-  ['assembling_repair_kit']     = 'Tillverkar reparationssats...',
-  ['not_enough_body_tools']     = 'Du har ~r~inte tillräckligt många karossverktyg!',
-  ['assembling_body_kit']       = 'Tillverkar karossverktyg...',
-  ['your_comp_earned']          = 'ditt företag har tjänat $',
-  ['you_used_blowtorch']        = 'du har använt en blåslampa',
-  ['you_used_repair_kit']       = 'du har använt en reparationssats',
-  ['you_used_body_kit']         = 'du har använt en karossverktyg',
-  ['have_withdrawn']            = 'du har tagit ut x%s %s',
-  ['have_deposited']            = 'du har lagrat x%s %s',
-  ['player_cannot_hold']        = 'du har ~r~inte tillräckligt med utrymme för att hålla det!',
-}
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/de_esx_mechanicjob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/de_esx_mechanicjob.sql
new file mode 100644
index 000000000..4b97955eb
--- /dev/null
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/de_esx_mechanicjob.sql
@@ -0,0 +1,32 @@
+INSERT INTO `addon_account` (name, label, shared) VALUES
+	('society_mechanic', 'Mechaniker', 1)
+;
+
+INSERT INTO `addon_inventory` (name, label, shared) VALUES
+	('society_mechanic', 'Mechaniker', 1)
+;
+
+INSERT INTO `datastore` (name, label, shared) VALUES
+	('society_mechanic', 'Mechaniker', 1)
+;
+
+INSERT INTO `jobs` (name, label) VALUES
+	('mechanic', 'Mechaniker')
+;
+
+INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
+	('mechanic',0,'recrue','Rekrut',12,'{}','{}'),
+	('mechanic',1,'novice','Neuling',24,'{}','{}'),
+	('mechanic',2,'experimente','Erfahren',36,'{}','{}'),
+	('mechanic',3,'chief',"Teamleitung",48,'{}','{}'),
+	('mechanic',4,'boss','Chef',0,'{}','{}')
+;
+
+INSERT INTO `items` (name, label, weight) VALUES
+	('gazbottle', 'Benzinkanister', 2),
+	('fixtool', 'Reparaturwerkzeuge', 2),
+	('carotool', 'Karosseriewerkzeuge', 2),
+	('blowpipe', 'Schweißbrenner', 2),
+	('fixkit', 'Werkzeugkasten', 3),
+	('carokit', 'Bausatz Karosserie', 3)
+;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
index 2e06496c6..ac1f7fb9c 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
@@ -1,5 +1,3 @@
-
-
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mechanic', 1)
 ;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql
index 72455d415..e6d0ce1c9 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql
@@ -1,5 +1,3 @@
-
-
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mekaanikko', 1)
 ;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fr_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fr_esx_mecanojob.sql
new file mode 100644
index 000000000..269172bee
--- /dev/null
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/fr_esx_mecanojob.sql
@@ -0,0 +1,32 @@
+INSERT INTO `addon_account` (name, label, shared) VALUES
+	('society_mechanic', 'Mécanicien', 1)
+;
+
+INSERT INTO `addon_inventory` (name, label, shared) VALUES
+	('society_mechanic', 'Mécanicien', 1)
+;
+
+INSERT INTO `datastore` (name, label, shared) VALUES
+	('society_mechanic', 'Mécanicien', 1)
+;
+
+INSERT INTO `jobs` (name, label) VALUES
+	('mechanic', 'Mécanicien')
+;
+
+INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
+	('mechanic',0,'recrue','Recrue',12,'{}','{}'),
+	('mechanic',1,'novice','Novice',24,'{}','{}'),
+	('mechanic',2,'expérimenté','Expérimenté',36,'{}','{}'),
+	('mechanic',3,'chef','Chef',48,'{}','{}'),
+	('mechanic',4,'boss','Boss',0,'{}','{}')
+;
+
+INSERT INTO `items` (name, label, weight) VALUES
+	('gazbottle', 'Bouteille de gaz', 2),
+	('fixtool', 'Outils de réparation', 2),
+	('carotool', 'Outils', 2),
+	('blowpipe', 'Chalumeau', 2),
+	('fixkit', 'Kit de réparation', 3),
+	('carokit', 'Kit de carrosserie', 3)
+;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql
index d456c4f34..6de651b3f 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql
@@ -1,5 +1,3 @@
-
-
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Szerelő', 1)
 ;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/it_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/it_esx_mecanojob.sql
new file mode 100644
index 000000000..4eb733e9c
--- /dev/null
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/it_esx_mecanojob.sql
@@ -0,0 +1,33 @@
+INSERT INTO `addon_account` (name, label, shared) VALUES
+	('society_mechanic', 'Meccanico', 1)
+;
+
+INSERT INTO `addon_inventory` (name, label, shared) VALUES
+	('society_mechanic', 'Meccanico', 1)
+;
+
+INSERT INTO `datastore` (name, label, shared) VALUES
+	('society_mechanic', 'Meccanico', 1)
+;
+
+INSERT INTO `jobs` (name, label) VALUES
+	('mechanic', 'Meccanico')
+;
+
+INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
+	('mechanic',0,'recrue','Recluta',12,'{}','{}'),
+	('mechanic',1,'novice','Novizio',24,'{}','{}'),
+	('mechanic',2,'experimente','Esperto',36,'{}','{}'),
+	('mechanic',3,'chief','Dirigente',48,'{}','{}'),
+	('mechanic',4,'boss','Capo',0,'{}','{}')
+;
+
+INSERT INTO `items` (name, label, weight) VALUES
+	('gazbottle', 'Bottiglia di gas', 2),
+	('fixtool', 'Strumenti di riparazione', 2),
+	('carotool', 'Strumenti', 2),
+	('blowpipe', 'Fiamma ossidrica', 2),
+	('fixkit', 'Kit di riparazione', 3),
+	('carokit', 'Kit per carrozzeria', 3)
+;
+
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/nl_esx_mechanicjob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/nl_esx_mechanicjob.sql
index 8b3d1d31d..88ee4cad4 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/nl_esx_mechanicjob.sql
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/nl_esx_mechanicjob.sql
@@ -18,7 +18,7 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_
 	('mechanic',0,'recrue','Stagair',12,'{}','{}'),
 	('mechanic',1,'novice','Personeel',24,'{}','{}'),
 	('mechanic',2,'experimente','Ervaard',36,'{}','{}'),
-	('mechanic',3,'chief','Supervisor',48,'{}','{}'),
+	('mechanic',3,'chief','Teamleider',48,'{}','{}'),
 	('mechanic',4,'boss','Baas',0,'{}','{}')
 ;
 
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql
index 325493656..21b61358e 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql
@@ -1,5 +1,3 @@
-
-
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mechanik', 1)
 ;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sl_esx_mecanojob.sql
similarity index 57%
rename from server-data/resources/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql
rename to server-data/resources/[esx_addons]/esx_mechanicjob/localization/sl_esx_mecanojob.sql
index 262c54846..5840b0d7a 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sl_esx_mecanojob.sql
@@ -1,33 +1,31 @@
-
-
 INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_mechanic', 'Mehanik', 1)
+	('society_mechanic', 'AMZS', 1)
 ;
 
 INSERT INTO `addon_inventory` (name, label, shared) VALUES
-	('society_mechanic', 'Mehanik', 1)
+	('society_mechanic', 'AMZS', 1)
 ;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
-	('society_mechanic', 'Mehanik', 1)
+	('society_mechanic', 'AMZS', 1)
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-	('mechanic', 'Mehanik')
+	('mechanic', 'AMZS')
 ;
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
-	('mechanic',0,'recrue','Rekrut',12,'{}','{}'),
-	('mechanic',1,'novice','Novinec',24,'{}','{}'),
-	('mechanic',2,'experimente','Izkušen',36,'{}','{}'),
-	('mechanic',3,'chief','PodDirektor',48,'{}','{}'),
+	('mechanic',0,'recrue','Novinec',12,'{}','{}'),
+	('mechanic',1,'novice','Delavec',24,'{}','{}'),
+	('mechanic',2,'experimente','Izkusen',36,'{}','{}'),
+	('mechanic',3,'chief','Pod Direktor',48,'{}','{}'),
 	('mechanic',4,'boss','Direktor',0,'{}','{}')
 ;
 
 INSERT INTO `items` (name, label, weight) VALUES
-	('gazbottle', 'Gas Bottle', 2),
+	('gazbottle', 'Kangla nafte', 2),
 	('fixtool', 'Orodja za popravilo', 2),
-	('carotool', 'Tools', 2),
+	('carotool', 'Orodja', 2),
 	('blowpipe', 'Blowtorch', 2),
 	('fixkit', 'Popravilo', 3),
 	('carokit', 'Body Kit', 3)
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sr_esx_mechanicjob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sr_esx_mechanicjob.sql
new file mode 100644
index 000000000..fbd03b626
--- /dev/null
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sr_esx_mechanicjob.sql
@@ -0,0 +1,33 @@
+
+INSERT INTO `addon_account` (name, label, shared) VALUES
+	('society_mechanic', 'Mehaničar', 1)
+;
+
+INSERT INTO `addon_inventory` (name, label, shared) VALUES
+	('society_mechanic', 'Mehaničar', 1)
+;
+
+INSERT INTO `datastore` (name, label, shared) VALUES
+	('society_mechanic', 'Mehaničar', 1)
+;
+
+INSERT INTO `jobs` (name, label) VALUES
+	('mechanic', 'Mehaničar')
+;
+
+INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
+	('mechanic',0,'recrue','Šegrt',12,'{}','{}'),
+	('mechanic',1,'novice','Početnik',24,'{}','{}'),
+	('mechanic',2,'experimente','Iskusni Radnik',36,'{}','{}'),
+	('mechanic',3,'chief','Menadžer',48,'{}','{}'),
+	('mechanic',4,'boss','Šef',0,'{}','{}')
+;
+
+INSERT INTO `items` (name, label, weight) VALUES
+	('gazbottle', 'Gas Bottle', 2),
+	('fixtool', 'Repair Tools', 2),
+	('carotool', 'Tools', 2),
+	('blowpipe', 'Blowtorch', 2),
+	('fixkit', 'Repair Kit', 3),
+	('carokit', 'Body Kit', 3)
+;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql b/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql
deleted file mode 100644
index 375200dd7..000000000
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_mechanic', 'Mekaniker', 1)
-;
-
-INSERT INTO `addon_inventory` (name, label, shared) VALUES
-	('society_mechanic', 'Mekaniker', 1)
-;
-
-INSERT INTO `datastore` (name, label, shared) VALUES
-	('society_mechanic', 'Mekaniker', 1)
-;
-
-INSERT INTO `jobs` (name, label) VALUES
-	('mechanic', 'Mekaniker')
-;
-
-INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
-	('mechanic',0,'recrue','Rekryt',12,'{}','{}'),
-	('mechanic',1,'novice','Nyanställd',24,'{}','{}'),
-	('mechanic',2,'experimente','Erfaren',36,'{}','{}'),
-	('mechanic',3,'chief','Chef',48,'{}','{}'),
-	('mechanic',4,'boss','Ägare',0,'{}','{}')
-;
-
-INSERT INTO `items` (name, label, weight) VALUES
-	('gazbottle', 'Gas Flaska', 2),
-	('fixtool', 'Reparationsverktyg', 2),
-	('carotool', 'Verktyg', 2),
-	('blowpipe', 'Blåslampa', 2),
-	('fixkit', 'Reparationssats', 3),
-	('carokit', 'Karosskit', 3)
-;
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/server/main.lua b/server-data/resources/[esx_addons]/esx_mechanicjob/server/main.lua
index 8ec9bc93b..42246c336 100644
--- a/server-data/resources/[esx_addons]/esx_mechanicjob/server/main.lua
+++ b/server-data/resources/[esx_addons]/esx_mechanicjob/server/main.lua
@@ -1,4 +1,4 @@
-local PlayersHarvesting, PlayersHarvesting2, PlayersHarvesting3  = {}, {}, {}
+local PlayersHarvesting, PlayersHarvesting2, PlayersHarvesting3, PlayersCrafting, PlayersCrafting2, PlayersCrafting3  = {}, {}, {}, {}, {}, {}
 
 if Config.MaxInService ~= -1 then
 	TriggerEvent('esx_service:activateService', 'mechanic', Config.MaxInService)
@@ -102,6 +102,105 @@ AddEventHandler('esx_mechanicjob:stopHarvest3', function()
 	PlayersHarvesting3[source] = false
 end)
 
+local function Craft(source)
+	SetTimeout(4000, function()
+
+		if PlayersCrafting[source] == true then
+			local xPlayer = ESX.GetPlayerFromId(source)
+			local GazBottleQuantity = xPlayer.getInventoryItem('gazbottle').count
+
+			if GazBottleQuantity <= 0 then
+				TriggerClientEvent('esx:showNotification', source, _U('not_enough_gas_can'))
+			else
+				xPlayer.removeInventoryItem('gazbottle', 1)
+				xPlayer.addInventoryItem('blowpipe', 1)
+				Craft(source)
+			end
+		end
+
+	end)
+end
+
+RegisterServerEvent('esx_mechanicjob:startCraft')
+AddEventHandler('esx_mechanicjob:startCraft', function()
+	local source = source
+	PlayersCrafting[source] = true
+	TriggerClientEvent('esx:showNotification', source, _U('assembling_blowtorch'))
+	Craft(source)
+end)
+
+RegisterServerEvent('esx_mechanicjob:stopCraft')
+AddEventHandler('esx_mechanicjob:stopCraft', function()
+	local source = source
+	PlayersCrafting[source] = false
+end)
+
+local function Craft2(source)
+	SetTimeout(4000, function()
+
+		if PlayersCrafting2[source] == true then
+			local xPlayer = ESX.GetPlayerFromId(source)
+			local FixToolQuantity = xPlayer.getInventoryItem('fixtool').count
+
+			if FixToolQuantity <= 0 then
+				TriggerClientEvent('esx:showNotification', source, _U('not_enough_repair_tools'))
+			else
+				xPlayer.removeInventoryItem('fixtool', 1)
+				xPlayer.addInventoryItem('fixkit', 1)
+				Craft2(source)
+			end
+		end
+
+	end)
+end
+
+RegisterServerEvent('esx_mechanicjob:startCraft2')
+AddEventHandler('esx_mechanicjob:startCraft2', function()
+	local source = source
+	PlayersCrafting2[source] = true
+	TriggerClientEvent('esx:showNotification', source, _U('assembling_repair_kit'))
+	Craft2(source)
+end)
+
+RegisterServerEvent('esx_mechanicjob:stopCraft2')
+AddEventHandler('esx_mechanicjob:stopCraft2', function()
+	local source = source
+	PlayersCrafting2[source] = false
+end)
+
+local function Craft3(source)
+	SetTimeout(4000, function()
+
+		if PlayersCrafting3[source] == true then
+			local xPlayer = ESX.GetPlayerFromId(source)
+			local CaroToolQuantity = xPlayer.getInventoryItem('carotool').count
+
+			if CaroToolQuantity <= 0 then
+				TriggerClientEvent('esx:showNotification', source, _U('not_enough_body_tools'))
+			else
+				xPlayer.removeInventoryItem('carotool', 1)
+				xPlayer.addInventoryItem('carokit', 1)
+				Craft3(source)
+			end
+		end
+
+	end)
+end
+
+RegisterServerEvent('esx_mechanicjob:startCraft3')
+AddEventHandler('esx_mechanicjob:startCraft3', function()
+	local source = source
+	PlayersCrafting3[source] = true
+	TriggerClientEvent('esx:showNotification', source, _U('assembling_body_kit'))
+	Craft3(source)
+end)
+
+RegisterServerEvent('esx_mechanicjob:stopCraft3')
+AddEventHandler('esx_mechanicjob:stopCraft3', function()
+	local source = source
+	PlayersCrafting3[source] = false
+end)
+
 RegisterServerEvent('esx_mechanicjob:onNPCJobMissionCompleted')
 AddEventHandler('esx_mechanicjob:onNPCJobMissionCompleted', function()
 	local source = source
@@ -149,6 +248,55 @@ ESX.RegisterUsableItem('carokit', function(source)
 	TriggerClientEvent('esx:showNotification', source, _U('you_used_body_kit'))
 end)
 
+RegisterServerEvent('esx_mechanicjob:getStockItem')
+AddEventHandler('esx_mechanicjob:getStockItem', function(itemName, count)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	TriggerEvent('esx_addoninventory:getSharedInventory', 'society_mechanic', function(inventory)
+		local item = inventory.getItem(itemName)
+
+		-- is there enough in the society?
+		if count > 0 and item.count >= count then
+
+			-- can the player carry the said amount of x item?
+			if xPlayer.canCarryItem(itemName, count) then
+				inventory.removeItem(itemName, count)
+				xPlayer.addInventoryItem(itemName, count)
+				xPlayer.showNotification(_U('have_withdrawn', count, item.label))
+			else
+				xPlayer.showNotification(_U('player_cannot_hold'))
+			end
+		else
+			xPlayer.showNotification(_U('invalid_quantity'))
+		end
+	end)
+end)
+
+ESX.RegisterServerCallback('esx_mechanicjob:getStockItems', function(source, cb)
+	TriggerEvent('esx_addoninventory:getSharedInventory', 'society_mechanic', function(inventory)
+		cb(inventory.items)
+	end)
+end)
+
+RegisterServerEvent('esx_mechanicjob:putStockItems')
+AddEventHandler('esx_mechanicjob:putStockItems', function(itemName, count)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	TriggerEvent('esx_addoninventory:getSharedInventory', 'society_mechanic', function(inventory)
+		local item = inventory.getItem(itemName)
+		local playerItemCount = xPlayer.getInventoryItem(itemName).count
+
+		if item.count >= 0 and count <= playerItemCount then
+			xPlayer.removeInventoryItem(itemName, count)
+			inventory.addItem(itemName, count)
+		else
+			xPlayer.showNotification(_U('invalid_quantity'))
+		end
+
+		xPlayer.showNotification(_U('have_deposited', count, item.label))
+	end)
+end)
+
 ESX.RegisterServerCallback('esx_mechanicjob:getPlayerInventory', function(source, cb)
 	local xPlayer    = ESX.GetPlayerFromId(source)
 	local items      = xPlayer.inventory
diff --git a/server-data/resources/[ox]/ox_inventory/data/stashes.lua b/server-data/resources/[ox]/ox_inventory/data/stashes.lua
index ab6561c39..5fa0c1a3e 100644
--- a/server-data/resources/[ox]/ox_inventory/data/stashes.lua
+++ b/server-data/resources/[ox]/ox_inventory/data/stashes.lua
@@ -55,23 +55,4 @@ return {
 		weight = 70000,
 		groups = {['unicorn'] = 0}
 	},
-
-	{
-		coords = vec3(-344.452759, -127.437363, 39.002197),
-		target = {
-			loc = vec3(-344.452759, -127.437363, 39.002197),
-			length = 0.6,
-			width = 1.8,
-			heading = 340,
-			minZ = 43.34,
-			maxZ = 44.74,
-			label = 'Storage'
-		},
-		name = 'mechaniclocker',
-		label = 'Storage',
-		owner = false,
-		slots = 70,
-		weight = 70000,
-		groups = {['mechanic'] = 0}
-	},
-}
\ No newline at end of file
+}

From 5a7b4588c03bb33bfccc8d0cb9b41b0d267ecdad Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:11:04 +0100
Subject: [PATCH 4/5] chore:  update the license year

---
 .../resources/[bpt_addons]/bpt_bakerjob/LICENSE        |  4 ++--
 .../resources/[bpt_addons]/bpt_bakerjob/README.md      |  2 +-
 .../resources/[bpt_addons]/bpt_ballasjob/LICENSE       |  4 ++--
 .../resources/[bpt_addons]/bpt_ballasjob/README.md     |  2 +-
 .../resources/[bpt_addons]/bpt_deliveries/README.md    |  2 +-
 .../resources/[bpt_addons]/bpt_doorlock/LICENSE        |  2 +-
 .../resources/[bpt_addons]/bpt_doorlock/README.md      |  2 +-
 server-data/resources/[bpt_addons]/bpt_dustman/LICENSE |  4 ++--
 .../resources/[bpt_addons]/bpt_dustman/README.md       |  2 +-
 server-data/resources/[bpt_addons]/bpt_farmer/LICENSE  |  4 ++--
 .../resources/[bpt_addons]/bpt_farmer/README.md        |  2 +-
 .../resources/[bpt_addons]/bpt_fisherman/LICENSE       |  4 ++--
 .../resources/[bpt_addons]/bpt_fisherman/README.md     |  2 +-
 server-data/resources/[bpt_addons]/bpt_hud/LICENSE     |  4 ++--
 server-data/resources/[bpt_addons]/bpt_menu/README.md  |  2 +-
 .../resources/[maps]/hdigitalden/fxmanifest.lua        | 10 +++++-----
 server-data/resources/[maps]/ring/LICENSE              |  4 ++--
 server-data/resources/[maps]/ring/fxmanifest.lua       |  8 ++++----
 18 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/server-data/resources/[bpt_addons]/bpt_bakerjob/LICENSE b/server-data/resources/[bpt_addons]/bpt_bakerjob/LICENSE
index 26ecd4f64..7c1b638e7 100644
--- a/server-data/resources/[bpt_addons]/bpt_bakerjob/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_bakerjob/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_bakerjob/README.md b/server-data/resources/[bpt_addons]/bpt_bakerjob/README.md
index 9885bdfb1..d99a16835 100644
--- a/server-data/resources/[bpt_addons]/bpt_bakerjob/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_bakerjob/README.md
@@ -2,7 +2,7 @@
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
 📌 License
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 
diff --git a/server-data/resources/[bpt_addons]/bpt_ballasjob/LICENSE b/server-data/resources/[bpt_addons]/bpt_ballasjob/LICENSE
index 26ecd4f64..7c1b638e7 100644
--- a/server-data/resources/[bpt_addons]/bpt_ballasjob/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_ballasjob/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_ballasjob/README.md b/server-data/resources/[bpt_addons]/bpt_ballasjob/README.md
index 64559b85e..c765fc972 100644
--- a/server-data/resources/[bpt_addons]/bpt_ballasjob/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_ballasjob/README.md
@@ -2,7 +2,7 @@
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
 📌 License
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 
diff --git a/server-data/resources/[bpt_addons]/bpt_deliveries/README.md b/server-data/resources/[bpt_addons]/bpt_deliveries/README.md
index f5c8b1bfc..9145b9c59 100644
--- a/server-data/resources/[bpt_addons]/bpt_deliveries/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_deliveries/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_deliveries</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 
diff --git a/server-data/resources/[bpt_addons]/bpt_doorlock/LICENSE b/server-data/resources/[bpt_addons]/bpt_doorlock/LICENSE
index 70a056a40..37ee53975 100644
--- a/server-data/resources/[bpt_addons]/bpt_doorlock/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_doorlock/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 bitpredator
+Copyright (c) 2023-2024 bitpredator
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/server-data/resources/[bpt_addons]/bpt_doorlock/README.md b/server-data/resources/[bpt_addons]/bpt_doorlock/README.md
index c024d8947..deda17063 100644
--- a/server-data/resources/[bpt_addons]/bpt_doorlock/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_doorlock/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_dorlock</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
diff --git a/server-data/resources/[bpt_addons]/bpt_dustman/LICENSE b/server-data/resources/[bpt_addons]/bpt_dustman/LICENSE
index 85757e6d0..6d9577f6a 100644
--- a/server-data/resources/[bpt_addons]/bpt_dustman/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_dustman/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023  bitpredator
+    <program>  Copyright (C) 2022-2024  bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_dustman/README.md b/server-data/resources/[bpt_addons]/bpt_dustman/README.md
index e1cf89480..5490c71d7 100644
--- a/server-data/resources/[bpt_addons]/bpt_dustman/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_dustman/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_dustman</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/LICENSE b/server-data/resources/[bpt_addons]/bpt_farmer/LICENSE
index 85757e6d0..6d9577f6a 100644
--- a/server-data/resources/[bpt_addons]/bpt_farmer/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_farmer/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023  bitpredator
+    <program>  Copyright (C) 2022-2024  bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/README.md b/server-data/resources/[bpt_addons]/bpt_farmer/README.md
index ee747e597..ba3cd7363 100644
--- a/server-data/resources/[bpt_addons]/bpt_farmer/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_farmer/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_farmer</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 
diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE b/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE
index 26ecd4f64..7c1b638e7 100644
--- a/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_fisherman/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/README.md b/server-data/resources/[bpt_addons]/bpt_fisherman/README.md
index 213a53f2a..53165a47d 100644
--- a/server-data/resources/[bpt_addons]/bpt_fisherman/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_fisherman/README.md
@@ -2,7 +2,7 @@
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
 📌 License
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 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.
 
diff --git a/server-data/resources/[bpt_addons]/bpt_hud/LICENSE b/server-data/resources/[bpt_addons]/bpt_hud/LICENSE
index 26ecd4f64..7c1b638e7 100644
--- a/server-data/resources/[bpt_addons]/bpt_hud/LICENSE
+++ b/server-data/resources/[bpt_addons]/bpt_hud/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.
diff --git a/server-data/resources/[bpt_addons]/bpt_menu/README.md b/server-data/resources/[bpt_addons]/bpt_menu/README.md
index 33d86a774..a03597767 100644
--- a/server-data/resources/[bpt_addons]/bpt_menu/README.md
+++ b/server-data/resources/[bpt_addons]/bpt_menu/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_menu</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
 This program is a project for the fivem community, you have legal permission to distribute and / or modify it only if you have forked this repository, if it is not a fork repository, the version will be removed from the DMCA request.
 
diff --git a/server-data/resources/[maps]/hdigitalden/fxmanifest.lua b/server-data/resources/[maps]/hdigitalden/fxmanifest.lua
index d3e12d8c7..5f034fbfb 100644
--- a/server-data/resources/[maps]/hdigitalden/fxmanifest.lua
+++ b/server-data/resources/[maps]/hdigitalden/fxmanifest.lua
@@ -1,5 +1,5 @@
-fx_version 'cerulean'
-game 'gta5'
-this_is_a_map 'yes'
-author 'Helenius#4165'
-client_script 'client.lua'
\ No newline at end of file
+fx_version("cerulean")
+game("gta5")
+this_is_a_map("yes")
+author("Helenius#4165")
+client_script("client.lua")
diff --git a/server-data/resources/[maps]/ring/LICENSE b/server-data/resources/[maps]/ring/LICENSE
index 0d2648c2c..1d2a02699 100644
--- a/server-data/resources/[maps]/ring/LICENSE
+++ b/server-data/resources/[maps]/ring/LICENSE
@@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
 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.
 
-  Copyright (C) 2015-2023 bitpredator
+  Copyright (C) 2015-2024 bitpredator
 
     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
@@ -651,7 +651,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:
 
-    Copyright (C) 2015-2023 bitpredator
+    Copyright (C) 2015-2024 bitpredator
     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.
diff --git a/server-data/resources/[maps]/ring/fxmanifest.lua b/server-data/resources/[maps]/ring/fxmanifest.lua
index 84b31af8f..5e93c86da 100644
--- a/server-data/resources/[maps]/ring/fxmanifest.lua
+++ b/server-data/resources/[maps]/ring/fxmanifest.lua
@@ -1,4 +1,4 @@
-fx_version "adamant"
-game 'gta5'
-this_is_a_map "yes"
-version '0.0.4'
\ No newline at end of file
+fx_version("adamant")
+game("gta5")
+this_is_a_map("yes")
+version("1.0.0")

From 63453e4ac057cceb93bebd1257a308474bf9106b Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:13:06 +0100
Subject: [PATCH 5/5] chore:  update the license year

---
 server-data/resources/[esx_addons]/esx_taxijob/LICENSE     | 4 ++--
 server-data/resources/[esx_addons]/esx_taxijob/README.md   | 2 +-
 server-data/resources/[esx_addons]/esx_uteknark1/LICENSE   | 4 ++--
 server-data/resources/[esx_addons]/esx_uteknark1/README.md | 2 +-
 server-data/resources/[esx_addons]/wk_wars2x/LICENSE       | 2 +-
 server-data/resources/[maps]/SLBK11_MissionRow/LICENSE     | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server-data/resources/[esx_addons]/esx_taxijob/LICENSE b/server-data/resources/[esx_addons]/esx_taxijob/LICENSE
index 56085349d..f5a11ff39 100644
--- a/server-data/resources/[esx_addons]/esx_taxijob/LICENSE
+++ b/server-data/resources/[esx_addons]/esx_taxijob/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2023 bitpredator
+    Copyright (C) 2023-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2023 bitpredator
+    <program>  Copyright (C) 2023-2024 bitpredator
     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.
diff --git a/server-data/resources/[esx_addons]/esx_taxijob/README.md b/server-data/resources/[esx_addons]/esx_taxijob/README.md
index 15c91c490..7ec364fdb 100644
--- a/server-data/resources/[esx_addons]/esx_taxijob/README.md
+++ b/server-data/resources/[esx_addons]/esx_taxijob/README.md
@@ -4,7 +4,7 @@ This Resource allows you to drive a fancy Taxi to pickup players , charge them p
 
 esx_taxijob: Taxi Service - Anyone Need a Taxi?!
 
-Copyright (C) 2015-2023 Jérémie N'gadi
+Copyright (C) 2015-2024 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.
 
diff --git a/server-data/resources/[esx_addons]/esx_uteknark1/LICENSE b/server-data/resources/[esx_addons]/esx_uteknark1/LICENSE
index 56085349d..f5a11ff39 100644
--- a/server-data/resources/[esx_addons]/esx_uteknark1/LICENSE
+++ b/server-data/resources/[esx_addons]/esx_uteknark1/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2023 bitpredator
+    Copyright (C) 2023-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2023 bitpredator
+    <program>  Copyright (C) 2023-2024 bitpredator
     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.
diff --git a/server-data/resources/[esx_addons]/esx_uteknark1/README.md b/server-data/resources/[esx_addons]/esx_uteknark1/README.md
index 8d90aee3d..2f88a9bfa 100644
--- a/server-data/resources/[esx_addons]/esx_uteknark1/README.md
+++ b/server-data/resources/[esx_addons]/esx_uteknark1/README.md
@@ -1,5 +1,5 @@
 # Legal
-Copyright (C) 2019-2023
+Copyright (C) 2019-2024
 
 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.
 
diff --git a/server-data/resources/[esx_addons]/wk_wars2x/LICENSE b/server-data/resources/[esx_addons]/wk_wars2x/LICENSE
index 0b08cf934..1b883e74f 100644
--- a/server-data/resources/[esx_addons]/wk_wars2x/LICENSE
+++ b/server-data/resources/[esx_addons]/wk_wars2x/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023
+Copyright (c) 2020-2024
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/server-data/resources/[maps]/SLBK11_MissionRow/LICENSE b/server-data/resources/[maps]/SLBK11_MissionRow/LICENSE
index 26ecd4f64..7c1b638e7 100644
--- a/server-data/resources/[maps]/SLBK11_MissionRow/LICENSE
+++ b/server-data/resources/[maps]/SLBK11_MissionRow/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.