cherry pick

11213d18d7345ee29f2efce6c5d421a855bed056
fb163d1be0aa291508bb6513e34cacba3ca06b36
fb508132d91543d5e837dfa4fac09cf5e4b9e7a8
d682ca0d36e3824b1bf73cc800f58c4126bcf104
0f2db4f76a88c26ca08b2da444b264444ce01316
50229e4506687d184c93ed702cdeeecea65e326a

f5195f822d9951015c4ef6599e5b4f6544ec0714
fbdb6ceecf60183ab382f043b78b61941157eccf
55af1972b86a82bf6038342aa1a3bf9013d0f164

c0d9d5a268da4b58385ee95e27408e06829c74b8
416890142c0fa62617fc6e4537826689635e9eb3
d532cb67f7bc68243e3d2dc2a12a466ed9c9e2d9
d1671eaf33b3b4223da174e115f35b9bc1f19c5a
4d90afad87375e3f1013a493f4b3b5d4e92bf521
3c397d61697c13f0467e0cb67fb127fff8401f71
64957ccd0f51ef283cc561d52a5439c3752c4e71

b7e0863207253ee758742a22c607c3ccc37af6d3

ae5a1e117d47876de9d2d2e8ea581e15686c5e1a
a0eb30d03f8fc311598f628ad45b5365c7391917
505a9c263e88e5519bade6a3167f829e41e13e64

9cbb9c66a2f63e7e0cb4aceebfc9c93776b82be2

Drillers upgrade #1163
https://github.com/Blood-Asp/GT5-Unofficial/pull/1163

3 files changed, 19 insertions, 12 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index b1c993a8aa..1e0f667498 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -661,7 +661,7 @@ public enum ItemList implements IItemContainer {
     Casing_Tank_1, Casing_Tank_2, Casing_Tank_3, Casing_Tank_4, Casing_Tank_5, Casing_Tank_6, Casing_Tank_7, Casing_Tank_8, Casing_Tank_9, Casing_Tank_10, Casing_Tank_11, Casing_Tank_12, Casing_Tank_13, Casing_Tank_14, Casing_Tank_15, Casing_Tank_0,
     MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, MobRep_LuV, MobRep_ZPM, MobRep_UV, Cover_PlayerDetector, Machine_Multi_HeatExchanger,
     Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced,
-    Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, Seismic_Prospector_Adv, OilDrill, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,
+    Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, Seismic_Prospector_Adv, OilDrill1, OilDrill2, OilDrill3, ConcreteBackfiller1, ConcreteBackfiller2, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,
     Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX,
     MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM,
     Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4,
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
index 5a7c4873ec..62e6f8cea1 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
@@ -1,14 +1,18 @@
 package gregtech.api.gui;
 
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
+    import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+    import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+    import gregtech.api.util.GT_LanguageManager;
+    import gregtech.api.util.GT_ModHandler;
+    import gregtech.api.util.GT_Utility;
+    import gregtech.common.items.GT_MetaGenerated_Tool_01;
+    import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DrillerBase;
+    import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+    import net.minecraft.entity.player.InventoryPlayer;
+    import net.minecraft.item.ItemStack;
+
 
-import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -54,13 +58,12 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
                 } else {
                     fontRendererObj.drawString(trans("142","Running perfectly."), 10, 16, 16448255);
                 }
-                int id = mContainer.mTileEntity.getMetaTileID();
-                if (id == 1157 || id == 1158 || id == 1177 || id == 1178 || id == 1179) {
+                if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DrillerBase) {
                     ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
                     if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) {
                         fontRendererObj.drawString(trans("143", "Missing Mining Pipe"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
                     }
-                } else if (id == 1131 || id == 1151 || id == 1152 || id == 1153) {
+                } else if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine) {
                     ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
                     if (tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170 && tItem.getItemDamage() <= 177)) {
                         fontRendererObj.drawString(trans("144", "Missing Turbine Rotor"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java
index e28f5e6024..bbdf0ec31d 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java
@@ -98,4 +98,8 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
         return false;
     }
+    @Override
+    public int getInventoryStackLimit() {
+        return 1;
+    }
 }