diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-09-03 14:55:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-03 14:55:30 +0200 |
commit | edba8167b655df8b4f7dea1ac091595b1bfaeba5 (patch) | |
tree | 139296cc779bf9ea7ab4fc15546b8c0993d2adf6 /src/main/java/gregtech/api/enums/ItemList.java | |
parent | eb749f64cac9db103d4c61002d8f663e23b3f435 (diff) | |
parent | 4f73a6b726dee54762660848bcd6c7736615fc79 (diff) | |
download | GT5-Unofficial-edba8167b655df8b4f7dea1ac091595b1bfaeba5.tar.gz GT5-Unofficial-edba8167b655df8b4f7dea1ac091595b1bfaeba5.tar.bz2 GT5-Unofficial-edba8167b655df8b4f7dea1ac091595b1bfaeba5.zip |
Merge branch 'unstable' into patch-5
Diffstat (limited to 'src/main/java/gregtech/api/enums/ItemList.java')
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 51aa28c15f..6763328cf2 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,6 +628,7 @@ public enum ItemList implements IItemContainer { MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV, Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, + Energy_Module, Energy_Cluster, ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal, |