Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

Browse source
This commit is contained in:
Techlone 2017-05-10 21:39:33 +05:00
commit 21f2b50507
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/gregtech/api/objects/GT_FluidStack.java
View file

@ -69,4 +69,9 @@ public class GT_FluidStack extends FluidStack {
} }
return new GT_FluidStack(this); 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());
}
} }

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
View file

@ -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) { if (tInputList.size() > 0) {
long tVoltage = getMaxInputVoltage(); long tVoltage = getMaxInputVoltage();
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));