added some Main Branch PRs

https://github.com/Blood-Asp/GT5-Unofficial/pull/1468/
https://github.com/Blood-Asp/GT5-Unofficial/pull/1462
https://github.com/Blood-Asp/GT5-Unofficial/pull/1452/

4 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
index 09e7f236f4..4783a0936c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
@@ -122,6 +122,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
         if (isHasMiningPipes(maxPipes)) return;
 
         ItemStack pipes = getStackInSlot(1);
+        if(pipes != null && !pipes.isItemEqual(miningPipe)) return;
         for (ItemStack storedItem : getStoredInputs()) {
             if (!storedItem.isItemEqual(miningPipe)) continue;
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
index 4ee145fc76..7595067853 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
@@ -13,6 +13,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 import java.util.Random;
 
@@ -57,6 +58,8 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM
             mOutputBlocked++;
             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
         }
+        if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
+                   return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
         if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
         this.mEUt = tRecipe.mEUt;
         this.mMaxProgresstime = (tRecipe.mDuration * 2);
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
index 677dcc9f58..f6c5f20094 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
@@ -13,6 +13,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;

 import net.minecraft.entity.player.InventoryPlayer;

 import net.minecraft.item.ItemStack;

+import net.minecraftforge.fluids.FluidStack;

 

 import java.util.Random;

 

@@ -57,6 +58,8 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa
             mOutputBlocked++;

             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;

         }

+        if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))

+                    return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;

         if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);

         this.mEUt = (2 * tRecipe.mEUt);

         this.mMaxProgresstime = tRecipe.mDuration;

diff --git a/src/main/resources/assets/gregtech/textures/gui/FusionComputer.png b/src/main/resources/assets/gregtech/textures/gui/FusionComputer.png
index bf6a2f87c3..ea87483b22 100644
--- a/src/main/resources/assets/gregtech/textures/gui/FusionComputer.png
+++ b/src/main/resources/assets/gregtech/textures/gui/FusionComputer.png