aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTechlone <techlone.mc@gmail.com>2017-05-10 21:39:33 +0500
committerTechlone <techlone.mc@gmail.com>2017-05-10 21:39:33 +0500
commit21f2b50507732f5a1c7eab00eff5d8efbd367aab (patch)
tree3d5d812cc079bd076e8a55ea450faec46bfa0bcd /src
parent1d70b454c72d154e5598f46bddf3b391a2a633e3 (diff)
parent6398c0650694dca192281e4f2bbe9dcd9d5546e7 (diff)
downloadGT5-Unofficial-21f2b50507732f5a1c7eab00eff5d8efbd367aab.tar.gz
GT5-Unofficial-21f2b50507732f5a1c7eab00eff5d8efbd367aab.tar.bz2
GT5-Unofficial-21f2b50507732f5a1c7eab00eff5d8efbd367aab.zip
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/objects/GT_FluidStack.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java2
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 f4aad8ed5e..2ed1ed0583 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -69,4 +69,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 e82fa34fa0..e0d0ee46d1 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
@@ -109,7 +109,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));