ea5305f7dfbb06b7285ee50a7406e2d67b666147

4 files changed, 35 insertions, 7 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
index 315d8b8692..38f591f185 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
@@ -28,7 +28,10 @@ public class GT_Block_Casings1
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
-
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block (Overheated)");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Overheated)");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Overheated)");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
         ItemList.Casing_ULV.set(new ItemStack(this, 1, 0));
         ItemList.Casing_LV.set(new ItemStack(this, 1, 1));
         ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
@@ -41,6 +44,10 @@ public class GT_Block_Casings1
         ItemList.Casing_MAX.set(new ItemStack(this, 1, 9));
         ItemList.Casing_BronzePlatedBricks.set(new ItemStack(this, 1, 10));
         ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11));
+        ItemList.Casing_Coil_Cupronickel_Overheated.set(new ItemStack(this, 1, 12));
+        ItemList.Casing_Coil_Kanthal_Overheated.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Coil_Nichrome_Overheated.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));
     }
 
     public IIcon getIcon(int aSide, int aMeta) {
@@ -50,6 +57,14 @@ public class GT_Block_Casings1
                     return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
                 case 11:
                     return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
+                case 12:
+                    return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL_OVERHEATED.getIcon();
+                case 13:
+                    return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon();
+                case 14:
+                    return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon();
+                case 15:
+                    return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
             }
             if (aSide == 0) {
                 return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon();
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 c76354d9a2..b94346f2cf 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -21,14 +21,12 @@ public class GT_Block_Casings5
         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() + ".5.name", "Superconducting 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_Superconductor.set(new ItemStack(this, 1, 5));
     }
     @Override
     @SideOnly(Side.CLIENT)
@@ -44,8 +42,6 @@ public class GT_Block_Casings5
                 return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
             case 4:
                 return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
-            case 5:
-                return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
         }
         return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
     }
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 5779d04b4f..8b4348e254 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
@@ -1,10 +1,27 @@
 package gregtech.common.blocks;
 
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 
 public class GT_Item_Casings1
         extends GT_Item_Casings_Abstract {
     public GT_Item_Casings1(Block par1) {
         super(par1);
     }
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
+        super.addInformation(aStack, aPlayer, aList, aF3_H);
+        int tMeta = getDamage(aStack);
+        if (tMeta >= 12 && tMeta <= 14) {
+            aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated1Tooltip);
+            aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated2Tooltip);
+        }
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
index 35d8ce77dc..39d38e9bd3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
@@ -39,12 +39,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
 
     @Override
     public Block getFusionCoil() {
-        return GregTech_API.sBlockCasings5;
+        return GregTech_API.sBlockCasings1;
     }
 
     @Override
     public int getFusionCoilMeta() {
-        return 5;
+        return 15;
     }
 
     public String[] getDescription() {