diff options
author | MauveCloud <MauveCloud@users.noreply.github.com> | 2016-04-28 11:30:29 -0700 |
---|---|---|
committer | MauveCloud <MauveCloud@users.noreply.github.com> | 2016-04-28 11:30:29 -0700 |
commit | b69385d29b99497ba68e878a8333315439ef854c (patch) | |
tree | cfdbe19adfcd6cf8d0b5370e4232a1f3e61c2ce8 /src/main/java/gregtech/api/enums/ItemList.java | |
parent | a88988770b9810c37331380b430fdae068a5d2b8 (diff) | |
parent | 5c8eec846d0a452b9f524e7ffe5351222fbc55ec (diff) | |
download | GT5-Unofficial-b69385d29b99497ba68e878a8333315439ef854c.tar.gz GT5-Unofficial-b69385d29b99497ba68e878a8333315439ef854c.tar.bz2 GT5-Unofficial-b69385d29b99497ba68e878a8333315439ef854c.zip |
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums/ItemList.java')
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 87455efac8..a5dac2ce29 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,7 +628,7 @@ public enum ItemList implements IItemContainer { LargeSteamTurbine, LargeGasTurbine, LargeHPSteamTurbine, LargePlasmaTurbine, Ingot_Heavy1, Ingot_Heavy2, Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, - Teleporter, Cover_NeedsMaintainance, Casing_Turbine, + Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, Cover_PlayerDetector, Machine_Multi_HeatExchanger, Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced, Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite, |