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 'refs/remotes/origin/release' into experimental

Browse Source 
# Conflicts:
#	Sources/epoch_config/Configs/CfgItemSort.hpp
This commit is contained in:
vbawol 2017-10-03 08:08:13 -05:00
commit 18dd7a5d80
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/epoch_config/Configs/CfgItemSort.hpp
View File

@ -2,7 +2,6 @@
class CfgItemSort
{
class MainCategories
{
classes[] = {
@ -103,7 +102,7 @@ class CfgItemSort
"U_JeansBlack19_uniform",
"U_JeansBlack20_uniform",
"U_JeansBlack21_uniform",
"U_O_CombatUniform_ocamo",
"U_O_GhillieSuit",
"U_O_PilotCoveralls",
@ -693,7 +692,7 @@ class CfgItemSort
"3Rnd_SmokePurple_Grenade_shell",
"3Rnd_SmokeBlue_Grenade_shell",
"3Rnd_SmokeOrange_Grenade_shell",
// Vehicle Mags
"500Rnd_127x99_mag",
"500Rnd_127x99_mag_Tracer_Red",