diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-05-22 01:28:37 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-05-22 01:28:37 +0200 |
| commit | 71790e521495c8df87714cba48bed2460ea266e4 (patch) | |
| tree | 01754be7abd25e273a29cc42289405145676604e /src/main/java/gregtech/common/tileentities | |
| parent | cbd6ba66511f50c9999b557d9ae19beb4f28dc4c (diff) | |
| download | GT5-Unofficial-71790e521495c8df87714cba48bed2460ea266e4.tar.gz GT5-Unofficial-71790e521495c8df87714cba48bed2460ea266e4.tar.bz2 GT5-Unofficial-71790e521495c8df87714cba48bed2460ea266e4.zip | |
fix
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 e3351cebfe..3a30fda598 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 @@ -220,12 +220,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace return false;
}
-<<<<<<< HEAD @Override
public String[] getInfoData() {
return new String[]{"Heating Capacity: " + (this.mHeatingCapacity) + "K", "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs", "Efficiency: " + (mEfficiency / 100.0F) + "%", "Problems: " + (getIdealStatus() - getRepairStatus())};
}
-======= ->>>>>>> Scan-termals-of-EBF +
}
|