diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-09-04 17:21:13 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-09-04 17:21:13 +0200 |
| commit | f295c05fe7defa288a465318084ea0af08d3fd26 (patch) | |
| tree | 6cc4a75488f027aa7c12265d406b96e06569b250 /src/main/java/gregtech/api | |
| parent | 42b9cee388359b26acfa2228afef0d6159cd3182 (diff) | |
| download | GT5-Unofficial-f295c05fe7defa288a465318084ea0af08d3fd26.tar.gz GT5-Unofficial-f295c05fe7defa288a465318084ea0af08d3fd26.tar.bz2 GT5-Unofficial-f295c05fe7defa288a465318084ea0af08d3fd26.zip | |
cherry pick
820b335d831f60e1936c462d0cb8e7dba3c13fae
733d77481757b6b1619408ea6f4766f770b45419
e2017c72c30c4eac9fff231482da660b7eccd370
147101ff6cfb6bc2a0d8a46bad8aa77c943b7429
612cece6299ed698146d041d1277b52fa6e65df1
820b335d831f60e1936c462d0cb8e7dba3c13fae
Add new zpm and uv battery #1147
Diffstat (limited to 'src/main/java/gregtech/api')
| -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 20bf36f52b..b1c993a8aa 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -648,7 +648,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, - ZPM3,ZPM2, + ZPM3,ZPM2, Energy_Module, Energy_Cluster, 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, Super_Tank_LV, Super_Tank_MV, Super_Tank_HV, Super_Tank_EV, Super_Tank_IV, Super_Chest_LV, Super_Chest_MV, Super_Chest_HV, Super_Chest_EV, Super_Chest_IV, |