Merge pull request #11 from EpochModTeam/master

update fork

CHANGE LOG 1.0.7.txt

@@ -153,7 +153,6 @@
 [UPDATED] The Journal main page was reworked and has some more information about the server settings now. (ef05eb4e) @AirwavesMan
 [UPDATED] Harvesting wood will yield at least 16 or more wood. This was added in order to decrease network traffic. (8dc6ef8d) @AirwavesMan
 [UPDATED] Increased cargo count of Refuel Trucks. (4667f20b) @AirwavesMan
-[UPDATED] The parachute has a new model. (cc4ee5b2) @AirwavesMan, @Helion4
 [UPDATED] Cinder buildings and metal floors have a new texture. @Helion4
 [UPDATED] Highly increased infection chance if the player eats uncooked meat or fish. (29b6a26) @AirwavesMan
 [UPDATED] Crafting wooden buildings now requires a handsaw and a hammer. (247f5dc6) @AirwavesMan

SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp

@@ -709,9 +709,6 @@ class CfgVehicles
 	#include "Boat\Seafox.hpp"
 	#include "Boat\Submarine.hpp"
 
-	//Epoch Parachute
-	#include "Parachute.hpp"
-
 	//Includes all Building Stuff
 	//Houses
 	#include "Buildings\Land_A_Crane_02b.hpp"

SQF/dayz_code/Configs/CfgVehicles/Parachute.hpp

@@ -1,4 +0,0 @@
-class ParachuteBase;
-class ParachuteWest: ParachuteBase {
-	model = "\z\addons\dayz_epoch_v\vehicles\chute\PARA.p3d";
-};

SQF/dayz_code/stringtable.xml

@@ -27935,7 +27935,7 @@
 			<German>Ein Waffenregal für 20 Waffen.</German>
 			<Russian>Полка, на которую можно повесить до 20 единиц оружия.</Russian>
 		</Key>
-		<Key ID="STR_EPOCH_GUNRACKKIT_DESC2">
+		<Key ID="STR_EPOCH_GUNRACKKIT2_DESC">
 			<English>A Gun Rack for 40 weapons.</English>
 			<German>Ein Waffenregal für 40 Waffen.</German>
 			<Russian>Полка, на которую можно повесить до 40 единиц оружия.</Russian>