diff options
| author | Technus <daniel112092@gmail.com> | 2020-04-07 06:19:25 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2020-04-07 06:19:25 +0200 |
| commit | 5de758036a52ad0467c3d56786c2e7a99c8e123b (patch) | |
| tree | 4e1c4e2f4bbf27f6a96571adcad52344d5db8645 /src/main/java/gregtech/api/enums | |
| parent | fefcabc97d7682017a5293bbc92000b6a0668fc0 (diff) | |
| parent | ecb77f163850d96176e068bd2912b79b5a75ab0b (diff) | |
| download | GT5-Unofficial-5de758036a52ad0467c3d56786c2e7a99c8e123b.tar.gz GT5-Unofficial-5de758036a52ad0467c3d56786c2e7a99c8e123b.tar.bz2 GT5-Unofficial-5de758036a52ad0467c3d56786c2e7a99c8e123b.zip | |
Merge branch 'Ore-Drilling-T5+T6' of https://github.com/GTNewHorizons/GT5-Unofficial into Ore-Drilling-T5+T6
# Conflicts:
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index a02e4bbf64..1986ded3f5 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1116,6 +1116,9 @@ public enum ItemList implements IItemContainer { Machine_HV_Printer, Machine_EV_Printer, Machine_IV_Printer, + Machine_LuV_Printer, + Machine_ZPM_Printer, + Machine_UV_Printer, Machine_LV_Recycler, Machine_MV_Recycler, @@ -1170,6 +1173,9 @@ public enum ItemList implements IItemContainer { Machine_HV_Boxinator, Machine_EV_Boxinator, Machine_IV_Boxinator, + Machine_LuV_Boxinator, + Machine_ZPM_Boxinator, + Machine_UV_Boxinator, Machine_LV_Unboxinator, Machine_MV_Unboxinator, |