Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/experimental' into experimental

Browse Source 
# Conflicts:
#	Sources/epoch_config/Configs/CfgBaseBuilding.hpp
This commit is contained in:
vbawol 2017-10-25 15:41:19 -05:00
commit 14026115e6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_config/Configs/CfgBaseBuilding.hpp
View File

@ -334,7 +334,7 @@ class CfgBaseBuilding
removeParts[] = {}; removeParts[] = {};
}; };
class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {}; class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {};
class MetalFloor_EPOCH : WoodFloor_EPOCH class MetalFloor_EPOCH : WoodFloor_EPOCH // merge
{ {
upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",3},{"MortarBucket",3}}}}; upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",3},{"MortarBucket",3}}}};
removeParts[] = {{"ItemCorrugatedLg",1},{"ItemCorrugated",1}}; removeParts[] = {{"ItemCorrugatedLg",1},{"ItemCorrugated",1}};