aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-08 10:46:11 +0200
committerDream-Master <dream-master@gmx.net>2017-07-08 10:46:11 +0200
commitc8475d850f306a6b0870dbb59ce68ae2afd9c425 (patch)
tree53d3bdbfbb7bcf37b43e1dadf7a0c232d555a8f7 /src/main/java/gregtech/api/enums
parente99ac7a5dfd01b360b4cb7caa21ceabc837365cc (diff)
parent98a508a0ae355da6a4a3037ce0d1521b158a89c4 (diff)
downloadGT5-Unofficial-c8475d850f306a6b0870dbb59ce68ae2afd9c425.tar.gz
GT5-Unofficial-c8475d850f306a6b0870dbb59ce68ae2afd9c425.tar.bz2
GT5-Unofficial-c8475d850f306a6b0870dbb59ce68ae2afd9c425.zip
Merge branch 'LV-MV-Miner' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java1
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 ed3aea00c4..518663e8ec 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -631,6 +631,7 @@ public enum ItemList implements IItemContainer {
Machine_LV_Hammer, Machine_MV_Hammer, Machine_HV_Hammer, Machine_EV_Hammer, Machine_IV_Hammer,
Machine_LV_FluidHeater, Machine_MV_FluidHeater, Machine_HV_FluidHeater, Machine_EV_FluidHeater, Machine_IV_FluidHeater,
Machine_Multi_LargeChemicalReactor,
+ Machine_LV_Miner, Machine_MV_Miner,
Neutron_Reflector,
Reactor_Coolant_He_1, Reactor_Coolant_He_3, Reactor_Coolant_He_6, Reactor_Coolant_NaK_1, Reactor_Coolant_NaK_3, Reactor_Coolant_NaK_6,neutroniumHeatCapacitor,