Deprecation cleanup (#637)

111 files changed, 491 insertions, 1956 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index d532459a70..2af07b1ea2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -19,8 +18,6 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import org.apache.commons.lang3.ArrayUtils;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -50,7 +47,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.LangUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
@@ -356,27 +352,6 @@ public class Meta_GT_Proxy {
         }
     }
 
-    public static boolean setTileEntityClassAsBlacklistedInWorldAccelerator(String aClassName) {
-        Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry");
-        Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config");
-        if (aMainModClass != null && aCoreModConfig != null) {
-            Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig");
-            if (aCoreConfig != null) {
-                Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames");
-                Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig);
-                if (aBlackList != null && aInstance != null) {
-                    String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance);
-                    if (aBlackListValue != null) {
-                        aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName);
-                        ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue);
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
     public static void setValidHeatingCoilMetas() {
         for (int i = 0; i <= 6; i++) {
             GT_ValidHeatingCoilMetas.put(i);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
index e99feff75a..af80b7c684 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
@@ -21,7 +21,6 @@ import gregtech.api.util.GT_Utility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
 import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget;
-import gtPlusPlus.core.util.minecraft.LangUtils;
 
 public class GTPP_Cover_Overflow extends GT_CoverBehavior {
 
@@ -86,7 +85,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
         }
         GT_Utility.sendChatToPlayer(
                 aPlayer,
-                LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
+                GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L"));
         return aCoverVariable;
     }
 
@@ -107,8 +106,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
         }
         GT_Utility.sendChatToPlayer(
                 aPlayer,
-                LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
-        aTileEntity.setCoverDataAtSide(side, aCoverVariable);
+                GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L"));
+        aTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aCoverVariable));
         return true;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
index f7657de5a9..2366bbe87f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
@@ -12,10 +12,11 @@ import net.minecraftforge.fluids.Fluid;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.ISerializableObject;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.util.minecraft.LangUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
 public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
@@ -40,7 +41,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
             EntityPlayer aPlayer, float aX, float aY, float aZ) {
         PlayerUtils
-                .messagePlayer(aPlayer, LangUtils.trans("756", "Connectable: ") + getConnectionState(aCoverVariable));
+                .messagePlayer(aPlayer, GT_Utility.trans("756", "Connectable: ") + getConnectionState(aCoverVariable));
         return super.onCoverRightclick(side, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ);
     }
 
@@ -77,10 +78,6 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
         return getConnectionState(aCoverVariable);
     }
 
-    public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return LangUtils.trans("756", "Connectable: ") + getConnectionState(aCoverVariable);
-    }
-
     public int getTickRate(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
         return 1;
     }
@@ -158,11 +155,8 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
 
     private static final void trySetState(ForgeDirection side, int aState, ICoverable aTile) {
         // Try set cover state directly
-        if (aTile instanceof IGregTechTileEntity) {
-            IGregTechTileEntity gTileEntity = (IGregTechTileEntity) aTile;
-            if (gTileEntity != null) {
-                gTileEntity.setCoverDataAtSide(side, aState);
-            }
+        if (aTile instanceof IGregTechTileEntity gTileEntity) {
+            gTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aState));
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index bb88429645..6ed8c7ed0a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -1,280 +1,12 @@
 package gtPlusPlus.xmod.gregtech.common.helpers;
 
-import static gregtech.api.enums.Mods.Forestry;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockAir;
-import net.minecraft.block.IGrowable;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.play.server.S23PacketBlockChange;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.BonemealEvent;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
 
-import com.google.common.collect.Lists;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import gnu.trove.set.hash.THashSet;
-import gregtech.api.enums.Mods;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.Textures;
-import gregtech.api.enums.ToolDictNames;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.players.FakeFarmer;
 import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.particles.BlockBreakParticles;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 
 public class TreeFarmHelper {
 
-    public static final FluidStack fertT1 = FluidUtils.getFluidStack("fluid.fertiliser", 3);
-    public static final FluidStack fertT2 = FluidUtils.getFluidStack("fluid.un18fertiliser", 2);
-    public static final FluidStack fertT3 = FluidUtils.getFluidStack("fluid.un32fertiliser", 1);
-    private static final int sawOreId = OreDictionary.getOreID(ToolDictNames.craftingToolSaw.name());
-
-    public static ITexture[][][] getTextureSet() {
-        final ITexture[][][] rTextures = new ITexture[10][17][];
-        for (byte i = -1; i < 16; i++) {
-            rTextures[0][i + 1] = TreeFarmHelper.getFront(i);
-            rTextures[1][i + 1] = TreeFarmHelper.getBack(i);
-            rTextures[2][i + 1] = TreeFarmHelper.getBottom(i);
-            rTextures[3][i + 1] = TreeFarmHelper.getTop(i);
-            rTextures[4][i + 1] = TreeFarmHelper.getSides(i);
-            rTextures[5][i + 1] = TreeFarmHelper.getFrontActive(i);
-            rTextures[6][i + 1] = TreeFarmHelper.getBackActive(i);
-            rTextures[7][i + 1] = TreeFarmHelper.getBottomActive(i);
-            rTextures[8][i + 1] = TreeFarmHelper.getTopActive(i);
-            rTextures[9][i + 1] = TreeFarmHelper.getSidesActive(i);
-        }
-        return rTextures;
-    }
-
-    public static ITexture[] getFront(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
-    }
-
-    public static ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
-    }
-
-    public static ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
-    }
-
-    public static ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
-    }
-
-    public static ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
-    }
-
-    public static ITexture[] getFrontActive(final byte aColor) {
-        return getFront(aColor);
-    }
-
-    public static ITexture[] getBackActive(final byte aColor) {
-        return getBack(aColor);
-    }
-
-    public static ITexture[] getBottomActive(final byte aColor) {
-        return getBottom(aColor);
-    }
-
-    public static ITexture[] getTopActive(final byte aColor) {
-        return getTop(aColor);
-    }
-
-    public static ITexture[] getSidesActive(final byte aColor) {
-        return getSides(aColor);
-    }
-
-    public static boolean applyBonemeal(final EntityPlayer player, final World world, final int intX, final int intY,
-            final int intZ, final short multiplier) {
-        final Block block = world.getBlock(intX, intY, intZ);
-
-        int roll;
-        int rollNeeded;
-
-        if (multiplier == 1) {
-            roll = MathUtils.randInt(1, 15);
-            rollNeeded = 15;
-        } else if (multiplier == 2) {
-            roll = MathUtils.randInt(1, 10);
-            rollNeeded = 10;
-        } else {
-            roll = MathUtils.randInt(1, 5);
-            rollNeeded = 5;
-        }
-
-        if (roll != rollNeeded) {
-            return false;
-        }
-
-        // EntityPlayer player = FakePlayerFactory.getMinecraft((WorldServer)world);
-        if (!world.isRemote) {
-            if (enableTreeFarmerParticles) {
-                world.playAuxSFX(2005, intX, intY, intZ, 0);
-            }
-        }
-        final BonemealEvent event = new BonemealEvent(player, world, block, intX, intY, intZ);
-        if (MinecraftForge.EVENT_BUS.post(event)) {
-            Logger.MACHINE_INFO("Not sure why this returned false");
-            return false;
-        }
-        if (event.getResult() == Result.ALLOW) {
-            if (!world.isRemote) {
-                world.playAuxSFX(2005, intX, intY, intZ, 0);
-            }
-            return true;
-        }
-        if (block instanceof IGrowable) {
-            final IGrowable igrowable = (IGrowable) block;
-            if (igrowable.func_149851_a(world, intX, intY, intZ, world.isRemote)) {
-                if (!world.isRemote) {
-                    if (igrowable.func_149852_a(world, CORE.RANDOM, intX, intY, intZ)) {
-                        igrowable.func_149853_b(world, CORE.RANDOM, intX, intY, intZ);
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean cleanUp(final IGregTechTileEntity aBaseMetaTileEntity) {
-        Logger.MACHINE_INFO("called cleanUp()");
-        int cleanedUp = 0;
-        final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 11;
-        final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 11;
-
-        for (int h = 1; h < 175; h++) {
-            for (int i = -11; i <= 11; i++) {
-                for (int j = -11; j <= 11; j++) {
-
-                    final Block testBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j);
-
-                    if ((((i == -8) || (i == 8)) || ((i == -9) || (i == 9))
-                            || ((i == -10) || (i == 10))
-                            || ((i == -11) || (i == 11)))
-                            && (((j == -8) || (j == 8)) || ((j == -9) || (j == 9))
-                                    || ((j == -10) || (j == 10))
-                                    || ((j == -11) || (j == 11)))) {
-
-                        if (!testBlock.getUnlocalizedName().toLowerCase().contains("air")
-                                || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
-                            // Logger.WARNING("5:"+testBlock.getUnlocalizedName());
-                        } else {
-                            aBaseMetaTileEntity.getWorld().setBlock(
-                                    aBaseMetaTileEntity.getXCoord() + xDir + i,
-                                    aBaseMetaTileEntity.getYCoord() + h,
-                                    aBaseMetaTileEntity.getZCoord() + zDir + j,
-                                    Blocks.bookshelf);
-                        }
-                    }
-
-                    // If not in the middle - don't know how else to check this one without lots of !=
-                    if ((i != 7) && (i != -7)
-                            && (j != 7)
-                            && (j != -7)
-                            && (i != 6)
-                            && (i != -6)
-                            && (j != 6)
-                            && (j != -6)
-                            && (i != 5)
-                            && (i != -5)
-                            && (j != 5)
-                            && (j != -5)
-                            && (i != 4)
-                            && (i != -4)
-                            && (j != 4)
-                            && (j != -4)
-                            && (i != 3)
-                            && (i != -3)
-                            && (j != 3)
-                            && (j != -3)
-                            && (i != 2)
-                            && (i != -2)
-                            && (j != 2)
-                            && (j != -2)
-                            && (i != 1)
-                            && (i != -1)
-                            && (j != 1)
-                            && (j != -1)
-                            && (i != 0)
-                            && (j != 0)) {
-
-                        if (!testBlock.getUnlocalizedName().toLowerCase().contains("air")
-                                || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
-                            // Logger.WARNING("0:"+testBlock.getUnlocalizedName());
-                        } else {
-                            aBaseMetaTileEntity.getWorld().setBlock(
-                                    aBaseMetaTileEntity.getXCoord() + xDir + i,
-                                    aBaseMetaTileEntity.getYCoord() + h,
-                                    aBaseMetaTileEntity.getZCoord() + zDir + j,
-                                    Blocks.melon_block);
-                        }
-
-                        if (isLeaves(testBlock) || isWoodLog(testBlock)) {
-                            // Logger.WARNING("1:"+testBlock.getUnlocalizedName());
-                            int posiX, posiY, posiZ;
-                            posiX = aBaseMetaTileEntity.getXCoord() + xDir + i;
-                            posiY = aBaseMetaTileEntity.getYCoord() + h;
-                            posiZ = aBaseMetaTileEntity.getZCoord() + zDir + j;
-                            // Utils.LOG_MACHINE_INFO("Cleaning Up some leftovers.");
-                            cleanedUp++;
-                            aBaseMetaTileEntity.getWorld().setBlockToAir(posiX, posiY, posiZ);
-                            new BlockBreakParticles(aBaseMetaTileEntity.getWorld(), posiX, posiY, posiZ, Blocks.dirt);
-                        } else {
-                            // Utils.LOG_WARNING("2:"+testBlock.getUnlocalizedName());
-                        }
-                    } else {
-                        // Utils.LOG_WARNING("1");
-                    }
-                }
-            }
-        }
-        Logger.MACHINE_INFO("cleaning up | " + cleanedUp);
-        return true;
-    }
-
     public static boolean isValidForGUI(final ItemStack aStack) {
         return isCorrectMachinePart(aStack) != SAWTOOL.NONE;
     }
@@ -297,751 +29,4 @@ public class TreeFarmHelper {
         return SAWTOOL.NONE;
     }
 
-    public static ToolType getPartType(final ItemStack aStack) {
-        if (aStack != null) {
-            // Utils.LOG_WARNING("Found "+aStack.getDisplayName()+" in the GUI slot.");
-
-            if (aStack.getItem() == MetaGeneratedGregtechItems.INSTANCE) {
-                int aDmg = aStack.getItemDamage();
-                if (aDmg >= 32120 && aDmg <= 32128) {
-                    return ToolType.Unbreakable;
-                }
-                Logger.INFO("bad Tool in Slot 2 | " + aStack.getUnlocalizedName().toLowerCase() + " | " + aDmg);
-                return null;
-            }
-
-            if (aStack.getItem() instanceof GT_MetaGenerated_Tool) {
-                if (Arrays.stream(OreDictionary.getOreIDs(aStack)).anyMatch(i -> i == sawOreId))
-                    return ToolType.Breakable;
-            }
-        }
-        Logger.INFO("bad Tool in Slot 4");
-        return null;
-    }
-
-    public static boolean isHumusLoaded = false;
-    public static boolean isForestryLogsLoaded = false;
-    public static boolean isForestryFenceLoaded = false;
-    public static boolean isForestrySaplingsLoaded = false;
-    public static boolean isForestryLeavesLoaded = false;
-    public static Block blockHumus;
-
-    public static boolean isForestryValid() {
-        if (!Forestry.isModLoaded()) {
-            return false;
-        }
-        if (ReflectionUtils.doesClassExist("forestry.core.blocks.BlockSoil")) {
-            isHumusLoaded = true;
-        }
-        if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockLog")) {
-            isForestryLogsLoaded = true;
-        }
-        if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockArbFence")) {
-            isForestryFenceLoaded = true;
-        }
-        if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockSapling")) {
-            isForestrySaplingsLoaded = true;
-        }
-        if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockForestryLeaves")) {
-            isForestryLeavesLoaded = true;
-        }
-        return true;
-    }
-
-    @Optional.Method(modid = Mods.Names.FORESTRY)
-    public static Block getHumus() {
-        if (blockHumus != null) {
-            return blockHumus;
-        } else if (isHumusLoaded) {
-            final Class<?> humusClass = ReflectionUtils.getClass("forestry.core.blocks.BlockSoil");
-            final ItemStack humusStack = ItemUtils.getCorrectStacktype("Forestry:soil", 1);
-            if (humusClass != null) {
-                blockHumus = Block.getBlockFromItem(humusStack.getItem());
-                return Block.getBlockFromItem(humusStack.getItem());
-            }
-        }
-        return null;
-    }
-
-    public static boolean isWoodLog(final Block log) {
-        final String tTool = log.getHarvestTool(0);
-
-        if ((log == Blocks.log) || (log == Blocks.log2)) {
-            return true;
-        }
-
-        // Forestry/General Compat
-        if (log.getClass().getName().toLowerCase().contains("blocklog")) {
-            return true;
-        }
-
-        // IC2 Rubber Tree Compat
-        if (log.getClass().getName().toLowerCase().contains("rubwood")
-                || log.getClass().getName().toLowerCase().contains("rubleaves")) {
-            return true;
-        }
-
-        return (OrePrefixes.log.contains(new ItemStack(log, 1)) && ((tTool != null) && (tTool.equals("axe"))))
-                || (log.getMaterial() != Material.wood) ? false
-                        : (OrePrefixes.fence.contains(new ItemStack(log, 1)) ? false : true);
-    }
-
-    public static boolean isLeaves(final Block log) {
-        if (log.getUnlocalizedName().toLowerCase().contains("leaf")) {
-            return true;
-        }
-        if (log.getUnlocalizedName().toLowerCase().contains("leaves")) {
-            return true;
-        }
-        if (log.getLocalizedName().toLowerCase().contains("leaf")) {
-            return true;
-        }
-        if (log.getLocalizedName().toLowerCase().contains("leaves")) {
-            return true;
-        }
-        return OrePrefixes.leaves.contains(new ItemStack(log, 1)) || log.getMaterial() == Material.leaves
-                || OrePrefixes.treeLeaves.contains(new ItemStack(log, 1))
-                || log.getMaterial() == Material.vine
-                || OrePrefixes.mushroom.contains(new ItemStack(log, 1))
-                || log.getMaterial() == Material.cactus;
-    }
-
-    public static boolean isSapling(final Block log) {
-        if (log != null) {
-            if (OrePrefixes.sapling.contains(new ItemStack(log, 1))) {
-                // Logger.WARNING(""+log.getLocalizedName());
-            }
-            if (log.getLocalizedName().toLowerCase().contains("sapling")) {
-                // Logger.WARNING(""+log.getLocalizedName());
-                return true;
-            }
-        }
-        return OrePrefixes.sapling.contains(new ItemStack(log, 1));
-    }
-
-    public static boolean isDirtBlock(final Block dirt) {
-        return (dirt == Blocks.dirt ? true
-                : (dirt == Blocks.grass ? true : (getHumus() == null ? false : (dirt == blockHumus ? true : false))));
-    }
-
-    public static boolean isFenceBlock(final Block fence) {
-        return (fence == Blocks.fence ? true
-                : (fence == Blocks.fence_gate ? true
-                        : (fence == Blocks.nether_brick_fence ? true
-                                : (OrePrefixes.fence.contains(new ItemStack(fence, 1)) ? true : false))));
-    }
-
-    public static boolean isAirBlock(final Block air) {
-        if (air.getLocalizedName().toLowerCase().contains("air")) {
-            return true;
-        }
-        if (air.getClass().getName().toLowerCase().contains("residual")
-                || air.getClass().getName().toLowerCase().contains("heat")) {
-            return true;
-        }
-        return (air == Blocks.air ? true : (air instanceof BlockAir ? true : false));
-    }
-
-    /*
-     * public static boolean isSaplingBlock(Block sapling){ return (sapling == Blocks.sapling ? true : (sapling ==
-     * Blocks.)) }
-     */
-
-    public static BlockPos checkForLogsInGrowArea(final IGregTechTileEntity aBaseMetaTileEntity) {
-        final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 7;
-        final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 7;
-        for (int i = -7; i <= 7; i++) {
-            for (int j = -7; j <= 7; j++) {
-                for (int h = 0; h <= 1; h++) {
-                    // Farm Floor inner 14x14
-                    if (((i != -7) && (i != 7)) && ((j != -7) && (j != 7))) {
-                        if (h == 1) {
-                            if (TreeFarmHelper.isWoodLog(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) {
-                                Logger.INFO("Found a Log");
-                                return new BlockPos(
-                                        aBaseMetaTileEntity.getXCoord() + xDir + i,
-                                        aBaseMetaTileEntity.getYCoord() + h,
-                                        aBaseMetaTileEntity.getZCoord() + zDir + j,
-                                        aBaseMetaTileEntity.getWorld());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    public static ItemStack[] findTreeFromBase(World world, BlockPos h) {
-        int HARD_LIMIT = 10000;
-        int mCount = 0;
-        Logger.INFO("Finding Rest of Tree.");
-        BlockPos mFirstSpot = h;
-        Set<BlockPos> mSearchedSpaces = new HashSet<BlockPos>();
-        Set<BlockPos> mTreeSet = getConnectedBlocks(world, mFirstSpot, mSearchedSpaces);
-        Set<Set<BlockPos>> mTreeSet2 = new HashSet<Set<BlockPos>>();
-        Set<BlockPos> mFinalTree = new HashSet<BlockPos>();
-        Iterator<BlockPos> it = mTreeSet.iterator();
-
-        Logger.INFO("Running first iteration.");
-        while (it.hasNext()) {
-            BlockPos G = it.next();
-            mSearchedSpaces.add(G);
-            mTreeSet2.add(getConnectedBlocks(world, G, mSearchedSpaces));
-            mCount++;
-            Logger.INFO("First Search: " + G.getLocationString());
-            if (mCount > HARD_LIMIT) {
-                break;
-            }
-        }
-
-        mCount = 0;
-        Iterator<Set<BlockPos>> it2 = mTreeSet2.iterator();
-        Iterator<BlockPos> it3;
-        Logger.INFO("Running second iteration.");
-        while (it2.hasNext()) {
-            Set<BlockPos> G = it2.next();
-            it3 = G.iterator();
-            while (it3.hasNext()) {
-                BlockPos G2 = it3.next();
-                mSearchedSpaces.add(G2);
-                mFinalTree.add(G2);
-                mCount++;
-                Logger.INFO("Second Search: " + G2.getLocationString());
-                if (mCount > HARD_LIMIT) {
-                    break;
-                }
-            }
-            if (mCount > HARD_LIMIT) {
-                break;
-            }
-        }
-
-        if (mFinalTree.size() > 0) {
-            Logger.INFO("Queuing " + mFinalTree.size() + " to Harvest Manager.");
-            TreeCutter harvestManager = new TreeCutter(world);
-
-            Iterator<BlockPos> ith = mFinalTree.iterator();
-            while (ith.hasNext()) {
-                BlockPos G = ith.next();
-                harvestManager.queue(G);
-                mCount++;
-                Logger.INFO("Queued: " + G.getLocationString());
-                if (mCount > HARD_LIMIT) {
-                    break;
-                }
-            }
-
-            if (harvestManager.isValid) {
-                ItemStack[] loot = harvestManager.getDrops();
-                if (loot.length > 0) {
-                    // Logger.INFO("Returning Drops from harvestManager Queue.");
-                    return loot;
-                }
-            }
-        }
-        return new ItemStack[] {};
-    }
-
-    public static Set<BlockPos> getConnectedBlocks(World W, BlockPos P, Set<BlockPos> checkedSpaces) {
-        int HARD_LIMIT = 1000;
-        int mCount = 0;
-        Logger.INFO("Finding blocks connected to " + P.getLocationString() + ".");
-        Set<BlockPos> mCheckedSpaces = checkedSpaces;
-        Set<BlockPos> mStartSearch = searchSixFaces(W, P, mCheckedSpaces, false);
-        Set<BlockPos> mSecondSearch = new HashSet<BlockPos>();
-        Set<BlockPos> mThirdSearch = new HashSet<BlockPos>();
-        Iterator<BlockPos> it = mStartSearch.iterator();
-        while (it.hasNext()) {
-            Logger.INFO("Running first iteration. [II]");
-            BlockPos G = it.next();
-            mCheckedSpaces.add(G);
-            Set<BlockPos> mBranchSearch = searchSixFaces(W, G, mCheckedSpaces, true);
-            Iterator<BlockPos> it2 = mBranchSearch.iterator();
-            while (it2.hasNext()) {
-                Logger.INFO("Running second iteration. [II]");
-                BlockPos G2 = it2.next();
-                mCheckedSpaces.add(G2);
-                mSecondSearch.add(G2);
-                mCount++;
-                if (mCount > HARD_LIMIT) {
-                    break;
-                }
-            }
-            if (mCount > HARD_LIMIT) {
-                break;
-            }
-        }
-        mCount = 0;
-        Iterator<BlockPos> itx = mSecondSearch.iterator();
-        while (itx.hasNext()) {
-            BlockPos G = itx.next();
-            mCheckedSpaces.add(G);
-            Set<BlockPos> mBranchSearch = searchSixFaces(W, G, mCheckedSpaces, true);
-            Iterator<BlockPos> it2 = mBranchSearch.iterator();
-            while (it2.hasNext()) {
-                BlockPos G2 = it2.next();
-                mCheckedSpaces.add(G2);
-                mThirdSearch.add(G2);
-                mCount++;
-                if (mCount > HARD_LIMIT) {
-                    break;
-                }
-            }
-            if (mCount > HARD_LIMIT) {
-                break;
-            }
-        }
-        return mThirdSearch;
-    }
-
-    public static Set<BlockPos> searchSixFaces(World W, BlockPos P, Set<BlockPos> checkedSpaces, boolean checkLeaves) {
-        Set<BlockPos> mConnected = new HashSet<BlockPos>();
-        int x = P.xPos;
-        int y = P.yPos;
-        int z = P.zPos;
-        if (checkLeaves) {
-            if (isWoodLog(W.getBlock(x - 1, y, z)) || isLeaves(W.getBlock(x - 1, y, z))) {
-                BlockPos L = new BlockPos(x - 1, y, z, W);
-                if (!checkedSpaces.contains(L)) {
-                    mConnected.add(L);
-                    Logger.INFO("Found Connected. [III]");
-                }
-            }
-            if (isWoodLog(W.getBlock(x + 1, y, z)) || isLeaves(W.getBlock(x + 1, y, z))) {
-                BlockPos L = new BlockPos(x + 1, y, z, W);
-                if (!checkedSpaces.contains(L)) {
-                    mConnected.add(L);
-                    Logger.INFO("Found Connected. [III]");
-                }
-            }
-            if (isWoodLog(W.getBlock(x, y - 1, z)) || isLeaves(W.getBlock(x, y - 1, z))) {
-                BlockPos L = new BlockPos(x, y - 1, z, W);
-                if (!checkedSpaces.contains(L)) {
-                    mConnected.add(L);
-                    Logger.INFO("Found Connected. [III]");
-                }
-            }
-            if (isWoodLog(W.getBlock(x, y + 1, z)) || isLeaves(W.getBlock(x, y + 1, z))) {
-                BlockPos L = new BlockPos(x, y + 1, z, W);
-                if (!checkedSpaces.contains(L)) {
-                    mConnected.add(L);
-                    Logger.INFO("Found Connected. [III]");
-                }
-            }
-            if (isWoodLog(W.getBlock(x, y, z - 1)) || isLeaves(W.getBlock(x, y, z - 1))) {
-                BlockPos L = new BlockPos(x, y, z - 1, W);
-                if (!checkedSpaces.contains(L)) {
-                    mConnected.add(L);
-                    Logger.INFO("Found Connected. [III]");
-                }
-            }
-            if (isWoodLog(W.getBlock(x, y, z + 1)) || isLeaves(W.getBlock(x, y, z + 1))) {
-                BlockPos L = new BlockPos(x, y, z + 1, W);
-                if (!checkedSpaces.contains(L)) {
-                    mConnected.add(L);
-                    Logger.INFO("Found Connected. [III]");
-                }
-            }
-        } else {
-            if (isWoodLog(W.getBlock(x - 1, y, z))) {
-                BlockPos L = new BlockPos(x - 1, y, z, W);
-                // if (!checkedSpaces.contains(L)) {
-                mConnected.add(L);
-                Logger.INFO("Found Connected. [III]");
-                // }
-            }
-            if (isWoodLog(W.getBlock(x + 1, y, z))) {
-                BlockPos L = new BlockPos(x + 1, y, z, W);
-                // if (!checkedSpaces.contains(L)) {
-                mConnected.add(L);
-                Logger.INFO("Found Connected. [III]");
-                // }
-            }
-            if (isWoodLog(W.getBlock(x, y - 1, z))) {
-                BlockPos L = new BlockPos(x, y - 1, z, W);
-                // if (!checkedSpaces.contains(L)) {
-                mConnected.add(L);
-                Logger.INFO("Found Connected. [III]");
-                // }
-            }
-            if (isWoodLog(W.getBlock(x, y + 1, z))) {
-                BlockPos L = new BlockPos(x, y + 1, z, W);
-                // if (!checkedSpaces.contains(L)) {
-                mConnected.add(L);
-                Logger.INFO("Found Connected. [III]");
-                // }
-            }
-            if (isWoodLog(W.getBlock(x, y, z - 1))) {
-                BlockPos L = new BlockPos(x, y, z - 1, W);
-                // if (!checkedSpaces.contains(L)) {
-                mConnected.add(L);
-                Logger.INFO("Found Connected. [III]");
-                // }
-            }
-            if (isWoodLog(W.getBlock(x, y, z + 1))) {
-                BlockPos L = new BlockPos(x, y, z + 1, W);
-                // if (!checkedSpaces.contains(L)) {
-                mConnected.add(L);
-                Logger.INFO("Found Connected. [III]");
-                // }
-            }
-        }
-        return mConnected;
-    }
-
-    public enum ToolType {
-        Unbreakable,
-        Breakable
-    }
-
-    /**
-     * Tree Cutting
-     */
-    public static class TreeCutter {
-
-        private final World mWorld;
-        private Map<String, BlockPos> mQueue = new ConcurrentHashMap<String, BlockPos>();
-        private AutoMap<ItemStack[]> mDrops = new AutoMap<ItemStack[]>();
-        private boolean isValid = true;
-
-        public TreeCutter(World world) {
-            this.mWorld = world;
-        }
-
-        public boolean queue(BlockPos pos) {
-            if (isValid && pos != null) {
-                // Logger.INFO("Queued: "+pos.getLocationString());
-                String hash = Utils.calculateChecksumMD5(pos);
-                if (hash != null && !mQueue.containsKey(hash)) {
-                    mQueue.put(hash, pos);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private boolean emptyQueue() {
-            if (isValid) {
-                Logger.INFO("Emptying Queue.");
-                if (this.mQueue.size() > 0) {
-                    int totalRemoved = 0;
-                    for (BlockPos h : mQueue.values()) {
-                        final Block block = mWorld.getBlock(h.xPos, h.yPos, h.zPos);
-                        if (block != null) {
-                            final int dropMeta = mWorld.getBlockMetadata(h.xPos, h.yPos, h.zPos);
-                            final ArrayList<ItemStack> blockDrops = block
-                                    .getDrops(mWorld, h.xPos, h.yPos, h.zPos, dropMeta, 0);
-                            final ItemStack[] drops = ItemUtils.getBlockDrops(blockDrops);
-                            mDrops.put(drops);
-                            // Remove drop that was added to the bus.
-                            mWorld.setBlockToAir(h.xPos, h.yPos, h.zPos);
-                            // new BlockBreakParticles(mWorld, h.xPos, h.yPos, h.zPos, block);
-                            totalRemoved++;
-                        }
-                    }
-                    if (totalRemoved > 0 && mDrops.size() > 0) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        public ItemStack[] getDrops() {
-            // If Queue is successfully cleared and drops are created, let us continue.
-            if (isValid && emptyQueue()) {
-                AutoMap<ItemStack> mCollective = new AutoMap<ItemStack>();
-                // Iterate ALL of the arrays, add output to a collective.
-                for (ItemStack[] i : this.mDrops) {
-                    // Array is not null.
-                    if (i != null) {
-                        // Iterate this array.
-                        for (int d = 0; d < i.length; d++) {
-                            // Put Output into collective if valid
-                            if (i[d] != null && i[d].stackSize > 0) {
-                                mCollective.put(i[d]);
-                            }
-                        }
-                    }
-                }
-                // Build an ItemStack array.
-                ItemStack[] drops = new ItemStack[mCollective.size()];
-                for (int m = 0; m < drops.length; m++) {
-                    drops[m] = mCollective.get(m);
-                }
-                // Return drops array if it's valid.
-                if (drops.length > 0) {
-                    isValid = false;
-                    return drops;
-                }
-            }
-            // Invalid or no drops, return empty array.
-            isValid = false;
-            return new ItemStack[] {};
-        }
-    }
-
-    /**
-     * Farm AI
-     */
-    private static EntityPlayerMP farmerAI;
-
-    public EntityPlayerMP getFakePlayer(World world) {
-        return farmerAI = checkFakePlayer(world);
-    }
-
-    public static EntityPlayerMP checkFakePlayer(World world) {
-        if (farmerAI == null) {
-            return new FakeFarmer(MinecraftServer.getServer().worldServerForDimension(world.provider.dimensionId));
-        }
-        return farmerAI;
-    }
-
-    public static boolean onBlockStartBreak(int x, int y, int z, World world) {
-        final Block wood = world.getBlock(x, y, z);
-        if (wood == null) {
-            return false;
-        }
-        if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) if (detectTree(world, x, y, z)) {
-            TreeChopTask chopper = new TreeChopTask(new ChunkPosition(x, y, z), checkFakePlayer(world), 128);
-            FMLCommonHandler.instance().bus().register(chopper);
-            // custom block breaking code, don't call vanilla code
-            return true;
-        }
-        // return onBlockStartBreak(stack, x, y, z, player);
-        return false;
-    }
-
-    public static boolean detectTree(World world, int pX, int pY, int pZ) {
-        ChunkPosition pos = null;
-        Stack<ChunkPosition> candidates = new Stack<>();
-        candidates.add(new ChunkPosition(pX, pY, pZ));
-
-        while (!candidates.isEmpty()) {
-            ChunkPosition candidate = candidates.pop();
-            int curX = candidate.chunkPosX, curY = candidate.chunkPosY, curZ = candidate.chunkPosZ;
-
-            Block block = world.getBlock(curX, curY, curZ);
-            if ((pos == null || candidate.chunkPosY > pos.chunkPosY) && block.isWood(world, curX, curY, curZ)) {
-                pos = new ChunkPosition(curX, candidate.chunkPosY + 1, curZ);
-                // go up
-                while (world.getBlock(curX, pos.chunkPosY, curZ).isWood(world, curX, pos.chunkPosY, curZ)) {
-                    pos = new ChunkPosition(curX, pos.chunkPosY + 1, curZ);
-                }
-                // check if we still have a way diagonally up
-                candidates.add(new ChunkPosition(curX + 1, pos.chunkPosY + 1, curZ));
-                candidates.add(new ChunkPosition(curX, pos.chunkPosY + 1, curZ + 1));
-                candidates.add(new ChunkPosition(curX - 1, pos.chunkPosY + 1, curZ));
-                candidates.add(new ChunkPosition(curX, pos.chunkPosY + 1, curZ - 1));
-            }
-        }
-
-        // not even one match, so there were no logs.
-        if (pos == null) {
-            return false;
-        }
-
-        // check if there were enough leaves around the last position
-        // pos now contains the block above the topmost log
-        // we want at least 5 leaves in the surrounding 26 blocks
-        int d = 3;
-        int leaves = 0;
-        for (int offX = 0; offX < d; offX++) {
-            for (int offY = 0; offY < d; offY++) {
-                for (int offZ = 0; offZ < d; offZ++) {
-                    int xPos = pos.chunkPosX - 1 + offX, yPos = pos.chunkPosY - 1 + offY,
-                            zPos = pos.chunkPosZ - 1 + offZ;
-                    Block leaf = world.getBlock(xPos, yPos, zPos);
-                    if (leaf != null && leaf.isLeaves(world, xPos, yPos, zPos)) {
-                        if (++leaves >= 5) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        // not enough leaves. sorreh
-        return false;
-    }
-
-    public static class TreeChopTask {
-
-        public final World world;
-        public final EntityPlayer player;
-        public final int blocksPerTick;
-
-        public Queue<ChunkPosition> blocks = Lists.newLinkedList();
-        public Set<ChunkPosition> visited = new THashSet<>();
-
-        public TreeChopTask(ChunkPosition start, EntityPlayer player, int blocksPerTick) {
-            this.world = player.getEntityWorld();
-            this.player = player;
-            this.blocksPerTick = blocksPerTick;
-
-            this.blocks.add(start);
-        }
-
-        private void queueCoordinate(int x, int y, int z) {
-            ChunkPosition pos = new ChunkPosition(x, y, z);
-            if (!visited.contains(pos)) {
-                blocks.add(pos);
-            }
-        }
-
-        @SubscribeEvent
-        public void onWorldTick(TickEvent.WorldTickEvent event) {
-            if (event.side.isClient()) {
-                finish();
-                return;
-            }
-            // only if same dimension
-            if (event.world.provider.dimensionId != world.provider.dimensionId) {
-                return;
-            }
-
-            // setup
-            int left = blocksPerTick;
-            // NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
-
-            // continue running
-            ChunkPosition pos;
-            while (left > 0) {
-                // completely done or can't do our job anymore?!
-                if (blocks.isEmpty() /* || tags.getBoolean("Broken") */) {
-                    finish();
-                    return;
-                }
-
-                pos = blocks.remove();
-                if (!visited.add(pos)) {
-                    continue;
-                }
-                int x = pos.chunkPosX, y = pos.chunkPosY, z = pos.chunkPosZ;
-
-                Block block = world.getBlock(x, y, z);
-                int meta = world.getBlockMetadata(x, y, z);
-
-                // can we harvest the block and is effective?
-                if (!block.isWood(world, x, y, z) || !isWoodLog(block)) {
-                    continue;
-                }
-
-                // save its neighbors
-                queueCoordinate(x + 1, y, z);
-                queueCoordinate(x, y, z + 1);
-                queueCoordinate(x - 1, y, z);
-                queueCoordinate(x, y, z - 1);
-
-                // also add the layer above.. stupid acacia trees
-                for (int offX = 0; offX < 3; offX++) {
-                    for (int offZ = 0; offZ < 3; offZ++) {
-                        queueCoordinate(x - 1 + offX, y + 1, z - 1 + offZ);
-                    }
-                }
-
-                // break it, wooo!
-                breakExtraBlock(player.worldObj, x, y, z, 0, player, x, y, z);
-                left--;
-            }
-        }
-
-        private void finish() {
-            // goodbye cruel world
-            FMLCommonHandler.instance().bus().unregister(this);
-        }
-    }
-
-    public static void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity,
-            int refX, int refY, int refZ) {
-        // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events
-        if (world.isAirBlock(x, y, z)) return;
-
-        // what?
-        if (!(playerEntity instanceof EntityPlayerMP)) return;
-        EntityPlayerMP player = (EntityPlayerMP) playerEntity;
-
-        // check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian
-        // or precious ores you can't harvest while mining stone
-        Block block = world.getBlock(x, y, z);
-        int meta = world.getBlockMetadata(x, y, z);
-
-        // only effective materials
-        if (!isWoodLog(block)) return;
-
-        Block refBlock = world.getBlock(refX, refY, refZ);
-        float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ);
-        float strength = ForgeHooks.blockStrength(block, player, world, x, y, z);
-
-        // only harvestable blocks that aren't impossibly slow to harvest
-        if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength / strength > 10f) return;
-
-        // send the blockbreak event
-        BlockEvent.BreakEvent event = ForgeHooks
-                .onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z);
-        if (event.isCanceled()) return;
-
-        if (player.capabilities.isCreativeMode) {
-            block.onBlockHarvested(world, x, y, z, meta, player);
-            if (block.removedByPlayer(world, player, x, y, z, false))
-                block.onBlockDestroyedByPlayer(world, x, y, z, meta);
-
-            // send update to client
-            if (!world.isRemote) {
-                player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
-            }
-            return;
-        }
-
-        // callback to the tool the player uses. Called on both sides. This damages the tool n stuff.
-        player.getCurrentEquippedItem().func_150999_a(world, block, x, y, z, player);
-
-        // server sided handling
-        if (!world.isRemote) {
-            // serverside we reproduce ItemInWorldManager.tryHarvestBlock
-
-            // ItemInWorldManager.removeBlock
-            block.onBlockHarvested(world, x, y, z, meta, player);
-
-            if (block.removedByPlayer(world, player, x, y, z, true)) // boolean is if block can be harvested, checked
-                                                                     // above
-            {
-                block.onBlockDestroyedByPlayer(world, x, y, z, meta);
-                block.harvestBlock(world, player, x, y, z, meta);
-                block.dropXpOnBlockBreak(world, x, y, z, event.getExpToDrop());
-            }
-
-            // always send block update to client
-            player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
-        }
-        // client sided handling
-        else {
-            // PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController;
-            // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send
-            // any new packets
-            // the code above, executed on the server, sends a block-updates that give us the correct state of the block
-            // we destroy.
-
-            // following code can be found in PlayerControllerMP.onPlayerDestroyBlock
-            world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
-            if (block.removedByPlayer(world, player, x, y, z, true)) {
-                block.onBlockDestroyedByPlayer(world, x, y, z, meta);
-            }
-            // callback to the tool
-            ItemStack itemstack = player.getCurrentEquippedItem();
-            if (itemstack != null) {
-                itemstack.func_150999_a(world, block, x, y, z, player);
-
-                if (itemstack.stackSize == 0) {
-                    player.destroyCurrentEquippedItem();
-                }
-            }
-
-            // send an update to the server, so we get an update back
-            // if(PHConstruct.extraBlockUpdates)
-            // Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z,
-            // Minecraft.getMinecraft().objectMouseOver.sideHit));
-        }
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index cc4503e46e..b53daf4f31 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
+import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.client.GT_TooltipHandler.Tier.*;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
@@ -16,6 +17,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_FoodStat;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.covers.GT_Cover_Arm;
@@ -35,7 +37,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow;
-import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
 
 public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 
@@ -386,31 +387,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                                 getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
         this.setElectricStats(32000 + tLastID, GT_Values.V[9] * 10 * 60 * 20, GT_Values.V[8], 8L, -3L, false);
 
-        String aTierName;
-        int aFirstMachineCasingID = 130;
-        GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV,
-                GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV,
-                GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV,
-                GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV,
-                GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV,
-                GregtechItemList.FakeMachineCasingPlate_MAX, };
-        for (int i = 0; i < 10; i++) {
-            if (i == 10) {
-                break;
-            } else {
-                aTierName = GT_Values.VN[i];
-                mMachineCasingCovers[i].set(
-                        this.addItem(
-                                aFirstMachineCasingID++,
-                                aTierName + " Machine Plate Cover",
-                                "Deprecated - Shapeless Craft to new version",
-                                new Object[] {}));
-                GregTech_API.registerCover(
-                        mMachineCasingCovers[i].get(1L),
-                        new GT_MultiTexture(new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[i][0] }),
-                        new GTPP_Cover_ToggleVisual());
-            }
-        }
         GregtechItemList.Laser_Lens_WoodsGlass.set(
                 this.addItem(
                         140,
@@ -513,19 +489,19 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 new GT_MultiTexture(
                         new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
                                 new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                new GT_Cover_Pump(8));
+                new GT_Cover_Pump(8, TextureFactory.of(OVERLAY_PUMP)));
         GregTech_API.registerCover(
                 GregtechItemList.Conveyor_Module_ULV.get(1L),
                 new GT_MultiTexture(
                         new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
                                 new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                new GT_Cover_Conveyor(1600));
+                new GT_Cover_Conveyor(1600, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
         GregTech_API.registerCover(
                 GregtechItemList.Robot_Arm_ULV.get(1L),
                 new GT_MultiTexture(
                         new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
                                 new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                new GT_Cover_Arm(1600));
+                new GT_Cover_Arm(1600, TextureFactory.of(OVERLAY_ARM)));
 
         return true;
     }
@@ -595,19 +571,19 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 new GT_MultiTexture(
                         new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
                                 new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                new GT_Cover_Pump(524288));
+                new GT_Cover_Pump(524288, TextureFactory.of(OVERLAY_PUMP)));
         GregTech_API.registerCover(
                 GregtechItemList.Conveyor_Module_MAX.get(1L),
                 new GT_MultiTexture(
                         new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
                                 new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                new GT_Cover_Conveyor(4));
+                new GT_Cover_Conveyor(4, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
         GregTech_API.registerCover(
                 GregtechItemList.Robot_Arm_MAX.get(1L),
                 new GT_MultiTexture(
                         new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
                                 new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                new GT_Cover_Arm(4));
+                new GT_Cover_Arm(4, TextureFactory.of(OVERLAY_ARM)));
 
         return true;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index a5d09bcbd9..db3638a4e0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -12,7 +12,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import codechicken.lib.math.MathHelper;
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Utility;
@@ -46,7 +46,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                 if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                     GT_Utility.sendSoundToPlayers(
                             aPlayer.worldObj,
-                            (String) GregTech_API.sSoundList.get(6),
+                            SoundResource.FIRE_IGNITE,
                             1.0F,
                             1.0F,
                             MathHelper.floor_double(aEntity.posX),
@@ -102,14 +102,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
-                            GT_Utility.sendSoundToPlayers(
-                                    aWorld,
-                                    (String) GregTech_API.sSoundList.get(6),
-                                    1.0F,
-                                    1.0F,
-                                    aX,
-                                    aY,
-                                    aZ);
+                            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
                             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
                             rOutput = true;
                             // ItemNBT.setLighterFuel(aStack, tFuelAmount);
@@ -162,14 +155,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
-                            GT_Utility.sendSoundToPlayers(
-                                    aWorld,
-                                    (String) GregTech_API.sSoundList.get(6),
-                                    1.0F,
-                                    1.0F,
-                                    aX,
-                                    aY,
-                                    aZ);
+                            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
                             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
                             rOutput = true;
                             // ItemNBT.setLighterFuel(aStack, tFuelAmount);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
index 78f77a7b33..7fd7de322c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
@@ -13,6 +13,7 @@ import net.minecraftforge.fluids.IFluidBlock;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.objects.ItemData;
@@ -52,14 +53,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
             GT_Utility.sendChatToPlayer(
                     aPlayer,
                     "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
-            GT_Utility.sendSoundToPlayers(
-                    aWorld,
-                    GregTech_API.sSoundList.get(Integer.valueOf(1)),
-                    1.0F,
-                    -1.0F,
-                    aX,
-                    aY,
-                    aZ);
+            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
             return true;
         }
         if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone))
@@ -69,14 +63,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
                 || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt))
                 || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) {
             if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
-                GT_Utility.sendSoundToPlayers(
-                        aWorld,
-                        GregTech_API.sSoundList.get(Integer.valueOf(1)),
-                        1.0F,
-                        -1.0F,
-                        aX,
-                        aY,
-                        aZ);
+                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
                 int tX = aX;
                 int tY = aY;
                 int tZ = aZ;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index df83976033..ae3a40cff9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -7,14 +7,12 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.potion.Potion;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.RenderPlayerEvent;
@@ -22,8 +20,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.apache.commons.io.IOUtils;
 import org.lwjgl.opengl.GL11;
 
-import com.mojang.authlib.GameProfile;
-
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -233,56 +229,6 @@ public class GTPP_CapeRenderer extends RenderPlayer {
         return false;
     }
 
-    @SuppressWarnings("unused")
-    @Deprecated
-    /**
-     * Should be able to get the username from a UUID
-     * 
-     * @param name - Players Name
-     * @param uuid - Players known UUID
-     * @return - The newest Player name
-     */
-    private String getPlayerName(String name, String uuid) {
-        try {
-            Logger.WORLD("[Capes++] Trying to UUID check " + name + ".");
-            if (uuid != null) {
-                if (uuid.length() > 0) {
-                    UUID g = UUID.fromString(uuid);
-                    if (g != null) {
-                        Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
-                        GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
-                        if (profile != null) {
-                            Logger.WARNING("[Capes++] Found for UUID check: " + profile.getName() + ".");
-                            return profile.getName();
-                        }
-                    } else {
-                        g = UUID.fromString(uuid.replace("-", ""));
-                        if (g != null) {
-                            Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
-                            GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
-                            if (profile != null) {
-                                Logger.WARNING("[Capes++] Found for UUID check 2: " + profile.getName() + ".");
-                                return profile.getName();
-                            }
-                        }
-                    }
-                }
-            }
-            if (name != null) {
-                if (name.length() > 0) {
-                    Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
-                    GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(name);
-                    if (profile != null) {
-                        Logger.WARNING("[Capes++] Found for name check: " + profile.getName() + ".");
-                        return profile.getName();
-                    }
-                }
-            }
-            Logger.WORLD("[Capes++] Failed UUID check for " + name + ".");
-        } catch (Throwable t) {}
-        return name;
-    }
-
     private static class CapeUtils {
 
         private static char SPLIT_CHARACTER = '§';
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
index e1c591f33b..8c7ca4c9e1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
@@ -55,7 +55,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
         mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")";
     }
 
-    public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 30, aDescription, aTextures);
     }
@@ -148,7 +148,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ElectricAutoWorkbench(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_ElectricAutoWorkbench(
+                this.mName,
+                this.mTier,
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
     @Override
@@ -214,7 +218,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
             for (byte i = 19; i < 28; i++) {
                 if (mInventory[i] != null && mInventory[i].isItemStackDamageable()
-                        && mInventory[i].getItem().hasContainerItem()) {
+                        && mInventory[i].getItem().hasContainerItem(mInventory[i])) {
                     mInventory[i].setItemDamage(OreDictionary.WILDCARD_VALUE);
                 }
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
index e797810ab8..2c9a50dfa5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
@@ -16,6 +16,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.oredict.OreDictionary;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.ModularUITextures;
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
@@ -61,7 +63,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
         mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")";
     }
 
-    public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 16, aDescription, aTextures);
     }
@@ -167,7 +169,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
         return new GT_MetaTileEntity_ElectricInventoryManager(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures);
     }
 
@@ -437,7 +439,8 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
 
     @Override
     public String[] getDescription() {
-        return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip.get() };
+        return ArrayUtils
+                .addAll(this.mDescriptionArray, "It's simpler than you think. I promise.", CORE.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index af20b51c20..2427cb12ae 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -19,6 +19,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IDigitalChest;
@@ -50,14 +52,14 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
         super(aID, aName, aNameRegional, aTier, 3, "");
     }
 
-    public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -620,11 +622,13 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Generates a Tesseract for the attached Inventory",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Generates a Tesseract for the attached Inventory",
                 "Connect with pipes to insert items",
                 "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
                 "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
-                CORE.GT_Tooltip.get() };
+                CORE.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
index 0ecee3b45d..18314c059f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
@@ -12,6 +12,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -39,14 +41,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
         super(aID, aName, aNameRegional, aTier, 3, "");
     }
 
-    public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TesseractTerminal(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_TesseractTerminal(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -484,11 +486,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Accesses Tesseract Generators remotely",
-                "Connect with pipes to extract items or fluids", "Outputs from the back face",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Accesses Tesseract Generators remotely",
+                "Connect with pipes to extract items or fluids",
+                "Outputs from the back face",
                 "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
                 "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
-                CORE.GT_Tooltip.get() };
+                CORE.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 7d58df65b2..402065f7a9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -5,6 +5,8 @@ import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 import com.gtnewhorizons.modularui.api.drawable.UITexture;
 
@@ -39,7 +41,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
         this.tier = tier;
     }
 
-    public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.steamPerSecond = (CORE.ConfigSwitches.boilerSteamPerSecond * aTier);
         this.tier = aTier;
@@ -47,10 +49,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Produces " + getPollution() + " pollution/sec",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Produces " + getPollution() + " pollution/sec",
                 "Consumes fuel only when temperature is less than 100C",
-                "Fuel with burn time greater than 500 is more efficient.", "Doesn't explode if there's no water",
-                CORE.GT_Tooltip.get() };
+                "Fuel with burn time greater than 500 is more efficient.",
+                "Doesn't explode if there's no water",
+                CORE.GT_Tooltip.get());
     }
 
     public ITexture getOverlayIcon() {
@@ -246,7 +251,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Base(this.mName, tier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Boiler_Base(this.mName, tier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
index d2a924009f..da6ef21dd3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
@@ -13,13 +13,13 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
         super(aID, aNameRegional, aBoilerTier);
     }
 
-    public GT_MetaTileEntity_Boiler_HV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_Boiler_HV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
index 98dd73a13c..13d3e6ae87 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
@@ -13,13 +13,13 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
         super(aID, aNameRegional, aBoilerTier);
     }
 
-    public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
index cb2a5fbbd8..b8214b0bbd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
@@ -13,13 +13,13 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
         super(aID, aNameRegional, aBoilerTier);
     }
 
-    public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
index 9410486dff..030f000710 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
@@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -25,17 +27,12 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 
     public int mEfficiency;
 
-    /*
-     * public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { super(aID,
-     * aName, aNameRegional, aTier); onConfigLoad(); }
-     */
-
     public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Requires semi-fluid Fuel", new ITexture[0]);
         onConfigLoad();
     }
 
-    public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String aDescription,
+    public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String[] aDescription,
             ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         onConfigLoad();
@@ -61,7 +58,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -72,8 +69,11 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Produces " + (this.getPollution()) + " pollution/sec",
-                "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Produces " + (this.getPollution()) + " pollution/sec",
+                "Fuel Efficiency: " + this.getEfficiency() + "%",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -100,7 +100,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
             Logger.WARNING("Bad Fuel?");
             return 0;
         }
-        int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack));
+        int rValue = Math.max(GT_ModHandler.getFuelValue(aStack) * 6 / 5, super.getFuelValue(aStack));
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
index 50f25951be..601dddb651 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
@@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -30,7 +32,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
         this.onConfigLoad();
     }
 
-    public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String aDescription,
+    public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.onConfigLoad();
@@ -39,8 +41,11 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
     @Override
     public String[] getDescription() {
         String aPollution = "Causes " + this.getPollution() + " Pollution per second";
-        return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
-                aPollution, CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
+                aPollution,
+                CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -69,7 +74,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
 
     @Override
     public int getFuelValue(final ItemStack aStack) {
-        int rValue = Math.max((GT_ModHandler.getFuelCanValue(aStack) * 6) / 5, super.getFuelValue(aStack));
+        int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack));
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
         }
@@ -83,7 +88,11 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntityGeothermalGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GregtechMetaTileEntityGeothermalGenerator(
+                this.mName,
+                this.mTier,
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index 25ec3468f8..53f009b430 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -28,7 +28,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
         this.onConfigLoad();
     }
 
-    public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String aDescription,
+    public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.onConfigLoad();
@@ -41,8 +41,11 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        // Logger.INFO("Valid Fuels: "+Recipe_GT.Gregtech_Recipe_Map.sRocketFuels.mRecipeList.size());
-        return new GregtechMetaTileEntityRocketFuelGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GregtechMetaTileEntityRocketFuelGenerator(
+                this.mName,
+                this.mTier,
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
     @Override
@@ -70,7 +73,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
 
     @Override
     public int getFuelValue(final ItemStack aStack) {
-        int rValue = Math.max((GT_ModHandler.getFuelCanValue(aStack) * 6) / 5, super.getFuelValue(aStack));
+        int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack));
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index 8dbcc09789..440fb72789 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -4,6 +4,8 @@ import static gregtech.api.enums.GT_Values.V;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
@@ -30,7 +32,7 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
         this.onConfigLoad();
     }
 
-    public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String aDescription,
+    public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.onConfigLoad();
@@ -38,8 +40,11 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
-                "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
+                "Output Voltage: " + this.getOutputTier() + " EU/t",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -49,7 +54,7 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     public void onConfigLoad() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
index 9bc980b45e..51d7b4d186 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
@@ -7,6 +7,8 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -173,10 +175,13 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Fuel is measured in minecraft days (Check with Scanner)",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Fuel is measured in minecraft days (Check with Scanner)",
                 "RTG changes output voltage depending on fuel",
                 "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
-                "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() };
+                "Output Voltage: " + this.getOutputTier() + " EU/t",
+                CORE.GT_Tooltip.get());
     }
 
     public GregtechMetaTileEntity_RTG(int aID, String aName, String aNameRegional, int aTier) {
@@ -197,7 +202,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
         return 0;
     }
 
-    public GregtechMetaTileEntity_RTG(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GregtechMetaTileEntity_RTG(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -209,7 +214,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_RTG(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GregtechMetaTileEntity_RTG(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -329,7 +334,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
                 }
                 ReflectionUtils.setByte(this, "mTier", mTier2);
                 this.mNewTier = mTier2;
-                // ReflectionUtils.setFinalStatic(mTier2, GT_Values.V[0]);
             } catch (Exception e) {
                 Logger.WARNING("Failed setting mTier.");
                 e.printStackTrace();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java
index 67e00342dd..8696c97ee6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java
@@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV;
 
 import static gregtech.api.enums.GT_Values.V;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.ITexture;
@@ -16,15 +18,18 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String aDescription,
+    public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String[] aDescription,
             ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec",
-                "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Produces " + (this.getPollution() * 20) + " pollution/sec",
+                "Fuel Efficiency: " + this.getEfficiency() + "%",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -34,7 +39,11 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_ULV_CombustionGenerator(
+                this.mName,
+                this.mTier,
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
index 3de1f0c1f8..e0d13325e9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
@@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV;
 
 import static gregtech.api.enums.GT_Values.V;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.IIconContainer;
@@ -15,18 +17,23 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine {
 
+    private static final int EFFICIENCY_DEFAULT = 95;
+
     public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier);
+        super(aID, aName, aNameRegional, aTier, EFFICIENCY_DEFAULT);
     }
 
-    public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aDescription, aTextures);
+    public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures, EFFICIENCY_DEFAULT);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec",
-                "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Produces " + (this.getPollution() * 20) + " pollution/sec",
+                "Fuel Efficiency: " + this.getEfficiency() + "%",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -36,7 +43,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -47,7 +54,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi
     @Override
     public void onConfigLoad() {
         this.mEfficiency = GregTech_API.sMachineFile
-                .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95);
+                .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, EFFICIENCY_DEFAULT);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
index 9dc531edd9..db107fa5cd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
@@ -13,6 +13,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
@@ -62,7 +64,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
                 aDescription);
     }
 
-    public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 21, aDescription, aTextures);
     }
@@ -140,7 +142,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -508,13 +510,16 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
     public String[] getDescription() {
         int aRadius = 10 + getRange(this.mTier);
         int aSide = (aRadius - 1) / 2;
-        return new String[] { this.mDescription, "Secondary mode can Hydrate/Fertilize/Weed-EX",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "Secondary mode can Hydrate/Fertilize/Weed-EX",
                 "Consumes " + powerUsage() + "eu per harvest",
                 "Consumes " + powerUsageSecondary() + "eu per secondary operation",
                 "Can harvest 2 blocks above and below",
                 "Radius: " + aSide + " each side (" + aRadius + "x3x" + aRadius + ")",
-                "Has " + (this.mTier * 5) + "% chance for extra drops", "Holds " + this.getCapacity() + "L of Water",
-                CORE.GT_Tooltip.get() };
+                "Has " + (this.mTier * 5) + "% chance for extra drops",
+                "Holds " + this.getCapacity() + "L of Water",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
deleted file mode 100644
index 9a26ea57ec..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
-
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.Mods.GregTech;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Textures;
-import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-
-public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock {
-
-    public static String[] BlacklistedTileEntiyClassNames;
-
-    private byte mMode = 0; // 0: RandomTicks around 1: TileEntities with range
-    // 1
-    private static CustomIcon _mGTIco_Norm_Idle;
-    private static CustomIcon _mGTIco_Norm_Active;
-    private static CustomIcon _mGTIco_TE_Idle;
-    private static CustomIcon _mGTIco_TE_Active;
-    private static int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512 };
-
-    @Override
-    public void registerIcons(IIconRegister aBlockIconRegister) {
-        super.registerIcons(aBlockIconRegister);
-        _mGTIco_Norm_Idle = new CustomIcon("iconsets/OVERLAY_ACCELERATOR");
-        _mGTIco_Norm_Active = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_ACTIVE");
-        _mGTIco_TE_Idle = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE");
-        _mGTIco_TE_Active = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE");
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public void onValueUpdate(byte aValue) {
-        mMode = aValue;
-    }
-
-    @Override
-    public byte getUpdateData() {
-        return mMode;
-    }
-
-    public GT_MetaTileEntity_WorldAccelerator(int pID, String pName, String pNameRegional, int pTier) {
-        super(pID, pName, pNameRegional, pTier, 0, "");
-    }
-
-    @Override
-    public String[] getDescription() {
-        return new String[] {
-                String.format(
-                        "Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)",
-                        mTier,
-                        getEnergyDemand(mTier, false),
-                        mAccelerateStatic[mTier]),
-                "Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it",
-                "This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" };
-    }
-
-    public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription,
-            ITexture[][][] pTextures) {
-        super(pName, pTier, pInvSlotCount, pDescription, pTextures);
-    }
-
-    @Override
-    public MetaTileEntity newMetaEntity(IGregTechTileEntity pTileEntity) {
-        return new GT_MetaTileEntity_WorldAccelerator(mName, mTier, mInventory.length, mDescription, mTextures);
-    }
-
-    @Override
-    public ITexture[][][] getTextureSet(ITexture[] pTextures) {
-        return new ITexture[0][0][0];
-    }
-
-    @Override
-    public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, ForgeDirection side, ForgeDirection sacing,
-            int pColorIndex, boolean pActive, boolean pRedstone) {
-        if (mMode == 0) return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
-                (side.offsetY != 0) ? null
-                        : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active)
-                                : new GT_RenderedTexture(_mGTIco_Norm_Idle) };
-        else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (side.offsetY != 0)
-                ? null
-                : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) };
-    }
-
-    @Override
-    public boolean allowPullStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side,
-            ItemStack pStack) {
-        return false;
-    }
-
-    @Override
-    public boolean allowPutStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side,
-            ItemStack pStack) {
-        return false;
-    }
-
-    @Override
-    public void saveNBTData(NBTTagCompound pNBT) {
-        pNBT.setByte("mAccelMode", mMode);
-    }
-
-    public static long getEnergyDemand(int pTier, boolean pIsAcceleratingTEs) {
-        return V[pTier] * (pIsAcceleratingTEs ? 6 : 3);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound pNBT) {
-        mMode = pNBT.getByte("mAccelMode");
-    }
-
-    @Override
-    public boolean isAccessAllowed(EntityPlayer pPlayer) {
-        return true;
-    }
-
-    @Override
-    public boolean isSimpleMachine() {
-        return false;
-    }
-
-    @Override
-    public boolean isFacingValid(ForgeDirection facing) {
-        return true;
-    }
-
-    @Override
-    public boolean isEnetInput() {
-        return true;
-    }
-
-    @Override
-    public boolean isInputFacing(ForgeDirection side) {
-        return true;
-    }
-
-    @Override
-    public boolean isTeleporterCompatible() {
-        return false;
-    }
-
-    @Override
-    public long getMinimumStoredEU() {
-        return 512;
-    }
-
-    @Override
-    public long maxEUStore() {
-        return 512 + V[mTier] * 50;
-    }
-
-    @Override
-    public long maxEUInput() {
-        return V[mTier];
-    }
-
-    @Override
-    public long maxAmperesIn() {
-        return 8;
-    }
-
-    private static String[] mModeStr = { "Blocks", "TileEntities" };
-
-    @Override
-    public void onScrewdriverRightClick(ForgeDirection pSide, EntityPlayer pPlayer, float pX, float pY, float pZ) {
-        mMode = (byte) (mMode == 0x00 ? 0x01 : 0x00);
-        markDirty();
-        PlayerUtils.messagePlayer(pPlayer, String.format("Switched mode to: %s", mModeStr[mMode]));
-    }
-
-    @Override
-    public void onPostTick(IGregTechTileEntity pBaseMetaTileEntity, long pTick) {
-        try {
-            if (!pBaseMetaTileEntity.isServerSide()) return;
-
-            long tEnergyDemand = getEnergyDemand(mTier, (mMode == 1));
-
-            // Do we have enough energy to run? Or are we not allowed to run?
-            if (pBaseMetaTileEntity.getStoredEU() < tEnergyDemand || !pBaseMetaTileEntity.isAllowedToWork()) {
-                // Check if machine was active before
-                if (pBaseMetaTileEntity.isActive()) pBaseMetaTileEntity.setActive(false); // Then disable it now
-            } else {
-                // Continue to drain power
-                if (pBaseMetaTileEntity.decreaseStoredEnergyUnits(tEnergyDemand, false)) {
-                    World tWorld = pBaseMetaTileEntity.getWorld();
-                    // Limit the random ticks to once per second
-                    if (mMode == 0) {
-                        if (pTick % 20 == 0) doAccelerateNormalBlocks(pBaseMetaTileEntity, tWorld);
-                    } else doAccelerateTileEntities(pBaseMetaTileEntity, tWorld);
-
-                } else {
-                    // Energy drain failed. Disable machine
-                    if (pBaseMetaTileEntity.isActive()) pBaseMetaTileEntity.setActive(false);
-                }
-            }
-        } catch (Exception e) {
-            Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash");
-            Logger.ERROR(e.getMessage());
-        }
-    }
-
-    private void doAccelerateTileEntities(IGregTechTileEntity pBaseMetaTileEntity, World pWorld) {
-        try {
-            if (!pBaseMetaTileEntity.isActive()) getBaseMetaTileEntity().setActive(true);
-
-            for (ForgeDirection tDir : ForgeDirection.VALID_DIRECTIONS) {
-                TileEntity tTile = pBaseMetaTileEntity.getTileEntityAtSide(tDir);
-                if (isTEBlackListed(tTile)) continue;
-
-                long tMaxTime = System.nanoTime() + 1000000;
-                for (int j = 0; j < mAccelerateStatic[mTier]; j++) {
-                    tTile.updateEntity();
-                    if (System.nanoTime() > tMaxTime) break;
-                }
-            }
-        } catch (Exception e) {
-            Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash");
-            Logger.ERROR(e.getMessage());
-        }
-    }
-
-    private static List<String> _mBlacklistedTileEntities = new ArrayList<String>();
-
-    // Inspired by ChromatiCraft's TileAccelerator
-    private boolean isTEBlackListed(TileEntity pTile) {
-        if (pTile == null) return true; // Obvious
-        if (!pTile.canUpdate()) return true; // Skip if TE can't update at all
-        if (pTile.isInvalid()) return true; // Obvious
-
-        String tSimpleClassName = pTile.getClass().getSimpleName().toLowerCase();
-        String tCanonicalName = pTile.getClass().getCanonicalName().toLowerCase();
-        if (tSimpleClassName.contains("conduit") || tSimpleClassName.contains("wire")
-                || tSimpleClassName.contains("cable"))
-            return true;
-        if (tCanonicalName.contains("appeng") || tCanonicalName.contains(GregTech.ID))
-            // Don't accelerate ANY Gregtech machines!
-            return true;
-        for (String tS : BlacklistedTileEntiyClassNames) {
-            if (tCanonicalName.equalsIgnoreCase(tS)) return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Accelerate normal blocks. Eats some power and adds randomTicks to every block within its working area
-     * (Tier-Number = radius) This does only affect blocks that implement the "RandomTick" method; Which is mostly used
-     * for grass growth and plants.
-     *
-     * @param pBaseMetaTileEntity
-     */
-    private void doAccelerateNormalBlocks(IGregTechTileEntity pBaseMetaTileEntity, World pWorld) {
-        if (!pBaseMetaTileEntity.isActive()) getBaseMetaTileEntity().setActive(true);
-
-        Random rnd = new Random();
-        int tX = pBaseMetaTileEntity.getXCoord();
-        int tY = pBaseMetaTileEntity.getYCoord();
-        int tZ = pBaseMetaTileEntity.getZCoord();
-
-        int tX1 = tX - mTier;
-        int tX2 = tX + mTier;
-        int tY1 = Math.max(tY - mTier, 0); // Limit to bedrock
-        int tY2 = Math.min(tY + mTier, 255); // Limit to build height
-        int tZ1 = tZ - mTier;
-        int tZ2 = tZ + mTier;
-
-        for (int xi = tX1; xi <= tX2; xi++) for (int yi = tY1; yi <= tY2; yi++)
-            for (int zi = tZ1; zi <= tZ2; zi++) tryTickBlock(pWorld, xi, yi, zi, rnd);
-    }
-
-    /**
-     * Send a tick to the target block
-     *
-     * @param pWorld
-     * @param pX
-     * @param pY
-     * @param pZ
-     * @param pRnd
-     */
-    private void tryTickBlock(World pWorld, int pX, int pY, int pZ, Random pRnd) {
-        try {
-            for (int j = 0; j < mTier; j++) {
-                Block tBlock = pWorld.getBlock(pX, pY, pZ);
-                if (tBlock.getTickRandomly()) tBlock.updateTick(pWorld, pX, pY, pZ, pRnd);
-            }
-        } catch (Exception e) {
-            Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash");
-            Logger.ERROR(e.getMessage());
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index 0e8106dd2a..2e95830a41 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -20,8 +20,8 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.ITexture;
@@ -89,8 +89,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
         mPollutionEnabled = PollutionUtils.isPollutionEnabled();
     }
 
-    public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
-            String aGUIName, String aNEIName) {
+    public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription,
+            ITexture[][][] aTextures, String aGUIName, String aNEIName) {
         super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName);
         mPollutionEnabled = PollutionUtils.isPollutionEnabled();
     }
@@ -106,7 +106,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
         return new GregtechMetaAtmosphericReconditioner(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures,
                 this.mGUIName,
                 this.mNEIName);
@@ -117,7 +117,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
         boolean highTier = this.mTier >= 7;
 
-        String[] A = new String[] { this.mDescription,
+        String[] A = ArrayUtils.addAll(
+                this.mDescriptionArray,
                 highTier ? "Will attempt to remove 1/4 pollution from 8 surrounding chunks" : "",
                 highTier ? "If these chunks are not loaded, they will be ignored" : "",
                 "Requires a turbine rotor and an Air Filter [T1/T2] to run.",
@@ -126,7 +127,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                 "Low Efficiency: Removes half pollution, Turbine takes 50% dmg",
                 "High Efficiency: Removes full pollution, Turbine takes 100% dmg",
                 "Turbine Rotor will not break in LE mode",
-                "Insert an equal tier Conveyor Module to enable automation" };
+                "Insert an equal tier Conveyor Module to enable automation");
         if (!mPollutionEnabled) {
             String[] B = new String[] { "===============================================",
                     "Pollution is disabled, scrubbers will now have a bonus use",
@@ -781,20 +782,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         if (aIndex == -120) {
-            GT_Utility.doSoundAtClient(
-                    (String) GregTech_API.sSoundList.get(Integer.valueOf(103)),
-                    MathUtils.randInt(5, 50),
-                    0.05F,
-                    aX,
-                    aY,
-                    aZ);
-        } else if (aIndex == -121 || aIndex == -122) {
-            // GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(108)), 0, 0.5F, aX, aY,
-            // aZ);
-        } /*
-           * else if (aIndex == -122) { GT_Utility.doSoundAtClient((String)
-           * GregTech_API.sSoundList.get(Integer.valueOf(6)), 100, 1.0F, aX, aY, aZ); }
-           */ else {
+            GT_Utility
+                    .doSoundAtClient(SoundResource.IC2_TOOLS_BATTERY_USE, MathUtils.randInt(5, 50), 0.05F, aX, aY, aZ);
+        } else {
             super.doSound((byte) 0, aX, aY, aZ);
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
index 1ff0f8eef6..910c3120b3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
@@ -4,6 +4,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
@@ -31,15 +33,18 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd
         super(aID, aName, aNameRegional, "A Steam condenser - [IC2->Steam]", new ITexture[0]);
     }
 
-    public GregtechMetaCondensor(final String aName, final int aTier, final String aDescription,
+    public GregtechMetaCondensor(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "IC2 Steam + Water = Normal Steam.",
-                "Requires no power to run, although it's not very fast.", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "IC2 Steam + Water = Normal Steam.",
+                "Requires no power to run, although it's not very fast.",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -80,7 +85,7 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
index 84cef090fc..5412f0108e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
@@ -48,7 +48,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
                 new ITexture[] {});
     }
 
-    public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+    public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
             String aGUIName, String aNEIName) {
         super(aName, aTier, 4, aDescription, aTextures, 0, 0, aGUIName, aNEIName);
     }
@@ -190,7 +190,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
         return new GregtechMetaTileEntityChunkLoader(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures,
                 this.mGUIName,
                 this.mNEIName);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
index d14121e116..d0c63f5aad 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
@@ -5,6 +5,8 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 import com.gtnewhorizons.modularui.api.math.Pos2d;
 import com.gtnewhorizons.modularui.api.math.Size;
@@ -53,7 +55,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
                         new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
     }
 
-    public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+    public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
             String aGUIName, String aNEIName) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
     }
@@ -63,7 +65,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
         return new GregtechMetaTileEntity_AutoChisel(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures,
                 this.mGUIName,
                 this.mNEIName);
@@ -71,10 +73,11 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
 
     @Override
     public String[] getDescription() {
-        String[] A = new String[] { this.mDescription, "What you want to chisel goes in slot 1",
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                "What you want to chisel goes in slot 1",
                 "What you want to get goes in the special slot (bottom right)",
-                "If special slot is empty, first chisel result is used" };
-        return A;
+                "If special slot is empty, first chisel result is used");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
index f97a831590..d75730b2a0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
@@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -38,20 +40,15 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
                         new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) });
     }
 
-    public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+    public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
             String aGUIName, String aNEIName) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
     }
 
-    /*
-     * public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][]
-     * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName,
-     * aNEIName); }
-     */
-
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get() };
+        return ArrayUtils
+                .addAll(this.mDescriptionArray, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -59,7 +56,7 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
         return new GregtechMetaTileEntity_BasicWasher(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures,
                 this.mGUIName,
                 this.mNEIName);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
index b5bbc86b7e..b6911e29f7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
@@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -38,14 +40,14 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba
                         new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP) });
     }
 
-    public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String aDescription,
+    public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String[] aDescription,
             ITexture[][][] aTextures, String aGUIName, String aNEIName) {
         super(aName, aTier, 1, aDescription, aTextures, 2, 9, aGUIName, aNEIName);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(this.mDescriptionArray, "Does not require ice cubes", CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -53,7 +55,7 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba
         return new GregtechMetaTileEntity_ReactorColdTrap(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures,
                 this.mGUIName,
                 this.mNEIName);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
index 22f449b0c2..c3303bf2db 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
@@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -38,14 +40,14 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt
                         new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP) });
     }
 
-    public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String aDescription,
+    public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String[] aDescription,
             ITexture[][][] aTextures, String aGUIName, String aNEIName) {
         super(aName, aTier, 1, aDescription, aTextures, 2, 9, aGUIName, aNEIName);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, CORE.GT_Tooltip.get() };
+        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -53,7 +55,7 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt
         return new GregtechMetaTileEntity_ReactorProcessingUnit(
                 this.mName,
                 this.mTier,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures,
                 this.mGUIName,
                 this.mNEIName);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
index e705d0a156..c8e947fbb5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
@@ -96,9 +96,9 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
                 .addInfo("500% faster than using single block machines of the same voltage")
                 .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes 16 items per voltage tier")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front center").addCasingInfo("Supply Depot Casings", 10).addInputBus("Any casing", 1)
-                .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
-                .addMufflerHatch("Any casing", 1).toolTipFinisher("GT++");
+                .addController("Front center").addCasingInfoMin("Supply Depot Casings", 10, false)
+                .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1)
+                .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1).toolTipFinisher("GT++");
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
index ae0096cad5..e77e5b7b60 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
@@ -94,7 +94,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
                 .addInfo("Enemies within " + this.mRange + "m are blasted with a high energy plasma.")
                 .addInfo("This uses 5,000,000EU per blast.")
                 .addInfo("Can screwdriver to toggle mode between Players and all Entities.").addSeparator()
-                .beginStructureBlock(1, 7, 1, false).addController("Top Middle").addCasingInfo("Casing", 360)
+                .beginStructureBlock(1, 7, 1, false).addController("Top Middle").addCasingInfoMin("Casing", 360, false)
                 .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1).addInputBus("Any 4 dot hint (min 1)", 4)
                 .addInputHatch("Any 4 dot hint(min 1)", 4).addOutputHatch("Any 4 dot hint(min 1)", 4)
                 .addEnergyHatch("Any 4 dot hint(min 1)", 4).addMaintenanceHatch("Any 4 dot hint(min 1)", 4)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
index cb88bd8562..8e5db11003 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
@@ -119,8 +119,8 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
                 .addInfo("Gains one parallel per voltage tier").addInfo("Gains one multiplier per coil tier")
                 .addInfo("Parallel = Tier * Coil Tier").addInfo("Gains 5% speed bonus per coil tier")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, true)
-                .addController("Bottom center").addCasingInfo("Inconel Reinforced Casings", 8)
-                .addCasingInfo("Integral Encasement V", 8).addCasingInfo("Heating Coils", 16)
+                .addController("Bottom center").addCasingInfoMin("Inconel Reinforced Casings", 8, false)
+                .addCasingInfoMin("Integral Encasement V", 8, false).addCasingInfoMin("Heating Coils", 16, true)
                 .addInputBus("Any Inconel Reinforced Casing", 1).addOutputBus("Any Inconel Reinforced Casing", 1)
                 .addEnergyHatch("Any Inconel Reinforced Casing", 1)
                 .addMaintenanceHatch("Any Inconel Reinforced Casing", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
index aca2826c4a..3d55bc9d2f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
@@ -23,7 +23,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -75,10 +75,10 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace extends
                 .addInfo("Processes 8 items per voltage tier * W/L")
                 .addInfo("Max Size required to process Plasma recipes").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().addController("Top center").addStructureInfo("Size: nx3xn [WxHxL] (Hollow)")
-                .addStructureInfo("n can be 3, 5 or 7").addCasingInfo(mCasingName, 10).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
-                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addStructureInfo("n can be 3, 5 or 7").addCasingInfoMin(mCasingName, 10, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -177,7 +177,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(207));
+        return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index f98942d595..fc98a793a9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -76,7 +76,7 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge extends
                 .addInfo("Disable animations with a screwdriver").addInfo("Only uses 90% of the EU/t normally required")
                 .addInfo("Processes six items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center")
-                .addCasingInfo("Centrifuge Casings", 10).addInputBus("Any Casing except front", 1)
+                .addCasingInfoMin("Centrifuge Casings", 10, false).addInputBus("Any Casing except front", 1)
                 .addOutputBus("Any Casing except front", 1).addInputHatch("Any Casing except front", 1)
                 .addOutputHatch("Any Casing except front", 1).addEnergyHatch("Any Casing except front", 1)
                 .addMaintenanceHatch("Any Casing except front", 1).addMufflerHatch("Any Casing except front", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
index 949231424a..f2b82f7220 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
@@ -78,9 +78,10 @@ public class GregtechMetaTileEntity_IndustrialChisel
                 .addInfo("If no target is provided for common buses, the result of the first chisel is used")
                 .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 16")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front center").addCasingInfo("Sturdy Printer Casing", 10).addInputBus("Any casing", 1)
-                .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
-                .addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front center").addCasingInfoMin("Sturdy Printer Casing", 10, false)
+                .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1)
+                .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
index 5532180944..4c90e93176 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
@@ -20,7 +20,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -70,8 +70,8 @@ public class GregtechMetaTileEntity_IndustrialCokeOven extends
                 .addInfo("Process 12x materials with Heat Resistant Casings")
                 .addInfo("Or 24x materials with Heat Proof Casings").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front middle at bottom")
-                .addCasingInfo("Structural Coke Oven Casings", 8)
-                .addCasingInfo("Heat Resistant/Proof Coke Oven Casings", 8).addInputBus("Any Casing", 1)
+                .addCasingInfoMin("Structural Coke Oven Casings", 8, false)
+                .addCasingInfoMin("Heat Resistant/Proof Coke Oven Casings", 8, false).addInputBus("Any Casing", 1)
                 .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
                 .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -144,7 +144,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(207));
+        return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index d9176057a1..c45621414d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -69,9 +69,9 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
                 .addInfo("200% faster than using single block machines of the same voltage")
                 .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true)
-                .addController("Front Center").addCasingInfo("Cutting Factory Frames", 26).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
-                .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+                .addController("Front Center").addCasingInfoMin("Cutting Factory Frames", 26, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
index 5a9a523e4c..dc1442c0e6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
@@ -78,7 +78,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends
                 .addInfo("Each 1800K over the min. Heat Capacity allows for one upgraded overclock")
                 .addInfo("Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, true)
-                .addController("Bottom Center").addCasingInfo(mCasingName, 5).addInputBus("Any Casing", 1)
+                .addController("Bottom Center").addCasingInfoMin(mCasingName, 5, false).addInputBus("Any Casing", 1)
                 .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
                 .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
index 58a88a0db2..b3f448d425 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
@@ -63,10 +63,10 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
                 .addInfo("180% faster than using single block machines of the same voltage")
                 .addInfo("Only uses 90% of the EU/t normally required").addInfo("Processes two items per voltage tier")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front Center").addCasingInfo("Electrolyzer Casings", 10).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
-                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin("Electrolyzer Casings", 10, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index 0d07b9f94e..9e00cdecae 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -21,7 +21,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder extends
                 .addInfo("Each Input Bus can have a different shape!")
                 .addInfo("You can use several input buses per multiblock")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true)
-                .addController("Front Center").addCasingInfo("Inconel Reinforced Casings", 14)
+                .addController("Front Center").addCasingInfoMin("Inconel Reinforced Casings", 14, false)
                 .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
                 .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Back Center", 2)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -116,7 +116,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(203));
+        return SoundResource.IC2_MACHINES_COMPRESSOR_OP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
index 0550cc8809..1fa2f99425 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
@@ -64,8 +64,8 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
                 .addInfo("Only uses 90% of the EU/t normally required")
                 .addInfo("Processes eight items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(5, 6, 5, true).addController("Front Center")
-                .addCasingInfo("Top/Bottom layer: Multi-use Casings", 34)
-                .addCasingInfo("Middle layers: Thermal Containment Casing", 47)
+                .addCasingInfoMin("Top/Bottom layer: Multi-use Casings", 34, false)
+                .addCasingInfoMin("Middle layers: Thermal Containment Casing", 47, false)
                 .addInputBus("Bottom Layer (optional)", 1).addInputHatch("Bottom Layer", 1)
                 .addOutputBus("Top Layer (optional)", 1).addOutputHatch("Top Layer", 1)
                 .addEnergyHatch("Any Multi-use Casing", 1).addMaintenanceHatch("Any Multi-use Casing", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
index d5e79e3c16..ceffb921f7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
@@ -34,7 +34,7 @@ import com.gtnewhorizon.structurelib.structure.ITierConverter;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -91,7 +91,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
         }
 
         tt.addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front Center").addCasingInfo("Forge Casing", 10).addInputBus("Any Casing", 1)
+                .addController("Front Center").addCasingInfoMin("Forge Casing", 10, false).addInputBus("Any Casing", 1)
                 .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
                 .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .addOtherStructurePart("Anvil", "In the center of 3x3x3 structure", 2)
@@ -171,7 +171,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(1);
+        return SoundResource.RANDOM_ANVIL_USE.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
index 06d55cf7fb..074ac0be41 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
@@ -26,6 +26,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -74,8 +75,8 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends
                 .addInfo("Maximum of n*tier parallels, LV = Tier 1, MV = Tier 2, etc.")
                 .addInfo("n=2 initially. n=8 after inserting Maceration Upgrade Chip.")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 6, 3, true)
-                .addController("Bottom center").addCasingInfo("Maceration Stack Casings (After upgrade)", 26)
-                .addCasingInfo("Stable Titanium Casings (Before upgrade)", 26).addInputBus("Bottom casing", 1)
+                .addController("Bottom center").addCasingInfoMin("Maceration Stack Casings (After upgrade)", 26, false)
+                .addCasingInfoMin("Stable Titanium Casings (Before upgrade)", 26, false).addInputBus("Bottom casing", 1)
                 .addEnergyHatch("Bottom casing", 1).addMaintenanceHatch("Bottom casing", 1)
                 .addOutputBus("One per layer except bottom layer", 2)
                 .addMufflerHatch("Any casing except bottom layer", 2).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -240,7 +241,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(201));
+        return SoundResource.IC2_MACHINES_MACERATOR_OP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
index ffd913f55b..67a6a17384 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
@@ -27,6 +27,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -92,10 +93,10 @@ public class GregtechMetaTileEntity_IndustrialMixer
                 .addInfo("250% faster than using single block machines of the same voltage")
                 .addInfo("Processes eight recipes per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(3, 4, 3, false).addController("Second Layer Center")
-                .addCasingInfo(mCasingName, 6).addCasingInfo(mCasingName2, 2).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
-                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addCasingInfoMin(mCasingName, 6, false).addCasingInfoMin(mCasingName2, 2, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -138,7 +139,7 @@ public class GregtechMetaTileEntity_IndustrialMixer
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(203));
+        return SoundResource.IC2_MACHINES_COMPRESSOR_OP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
index 69a70eced9..ca445d2332 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
@@ -64,10 +64,13 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
         tt.addMachineType(getMachineType()).addInfo("Changes the structure of items to produce new ones")
                 .addInfo("Maximum 1x of each bus/hatch.").addPollutionAmount(getPollutionPerSecond(null)).addSeparator()
                 .beginStructureBlock(7, 7, 7, false).addController("Top Center")
-                .addCasingInfo("Robust Tungstensteel Machine Casing", 40).addCasingInfo("Tungstensteel Coils", 16)
-                .addCasingInfo("Molecular Containment Casing", 52).addCasingInfo("High Voltage Current Capacitor", 32)
-                .addCasingInfo("Particle Containment Casing", 4).addCasingInfo("Resonance Chamber I", 5)
-                .addCasingInfo("Modulator I", 4).addInputBus("Any Robust Tungstensteel Machine Casing", 1)
+                .addCasingInfoMin("Robust Tungstensteel Machine Casing", 40, false)
+                .addCasingInfoMin("Tungstensteel Coils", 16, false)
+                .addCasingInfoMin("Molecular Containment Casing", 52, false)
+                .addCasingInfoMin("High Voltage Current Capacitor", 32, false)
+                .addCasingInfoMin("Particle Containment Casing", 4, false)
+                .addCasingInfoMin("Resonance Chamber I", 5, false).addCasingInfoMin("Modulator I", 4, false)
+                .addInputBus("Any Robust Tungstensteel Machine Casing", 1)
                 .addOutputBus("Any Robust Tungstensteel Machine Casing", 1)
                 .addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1)
                 .addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index 129a1c1330..8e9fc47c2b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -121,10 +121,10 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
                                 + EnumChatFormatting.RESET)
                 .addInfo("Read Multi-Machine Manual for extra information")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front Center").addCasingInfo("Multi-Use Casings", 6).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
-                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin("Multi-Use Casings", 6, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
index 3bda4c8e08..02b28bb911 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -23,7 +23,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -71,7 +71,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends
                 .addInfo("Processes four items per voltage tier").addInfo("Circuit for recipe goes in the Input Bus")
                 .addInfo("Each Input Bus can have a different Circuit/Shape!")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front Center").addCasingInfo("Material Press Machine Casings", 10)
+                .addController("Front Center").addCasingInfoMin("Material Press Machine Casings", 10, false)
                 .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
                 .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -117,7 +117,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(203);
+        return SoundResource.IC2_MACHINES_COMPRESSOR_OP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
index 87d4a7b736..d714dfca6b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
@@ -65,10 +65,11 @@ public class GregtechMetaTileEntity_IndustrialSifter
                 .addInfo("400% faster than single-block machines of the same voltage")
                 .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 3, 5, false)
-                .addController("Bottom Center").addCasingInfo("Sieve Grate", 18).addCasingInfo("Sieve Casings", 35)
-                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
-                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
-                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Bottom Center").addCasingInfoMin("Sieve Grate", 18, false)
+                .addCasingInfoMin("Sieve Casings", 35, false).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
+                .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+                .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
index 6c4814ab7b..9317917ad3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -66,8 +66,8 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge
                 .addInfo("Only uses 80% of the EU/t normally required")
                 .addInfo("Processes eight items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(3, 2, 3, false).addController("Front Center")
-                .addCasingInfo("Thermal Processing Casings/Noise Hazard Sign Blocks", 8).addInputBus("Bottom Casing", 1)
-                .addOutputBus("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
+                .addCasingInfoMin("Thermal Processing Casings/Noise Hazard Sign Blocks", 8, false)
+                .addInputBus("Bottom Casing", 1).addOutputBus("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
                 .addMaintenanceHatch("Bottom Casing", 1).addMufflerHatch("Bottom Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
index 1e6c1d8070..1ce6e5e72e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
@@ -81,7 +81,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
                 .addInfo("Consumes 1L of " + mCryoFuelName + "/t during operation")
                 .addInfo("Constructed exactly the same as a normal Vacuum Freezer")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front Center").addCasingInfo(mCasingName, 10).addStructureHint(mHatchName, 1)
+                .addController("Front Center").addCasingInfoMin(mCasingName, 10, false).addStructureHint(mHatchName, 1)
                 .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
                 .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
                 .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
index da52ee2745..e51cab5a92 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -82,10 +82,10 @@ public class GregtechMetaTileEntity_IndustrialWashPlant extends
                 .addInfo("Always requires an Input Hatch full of water to refill structure")
                 .addInfo("Need to be filled with water.").addInfo("Will automatically fill water from input hatch.")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 3, 7, true)
-                .addController("Front Center").addCasingInfo("Wash Plant Casings", 40).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
-                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin("Wash Plant Casings", 40, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
index c98526b80a..c155a9e609 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -26,7 +26,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -73,9 +73,10 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends
                 .addInfo("200% faster than using single block machines of the same voltage")
                 .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true)
-                .addController("Front Center").addCasingInfo("Wire Factory Casings", 20).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
-                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin("Wire Factory Casings", 20, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+                .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -119,7 +120,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(204);
+        return SoundResource.IC2_MACHINES_RECYCLER_OP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
index a9a64807c0..4d122f3619 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
@@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
 
     @Override
     public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCoverID) {
-        return (GregTech_API.getCoverBehavior(aCoverID.toStack()).isSimpleCover())
+        return (GregTech_API.getCoverBehaviorNew(aCoverID.toStack()).isSimpleCover())
                 && (super.allowCoverOnSide(side, aCoverID));
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
index 0a168b2d99..46a978aa3b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
@@ -82,7 +82,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
         tt.addMachineType(getMachineType()).addInfo("Controller Block for the Large Grinding Machine")
                 .addInfo("Grind ores.").addPollutionAmount(getPollutionPerSecond(null)).addSeparator()
                 .beginStructureBlock(3, 3, 7, false).addController("Front Center")
-                .addCasingInfo("IsaMill Exterior Casing", 40)
+                .addCasingInfoMin("IsaMill Exterior Casing", 40, false)
                 .addOtherStructurePart("IsaMill Gearbox", "5x, Inner Blocks")
                 .addOtherStructurePart("IsaMill Piping", "8x, ring around controller")
                 .addStructureInfo("IsaMill Pipings must not be obstructed in front (only air blocks)")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
index 7f61ad1eb8..64cce876c0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
@@ -228,7 +228,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
                     this.mOutputFluids = new FluidStack[] {};
                     this.mLastRecipe = tRecipe;
 
-                    calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
+                    calculateOverclockedNessMulti((long) tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
                     int aDevProgress = this.mMaxProgresstime / 10;
                     this.mMaxProgresstime = Math.max(1, aDevProgress);
                     this.mOutputItems = new ItemStack[] {};
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
index 870430543b..8fd6c0bd5c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
@@ -177,8 +177,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
                 .addInfo("Max parallel dictated by tower tier and mode").addInfo("DTower Mode: T1=4, T2=12")
                 .addInfo("Distilery Mode: Tower Tier * (4*InputTier)")
                 .addInfo("Distilery Mode require a full height tower").addPollutionAmount(getPollutionPerSecond(null))
-                .addSeparator().addCasingInfo("Clean Stainless Steel Machine Casing", 7).addInputBus("Bottom Casing", 1)
-                .addOutputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1)
+                .addSeparator().addCasingInfoMin("Clean Stainless Steel Machine Casing", 7, false)
+                .addInputBus("Bottom Casing", 1).addOutputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1)
                 .addMaintenanceHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
                 .addOutputHatch("One per layer except bottom", 2).addMufflerHatch("Top Casing", 3)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index 422f3de857..48a3673cca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -87,7 +87,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
                 .addInfo("Speed: +120% | EU Usage: 90% | Parallel: 8")
                 .addInfo("Consumes 10L of " + mHotFuelName + " per second during operation")
                 .addInfo("Constructed exactly the same as a normal EBF").addPollutionAmount(getPollutionPerSecond(null))
-                .addSeparator().addController("Bottom center").addCasingInfo(mCasingName, 8)
+                .addSeparator().addController("Bottom center").addCasingInfoMin(mCasingName, 8, false)
                 .addInputHatch("Any Casing", 1).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
                 .addOutputHatch("Any Casing", 1).addStructureHint(mHatchName, 1).addEnergyHatch("Any Casing", 1)
                 .addMufflerHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index 9a353793ad..fde072842a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -54,7 +54,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
                 .addInfo("If the recipe has a startup cost greater than the")
                 .addInfo("number of energy hatches * cap, you can't do it").addSeparator()
                 .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed")
-                .addCasingInfo("Fusion Machine Casings MK III", 79).addStructureInfo("Cover the coils with casing")
+                .addCasingInfoMin("Fusion Machine Casings MK III", 79, false)
+                .addStructureInfo("Cover the coils with casing")
                 .addOtherStructurePart("Advanced Fusion Coils", "Center part of the ring")
                 .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1)
                 .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UHV or better")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
index bb86c94d08..a7966d1a8c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
@@ -54,7 +54,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
                 .addInfo("If the recipe has a startup cost greater than the")
                 .addInfo("number of energy hatches * cap, you can't do it").addSeparator()
                 .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed")
-                .addCasingInfo("Fusion Machine Casings MK IV", 79).addStructureInfo("Cover the coils with casing")
+                .addCasingInfoMin("Fusion Machine Casings MK IV", 79, false)
+                .addStructureInfo("Cover the coils with casing")
                 .addOtherStructurePart("Advanced Fusion Coils II", "Center part of the ring")
                 .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1)
                 .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UEV or better")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
index ff47520fcc..7f583a892e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
@@ -135,7 +135,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
                 .addInfo("A circuit in the controller lowers the SH Steam threshold and efficiency")
                 .addInfo("2400 L/s reduction and 1.5% efficiency loss per circuit config over 1").addSeparator()
                 .beginStructureBlock(5, 9, 5, false).addController("Front bottom")
-                .addCasingInfo("Reinforced Heat Exchanger Casing", 90)
+                .addCasingInfoMin("Reinforced Heat Exchanger Casing", 90, false)
                 .addOtherStructurePart("Tungstensteel Pipe Casing", "Center 3x5x3 (45 blocks)")
                 .addMaintenanceHatch("Any casing", 1).addInputHatch("Hot fluid, bottom center", 2)
                 .addInputHatch("Distilled water, any bottom layer casing", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
index bb40aceed4..e89830cefe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
@@ -8,11 +8,12 @@ import static gregtech.api.GregTech_API.sBlockCasings4;
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -59,7 +60,7 @@ public class GregtechMetaTileEntity_Adv_Implosion
                 .addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)")
                 .addInfo("Constructed exactly the same as a normal Implosion Compressor")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front center").addCasingInfo("Robust TungstenSteel Casing", 10)
+                .addController("Front center").addCasingInfoMin("Robust TungstenSteel Casing", 10, false)
                 .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1)
                 .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -150,13 +151,13 @@ public class GregtechMetaTileEntity_Adv_Implosion
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 20) {
-            GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(5)), 10, 1.0F, aX, aY, aZ);
+            GT_Utility.doSoundAtClient(new ResourceLocation(getSound()), 10, 1.0F, aX, aY, aZ);
         }
     }
 
     @Override
     public String getSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(5));
+        return SoundResource.RANDOM_EXPLODE.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
index 6ecb7ed08d..d5607ae2e3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
@@ -63,8 +63,8 @@ public class GregtechMetaTileEntity_SteamCompressor
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType(getMachineType()).addInfo("Controller Block for the Steam Compressor")
                 .addInfo("Compresses " + getMaxParallelRecipes() + " things at a time").addSeparator()
-                .beginStructureBlock(3, 3, 4, true).addController("Front center").addCasingInfo(mCasingName, 28)
-                .addOtherStructurePart(TT_steaminputbus, "Any casing", 1)
+                .beginStructureBlock(3, 3, 4, true).addController("Front center")
+                .addCasingInfoMin(mCasingName, 28, false).addOtherStructurePart(TT_steaminputbus, "Any casing", 1)
                 .addOtherStructurePart(TT_steamoutputbus, "Any casing", 1)
                 .addOtherStructurePart(TT_steamhatch, "Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
index eb05973425..ad50d51c3a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
@@ -67,8 +67,8 @@ public class GregtechMetaTileEntity_SteamMacerator
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType(getMachineType()).addInfo("Controller Block for the Steam Macerator")
                 .addInfo("Macerates " + getMaxParallelRecipes() + " ores at a time").addSeparator()
-                .beginStructureBlock(3, 3, 3, true).addController("Front center").addCasingInfo(mCasingName, 14)
-                .addOtherStructurePart(TT_steaminputbus, "Any casing", 1)
+                .beginStructureBlock(3, 3, 3, true).addController("Front center")
+                .addCasingInfoMin(mCasingName, 14, false).addOtherStructurePart(TT_steaminputbus, "Any casing", 1)
                 .addOtherStructurePart(TT_steamoutputbus, "Any casing", 1)
                 .addOtherStructurePart(TT_steamhatch, "Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
index b21ad61e0a..87037e89ae 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
@@ -256,7 +256,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
                 .addInfo("Converts Water & Heat into Steam").addInfo("Explodes if water is not supplied")
                 .addInfo("Consult user manual for more information").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center")
-                .addCasingInfo("Thermal Containment Casings", 10).addInputBus("Any Casing", 1)
+                .addCasingInfoMin("Thermal Containment Casings", 10, false).addInputBus("Any Casing", 1)
                 .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
                 .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
index 890ed018bf..8d970f5492 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
@@ -80,14 +80,16 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
                 .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 8 * Tier").addInfo("Maximum 1x of each bus/hatch.")
                 .addInfo("Does not require both Output Hatch & Bus").addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator().beginStructureBlock(9, 6, 9, true).addController("Top Center")
-                .addCasingInfo("Elemental Confinement Shell", 138).addCasingInfo("Matter Fabricator Casing", 24)
-                .addCasingInfo("Particle Containment Casing", 24).addCasingInfo("Matter Generation Coil", 24)
-                .addCasingInfo("High Voltage Current Capacitor", 20).addCasingInfo("Resonance Chamber III", 24)
-                .addCasingInfo("Modulator III", 16).addOtherStructurePart("Data Orb Repository", "1x", 1)
-                .addInputHatch("Any 1 dot hint", 1).addOutputBus("Any 1 dot hint", 1)
-                .addOutputHatch("Any 1 dot hint", 1).addEnergyHatch("Any 1 dot hint", 1)
-                .addMaintenanceHatch("Any 1 dot hint", 1).addMufflerHatch("Any 1 dot hint", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addCasingInfoMin("Elemental Confinement Shell", 138, false)
+                .addCasingInfoMin("Matter Fabricator Casing", 24, false)
+                .addCasingInfoMin("Particle Containment Casing", 24, false)
+                .addCasingInfoMin("Matter Generation Coil", 24, false)
+                .addCasingInfoMin("High Voltage Current Capacitor", 20, false)
+                .addCasingInfoMin("Resonance Chamber III", 24, false).addCasingInfoMin("Modulator III", 16, false)
+                .addOtherStructurePart("Data Orb Repository", "1x", 1).addInputHatch("Any 1 dot hint", 1)
+                .addOutputBus("Any 1 dot hint", 1).addOutputHatch("Any 1 dot hint", 1)
+                .addEnergyHatch("Any 1 dot hint", 1).addMaintenanceHatch("Any 1 dot hint", 1)
+                .addMufflerHatch("Any 1 dot hint", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
index 1594774b9b..86eb10d2b4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
@@ -24,7 +24,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -70,16 +70,16 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
         tt.addMachineType(getMachineType()).addInfo("Process that milled ore!")
                 .addInfo("You can only ever process one type of material per controller")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 9, 7, true)
-                .addController("Front Center").addCasingInfo("Inconel Reinforced Casing", 68)
-                .addCasingInfo("Flotation Casing", 52).addInputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1)
-                .addOutputHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
+                .addController("Front Center").addCasingInfoMin("Inconel Reinforced Casing", 68, false)
+                .addCasingInfoMin("Flotation Casing", 52, false).addInputBus("Bottom Casing", 1)
+                .addInputHatch("Bottom Casing", 1).addOutputHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
                 .addMaintenanceHatch("Bottom Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(207));
+        return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index e77842cfd5..5ebdb4103b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -91,11 +91,11 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
                 .addInfo("Outputs U233 every 10 seconds, on average, while the reactor is running")
                 .addInfo("Check NEI to see the other 3 outputs - they differ between fuels")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 4, 7, true)
-                .addController("Bottom Center").addCasingInfo("Hastelloy-N Reactor Casing", 27)
-                .addCasingInfo("Zeron-100 Reactor Shielding", 26).addInputHatch("Top or bottom layer edges", 1)
-                .addOutputHatch("Top or bottom layer edges", 1).addDynamoHatch("Top or bottom layer edges", 1)
-                .addMaintenanceHatch("Top or bottom layer edges", 1).addMufflerHatch("Top 3x3", 2)
-                .addStructureInfo("All dynamos must be between EV and LuV tier.")
+                .addController("Bottom Center").addCasingInfoMin("Hastelloy-N Reactor Casing", 27, false)
+                .addCasingInfoMin("Zeron-100 Reactor Shielding", 26, false)
+                .addInputHatch("Top or bottom layer edges", 1).addOutputHatch("Top or bottom layer edges", 1)
+                .addDynamoHatch("Top or bottom layer edges", 1).addMaintenanceHatch("Top or bottom layer edges", 1)
+                .addMufflerHatch("Top 3x3", 2).addStructureInfo("All dynamos must be between EV and LuV tier.")
                 .addStructureInfo("All other hatches must be IV+ tier.")
                 .addStructureInfo("4x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches")
                 .addStructureInfo("2x Maintenance Hatches, 4x Mufflers").toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -298,27 +298,27 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
         // TODO
         if (this.mDynamoHatches != null) {
             for (final GT_MetaTileEntity_Hatch_Dynamo hatch : this.mDynamoHatches) {
-                hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12);
+                hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mMufflerHatches != null) {
             for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) {
-                hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12);
+                hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mOutputHatches != null) {
             for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
-                hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12);
+                hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mInputHatches != null) {
             for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
-                hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12);
+                hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mMaintenanceHatches != null) {
             for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) {
-                hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12);
+                hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         return true;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java
index 55ed8fefb6..1ca346d3c0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java
@@ -72,7 +72,7 @@ public class GregtechMetaTileEntityGeneratorArray
                 .addInfo("Runs supplied generators as if placed in the world")
                 .addInfo("Place up to 16 Single Block GT Generators into the Controller").addSeparator()
                 .beginStructureBlock(3, 3, 3, true).addController("Front center")
-                .addCasingInfo("Robust Tungstensteel Machine Casings", 10).addInputBus("Any casing", 1)
+                .addCasingInfoMin("Robust Tungstensteel Machine Casings", 10, false).addInputBus("Any casing", 1)
                 .addOutputBus("Any casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
                 .addDynamoHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index bb15f52aff..7f7b321ff2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -121,9 +121,10 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                 .addInfo("When fertilizer is supplied, produces saplings instead of logs")
                 .addInfo("Forestry saplings can get increased production")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
-                .addController("Front center").addCasingInfo("Sterile Farm Casing", 8).addInputBus("Any casing", 1)
-                .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
-                .addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front center").addCasingInfoMin("Sterile Farm Casing", 8, false)
+                .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1)
+                .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
index 5941992780..7bc6b0628e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -28,7 +28,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -89,8 +89,8 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
                 .addInfo("Allows Complex GT++ alloys to be created").addInfo("Accepts only one Energy Hatch")
                 .addInfo("Circuit for recipe goes in the Input Bus or GUI slot")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true)
-                .addController("Bottom Center").addCasingInfo("Blast Smelter Casings", 5)
-                .addCasingInfo("Blast Smelter Heat Containment Coils", 16).addInputBus("Any Casing", 1)
+                .addController("Bottom Center").addCasingInfoMin("Blast Smelter Casings", 5, false)
+                .addCasingInfoMin("Blast Smelter Heat Containment Coils", 16, false).addInputBus("Any Casing", 1)
                 .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
                 .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -136,7 +136,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(208));
+        return SoundResource.IC2_MACHINES_INDUCTION_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
index 62a0fc3496..fdc893d9df 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
@@ -28,10 +28,6 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.util.GTPP_Recipe;
@@ -170,10 +166,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
                 .addInfo("Any external casing can be a hatch/bus, unlike Fusion")
                 .addInfo("Cyclotron Machine Casings around Cyclotron Coil Blocks")
                 .addInfo("All Hatches must be IV or better").addPollutionAmount(getPollutionPerSecond(null))
-                .addSeparator().addCasingInfo("Cyclotron Machine Casings", 40).addCasingInfo("Cyclotron Coil", 32)
-                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
-                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
-                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addSeparator().addCasingInfoMin("Cyclotron Machine Casings", 40, false)
+                .addCasingInfoMin("Cyclotron Coil", 32, false).addInputBus("Any Casing", 1)
+                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -361,31 +358,6 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
         return 1;
     }
 
-    @SuppressWarnings("deprecation")
-    public boolean turnCasingActive(final boolean status) {
-        if (this.mEnergyHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) {
-                hatch.mMachineBlock = status ? (byte) 44 : (byte) 44;
-            }
-        }
-        if (this.mOutputHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
-                hatch.mMachineBlock = status ? (byte) 44 : (byte) 44;
-            }
-        }
-        if (this.mInputHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
-                hatch.mMachineBlock = status ? (byte) 44 : (byte) 44;
-            }
-        }
-        if (this.mMaintenanceHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) {
-                hatch.mMachineBlock = status ? (byte) 44 : (byte) 44;
-            }
-        }
-        return true;
-    }
-
     @Override
     public boolean doesBindPlayerInventory() {
         return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
index 4c748f3b80..598c559272 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
@@ -92,9 +92,9 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
                 .addInfo("Circuit 14 for Fish").addInfo("Circuit 15 for Junk").addInfo("Circuit 16 for Treasure")
                 .addInfo("Need to be filled with water.").addInfo("Will automatically fill water from input hatch.")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(9, 3, 9, true)
-                .addController("Front Center").addCasingInfo("Aquatic Casings", 64).addInputBus("Any Casing", 1)
-                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
-                .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+                .addController("Front Center").addCasingInfoMin("Aquatic Casings", 64, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
index 156bcd3294..6d5a049b3c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
@@ -10,7 +10,6 @@ import static gregtech.api.enums.GT_HatchElement.Maintenance;
 import static gregtech.api.enums.GT_HatchElement.Muffler;
 import static gregtech.api.enums.GT_HatchElement.OutputBus;
 import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
@@ -26,9 +25,9 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -80,8 +79,8 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
                 .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8").addInfo("Circuit goes in the GUI slot")
                 .addInfo("1 = cobble, 2 = stone, 3 = obsidian").addInfo("Supply Water/Lava")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true)
-                .addController("Bottom Center").addCasingInfo("Thermal Processing Casing", 9)
-                .addCasingInfo("Thermal Containment Casing", 16).addInputBus("Any Casing", 1)
+                .addController("Bottom Center").addCasingInfoMin("Thermal Processing Casing", 9, false)
+                .addCasingInfoMin("Thermal Containment Casing", 16, false).addInputBus("Any Casing", 1)
                 .addInputHatch("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
                 .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
@@ -131,7 +130,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(208);
+        return SoundResource.IC2_MACHINES_INDUCTION_LOOP.toString();
     }
 
     @Override
@@ -154,7 +153,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
             "gt.recipe.fakerockbreaker",
             "Rock Breaker",
             "smelting",
-            RES_PATH_GUI + "basicmachines/E_Furnace",
+            "",
             1,
             1,
             0,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
index 4391bbd888..841d112156 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
@@ -109,9 +109,10 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends
                 .addInfo("- 50% of max fuel efficiency at 69k or 207k EU/t output energy")
                 .addInfo("- 25% of max fuel efficiency at 98k or 294k EU/t output energy")
                 .addInfo("formula: x = input of energy (30000^(1/3)/ x^(1/3)) * (80000^(1/3)/ x^(1/3))").addSeparator()
-                .beginStructureBlock(3, 3, 10, false).addController("Front Center").addCasingInfo(mCasingName, 64)
-                .addCasingInfo(mGearboxName, 8).addStructureHint("Air Intake Hatch", 1)
-                .addInputBus("Side center line", 1).addInputHatch("Side center line", 1)
+                .beginStructureBlock(3, 3, 10, false).addController("Front Center")
+                .addCasingInfoMin(mCasingName, 64, false).addCasingInfoMin(mGearboxName, 8, false)
+                .addStructureHint("Air Intake Hatch", 1).addInputBus("Side center line", 1)
+                .addInputHatch("Side center line", 1)
                 .addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1)
                 .addDynamoHatch("Top center line", 2).addMufflerHatch("Back Center", 3)
                 .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
index 88becb055b..32f18d5841 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
@@ -67,10 +67,11 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
                 .addInfo("Default: Produces 2048EU/t at 100% efficiency")
                 .addInfo("Boosted: Produces 6144EU/t at 150% efficiency")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false)
-                .addController("Front Center").addCasingInfo("Stable Titanium Machine Casing", 16)
-                .addCasingInfo("Steel Gear Box Machine Casing", 2).addCasingInfo("Engine Intake Machine Casing", 8)
-                .addInputHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .addDynamoHatch("Back Center", 2).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin("Stable Titanium Machine Casing", 16, false)
+                .addCasingInfoMin("Steel Gear Box Machine Casing", 2, false)
+                .addCasingInfoMin("Engine Intake Machine Casing", 8, false).addInputHatch("Any Casing", 1)
+                .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1).addDynamoHatch("Back Center", 2)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
index 8e161656f4..03e3ed1928 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
@@ -112,11 +112,11 @@ public class GregtechMetaTileEntity_MassFabricator
                 .addInfo("Speed: +0% | EU Usage: 80%").addInfo("Parallel: Scrap = 64 | UU = 8 * Tier")
                 .addInfo("Produces UU-A, UU-M & Scrap").addInfo("Change mode with screwdriver")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 4, 5, true)
-                .addController("Front Center").addCasingInfo(mCasingName3, 9).addCasingInfo(mCasingName2, 24)
-                .addCasingInfo(mCasingName1, 40).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
-                .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
-                .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
-                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin(mCasingName3, 9, false)
+                .addCasingInfoMin(mCasingName2, 24, false).addCasingInfoMin(mCasingName1, 40, false)
+                .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+                .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
index 767228fc20..e8f2819368 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
@@ -44,7 +44,6 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TAE;
@@ -261,11 +260,13 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
                 .addInfo("Pulse Manipulators: Recipe Tier Allowed (check NEI for the tier of each recipe)")
                 .addInfo("Shielding Cores: Focusing Tier (equal to or higher than recipe tier to allow focus)")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(15, 21, 15, true)
-                .addController("Bottom Center").addCasingInfo("Bulk Production Frame", 80)
-                .addCasingInfo("Quantum Force Conductor", 177).addCasingInfo("Force Field Glass", 224)
-                .addCasingInfo("Neutron Pulse Manipulators", 233).addCasingInfo("Neutron Shielding Cores", 142)
-                .addInputBus("Bottom Layer", 4).addInputHatch("Bottom Layer", 4).addOutputHatch("Top Layer", 5)
-                .addOutputBus("Top Layer", 5).addEnergyHatch("Bottom Layer", 4).addMaintenanceHatch("Bottom Layer", 4)
+                .addController("Bottom Center").addCasingInfoMin("Bulk Production Frame", 80, false)
+                .addCasingInfoMin("Quantum Force Conductor", 177, false)
+                .addCasingInfoMin("Force Field Glass", 224, false)
+                .addCasingInfoMin("Neutron Pulse Manipulators", 233, false)
+                .addCasingInfoMin("Neutron Shielding Cores", 142, false).addInputBus("Bottom Layer", 4)
+                .addInputHatch("Bottom Layer", 4).addOutputHatch("Top Layer", 5).addOutputBus("Top Layer", 5)
+                .addEnergyHatch("Bottom Layer", 4).addMaintenanceHatch("Bottom Layer", 4)
                 .addStructureInfo("Neptunium Plasma Hatch: Left side of Controller")
                 .addStructureInfo("Fermium Plasma Hatch: Right side of Controller").toolTipFinisher(
                         GT_Values.AuthorBlueWeabo + EnumChatFormatting.RESET
@@ -405,10 +406,6 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
         return mFocusingTier;
     }
 
-    public String getSound() {
-        return GregTech_API.sSoundList.get(208);
-    }
-
     protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
index 64d4a12df6..b3aa2ad34b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
@@ -63,9 +63,10 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
                 .addInfo("Only one Energy Hatch is allowed per Processing Unit")
                 .addInfo("All recipe times in this multi are very long, watch out!")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 9, 3, false)
-                .addController("Bottom Center").addCasingInfo("Hastelloy-X Structural Block", 7)
-                .addCasingInfo("Incoloy-DS Fluid Containment Block", 5).addCasingInfo("Zeron-100 Reactor Shielding", 4)
-                .addCasingInfo("Hastelloy-N Sealant Blocks", 17).addInputHatch("Base platform", 1)
+                .addController("Bottom Center").addCasingInfoMin("Hastelloy-X Structural Block", 7, false)
+                .addCasingInfoMin("Incoloy-DS Fluid Containment Block", 5, false)
+                .addCasingInfoMin("Zeron-100 Reactor Shielding", 4, false)
+                .addCasingInfoMin("Hastelloy-N Sealant Blocks", 17, false).addInputHatch("Base platform", 1)
                 .addOutputHatch("Base platform", 1).addOutputBus("Base platform", 1).addMufflerHatch("Base platform", 1)
                 .addMaintenanceHatch("Base platform", 1).addEnergyHatch("Base platform", 1)
                 .addStructureInfo("Muffler's Tier must be IV+")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
index 24e0d6acd5..af7a7591e1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
@@ -24,7 +24,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -94,10 +94,12 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
                 .addInfo("Total number of reflectors based on how many rings are built:")
                 .addInfo("1 ring = 36, 2 rings = 88, 3 rings = 156, 4 rings = 240, 5 rings = 340").addSeparator()
                 .beginVariableStructureBlock(15, 31, 28, 28, 15, 31, false).addController("Top Middle")
-                .addCasingInfo("Structural Solar Casing", 229).addCasingInfo("Thermally Insulated Casing", 60)
-                .addCasingInfo("Salt Containment Casing", 66).addCasingInfo("Thermal Containment Casing", 60)
-                .addInputHatch("Any 2 dot hint(min 1)", 2).addOutputHatch("Any 2 dot hint(min 1)", 2)
-                .addMaintenanceHatch("Any 2 dot hint", 2).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addCasingInfoMin("Structural Solar Casing", 229, false)
+                .addCasingInfoMin("Thermally Insulated Casing", 60, false)
+                .addCasingInfoMin("Salt Containment Casing", 66, false)
+                .addCasingInfoMin("Thermal Containment Casing", 60, false).addInputHatch("Any 2 dot hint(min 1)", 2)
+                .addOutputHatch("Any 2 dot hint(min 1)", 2).addMaintenanceHatch("Any 2 dot hint", 2)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -398,7 +400,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(212));
+        return SoundResource.IC2_MACHINES_MAGNETIZER_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
index 7807f9130f..a175a2681b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
@@ -21,6 +21,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -84,9 +85,10 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
                 .addInfo("All Buses/Hatches must, at least, match the tier of the Casings")
                 .addInfo("Fill Input Hatch with Water to fill the inside of the multiblock.")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(9, 3, 9, true)
-                .addController("Front Center").addCasingInfo("Machine Casings", 64)
-                .addCasingInfo("Sterile Farm Casings", 64).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
-                .addInputHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+                .addController("Front Center").addCasingInfoMin("Machine Casings", 64, true)
+                .addCasingInfoMin("Sterile Farm Casings", 64, false).addInputBus("Any Casing", 1)
+                .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+                .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -161,7 +163,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(207));
+        return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index 0c21e1f838..4334c8675c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -36,6 +36,7 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.HeatingCoilLevel;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -428,7 +429,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
 
     @Override
     public String getSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(207));
+        return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
index 6c28b2defc..90a4016f2f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
@@ -103,7 +103,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends
                 .addInfo("XL Steam Turbines can use Loose Mode with either Slow or Fast Mode")
                 .addPollutionAmount(getPollutionPerSecond(null)).addInfo("Pollution is 3x higher in Fast Mode")
                 .addSeparator().beginStructureBlock(7, 9, 7, false).addController("Top Middle")
-                .addCasingInfo(getCasingName(), 360).addCasingInfo("Rotor Shaft", 30)
+                .addCasingInfoMin(getCasingName(), 360, false).addCasingInfoMin("Rotor Shaft", 30, false)
                 .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1).addInputBus("Any 4 dot hint (min 1)", 4)
                 .addInputHatch("Any 4 dot hint(min 1)", 4);
         if (requiresOutputHatch()) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 7114bed42f..9596aebcd7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -127,7 +127,7 @@ public class GregtechMetaTileEntity_PowerSubStationController
                 .addInfo("Hatches can be placed nearly anywhere")
                 .addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use")
                 .addInfo("Supports voltages >= UHV using MAX tier components.").addSeparator()
-                .addController("Bottom Center").addCasingInfo("Sub-Station External Casings", 10)
+                .addController("Bottom Center").addCasingInfoMin("Sub-Station External Casings", 10, false)
                 .addDynamoHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
                 .addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier")
                 .addSubChannelUsage("height", "Height of structure").toolTipFinisher(CORE.GT_Tooltip_Builder.get());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
index 0a3736bee4..720fcbffff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
@@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -29,14 +31,14 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public TileEntitySolarHeater(final String aName, final int aTier, final String aDescription,
+    public TileEntitySolarHeater(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "Point me at a Solar Tower", CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -115,7 +117,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescription, this.mTextures, 0);
+        return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
index 3a070ec781..5b103191f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
@@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
@@ -25,11 +27,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String aDescription,
-            ITexture[][][] aTextures) {
-        super(aName, aTier, aInvSlotCount, aDescription, aTextures);
-    }
-
     public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
             ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
@@ -109,6 +106,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, CORE.GT_Tooltip.get() };
+        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
index f76154b1c6..2b3ec158d8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
@@ -34,14 +34,14 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
                 "Right-click with Screwdriver to change Button Design");
     }
 
-    public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String aDescription,
+    public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, 5, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescription, this.mTextures);
+        return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
index 933e7f1b75..8fa38ac694 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
@@ -40,6 +40,7 @@ import gregtech.api.util.GT_CircuitryBehavior;
 import gregtech.api.util.GT_CoverBehavior;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
+import gregtech.api.util.ISerializableObject;
 import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -53,14 +54,14 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
         super(aID, "redstone.circuit", "Redstone Circuit Block", 1, 5, "Computes Redstone");
     }
 
-    public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String aDescription,
+    public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, 1, 5, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescription, this.mTextures);
+        return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -395,7 +396,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public GT_CoverBehavior getCover(ForgeDirection side) {
-        return getBaseMetaTileEntity().getCoverBehaviorAtSide(side);
+        return (GT_CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side);
     }
 
     @Override
@@ -405,7 +406,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public int getCoverVariable(ForgeDirection side) {
-        return getBaseMetaTileEntity().getCoverDataAtSide(side);
+        return ((ISerializableObject.LegacyCoverData) getBaseMetaTileEntity().getComplexCoverDataAtSide(side)).get();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
index 1180ffe6b9..5a97a6da90 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
@@ -24,13 +24,13 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
         super(aID, "redstone.lamp", "Redstone Controlled Lamp", 0, 0, "Redstone Controlled Lamp");
     }
 
-    public GT_MetaTileEntity_RedstoneLamp(final String aName, String aDescription, final ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_RedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 0, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescription, this.mTextures);
+        return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
index 681cc9278f..c69ccf9181 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
@@ -27,14 +27,14 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
         super(aID, aUnlocal, aLocal, 5, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String aDescription,
+    public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, 5, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescription, this.mTextures);
+        return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
index 00c2d9cc9a..bf794650ec 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
@@ -25,14 +25,14 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
         super(aID, "redstone.display.scale", "Redstone Scale", "Redstone Strength on a Scale");
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String aDescription,
+    public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescription, this.mTextures);
+        return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
index 6fba128833..5927f08ca9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
@@ -12,6 +12,8 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
@@ -54,7 +56,7 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
         mLocalName = aNameRegional;
     }
 
-    public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, 35, aDescription, aTextures);
     }
@@ -136,7 +138,11 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AdvancedCraftingTable(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_AdvancedCraftingTable(
+                this.mName,
+                this.mTier,
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
     @Override
@@ -470,8 +476,11 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
 
     @Override
     public String[] getDescription() {
-        return new String[] { isAdvanced() ? "For the very large Projects" : "For the smaller Projects",
-                "Hold Shift in GUI to see slot usage", this.mDescription, CORE.GT_Tooltip.get() };
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
+                isAdvanced() ? "For the very large Projects" : "For the smaller Projects",
+                "Hold Shift in GUI to see slot usage",
+                CORE.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java
index 8899827aac..e4fdb869ab 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java
@@ -21,7 +21,7 @@ public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_Adv
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
@@ -38,13 +38,16 @@ public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_Adv
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BronzeCraftingTable(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_BronzeCraftingTable(
+                this.mName,
+                this.mTier,
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
-        return GregTech_API.getCoverBehavior(aStack.toStack()).isSimpleCover();
+        return GregTech_API.getCoverBehaviorNew(aStack.toStack()).isSimpleCover();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
index b3aac7b33e..9a073e9e30 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
@@ -80,13 +80,14 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
                 new ITexture[0]);
     }
 
-    public GT_MetaTileEntity_ConnectableCrate(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_ConnectableCrate(String aName, int aTier, String[] aDescription,
+            ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, CORE.GT_Tooltip.get() };
+        return org.apache.commons.lang3.ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -110,7 +111,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ConnectableCrate(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_ConnectableCrate(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     public int getOppositeSide(int side) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
index fa4ee205ae..f0c91ec34f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
@@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
@@ -40,18 +42,13 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
                 new ITexture[0]);
     }
 
-    public GT_MetaTileEntity_TieredChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    /*
-     * public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
-     * super(aName, aTier, 3, aDescription, aTextures); }
-     */
-
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, CORE.GT_Tooltip.get() };
+        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -75,7 +72,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index 82f43aab1b..6c263b6836 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -30,24 +32,20 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
         super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid");
     }
 
-    public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String aDescription,
+    public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String[] aDescription,
             final ITexture[][][] aTextures) {
-        super(aName, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid", aTextures);
+        super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        String[] aTip;
-
-        String aTankPortableness = "portable";
-
-        if (this.mFluid == null) {
-            aTip = new String[] { this.mDescription, "A " + aTankPortableness + " tank.", CORE.GT_Tooltip.get() };
-        } else {
-            aTip = new String[] { this.mDescription, "A " + aTankPortableness + " tank.",
-                    "Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L", CORE.GT_Tooltip.get() };
+        List<String> description = new ArrayList<>(Arrays.asList(this.mDescriptionArray));
+        description.add("A portable tank.");
+        if (this.mFluid != null) {
+            description.add("Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L");
         }
-        return aTip;
+        description.add(CORE.GT_Tooltip.get());
+        return description.toArray(new String[0]);
     }
 
     @Override
@@ -144,7 +142,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TieredTank(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_TieredTank(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
index bc9964301d..7d87d186b5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
@@ -131,34 +131,6 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
                 new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
-    /*
-     * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new
-     * ITexture[2][17][]; for (byte i = -1; i < 16; i++) { rTextures[0][i + 1] = new ITexture[] { new
-     * GT_RenderedTexture( Textures.BlockIcons.MACHINE_HEATPROOFCASING) }; rTextures[1][i + 1] = new ITexture[] { new
-     * GT_RenderedTexture( Textures.BlockIcons.MACHINE_HEATPROOFCASING), mInventory.length > 4 ?
-     * Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; } return
-     * rTextures; }
-     */
-
-    /*
-     * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new
-     * ITexture[5][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture(
-     * Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] =
-     * tmp0; ITexture[] tmp1 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) }; rTextures[1][(i + 1)]
-     * = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
-     * Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i + 1)] = tmp2;
-     * ITexture[] tmp4 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
-     * Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i + 1)] = tmp4;
-     * ITexture[] tmp5 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
-     * Dyes._NULL.mRGBa)), new GT_RenderedTexture( Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] =
-     * tmp5; } return rTextures; }
-     */
-
-    /*
-     * @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte
-     * aColorIndex, boolean aActive, boolean aRedstone) { return mTextures[side == facing ? 1 : 0][aColorIndex+1]; }
-     */
-
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
         return new GregtechMetaEnergyBuffer(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
index 7f70731e3c..9e7b7d03e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
@@ -24,19 +26,14 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase implements
         super(aID, aName, aNameRegional, aTier, 28, "Protecting your items from sticky fingers.");
     }
 
-    public GregtechMetaSafeBlock(final int aID, final String aName, final String aNameRegional, final int aTier,
-            final int aInvSlotCount, final String aDescription) {
-        super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
-    }
-
     public GregtechMetaSafeBlock(final String aName, final int aTier, final int aInvSlotCount,
-            final String aDescription, final ITexture[][][] aTextures) {
+            final String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, CORE.GT_Tooltip.get() };
+        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
     }
 
     @Override
@@ -45,7 +42,7 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase implements
                 this.mName,
                 this.mTier,
                 this.mInventory.length,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures);
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
index 2e8c438221..53892cd841 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
@@ -7,7 +7,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
@@ -18,17 +17,12 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String aDescription,
+    public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String[] aDescription,
             ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
-    public String[] getDescription() {
-        return new String[] { this.mDescription, CORE.GT_Tooltip.get() };
-    }
-
-    @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.getWorld().isRemote) {
             return false;
@@ -92,6 +86,6 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_InfiniteItemHolder(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_InfiniteItemHolder(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
index 1fa208ae98..aeea5b33e8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
@@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -24,7 +26,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIco
 public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
 
     public byte mType = 0;
-    public String mOldDesc = "";
     public boolean mLocked = false;
     protected byte mIndex = (byte) MathUtils.randInt(1, 3);
     public static GT_RenderedTexture texBottom = new GT_RenderedTexture(
@@ -36,12 +37,10 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
 
     public GT4Entity_Shelf(final int aID, final String aName, final String aNameRegional, final String aDescription) {
         super(aID, aName, aNameRegional, 0, aDescription);
-        mOldDesc = aDescription;
     }
 
-    public GT4Entity_Shelf(final String aName, final String aDescription, final ITexture[][][] aTextures) {
+    public GT4Entity_Shelf(final String aName, final String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 0, aDescription, aTextures);
-        mOldDesc = aDescription;
     }
 
     @Override
@@ -49,10 +48,6 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
         return true;
     }
 
-    public int getInvSize() {
-        return 1;
-    }
-
     @Override
     public boolean isFacingValid(ForgeDirection facing) {
         return facing.offsetY == 0;
@@ -178,7 +173,7 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_Shelf(this.mName, this.mDescription, this.mTextures);
+        return new GT4Entity_Shelf(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -213,8 +208,12 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
 
     @Override
     public String[] getDescription() {
-        return new String[] { mOldDesc, "Decorative Item Storage", "Right click to store/remove something",
-                "Ctrl + Rmb to check contents", "Ctrl + Rmb with a screwdriver to lock", };
+        return ArrayUtils.addAll(
+                mDescriptionArray,
+                "Decorative Item Storage",
+                "Right click to store/remove something",
+                "Ctrl + Rmb to check contents",
+                "Ctrl + Rmb with a screwdriver to lock");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
index 6167bcede9..fec96cbdd4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
@@ -16,13 +16,13 @@ public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf {
         super(aID, aName, aNameRegional, aDescription);
     }
 
-    public GT4Entity_Shelf_Compartment(String mName, String mDescriptionArray, ITexture[][][] mTextures) {
+    public GT4Entity_Shelf_Compartment(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
         super(mName, mDescriptionArray, mTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_Shelf_Compartment(this.mName, this.mDescription, this.mTextures);
+        return new GT4Entity_Shelf_Compartment(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
index b8bc4bf427..e486292995 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
@@ -13,13 +13,13 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
         super(aID, aName, aNameRegional, aDescription);
     }
 
-    public GT4Entity_Shelf_Desk(String mName, String mDescriptionArray, ITexture[][][] mTextures) {
+    public GT4Entity_Shelf_Desk(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
         super(mName, mDescriptionArray, mTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_Shelf_Desk(this.mName, this.mDescription, this.mTextures);
+        return new GT4Entity_Shelf_Desk(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
index 502bb62b1f..60fc4d511e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
@@ -16,7 +16,7 @@ public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf {
         super(aID, aName, aNameRegional, aDescription);
     }
 
-    public GT4Entity_Shelf_FileCabinet(String mName, String mDescriptionArray, ITexture[][][] mTextures) {
+    public GT4Entity_Shelf_FileCabinet(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
         super(mName, mDescriptionArray, mTextures);
     }
 
@@ -30,7 +30,7 @@ public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescription, this.mTextures);
+        return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
index 22f8aaf769..e870113951 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
@@ -11,13 +11,13 @@ public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf {
         super(aID, aName, aNameRegional, aDescription);
     }
 
-    public GT4Entity_Shelf_Iron(String mName, String mDescriptionArray, ITexture[][][] mTextures) {
+    public GT4Entity_Shelf_Iron(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
         super(mName, mDescriptionArray, mTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_Shelf_Iron(this.mName, this.mDescription, this.mTextures);
+        return new GT4Entity_Shelf_Iron(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
index 17464c5333..c2fd2674d8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
@@ -36,7 +36,7 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
         this.mItemStack = null;
     }
 
-    public GT4Entity_Shelf_Large(String mName, String mDescriptionArray, final int aSize, ITexture[][][] mTextures) {
+    public GT4Entity_Shelf_Large(String mName, String[] mDescriptionArray, final int aSize, ITexture[][][] mTextures) {
         super(mName, mDescriptionArray, mTextures);
         this.mSize = aSize;
         this.mItemCount = 0;
@@ -45,13 +45,9 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_Shelf_Large(this.mName, this.mDescription, mSize, this.mTextures);
+        return new GT4Entity_Shelf_Large(this.mName, this.mDescriptionArray, mSize, this.mTextures);
     }
 
-    /*
-     * @Override public int getInvSize() { return (mSize > 0 && mSize < 255 ? mSize : 255); }
-     */
-
     @Override
     public boolean isGivingInformation() {
         return true;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
index 8fb3cd9886..357cd74cbc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
@@ -16,8 +16,8 @@ import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
@@ -80,17 +80,12 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
 
     @Override
     public String getCraftingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(1));
+        return SoundResource.RANDOM_ANVIL_USE.toString();
     }
 
     @Override
     public String getEntityHitSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(2));
-    }
-
-    @Override
-    public String getBreakingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return SoundResource.RANDOM_ANVIL_BREAK.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
index a1d424c618..be943cd398 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
@@ -18,7 +18,7 @@ import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.util.GT_Recipe;
@@ -82,17 +82,12 @@ public class TOOL_Gregtech_Choocher extends GT_Tool {
 
     @Override
     public String getCraftingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(1));
+        return SoundResource.RANDOM_ANVIL_USE.toString();
     }
 
     @Override
     public String getEntityHitSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(2));
-    }
-
-    @Override
-    public String getBreakingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return SoundResource.RANDOM_ANVIL_BREAK.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
index c7e978e5bc..dbae822abd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
@@ -16,8 +16,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
@@ -80,17 +80,12 @@ public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool {
 
     @Override
     public String getCraftingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(1));
+        return SoundResource.RANDOM_ANVIL_USE.toString();
     }
 
     @Override
     public String getEntityHitSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(2));
-    }
-
-    @Override
-    public String getBreakingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return SoundResource.RANDOM_ANVIL_BREAK.toString();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
index e464c41abe..46720bb4f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
@@ -15,8 +15,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
@@ -79,17 +79,12 @@ public class TOOL_Gregtech_ElectricLighter extends GT_Tool {
 
     @Override
     public String getCraftingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(1));
+        return SoundResource.RANDOM_ANVIL_USE.toString();
     }
 
     @Override
     public String getEntityHitSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(2));
-    }
-
-    @Override
-    public String getBreakingSound() {
-        return GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return SoundResource.RANDOM_ANVIL_BREAK.toString();
     }
 
     @Override