diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-27 13:10:57 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 13:10:57 +1000 |
| commit | a42842e4e93525a64d0b2efc0d68115a59acb20c (patch) | |
| tree | 55f4c3c6635c1d94ff22abf90b486638661b930f /src/Java/gtPlusPlus/xmod/gregtech/api/enums | |
| parent | 5d4d3fb679c8af83ed5ee14430c6cde0b16cfcc6 (diff) | |
| parent | 066bd6475ce142f405d521975b1d4105ccaddf0d (diff) | |
| download | GT5-Unofficial-a42842e4e93525a64d0b2efc0d68115a59acb20c.tar.gz GT5-Unofficial-a42842e4e93525a64d0b2efc0d68115a59acb20c.tar.bz2 GT5-Unofficial-a42842e4e93525a64d0b2efc0d68115a59acb20c.zip | |
Merge pull request #156 from draknyte1/Multiblock-Fix
Multiblock fix for #141, other misc. fixes & a few new additions.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/enums')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 2032555a7f..7a0df6c43c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -173,7 +173,7 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Autocrafter, - Casing_PlaceHolder13, + Casing_CuttingFactoryFrame, Casing_PlaceHolder14, Casing_PlaceHolder15, @@ -253,6 +253,24 @@ public enum GregtechItemList implements GregtechItemContainer { Machine_Advanced_EV_Mixer, Machine_Advanced_IV_Mixer, Machine_Advanced_LuV_Mixer, Machine_Advanced_ZPM_Mixer, Machine_Advanced_UV_Mixer, + //Custom hatches + Hatch_Input_Battery_MV, Hatch_Input_Battery_EV, + Hatch_Output_Battery_MV, Hatch_Output_Battery_EV, + + //Wireless Chargers + Charger_LV, Charger_MV, Charger_HV, + Charger_EV, Charger_IV, Charger_LuV, + Charger_ZPM, Charger_UV, Charger_MAX, + + //Generator Array + Generator_Array_Controller, + + //Cutting Factory Controller + Industrial_CuttingFactoryController, + + //Tiny Fusion + Miniature_Fusion, + |