Merge pull request #11 from EpochModTeam/master

update fork
This commit is contained in:
W0LF
2021-03-27 15:37:09 +03:00
committed by GitHub
4 changed files with 1 additions and 9 deletions

View File

@@ -153,7 +153,6 @@
[UPDATED] The Journal main page was reworked and has some more information about the server settings now. (ef05eb4e) @AirwavesMan [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] 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] 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] 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] 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 [UPDATED] Crafting wooden buildings now requires a handsaw and a hammer. (247f5dc6) @AirwavesMan

View File

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

View File

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

View File

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