diff options
| author | Alkalus <draknyte1@hotmail.com> | 2018-05-12 17:17:02 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-12 17:17:02 +1000 |
| commit | 92015f6588800b78aa85f5af5f162d271e890983 (patch) | |
| tree | b55bc0b92b2dccaec4e67010d848f177e0d900ed /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | 54f1060e09e2210e345b082421f9e83df9dcfbc0 (diff) | |
| parent | f00d6312349a4e644fda7e46d2cdd3af6e9645c6 (diff) | |
| download | GT5-Unofficial-92015f6588800b78aa85f5af5f162d271e890983.tar.gz GT5-Unofficial-92015f6588800b78aa85f5af5f162d271e890983.tar.bz2 GT5-Unofficial-92015f6588800b78aa85f5af5f162d271e890983.zip | |
Merge branch 'master' into codeenvy
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index b78b565ba2..b137e93454 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -313,17 +313,26 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_Buffer_Dynamo_ULV, Hatch_Buffer_Dynamo_LV, Hatch_Buffer_Dynamo_MV, Hatch_Buffer_Dynamo_HV, Hatch_Buffer_Dynamo_EV, Hatch_Buffer_Dynamo_IV, Hatch_Buffer_Dynamo_LuV, Hatch_Buffer_Dynamo_ZPM, Hatch_Buffer_Dynamo_UV, Hatch_Buffer_Dynamo_MAX, + + //Large Packager Amazon_Warehouse_Controller, Casing_AmazonWarehouse, - //Advanced Vacuum Freezer - Industrial_Cryogenic_Freezer, Casing_AdvancedVacuum, + Hatch_Air_Intake, //ULV Generators - Generator_Diesel_ULV, Generator_Gas_Turbine_ULV, Generator_Steam_Turbine_ULV + Generator_Diesel_ULV, Generator_Gas_Turbine_ULV, Generator_Steam_Turbine_ULV, + + + //Advanced GT vanilla Multis + Machine_Adv_BlastFurnace, Casing_Adv_BlastFurnace, + Machine_Adv_ImplosionCompressor, + //Advanced Vacuum Freezer + Industrial_Cryogenic_Freezer, Casing_AdvancedVacuum, + FusionComputer_UV2 |