aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin <dream-master@gmx.net>2016-04-16 21:46:59 +0200
committerMartin <dream-master@gmx.net>2016-04-16 21:46:59 +0200
commit3af174488ae5569e77727715272230cb0df9493a (patch)
treecf8888b97bacb9cfb96da5dfde1ee52515aa23b7
parentefa4392b3375c0fb4d9608123b5e2b12a0fdb307 (diff)
parent76c555d62c36ff60f47c50eca93b682476838a87 (diff)
downloadGT5-Unofficial-3af174488ae5569e77727715272230cb0df9493a.tar.gz
GT5-Unofficial-3af174488ae5569e77727715272230cb0df9493a.tar.bz2
GT5-Unofficial-3af174488ae5569e77727715272230cb0df9493a.zip
Merge pull request #6 from GTNewHorizons/EBF-overhaul
EBF overhaul
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings1.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java3
3 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
index a02124706e..c635698dfa 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
@@ -23,6 +23,9 @@ public class GT_Item_Casings1
break;
case 14:
aList.add(this.mCoil03Tooltip);
+ break;
+ case 15:
+ aList.add(this.mCoil04Tooltip);
}
}
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
index 0ff5b904b7..a2f26cd617 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
@@ -16,6 +16,7 @@ public abstract class GT_Item_Casings_Abstract
protected final String mCoil01Tooltip = GT_LanguageManager.addStringLocalization("gt.coil01tooltip", "Base Heating Capacity = 1800 Kelvin");
protected final String mCoil02Tooltip = GT_LanguageManager.addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin");
protected final String mCoil03Tooltip = GT_LanguageManager.addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin");
+ protected final String mCoil04Tooltip = GT_LanguageManager.addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 9000 Kelvin");
protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
public GT_Item_Casings_Abstract(Block par1) {
super(par1);
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 0c6463fcc8..aecb8caedb 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
@@ -145,6 +145,9 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
case 14:
this.mHeatingCapacity = 3600;
break;
+ case 14:
+ this.mHeatingCapacity = 9000;
+ break;
default:
return false;
}