Merge branch 'unstable' into mergeGTNH

2 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index 6ff1627ab7..96f8fc6849 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -68,4 +68,9 @@ public class GT_FluidStack extends FluidStack {
         }
         return new GT_FluidStack(this);
     }
+    
+    @Override
+    public String toString() {
+    	return String.format("GT_FluidStack: %s x %s, ID:%s", this.amount, this.getFluid().getName(), this.getFluidID());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index 2abf19a658..c9a1c0081f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -112,7 +112,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 }

             }

         }

-        FluidStack[] tFluids = Arrays.copyOfRange(tFluidList.toArray(new FluidStack[tInputList.size()]), 0, 1);

+        FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);

         if (tInputList.size() > 0) {

             long tVoltage = getMaxInputVoltage();

             byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));