diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-05-22 01:26:18 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-05-22 01:26:18 +0200 |
| commit | cbd6ba66511f50c9999b557d9ae19beb4f28dc4c (patch) | |
| tree | e8c1a17560d117703951b6001beffcdb2deb6f0d /src/main/java/gregtech/common | |
| parent | 7e4aecb65f584d75babc3c20a84c671f0a1cdda3 (diff) | |
| parent | 2d582f300eefc37425b31b0cb2b295492c9d12a0 (diff) | |
| download | GT5-Unofficial-cbd6ba66511f50c9999b557d9ae19beb4f28dc4c.tar.gz GT5-Unofficial-cbd6ba66511f50c9999b557d9ae19beb4f28dc4c.tar.bz2 GT5-Unofficial-cbd6ba66511f50c9999b557d9ae19beb4f28dc4c.zip | |
Merge branch 'Scan-termals-of-EBF'
Conflicts:
build.properties
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 3 |
1 files changed, 3 insertions, 0 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 c0b429778f..e3351cebfe 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,9 +220,12 @@ 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 }
|