diff --git a/CHANGE LOG 1.0.6.3.txt b/CHANGE LOG 1.0.6.3.txt
index b1def13e8..7b3c62351 100644
--- a/CHANGE LOG 1.0.6.3.txt
+++ b/CHANGE LOG 1.0.6.3.txt
@@ -1,28 +1,32 @@
-[NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty @oiad
-[NEW] Added 93 new zombie models with loot groups and strings for Server Admins @Airwavesman
-[NEW] Zombie Loot supports backpacks now @Airwavesman
-[NEW] Hide Body can be edited and toggled now. Enabled by default, configVariables.sqf/DZE_Hide_Body @AirwavesMan
-[NEW] 6 AK-107 versions added with attachment support. @AirwavesMan
+[NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty (c3cbca1) @oiad
+[NEW] Added 93 new zombie models with loot groups and strings for Server Admins. (2e15009) @AirwavesMan
+[NEW] Zombie Loot supports backpacks now. (096fc13) @AirwavesMan
+[NEW] Hide Body can be edited and toggled now. Enabled by default, configVariables.sqf/DZE_Hide_Body (c0e9fe6) @AirwavesMan
+[NEW] 6 AK-107 versions added with attachment support. (82485ea) @AirwavesMan
-[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5)
+[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5) @ebayShopper
[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob
-[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997)
-[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da)
-[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a)
-[FIXED] Player could shoot during unconscious wake up animation (634a01a)
+[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997) @ebayShopper
+[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da) @shu @oiad
+[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a) @ebayShopper
+[FIXED] Player could shoot during unconscious wake up animation (634a01a) @ebayShopper
[FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad @AirwavesMan
[FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly
-[FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227)
+[FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227) @ebayShopper
[FIXED] Disabled Arma's automatic vehicle refuel, repair and rearm at WarfareBVehicleServicePoint buildings (2c4f06c) @dihan48
-[FIXED] DistanceFoot database stat was incorrect. @dihan48
-[FIXED] Wrong cargo count of Refuel Trucks after last Corepatch. @AirwavesMan
-[FIXED] Vehicles jumping into the air after flipping. @AirwavesMan
-[FIXED] Crafting wooden arrows from wood piles and razors was not possible. @AirwavesMan
-[FIXED] Top snap point for half cinder wall was incorrect. @ndavalos, @AirwavesMan
-[FIXED] The RPK-74 magazine could not be used with all AK-74 versions. @AirwavesMan
+[FIXED] DistanceFoot database stat was incorrect. (be777dd) @dihan48
+[FIXED] Wrong cargo count of Refuel Trucks after last Corepatch. (e26fb24) @AirwavesMan
+[FIXED] Vehicles jumping into the air after flipping. (096fc13) @AirwavesMan
+[FIXED] Crafting wooden arrows from wood piles and razors was not possible. (d4b46e4) @AirwavesMan
+[FIXED] Top snap point for half cinder wall was incorrect. (8f10a36) @ndavalos, @AirwavesMan
+[FIXED] The RPK-74 magazine could not be used with all AK-74 versions. (82485ea) @AirwavesMan
+[FIXED] Multiple Vehicle Upgrades were not possbile. (ac884f2), (a430f79), (c24504a) @F507DMT
+[FIXED] Fix an inventory dupe if on water. (a052ba7), (baf92eb) @F507DMT
+[FIXED] The pickaxe and the broken pickaxe spawned in the ground on loot spawn. @AirwavesMan
[UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_
-[UPDATED] Added notification when status icons are disabled
-[UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch
+[UPDATED] Added notification when status icons are disabled. (e04f0fc) @ebayShopper
+[UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch (d6cf707) @ebayShopper
+[UPDATED] All M32 grenades using one inventroy slot now. (cc85067) @AirwavesMan
[INFO] Synced with DayZMod upstream up to commit fe063a8
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
index 8192b2f99..6d8ecbb36 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
@@ -5,8 +5,10 @@ Castle[] =
{Loot_WEAPON, 1, ItemMap},
{Loot_WEAPON, 1, ItemCompass},
{Loot_WEAPON, 2, ItemFlashlight},
- {Loot_WEAPON, 1, ItemPickaxe},
- {Loot_WEAPON, 2, ItemPickaxeBroken},
+ //{Loot_WEAPON, 1, ItemPickaxe},
+ //{Loot_WEAPON, 2, ItemPickaxeBroken},
+ {Loot_VEHICLE, 1, WeaponHolder_ItemPickaxe},
+ {Loot_VEHICLE, 2, WeaponHolder_ItemPickaxeBroken},
// {Loot_WEAPON, 2, ItemShovel},
// {Loot_WEAPON, 1, ItemHatchet},
{Loot_VEHICLE, 1, WeaponHolder_ItemHatchet},
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
index cb2f5d8db..400ff5021 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
@@ -10,8 +10,10 @@ Construction[] =
{Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, ItemComboLock},
- {Loot_WEAPON, 1, ItemPickaxe},
- {Loot_WEAPON, 2, ItemPickaxeBroken},
+ //{Loot_WEAPON, 1, ItemPickaxe},
+ //{Loot_WEAPON, 2, ItemPickaxeBroken},
+ {Loot_VEHICLE, 1, WeaponHolder_ItemPickaxe},
+ {Loot_VEHICLE, 2, WeaponHolder_ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledge},
{Loot_MAGAZINE, 2, ItemSledgeHandle},
{Loot_MAGAZINE, 2, ItemSledgeHead},
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
index 59452e3df..c9658f64b 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
@@ -7,8 +7,10 @@ Industrial[] =
{Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar},
// {Loot_WEAPON, 5, ItemHatchet},
{Loot_VEHICLE, 5, WeaponHolder_ItemHatchet},
- {Loot_WEAPON, 1, ItemPickaxe},
- {Loot_WEAPON, 2, ItemPickaxeBroken},
+ //{Loot_WEAPON, 1, ItemPickaxe},
+ //{Loot_WEAPON, 2, ItemPickaxeBroken},
+ {Loot_VEHICLE, 1, WeaponHolder_ItemPickaxe},
+ {Loot_VEHICLE, 2, WeaponHolder_ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledge},
{Loot_MAGAZINE, 2, ItemSledgeHandle},
{Loot_MAGAZINE, 2, ItemSledgeHead},
diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
index 0d2cb973e..3a596680a 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
@@ -22,6 +22,27 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase
init="[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
+class WeaponHolder_ItemPickaxe: WeaponHolderBase
+{
+ scope=2;
+ displayName = $STR_EQUIP_NAME_PICKAXE;
+ model = "z\addons\dayz_communityweapons\models\pickaxe\pickaxe.p3d";
+ destrType = "DestructNo";
+
+ class eventHandlers
+ {
+ init="[(_this select 0),'cfgWeapons','ItemPickaxe'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
+ };
+};
+class WeaponHolder_ItemPickaxeBroken: WeaponHolder_ItemPickaxe
+{
+ displayName = $STR_name_ItemPickaxeBroken;
+
+ class eventHandlers
+ {
+ init="[(_this select 0),'cfgWeapons','ItemPickaxeBroken'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
+ };
+};
class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for player_dropWeapon
scope = public;
displayName = $STR_EQUIP_NAME_SledgeHammer;
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index c84ab2a31..eac67ec0e 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -14798,7 +14798,7 @@
Lumber Pack
- Bauholzstapel
+ Bauholzpaket
Упаковка пиломатериалов
@@ -14833,7 +14833,7 @@
Plywood in a stack.
- Sperrholzstapel.
+ Sperrholz, gestapelt und zusammengebunden.
Упакованная фанера.