f98e51a82f646fa34172ce079a4b432ef3affffd

5 files changed, 41 insertions, 6 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
index b94346f2cf..f19f82a0d1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -20,13 +20,17 @@ public class GT_Block_Casings5
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Naquadah Alloy Coil Block");
+        //GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Naquadah Alloy Coil Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy Coil Block");
 
         ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1));
         ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 2));
         ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 3));
-        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4));
+        //ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Coil_Naquadah.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 6));
     }
     @Override
     @SideOnly(Side.CLIENT)
@@ -40,7 +44,9 @@ public class GT_Block_Casings5
                 return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
             case 3:
                 return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
-            case 4:
+            case 5:
+                return Textures.BlockIcons.MACHINE_COIL_NAQUADAH.getIcon();
+            case 6:
                 return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
         }
         return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
index 7b5f281006..36e7fea047 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -33,6 +33,12 @@ public class GT_Item_Casings5
             case 4:
                 aList.add(this.mCoil05Tooltip);
                 break;
+            case 5:
+                aList.add(this.mCoil06Tooltip);
+                break;
+            case 6:
+                aList.add(this.mCoil07Tooltip);
+                break;
         }
     }
 }
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 b79efe4ae8..b4cc465476 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
@@ -17,7 +17,9 @@ public abstract class GT_Item_Casings_Abstract
     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 = 4500 Kelvin");
-    protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 9001 Kelvin");
+    protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin");
+    protected final String mCoil06Tooltip = GT_LanguageManager.addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin");
+    protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin");
     protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are overheated");
     protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to repair");
     protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
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 b98cef385e..3301c49a69 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
@@ -158,6 +158,12 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 this.mHeatingCapacity = 4500;
                 break;
             case 4:
+                this.mHeatingCapacity = 5400;
+                break;
+            case 5:
+                this.mHeatingCapacity = 7200;
+                break;
+            case 6:
                 this.mHeatingCapacity = 9001;
                 break;
             default:
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index 229934ce78..4c6386a2e1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -20,6 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 public class GT_MetaTileEntity_MultiFurnace
         extends GT_MetaTileEntity_MultiBlockBase {
     private int mLevel = 0;
+    private int mCostDiscount = 1;
 
     public GT_MetaTileEntity_MultiFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
@@ -86,7 +87,7 @@ public class GT_MetaTileEntity_MultiFurnace
                 this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
                 this.mEfficiencyIncrease = 10000;
 
-                this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * Math.min(this.mLevel, 8));
+                this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * this.mLevel / this.mCostDiscount);
                 this.mMaxProgresstime = Math.max(1, 512 / (1 << tTier - 1));
             }
             updateSlots();
@@ -100,6 +101,7 @@ public class GT_MetaTileEntity_MultiFurnace
         int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
 
         this.mLevel = 0;
+        this.mCostDiscount = 1;
         if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) {
             return false;
         }
@@ -109,18 +111,31 @@ public class GT_MetaTileEntity_MultiFurnace
         switch (tUsedMeta) {
             case 0:
                 this.mLevel = 1;
+                this.mCostDiscount = 1;
                 break;
             case 1:
                 this.mLevel = 2;
+                this.mCostDiscount = 1;
                 break;
             case 2:
                 this.mLevel = 4;
+                this.mCostDiscount = 1;
                 break;
             case 3:
                 this.mLevel = 8;
+                this.mCostDiscount = 1;
                 break;
             case 4:
                 this.mLevel = 16;
+                this.mCostDiscount = 2;
+                break;
+            case 5:
+                this.mLevel = 16;
+                this.mCostDiscount = 4;
+                break;
+            case 6:
+                this.mLevel = 16;
+                this.mCostDiscount = 8;
                 break;
             default:
                 return false;
@@ -179,7 +194,7 @@ public class GT_MetaTileEntity_MultiFurnace
     }
 
     public int getAmountOfOutputs() {
-        return 18;
+        return 128;
     }
 
     public boolean explodesOnComponentBreak(ItemStack aStack) {