diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-09-03 17:57:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-03 17:57:34 +0200 |
commit | 6df7f36bd91815c71881aed11dc8b37975823736 (patch) | |
tree | 19fdb02e6c7f3435c8c39136ce73337ef5e14b7e /src/main/java/gregtech/api/enums/ItemList.java | |
parent | 5e87d49f2954f22fd830383420cc5d27e7378160 (diff) | |
parent | a6a74841389345b08e68d678e454dd76a46cc2a4 (diff) | |
download | GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.tar.gz GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.tar.bz2 GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.zip |
Merge branch 'unstable' into CircuitChemistryUpdateFollowup
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 b8e24196c6..92afee5cec 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, |