Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)

# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/enums/Materials.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/enums/Tier.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/util/GT_ModHandler.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_RecipeAdder.java
# src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Item_Machines.java
# src/main/java/gregtech/common/blocks/GT_Item_Ores.java
# src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
# src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
# src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
# src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
# src/main/java/gregtech/common/gui/GT_Container_Regulator.java
# src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
# src/main/java/gregtech/common/items/armor/ArmorData.java
# src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java
# src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
# src/main/java/gregtech/common/items/armor/Values.java
# src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
# src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
# src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_Achievements.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire16.java
# src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
# src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png

25 files changed, 836 insertions, 715 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 7eb7cb4189..7b54619980 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
@@ -1,83 +1,83 @@
-package gregtech.common.blocks;

-

-import gregtech.api.enums.ItemList;

-import gregtech.api.enums.Textures;

-import gregtech.api.objects.GT_CopiedBlockTexture;

-import gregtech.api.util.GT_LanguageManager;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.IIcon;

-import net.minecraft.world.IBlockAccess;

-

-public class GT_Block_Casings1

-        extends GT_Block_Casings_Abstract {

-    public GT_Block_Casings1() {

-        super(GT_Item_Casings1.class, "gt.blockcasings", GT_Material_Casings.INSTANCE);

-        for (byte i = 0; i < 16; i = (byte) (i + 1)) {

-            Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);

-        }

-        Textures.BlockIcons.CASING_BLOCKS[120] = new GT_CopiedBlockTexture(this, 6, 0);

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");

-        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 (Deprecated)");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Deprecated)");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Deprecated)");

-        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));

-        ItemList.Casing_HV.set(new ItemStack(this, 1, 3));

-        ItemList.Casing_EV.set(new ItemStack(this, 1, 4));

-        ItemList.Casing_IV.set(new ItemStack(this, 1, 5));

-        ItemList.Casing_LuV.set(new ItemStack(this, 1, 6));

-        ItemList.Casing_ZPM.set(new ItemStack(this, 1, 7));

-        ItemList.Casing_UV.set(new ItemStack(this, 1, 8));

-        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_Deprecated.set(new ItemStack(this, 1, 12));

-        ItemList.Casing_Coil_Kanthal_Deprecated.set(new ItemStack(this, 1, 13));

-        ItemList.Casing_Coil_Nichrome_Deprecated.set(new ItemStack(this, 1, 14));

-        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));

-    }

-

-    public IIcon getIcon(int aSide, int aMeta) {

-        if ((aMeta >= 0) && (aMeta < 16)) {

-            switch (aMeta) {

-                case 10:

-                    return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();

-                case 11:

-                    return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();

-                case 12:

-                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();

-                case 13:

-                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();

-                case 14:

-                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();

-                case 15:

-                    return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();

-            }

-            if (aSide == 0) {

-                return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon();

-            }

-            if (aSide == 1) {

-                return Textures.BlockIcons.MACHINECASINGS_TOP[aMeta].getIcon();

-            }

-            return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon();

-        }

-        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

-    }

-

-    public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {

-        return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2];

-    }

-}

+package gregtech.common.blocks;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
+public class GT_Block_Casings1
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings1() {
+        super(GT_Item_Casings1.class, "gt.blockcasings", GT_Material_Casings.INSTANCE);
+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+            Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
+        }
+        Textures.BlockIcons.CASING_BLOCKS[120] = new GT_CopiedBlockTexture(this, 6, 0);
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV 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 (Deprecated)");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Deprecated)");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Deprecated)");
+        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));
+        ItemList.Casing_HV.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_EV.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_IV.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_LuV.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_ZPM.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_UV.set(new ItemStack(this, 1, 8));
+        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_Deprecated.set(new ItemStack(this, 1, 12));
+        ItemList.Casing_Coil_Kanthal_Deprecated.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Coil_Nichrome_Deprecated.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));
+    }
+
+    public IIcon getIcon(int aSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            switch (aMeta) {
+                case 10:
+                    return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
+                case 11:
+                    return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
+                case 12:
+                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+                case 13:
+                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+                case 14:
+                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+                case 15:
+                    return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
+            }
+            if (aSide == 0) {
+                return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon();
+            }
+            if (aSide == 1) {
+                return Textures.BlockIcons.MACHINECASINGS_TOP[aMeta].getIcon();
+            }
+            return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon();
+        }
+        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+    }
+
+    public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2];
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
index 0a01488f68..6cb65158c6 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
@@ -1,95 +1,95 @@
-package gregtech.common.blocks;

-

-import gregtech.api.enums.ItemList;

-import gregtech.api.enums.Textures;

-import gregtech.api.objects.GT_CopiedBlockTexture;

-import gregtech.api.util.GT_LanguageManager;

-import net.minecraft.entity.Entity;

-import net.minecraft.init.Blocks;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.IIcon;

-import net.minecraft.world.World;

-

-public class GT_Block_Casings2

-        extends GT_Block_Casings_Abstract {

-    public GT_Block_Casings2() {

-        super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE);

-        for (byte i = 0; i < 16; i = (byte) (i + 1)) {

-            Textures.BlockIcons.CASING_BLOCKS[(i + 16)] = new GT_CopiedBlockTexture(this, 6, i);

-        }

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Machine Casing");

-        ItemList.Casing_SolidSteel.set(new ItemStack(this, 1, 0));

-        ItemList.Casing_FrostProof.set(new ItemStack(this, 1, 1));

-        ItemList.Casing_Gearbox_Bronze.set(new ItemStack(this, 1, 2));

-        ItemList.Casing_Gearbox_Steel.set(new ItemStack(this, 1, 3));

-        ItemList.Casing_Gearbox_Titanium.set(new ItemStack(this, 1, 4));

-        ItemList.Casing_Gearbox_TungstenSteel.set(new ItemStack(this, 1, 5));

-        ItemList.Casing_Processor.set(new ItemStack(this, 1, 6));

-        ItemList.Casing_DataDrive.set(new ItemStack(this, 1, 7));

-        ItemList.Casing_ContainmentField.set(new ItemStack(this, 1, 8));

-        ItemList.Casing_Assembler.set(new ItemStack(this, 1, 9));

-        ItemList.Casing_Pump.set(new ItemStack(this, 1, 10));

-        ItemList.Casing_Motor.set(new ItemStack(this, 1, 11));

-        ItemList.Casing_Pipe_Bronze.set(new ItemStack(this, 1, 12));

-        ItemList.Casing_Pipe_Steel.set(new ItemStack(this, 1, 13));

-        ItemList.Casing_Pipe_Titanium.set(new ItemStack(this, 1, 14));

-        ItemList.Casing_Pipe_TungstenSteel.set(new ItemStack(this, 1, 15));

-    }

-

-    public IIcon getIcon(int aSide, int aMeta) {

-        switch (aMeta) {

-            case 0:

-                return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

-            case 1:

-                return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon();

-            case 2:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_BRONZE.getIcon();

-            case 3:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon();

-            case 4:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TITANIUM.getIcon();

-            case 5:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();

-            case 6:

-                return Textures.BlockIcons.MACHINE_CASING_PROCESSOR.getIcon();

-            case 7:

-                return Textures.BlockIcons.MACHINE_CASING_DATA_DRIVE.getIcon();

-            case 8:

-                return Textures.BlockIcons.MACHINE_CASING_CONTAINMENT_FIELD.getIcon();

-            case 9:

-                return Textures.BlockIcons.MACHINE_CASING_ASSEMBLER.getIcon();

-            case 10:

-                return Textures.BlockIcons.MACHINE_CASING_PUMP.getIcon();

-            case 11:

-                return Textures.BlockIcons.MACHINE_CASING_MOTOR.getIcon();

-            case 12:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon();

-            case 13:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon();

-            case 14:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon();

-            case 15:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon();

-        }

-        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

-    }

-

-    public float getExplosionResistance(Entity aTNT, World aWorld, int aX, int aY, int aZ, double eX, double eY, double eZ) {

-        return aWorld.getBlockMetadata(aX, aY, aZ) == 8 ? Blocks.bedrock.getExplosionResistance(aTNT) : super.getExplosionResistance(aTNT, aWorld, aX, aY, aZ, eX, eY, eZ);

-    }

-}

+package gregtech.common.blocks;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class GT_Block_Casings2
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings2() {
+        super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE);
+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+            Textures.BlockIcons.CASING_BLOCKS[(i + 16)] = new GT_CopiedBlockTexture(this, 6, i);
+        }
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Machine Casing");
+        ItemList.Casing_SolidSteel.set(new ItemStack(this, 1, 0));
+        ItemList.Casing_FrostProof.set(new ItemStack(this, 1, 1));
+        ItemList.Casing_Gearbox_Bronze.set(new ItemStack(this, 1, 2));
+        ItemList.Casing_Gearbox_Steel.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_Gearbox_Titanium.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Gearbox_TungstenSteel.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_Processor.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_DataDrive.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_ContainmentField.set(new ItemStack(this, 1, 8));
+        ItemList.Casing_Assembler.set(new ItemStack(this, 1, 9));
+        ItemList.Casing_Pump.set(new ItemStack(this, 1, 10));
+        ItemList.Casing_Motor.set(new ItemStack(this, 1, 11));
+        ItemList.Casing_Pipe_Bronze.set(new ItemStack(this, 1, 12));
+        ItemList.Casing_Pipe_Steel.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Pipe_Titanium.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Pipe_TungstenSteel.set(new ItemStack(this, 1, 15));
+    }
+
+    public IIcon getIcon(int aSide, int aMeta) {
+        switch (aMeta) {
+            case 0:
+                return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+            case 1:
+                return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon();
+            case 2:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_BRONZE.getIcon();
+            case 3:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon();
+            case 4:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TITANIUM.getIcon();
+            case 5:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
+            case 6:
+                return Textures.BlockIcons.MACHINE_CASING_PROCESSOR.getIcon();
+            case 7:
+                return Textures.BlockIcons.MACHINE_CASING_DATA_DRIVE.getIcon();
+            case 8:
+                return Textures.BlockIcons.MACHINE_CASING_CONTAINMENT_FIELD.getIcon();
+            case 9:
+                return Textures.BlockIcons.MACHINE_CASING_ASSEMBLER.getIcon();
+            case 10:
+                return Textures.BlockIcons.MACHINE_CASING_PUMP.getIcon();
+            case 11:
+                return Textures.BlockIcons.MACHINE_CASING_MOTOR.getIcon();
+            case 12:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon();
+            case 13:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon();
+            case 14:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon();
+            case 15:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon();
+        }
+        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+    }
+
+    public float getExplosionResistance(Entity aTNT, World aWorld, int aX, int aY, int aZ, double eX, double eY, double eZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ) == 8 ? Blocks.bedrock.getExplosionResistance(aTNT) : super.getExplosionResistance(aTNT, aWorld, aX, aY, aZ, eX, eY, eZ);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java
new file mode 100644
index 0000000000..090855cf39
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java
@@ -0,0 +1,99 @@
+package gregtech.common.blocks;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
+public class GT_Block_Casings6
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings6() {
+        super(GT_Item_Casings6.class, "gt.blockcasings6", GT_Material_Casings.INSTANCE);
+        
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing I");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing II");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing III");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing IV");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing V");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VI");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VII");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing VII");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing IX");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing X");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XI");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XII");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIII");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XIV");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Hermetic Casing XV");
+
+        ItemList.Casing_Tank_0.set(new ItemStack(this, 1, 0));
+        ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 1));