make almost all hardcoded items localizable (#521)

* make almost all hardcoded items localizable

* sa

62 files changed, 384 insertions, 548 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index 4f8ac3b4e7..975ddd3d0f 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -13,7 +13,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
@@ -34,7 +33,6 @@ public class BlockSuperLight extends BlockContainer {
         this.setBlockName("blockSuperLight");
         this.setCreativeTab(CreativeTabs.tabRedstone);
         GameRegistry.registerBlock(this, "blockSuperLight");
-        LanguageRegistry.addName(this, "Shining Star");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index e0feb70497..6a92c92453 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -13,7 +13,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -37,7 +36,6 @@ public class BlockTankXpConverter extends BlockContainer {
         this.setBlockName("blockTankXpConverter");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, ItemBlockEntityBase.class, "blockTankXpConverter");
-        LanguageRegistry.addName(this, "Xp Converter");
         this.generateRainbowMap();
         if (!this.getTickRandomly()) {
             this.setTickRandomly(true);
diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
index 0ac8f240c1..6c93fdf2cf 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
@@ -18,7 +18,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.block.base.BasicBlock;
@@ -40,7 +39,6 @@ public class FirePit extends BasicBlock {
         this.setResistance(35.0F);
         this.setStepSound(Block.soundTypeWood);
         GameRegistry.registerBlock(this, "blockFirePit");
-        LanguageRegistry.addName(this, "Fire Pit");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
index 4942d9555c..235b7db07a 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
@@ -21,7 +21,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.google.common.collect.Maps;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.random.XSTR;
@@ -48,7 +47,6 @@ public class HellFire extends BlockFire {
         this.setBlockName("blockHellFire");
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         GameRegistry.registerBlock(this, "blockHellFire");
-        LanguageRegistry.addName(this, "Hellish Fire");
         this.enableBrutalFire();
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
index b254caadf3..8dfe5eb367 100644
--- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
@@ -15,7 +15,6 @@ import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -33,7 +32,6 @@ public class MiningExplosives extends BlockTNT {
     public MiningExplosives() {
         this.setBlockName("blockMiningExplosives");
         GameRegistry.registerBlock(this, "blockMiningExplosives");
-        LanguageRegistry.addName(this, "Earth Blasting Explosives");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index b25b24302f..5f353f2590 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -11,7 +11,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
@@ -37,7 +36,6 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
     @SuppressWarnings("deprecation")
     public CircuitProgrammer() {
         super(Material.iron);
-        LanguageRegistry.addName(this, "Circuit Programmer");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
index 7ca23df3f9..28690e7972 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
@@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -58,7 +57,6 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
         this.setHardness(5f);
         this.setResistance(1f);
         GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockDecayablesChest");
-        LanguageRegistry.addName(this, "Lead Lined Box");
         this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
index f4de81cbd4..7cc444e7d0 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
@@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -57,7 +56,6 @@ public class EggBox extends BlockContainer implements ITileTooltip {
         this.setHardness(5f);
         this.setResistance(1f);
         GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockEggBox");
-        LanguageRegistry.addName(this, "Egg Box");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
index 5571a4eb41..f016681b77 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -54,7 +53,6 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
         this.setResistance(1f);
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockFishTrap");
-        LanguageRegistry.addName(this, "Fish Catcher");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
index 8eaa331c12..610c7307f6 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
@@ -9,7 +9,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -34,7 +33,6 @@ public class HeliumGenerator extends BlockContainer {
         this.setBlockName("blockHeliumGenerator");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, "blockHeliumGenerator");
-        LanguageRegistry.addName(this, "Helium Generator");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
index 14c54b1040..0d6ed29e78 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
@@ -11,7 +11,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -49,7 +48,6 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool
         this.setBlockName("blockModularity");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockModularity");
-        LanguageRegistry.addName(this, "Modularity Configurator");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
index 895bc8847f..4058196e21 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
@@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -55,7 +54,6 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
         this.setResistance(1f);
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockPestKiller");
-        LanguageRegistry.addName(this, "Pest Killer");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index 1f0f03f0f0..c334802f21 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -13,7 +13,6 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
@@ -56,7 +55,6 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
         this.setBlockName("blockProjectBench");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockProjectBench");
-        LanguageRegistry.addName(this, "Project Workbench");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
index b79edd3fd9..5dcba9131c 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
@@ -16,7 +16,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.util.GT_Utility;
@@ -40,7 +39,6 @@ public class Machine_SuperJukebox extends BlockJukebox {
         setStepSound(soundTypePiston);
         setBlockTextureName("jukebox");
         GameRegistry.registerBlock(this, "blockSuperJukebox");
-        LanguageRegistry.addName(this, "Sir Mixalot [Jukebox]");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
index a25dd12e83..5619e55739 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
@@ -12,7 +12,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
@@ -44,7 +43,6 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
     @SuppressWarnings("deprecation")
     public VolumetricFlaskSetter() {
         super(Material.iron);
-        LanguageRegistry.addName(this, "Volumetric Flask Configurator");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 9c843943a4..e9bb6e1bf6 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -722,8 +722,8 @@ public final class ModItems {
         shardDull = new BaseItemTCShard(
                 "Drained",
                 Utils.rgbtoHexValue(75, 75, 75),
-                "Can be infused to create a magical shard.",
-                "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt.");
+                new String[] { "Can be infused to create a magical shard.",
+                        "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt." });
 
         // Generates four elemental shards when TC is not installed.
         if (!LoadedMods.Thaumcraft) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
index 154c1652ce..2b057ae416 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
@@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -101,12 +102,9 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
     public void registerItem(final int id, final String localizedName, final long euStorage, final short tier,
             final String description, final EnumRarity regRarity, final EnumChatFormatting colour,
             final boolean Effect) {
-        this.addItem(id, localizedName, EnumChatFormatting.YELLOW + "Electric", new Object[] {});
+        this.addItem(id, localizedName, colour + description, new Object[] {});
         this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true);
         this.rarity.add(new Pair<>(id, regRarity));
-        this.itemName.add(new Pair<>(id, localizedName));
-        this.itemDescription.add(new Pair<>(id, description));
-        this.descColour.add(new Pair<>(id, colour));
         this.hasEffect.add(new Pair<>(id, Effect));
     }
 
@@ -131,40 +129,34 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
     @Override
     public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) {
         // aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
-        if ((this.descColour.get(aStack.getItemDamage() - this.mOffset) != null)
-                && (this.itemDescription.get(aStack.getItemDamage() - this.mOffset) != null)) {
-            aList.add(
-                    this.descColour.get(aStack.getItemDamage() - this.mOffset).getValue()
-                            + this.itemDescription.get(aStack.getItemDamage() - this.mOffset).getValue());
-        }
-        final String tKey = this.getUnlocalizedName(aStack) + ".tooltip",
+        int keyValue = aStack.getItemDamage() - this.mOffset;
+        final String tKey = "gtplusplus." + this.getUnlocalizedName(aStack) + "." + keyValue + ".tooltip",
                 tString = GT_LanguageManager.getTranslation(tKey);
         if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) {
             aList.add(tString);
         }
+        aList.add(StatCollector.translateToLocal("item.itemBaseEuItem.tooltip.0"));
         final Long[] tStats = this.getElectricStats(aStack);
         if (tStats != null) {
             if (tStats[3] > 0) {
                 aList.add(
-                        EnumChatFormatting.AQUA + "Contains "
-                                + GT_Utility.formatNumbers(tStats[3])
-                                + " EU   Tier: "
-                                + (tStats[2] >= 0 ? tStats[2] : 0)
-                                + EnumChatFormatting.GRAY);
+                        EnumChatFormatting.AQUA + StatCollector.translateToLocalFormatted(
+                                "item.itemBaseEuItem.tooltip.1",
+                                GT_Utility.formatNumbers(tStats[3]),
+                                (tStats[2] >= 0 ? tStats[2] : 0)) + EnumChatFormatting.GRAY);
             } else {
                 final long tCharge = this.getRealCharge(aStack);
                 if ((tStats[3] == -2) && (tCharge <= 0)) {
                     aList.add(
-                            EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
+                            EnumChatFormatting.AQUA + StatCollector.translateToLocal("item.itemBaseEuItem.tooltip.2")
                                     + EnumChatFormatting.GRAY);
                 } else {
                     aList.add(
-                            EnumChatFormatting.AQUA + ""
-                                    + GT_Utility.formatNumbers(tCharge)
-                                    + " / "
-                                    + GT_Utility.formatNumbers(Math.abs(tStats[0]))
-                                    + " EU - Voltage: "
-                                    + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
+                            EnumChatFormatting.AQUA + StatCollector.translateToLocalFormatted(
+                                    "item.itemBaseEuItem.tooltip.3",
+                                    GT_Utility.formatNumbers(tCharge),
+                                    GT_Utility.formatNumbers(Math.abs(tStats[0])),
+                                    V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)])
                                     + EnumChatFormatting.GRAY);
                 }
             }
@@ -561,8 +553,12 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
             final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID);
             this.mEnabledItems.set(aID);
             this.mVisibleItems.set(aID);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip);
+            GT_LanguageManager.addStringLocalization(
+                    "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".name",
+                    aEnglish);
+            GT_LanguageManager.addStringLocalization(
+                    "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".tooltip",
+                    aToolTip);
             final List<TC_AspectStack> tAspects = new ArrayList<>();
             // Important Stuff to do first
             for (final Object tRandomData : aRandomData) {
@@ -621,9 +617,10 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
     @Override
     public String getItemStackDisplayName(final ItemStack par1ItemStack) {
         int keyValue = (par1ItemStack.getItemDamage() - this.mOffset);
-        if (keyValue < 0 || keyValue > 3) {
+        if (keyValue < 0 || keyValue > 5) {
             keyValue = 0;
         }
-        return this.itemName.get(keyValue).getValue();
+        return GT_LanguageManager
+                .getTranslation("gtplusplus." + this.getUnlocalizedName(par1ItemStack) + "." + keyValue + ".name");
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java
index 27f7d51bbd..ef27a4fa02 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java
@@ -67,18 +67,6 @@ public class BaseItemBackpack extends Item {
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-        // Name Formatting.
-        String temp = this.unlocalName.replace("backpack", "");
-        // Lets find the colour.
-        if (temp.toLowerCase().contains("dark")) {
-            temp = this.unlocalName.substring(12, this.unlocalName.length());
-            temp = "Dark " + temp;
-        }
-        return (temp + " Backpack");
-    }
-
-    @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(final IIconRegister iconRegister) {
         this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemBackpack");
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
index 9e5a995a80..5b935d8234 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
@@ -12,14 +12,13 @@ import net.minecraft.util.EnumChatFormatting;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.core.lib.CORE;
 
 public class BaseItemColourable extends Item {
 
     private final EnumRarity rarity;
     private final EnumChatFormatting descColour;
-    private final String itemDescription;
-    protected String itemName;
     private final boolean hasEffect;
     public final int componentColour;
 
@@ -42,7 +41,7 @@ public class BaseItemColourable extends Item {
         this.setMaxDamage(maxDmg);
         this.setHasSubtypes(true);
         this.rarity = regRarity;
-        this.itemDescription = description;
+        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description);
         this.descColour = colour;
         this.hasEffect = Effect;
         this.componentColour = rgb;
@@ -57,13 +56,13 @@ public class BaseItemColourable extends Item {
             final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity,
             final EnumChatFormatting colour, final boolean Effect, int rgb) {
         this.setUnlocalizedName(unlocalizedName);
-        this.itemName = displayName;
+        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName);
         this.setTextureName(CORE.MODID + ":" + unlocalizedName);
         this.setCreativeTab(creativeTab);
         this.setMaxStackSize(stackSize);
         this.setMaxDamage(maxDmg);
         this.rarity = regRarity;
-        this.itemDescription = description;
+        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description);
         this.descColour = colour;
         this.hasEffect = Effect;
         this.componentColour = rgb;
@@ -73,7 +72,9 @@ public class BaseItemColourable extends Item {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        list.add(this.descColour + this.itemDescription);
+        list.add(
+                this.descColour
+                        + GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip"));
         // super.addInformation(stack, aPlayer, list, bool);
     }
 
@@ -90,9 +91,9 @@ public class BaseItemColourable extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        if ((this.itemName == null) || this.itemName.equals("")) {
-            return super.getItemStackDisplayName(tItem);
-        }
-        return this.itemName;
+        if (!("gtplusplus." + this.getUnlocalizedName() + ".name")
+                .equals(GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) {
+            return GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name");
+        } else return super.getItemStackDisplayName(tItem);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 414a280f3d..ec1fc44e76 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -126,16 +126,7 @@ public class BaseItemComponent extends Item {
                 ItemUtils.getSimpleStack(this));
         registerComponent();
 
-        String aFormattedLangName = componentType.getName();
-        if (!aFormattedLangName.startsWith(" ")) {
-            if (aFormattedLangName.contains("@")) {
-                String[] aSplit = aFormattedLangName.split("@");
-                aFormattedLangName = aSplit[0] + " %material " + aSplit[1];
-            }
-        }
-        if (aFormattedLangName.equals(componentType.getName())) {
-            aFormattedLangName = "%material" + aFormattedLangName;
-        }
+        String aFormattedLangName = componentType.getName().replace("@", "%material");
         GT_LanguageManager.addStringLocalization("gtplusplus.item." + this.unlocalName + ".name", aFormattedLangName);
     }
 
@@ -413,30 +404,30 @@ public class BaseItemComponent extends Item {
 
     public static enum ComponentTypes {
 
-        DUST("Dust", " Dust", "dust", OrePrefixes.dust),
-        DUSTSMALL("DustSmall", "Small Pile of@Dust", "dustSmall", OrePrefixes.dustSmall),
-        DUSTTINY("DustTiny", "Tiny Pile of@Dust", "dustTiny", OrePrefixes.dustTiny),
-        INGOT("Ingot", " Ingot", "ingot", OrePrefixes.ingot),
-        HOTINGOT("HotIngot", "Hot@Ingot", "ingotHot", OrePrefixes.ingotHot),
-        PLATE("Plate", " Plate", "plate", OrePrefixes.plate),
-        PLATEDOUBLE("PlateDouble", "Double@Plate", "plateDouble", OrePrefixes.plateDouble),
-        ROD("Rod", " Rod", "stick", OrePrefixes.stick),
-        RODLONG("RodLong", "Long@Rod", "stickLong", OrePrefixes.stickLong),
-        GEAR("Gear", " Gear", "gearGt", OrePrefixes.gearGt),
-        SMALLGEAR("SmallGear", "Small@Gear", "gearGtSmall", OrePrefixes.gearGtSmall), // TODO
-        SCREW("Screw", " Screw", "screw", OrePrefixes.screw),
-        BOLT("Bolt", " Bolt", "bolt", OrePrefixes.bolt),
-        ROTOR("Rotor", " Rotor", "rotor", OrePrefixes.rotor),
-        RING("Ring", " Ring", "ring", OrePrefixes.ring),
-        FOIL("Foil", " Foil", "foil", OrePrefixes.foil),
-        PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma", OrePrefixes.cellPlasma),
-        CELL("Cell", " Cell", "cell", OrePrefixes.cell),
-        NUGGET("Nugget", " Nugget", "nugget", OrePrefixes.nugget),
-        PLATEHEAVY("HeavyPlate", "Heavy@Plate", "plateHeavy", OrePrefixes.plateQuadruple),
-        SPRING("Spring", " Spring", "spring", OrePrefixes.spring),
-        SMALLSPRING("SmallSpring", "Small@Spring", "springSmall", OrePrefixes.springSmall),
-        FINEWIRE("FineWire", "Fine@Wire", "wireFine", OrePrefixes.wireFine),
-        PLATEDENSE("PlateDense", "Dense@Plate", "plateDense", OrePrefixes.plateDense),;
+        DUST("Dust", "@ Dust", "dust", OrePrefixes.dust),
+        DUSTSMALL("DustSmall", "Small Pile of @ Dust", "dustSmall", OrePrefixes.dustSmall),
+        DUSTTINY("DustTiny", "Tiny Pile of @ Dust", "dustTiny", OrePrefixes.dustTiny),
+        INGOT("Ingot", "@ Ingot", "ingot", OrePrefixes.ingot),
+        HOTINGOT("HotIngot", "Hot @ Ingot", "ingotHot", OrePrefixes.ingotHot),
+        PLATE("Plate", "@ Plate", "plate", OrePrefixes.plate),
+        PLATEDOUBLE("PlateDouble", "Double @ Plate", "plateDouble", OrePrefixes.plateDouble),
+        ROD("Rod", "@ Rod", "stick", OrePrefixes.stick),
+        RODLONG("RodLong", "Long @ Rod", "stickLong", OrePrefixes.stickLong),
+        GEAR("Gear", "@ Gear", "gearGt", OrePrefixes.gearGt),
+        SMALLGEAR("SmallGear", "Small @ Gear", "gearGtSmall", OrePrefixes.gearGtSmall), // TODO
+        SCREW("Screw", "@ Screw", "screw", OrePrefixes.screw),
+        BOLT("Bolt", "@ Bolt", "bolt", OrePrefixes.bolt),
+        ROTOR("Rotor", "@ Rotor", "rotor", OrePrefixes.rotor),
+        RING("Ring", "@ Ring", "ring", OrePrefixes.ring),
+        FOIL("Foil", "@ Foil", "foil", OrePrefixes.foil),
+        PLASMACELL("CellPlasma", "@ Plasma Cell", "cellPlasma", OrePrefixes.cellPlasma),
+        CELL("Cell", "@ Cell", "cell", OrePrefixes.cell),
+        NUGGET("Nugget", "@ Nugget", "nugget", OrePrefixes.nugget),
+        PLATEHEAVY("HeavyPlate", "Heavy @ Plate", "plateHeavy", OrePrefixes.plateQuadruple),
+        SPRING("Spring", "@ Spring", "spring", OrePrefixes.spring),
+        SMALLSPRING("SmallSpring", "Small @ Spring", "springSmall", OrePrefixes.springSmall),
+        FINEWIRE("FineWire", "Fine @ Wire", "wireFine", OrePrefixes.wireFine),
+        PLATEDENSE("PlateDense", "Dense @ Plate", "plateDense", OrePrefixes.plateDense),;
 
         private String COMPONENT_NAME;
         private String DISPLAY_NAME;
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
index 1e4a104b65..1714278cd1 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
@@ -6,10 +6,10 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -20,27 +20,24 @@ public class BaseItemTCShard extends Item {
 
     public final String unlocalName;
     public final String displayName;
-    public final String descriptionString;
-    public final String descriptionString2;
     public final int itemColour;
 
     public BaseItemTCShard(final String DisplayName, final int colour) {
-        this(DisplayName, colour, "");
+        this(DisplayName, colour, null);
     }
 
-    public BaseItemTCShard(final String DisplayName, final int colour, final String Description) {
-        this(DisplayName, colour, "", Description);
-    }
-
-    public BaseItemTCShard(final String DisplayName, final int colour, final String Description,
-            final String Description2) {
+    public BaseItemTCShard(final String DisplayName, final int colour, final String[] Description) {
         this.unlocalName = "item" + Utils.sanitizeString(DisplayName);
         this.displayName = DisplayName;
         this.itemColour = colour;
-        this.descriptionString = Description;
-        this.descriptionString2 = Description2;
         this.setCreativeTab(AddToCreativeTab.tabMisc);
         this.setUnlocalizedName(this.unlocalName);
+        if (Description != null) {
+            for (int i = 0; i < Description.length; i++) {
+                GT_LanguageManager
+                        .addStringLocalization("gtplusplus." + getUnlocalizedName() + ".tooltip." + i, Description[i]);
+            }
+        }
         this.setMaxStackSize(64);
         this.setTextureName(CORE.MODID + ":" + "itemShard");
         GameRegistry.registerItem(this, this.unlocalName);
@@ -48,19 +45,15 @@ public class BaseItemTCShard extends Item {
         GT_OreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this));
     }
 
-    @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-        return (this.displayName + " Shard");
-    }
-
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        if ((this.descriptionString != "") || !this.descriptionString.equals("")) {
-            list.add(EnumChatFormatting.GRAY + this.descriptionString);
-        }
-        if ((this.descriptionString2 != "") || !this.descriptionString2.equals("")) {
-            list.add(EnumChatFormatting.GRAY + this.descriptionString2);
+        for (int i = 0;; i++) {
+            String tooltip = GT_LanguageManager
+                    .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i);
+            if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) {
+                list.add(tooltip);
+            } else break;
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
index 2cf0e4510d..516fdea294 100644
--- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
@@ -14,6 +14,7 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -22,7 +23,6 @@ public class CoreItem extends Item {
 
     private final EnumRarity rarity;
     private final EnumChatFormatting descColour;
-    private final String[] itemDescription;
     protected String itemName;
     private final boolean hasEffect;
 
@@ -182,7 +182,7 @@ public class CoreItem extends Item {
         this.setMaxStackSize(stackSize);
         this.setMaxDamage(maxDmg);
         this.rarity = regRarity;
-        this.itemDescription = description;
+        this.setItemDescription(description);
         this.descColour = colour != null ? colour : EnumChatFormatting.RESET;
         this.hasEffect = Effect;
         this.turnsInto = OverrideItem;
@@ -203,7 +203,7 @@ public class CoreItem extends Item {
         this.setMaxStackSize(stackSize);
         this.setMaxDamage(maxDmg);
         this.rarity = regRarity;
-        this.itemDescription = description;
+        this.setItemDescription(description);
         this.descColour = colour != null ? colour : EnumChatFormatting.RESET;
         this.hasEffect = Effect;
         this.turnsInto = OverrideItem;
@@ -213,10 +213,12 @@ public class CoreItem extends Item {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        if (this.itemDescription.length > 0) {
-            for (int u = 0; u < this.itemDescription.length; u++) {
-                list.add(this.descColour + this.itemDescription[u]);
-            }
+        for (int i = 0;; i++) {
+            String tooltip = GT_LanguageManager
+                    .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i);
+            if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) {
+                list.add(tooltip);
+            } else break;
         }
         // list.add(this.descColour+this.itemDescription);
         // super.addInformation(stack, aPlayer, list, bool);
@@ -271,6 +273,13 @@ public class CoreItem extends Item {
         return ItemUtils.getSimpleStack(this);
     }
 
+    public void setItemDescription(String[] description) {
+        for (int i = 0; i < description.length; i++) {
+            GT_LanguageManager.addStringLocalization(
+                    "gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i,
+                    description[i]);
+        }
+    }
     /*
      * @Override public String getItemStackDisplayName(final ItemStack tItem) { if ((this.itemName == null) ||
      * this.itemName.equals("")) { return super.getItemStackDisplayName(tItem); } return this.itemName; }
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
index 655d8c431f..8e9c00143a 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
@@ -58,11 +58,6 @@ public class BaseItemPlasmaCell extends BaseItemComponent {
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack cell) {
-        return this.materialName + " Plasma Cell";
-    }
-
-    @Override
     public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
             final boolean p_77663_5_) {
         if (this.componentMaterial != null) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 8d90228bca..4fc3c6936d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -25,7 +26,6 @@ public class BaseItemDustUnique extends Item {
     protected final int colour;
     protected final int sRadiation;
     protected final String materialName;
-    protected final String name;
     protected final String chemicalNotation;
 
     public BaseItemDustUnique(final String unlocalizedName, final String materialName, final int colour,
@@ -49,13 +49,15 @@ public class BaseItemDustUnique extends Item {
         this.sRadiation = ItemUtils.getRadioactivityLevel(materialName);
         GameRegistry.registerItem(this, unlocalizedName);
 
+        String type;
         if (this.getUnlocalizedName().contains("DustTiny")) {
-            this.name = "Tiny Pile of " + this.materialName + " Dust";
+            type = "Tiny Pile of %material Dust";
         } else if (this.getUnlocalizedName().contains("DustSmall")) {
-            this.name = "Small Pile of " + this.materialName + " Dust";
+            type = "Small Pile of %material Dust";
         } else {
-            this.name = this.materialName + " Dust";
+            type = "%material Dust";
         }
+        GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type);
 
         String temp = "";
         Logger.WARNING("Unlocalized name for OreDict nameGen: " + this.getUnlocalizedName());
@@ -107,7 +109,8 @@ public class BaseItemDustUnique extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack iStack) {
-        return this.name;
+        return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
+                .replace("%material", GT_LanguageManager.getTranslation("gtplusplus.material." + materialName));
     }
 
     private String getCorrectTexture(final String pileSize) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
index b9d5011f94..95f2a1d41d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
+++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
@@ -41,10 +41,4 @@ public class BaseItemFood extends ItemFood {
             }
         }
     }
-
-    @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
-        return ("A Serving of " + this.localName);
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
index ab00cb483b..b68d7a5d7f 100644
--- a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
+++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
@@ -8,6 +8,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import gtPlusPlus.api.objects.Logger;
@@ -63,16 +64,11 @@ public class BaseItemHotFood extends BaseItemFood {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")) {
+            list.add(StatCollector.translateToLocal("item.itemBaseItemHotFood.tooltip.0"));
             list.add(
-                    EnumChatFormatting.GRAY + "Warning: "
-                            + EnumChatFormatting.RED
-                            + "Very hot!"
-                            + EnumChatFormatting.GRAY
-                            + " Avoid direct handling..");
-            list.add(
-                    EnumChatFormatting.GRAY + "This food has "
-                            + ((this.cooldownTime - stack.getItemDamage()) / 20)
-                            + " seconds left, until it is cool.");
+                    EnumChatFormatting.GRAY + StatCollector.translateToLocalFormatted(
+                            "item.itemBaseItemHotFood.tooltip.1",
+                            (this.cooldownTime - stack.getItemDamage()) / 20));
         }
         super.addInformation(stack, aPlayer, list, bool);
     }
diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
index 80cda709cc..a2b8f15b2c 100644
--- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
+++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
@@ -7,13 +7,13 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -27,7 +27,6 @@ public class BaseItemMisc extends Item {
     public final String unlocalName;
     public final MiscTypes miscType;
     public final Object componentColour;
-    public final String[] description;
 
     public BaseItemMisc(final String displayName, final short[] RGB, final int maxStackSize, final MiscTypes miscType,
             String[] description) {
@@ -46,16 +45,17 @@ public class BaseItemMisc extends Item {
         } else {
             this.componentColour = null;
         }
-        this.description = description;
+        if (description != null) {
+            for (int i = 0; i < description.length; i++) {
+                GT_LanguageManager.addStringLocalization(
+                        "gtplusplus." + this.getUnlocalizedName() + ".tooltip." + i,
+                        description[i]);
+            }
+        }
         GameRegistry.registerItem(this, this.unlocalName);
         GT_OreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this));
     }
 
-    @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-        return this.displayName + miscType.DISPLAY_NAME_SUFFIX;
-    }
-
     private String getCorrectTextures() {
         return CORE.MODID + ":" + "item" + this.miscType.TYPE;
     }
@@ -94,14 +94,13 @@ public class BaseItemMisc extends Item {
     @Override
     public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
             final boolean bool) {
-        if (this.description != null) { // Incase I don't add one
-            if (this.description.length > 0) { // Incase I somehow add a blank one
-                for (int x = 0; x < this.description.length; x++) {
-                    list.add(EnumChatFormatting.GRAY + description[x]);
-                }
-            }
+        for (int i = 0;; i++) {
+            String tooltip = GT_LanguageManager
+                    .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i);
+            if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) {
+                list.add(tooltip);
+            } else break;
         }
-        super.addInformation(stack, aPlayer, list, bool);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
index 2edf3b4612..a6d33f57a4 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
@@ -56,12 +56,6 @@ public class BaseItemPlate_OLD extends Item {
         }
     }
 
-    @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
-        return (this.materialName + " plate");
-    }
-
     public final String getMaterialName() {
         return this.materialName;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
index 126c4dbe54..14133ff837 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
@@ -24,6 +24,7 @@ import com.google.common.collect.Multimap;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
@@ -39,23 +40,21 @@ public class BaseBauble extends Item implements IBauble {
      */
     private BaubleType mThisBauble;
 
-    private final String mDisplayName;
     private List<String> damageNegations = new ArrayList<String>();
     Multimap<String, AttributeModifier> attributes = HashMultimap.create();
 
     public BaseBauble(BaubleType type, String displayName) {
         this.mThisBauble = type;
-        this.mDisplayName = displayName;
         Utils.registerEvent(this);
         this.setMaxStackSize(1);
         this.setCreativeTab(AddToCreativeTab.tabMisc);
         this.setUnlocalizedName(Utils.sanitizeString(displayName.toLowerCase()));
+        GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", displayName);
         GameRegistry.registerItem(this, getUnlocalizedName());
     }
 
     public BaseBauble(BaubleType type, String unlocalName, int register) {
         this.mThisBauble = type;
-        this.mDisplayName = "";
         Utils.registerEvent(this);
         this.setMaxStackSize(1);
         this.setCreativeTab(AddToCreativeTab.tabMisc);
@@ -63,10 +62,11 @@ public class BaseBauble extends Item implements IBauble {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        if (this.mDisplayName == null || this.mDisplayName.length() < 1) {
+        String key = "gtplusplus." + getUnlocalizedName() + ".name";
+        if (key.equals(GT_LanguageManager.getTranslation(key))) {
             return super.getItemStackDisplayName(tItem).replaceAll(".name", "");
         }
-        return this.mDisplayName;
+        return GT_LanguageManager.getTranslation(key);
     }
 
     @SubscribeEvent
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java
index e38c1084d5..bd58824687 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java
@@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 
 import baubles.api.BaubleType;
 
@@ -31,8 +32,8 @@ public class HealthBoostBauble extends BaseBauble {
 
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
-        list.add(EnumChatFormatting.GRAY + "You feel like you're on top of the world.");
-        list.add(EnumChatFormatting.GRAY + "Wear it around your neck like an amulet.");
+        list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.thekeytothecity.tooltip.0"));
+        list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.thekeytothecity.tooltip.1"));
         super.addInformation(stack, player, list, bool);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java
index b13a191225..8c5530f242 100644
--- a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java
+++ b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java
@@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -46,15 +47,6 @@ public class BaseItemGrindle extends Item {
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack aStack) {
-        String aName = super.getItemStackDisplayName(aStack);
-        if (aName.toLowerCase().contains(".name") || aName.toLowerCase().contains("git")) {
-            aName = "Grindle";
-        }
-        return aName;
-    }
-
-    @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(final IIconRegister iconRegister) {
         this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemTablet");
@@ -68,7 +60,7 @@ public class BaseItemGrindle extends Item {
     @Override
     public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
         super.addInformation(p_77624_1_, p_77624_2_, aList, p_77624_4_);
-        aList.add("Used to read data from DataSticks & DataOrbs.");
+        aList.add(StatCollector.translateToLocal("item.itemGrindleTablet.tooltip"));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java
index 676cde058e..573325ddd7 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java
@@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -61,20 +62,15 @@ public class ItemAreaClear extends CoreItem {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        String itemName = "Debug Square";
-        String suffixName = "";
-        if (tItem.getItemDamage() == 0) {
-            suffixName = " [1]";
-        } else if (tItem.getItemDamage() == 1) {
-            suffixName = " [2]";
-        }
-        return (itemName + suffixName);
+        return StatCollector.translateToLocalFormatted("item.itemDebugClearing.name", tItem.getItemDamage() + 1);
     }
 
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
-        String mMode = (stack.getItemDamage() == 0 ? "Clear" : "Fill");
-        list.add(EnumChatFormatting.GRAY + "" + ("Mode: " + mMode));
+        list.add(
+                EnumChatFormatting.GRAY + ""
+                        + StatCollector
+                                .translateToLocal("item.itemDebugClearing." + stack.getItemDamage() + ".tooltip"));
         super.addInformation(stack, player, list, bool);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
index dec01d1a71..435195c105 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.item.general;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import gtPlusPlus.core.block.general.FirePit;
@@ -46,13 +47,15 @@ public class ItemBasicFirestarter extends CoreItem {
         }
         if (thisWorld.getBlock(blockX, blockY, blockZ) instanceof FirePit) {
             thisWorld.setBlockMetadataWithNotify(blockX, blockY, blockZ, 2, 4);
-            PlayerUtils.messagePlayer(thisPlayer, "You light the fire pit. ");
+            PlayerUtils.messagePlayer(thisPlayer, StatCollector.translateToLocal("item.itemSimpleFiremaker.message.0"));
         }
         if (thisWorld.isAirBlock(blockX, blockY, blockZ)) {
             final int random = MathUtils.randInt(0, 3);
             // Explode, lol.
             if (random == 0) {
-                PlayerUtils.messagePlayer(thisPlayer, "You somehow managed to set yourself on fire... ");
+                PlayerUtils.messagePlayer(
+                        thisPlayer,
+                        StatCollector.translateToLocal("item.itemSimpleFiremaker.message.1"));
                 thisWorld.playSoundEffect(
                         thisPlayer.posX + 0.5D,
                         thisPlayer.posY + 0.5D,
@@ -66,7 +69,9 @@ public class ItemBasicFirestarter extends CoreItem {
 
             // Create a fire
             else if (random == 2) {
-                PlayerUtils.messagePlayer(thisPlayer, "You created a fire!");
+                PlayerUtils.messagePlayer(
+                        thisPlayer,
+                        StatCollector.translateToLocal("item.itemSimpleFiremaker.message.2"));
                 thisWorld.playSoundEffect(
                         blockX + 0.5D,
                         blockY + 0.5D,
@@ -79,7 +84,9 @@ public class ItemBasicFirestarter extends CoreItem {
 
             // Do nothing
             else {
-                PlayerUtils.messagePlayer(thisPlayer, "Your attemp does nothing.");
+                PlayerUtils.messagePlayer(
+                        thisPlayer,
+                        StatCollector.translateToLocal("item.itemSimpleFiremaker.message.3"));
                 thisItem.damageItem(1, thisPlayer);
                 return false;
             }
@@ -87,9 +94,4 @@ public class ItemBasicFirestarter extends CoreItem {
         thisItem.damageItem(1, thisPlayer);
         return true;
     }
-
-    @Override
-    public String getItemStackDisplayName(final ItemStack thisItem) {
-        return "Basic Firemaker";
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java
index 9e8573f6a8..e918e4d917 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java
@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -54,25 +55,26 @@ public class ItemBlueprint extends Item implements IItemBlueprint {
         // Write to tooltip list for each viable setting.
         if (itemStack.hasTagCompound()) {
             if (id != -1) {
-                list.add(EnumChatFormatting.GRAY + "Technical Document No. " + id);
+                list.add(
+                        EnumChatFormatting.GRAY + StatCollector.translateToLocalFormatted(
+                                StatCollector.translateToLocal("item.itemBlueprint.tooltip.0"),
+                                id));
             }
             if (blueprint) {
-                list.add(EnumChatFormatting.BLUE + "Currently holding a blueprint for " + name);
+                list.add(
+                        EnumChatFormatting.BLUE + StatCollector.translateToLocalFormatted(
+                                StatCollector.translateToLocal("item.itemBlueprint.tooltip.1"),
+                                name));
             } else {
-                list.add(EnumChatFormatting.RED + "Currently not holding a blueprint for anything.");
+                list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("item.itemBlueprint.tooltip.2"));
             }
         } else {
-            list.add(EnumChatFormatting.RED + "Currently not holding a blueprint for anything.");
+            list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("item.itemBlueprint.tooltip.2"));
         }
         super.addInformation(itemStack, aPlayer, list, bool);
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-        return "Blueprint";
-    }
-
-    @Override
     public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {
         this.createNBT(itemStack);
     }
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
index e71858a991..6843cedd46 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
@@ -9,7 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import baubles.api.BaubleType;
@@ -107,12 +107,6 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
-        return (EnumChatFormatting.BLUE + "Personal Cloaking Device" + EnumChatFormatting.GRAY);
-    }
-
-    @Override
     public double getDurabilityForDisplay(final ItemStack stack) {
         // return 1.0D - getEnergyStored(stack) / this.capacity;
         return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack));
@@ -132,36 +126,23 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         list.add("");
-        list.add(EnumChatFormatting.GREEN + "Worn as a Belt within Baubles." + EnumChatFormatting.GRAY);
-        list.add(EnumChatFormatting.GREEN + "Drains 10,000EU/t to provide invisibility." + EnumChatFormatting.GRAY);
+        list.add(StatCollector.translateToLocal("item.personalCloakingDevice.tooltip.0"));
+        list.add(StatCollector.translateToLocal("item.personalCloakingDevice.tooltip.1"));
         list.add("");
-        list.add(EnumChatFormatting.GOLD + "IC2/EU Information" + EnumChatFormatting.GRAY);
+        list.add(StatCollector.translateToLocal("item.personalCloakingDevice.tooltip.2"));
         list.add(
-                EnumChatFormatting.GRAY + "Tier: ["
-                        + EnumChatFormatting.YELLOW
-                        + this.getTier(this.thisStack)
-                        + EnumChatFormatting.GRAY
-                        + "] Input Limit: ["
-                        + EnumChatFormatting.YELLOW
-                        + this.getTransferLimit(this.thisStack)
-                        + EnumChatFormatting.GRAY
-                        + "EU/t]");
+                StatCollector.translateToLocalFormatted(
+                        "item.personalCloakingDevice.tooltip.3",
+                        this.getTier(this.thisStack),
+                        this.getTransferLimit(this.thisStack)));
         list.add(
-                EnumChatFormatting.GRAY + "Current Power: ["
-                        + EnumChatFormatting.YELLOW
-                        + (long) this.getCharge(stack)
-                        + EnumChatFormatting.GRAY
-                        + "EU] ["
-                        + EnumChatFormatting.YELLOW
-                        + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))
-                        + EnumChatFormatting.GRAY
-                        + "%]");
+                StatCollector.translateToLocalFormatted(
+                        "item.personalCloakingDevice.tooltip.4",
+                        (long) this.getCharge(stack),
+                        MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))));
         list.add(
-                EnumChatFormatting.GRAY + "Time Remaining: ["
-                        + EnumChatFormatting.YELLOW
-                        + this.secondsLeft(stack)
-                        + EnumChatFormatting.GRAY
-                        + " seconds]");
+                StatCollector
+                        .translateToLocalFormatted("item.personalCloakingDevice.tooltip.5", this.secondsLeft(stack)));
         super.addInformation(stack, aPlayer, list, bool);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java
index 21e127e387..3ce0490468 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -9,6 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
@@ -65,56 +66,16 @@ public class ItemControlCore extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         list.add(
-                EnumChatFormatting.GRAY + "Allows a Multiblock to function upto "
-                        + GT_Values.VN[stack.getItemDamage()]
-                        + "");
-        list.add(EnumChatFormatting.GRAY + "Required Tier is determined by the sum of the eu/t of all Energy Inputs");
-        list.add(EnumChatFormatting.GRAY + "Lower tiers may be used to underclock, which is useful in some situations");
+                EnumChatFormatting.GRAY + StatCollector.translateToLocalFormatted(
+                        "item.itemControlCore.tooltip.0",
+                        GT_Values.VN[stack.getItemDamage()]));
+        list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.itemControlCore.tooltip.1"));
+        list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.itemControlCore.tooltip.2"));
     }
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        if (tItem == null) {
-            return "Control Core";
-        }
-        String aReturnValue = super.getItemStackDisplayName(tItem);
-        if (tItem != null) {
-            try {
-                if (aReturnValue != null) {
-                    if (aReturnValue.toLowerCase().contains(".name")) {
-                        aReturnValue = "Control Core";
-                    } else {
-                        return aReturnValue;
-                    }
-                }
-            } catch (Throwable t) {}
-        }
-        if (aReturnValue == null || !aReturnValue.toLowerCase().contains("control core")
-                || aReturnValue.length() <= 0) {
-            aReturnValue = "Error";
-        }
-        String suffixName = "";
-        if (tItem.getItemDamage() == 0) {
-            suffixName = " [ULV]";
-        } else if (tItem.getItemDamage() == 1) {
-            suffixName = " [LV]";
-        } else if (tItem.getItemDamage() == 2) {
-            suffixName = " [MV]";
-        } else if (tItem.getItemDamage() == 3) {
-            suffixName = " [HV]";
-        } else if (tItem.getItemDamage() == 4) {
-            suffixName = " [EV]";
-        } else if (tItem.getItemDamage() == 5) {
-            suffixName = " [IV]";
-        } else if (tItem.getItemDamage() == 6) {
-            suffixName = " [LuV]";
-        } else if (tItem.getItemDamage() == 7) {
-            suffixName = " [ZPM]";
-        } else if (tItem.getItemDamage() == 8) {
-            suffixName = " [UV]";
-        } else if (tItem.getItemDamage() == 9) {
-            suffixName = " [MAX]";
-        }
-        return (aReturnValue + suffixName);
+        return StatCollector
+                .translateToLocalFormatted("item.itemControlCore.name", GT_Values.VN[tItem.getItemDamage()]);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java b/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java
index cfb8a5a163..d88cf3328a 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java
@@ -7,6 +7,7 @@ import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 
 import gtPlusPlus.core.item.base.BaseItemColourable;
 import gtPlusPlus.core.util.Utils;
@@ -47,18 +48,8 @@ public class ItemGemShards extends BaseItemColourable {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        String suffix = " Shards";
-        String gemType = "";
-        if (tItem.getItemDamage() == 0) {
-            gemType = "Diamond";
-        } else if (tItem.getItemDamage() == 1) {
-            gemType = "Emerald";
-        } else if (tItem.getItemDamage() == 2) {
-            gemType = "Ruby";
-        } else if (tItem.getItemDamage() == 3) {
-            gemType = "Sapphire";
-        }
-        return (gemType + suffix);
+        return StatCollector
+                .translateToLocal(getUnlocalizedNameInefficiently(tItem) + "." + tItem.getItemDamage() + ".name");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
index 7b79556693..3fc1cccb23 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -14,6 +14,7 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
 import gtPlusPlus.core.lib.CORE;
@@ -71,8 +72,15 @@ public class ItemGenericToken extends CoreItem {
         sizes[0][4] = mCustomNameColours.size();
         // sizes[0][5] = mIcons.size();
         mLocalNames.put(id, aLocalName);
+        GT_LanguageManager
+                .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + "." + id + ".name", aLocalName);
         mMaxStackSizes.put(id, aMaxStack);
         mDescriptionArrays.put(id, aDescript);
+        for (int i = 0; i < aDescript.length; i++) {
+            GT_LanguageManager.addStringLocalization(
+                    "gtplusplus." + this.getUnlocalizedName() + "." + id + ".tooltip." + i,
+                    aDescript[0]);
+        }
         mRarities.put(id, aRarity);
         mCustomNameColours.put(id, aCustomNameColour);
         sizes[1][0] = mLocalNames.size();
@@ -102,22 +110,22 @@ public class ItemGenericToken extends CoreItem {
     @Override
     public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
         super.addInformation(stack, aPlayer, list, bool);
-        for (String s : mDescriptionArrays.get(stack.getItemDamage())) {
-            list.add(s);
+        for (int i = 0;; i++) {
+            String tooltip = GT_LanguageManager.getTranslation(
+                    "gtplusplus." + this
+                            .getUnlocalizedNameInefficiently(stack) + "." + stack.getItemDamage() + ".tooltip." + i);
+            if (!("gtplusplus." + this
+                    .getUnlocalizedNameInefficiently(stack) + "." + stack.getItemDamage() + ".tooltip." + i)
+                            .equals(tooltip)) {
+                list.add(tooltip);
+            } else break;
         }
     }
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-
-        String s = "" + mCustomNameColours.get(tItem.getItemDamage());
-        String parent = super.getItemStackDisplayName(tItem);
-        if (mLocalNames.get(tItem.getItemDamage()).length() > 0 && parent.toLowerCase().contains(".name")) {
-            s = s + mLocalNames.get(tItem.getItemDamage());
-        } else {
-            s = s + parent;
-        }
-        return s;
+        return GT_LanguageManager.getTranslation(
+                "gtplusplus." + this.getUnlocalizedNameInefficiently(tItem) + "." + tItem.getItemDamage() + ".name");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index 8bb2ac7929..c4f90247c2 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -87,12 +87,6 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
-        return (EnumChatFormatting.BLUE + "Personal Healing NanoBooster" + EnumChatFormatting.RESET);
-    }
-
-    @Override
     public double getDurabilityForDisplay(final ItemStack stack) {
         // return 1.0D - getEnergyStored(stack) / this.capacity;
         return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack));
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java
index 3373473b75..931e464dd2 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java
@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -48,11 +49,6 @@ public class ItemLavaFilter extends CoreItem {
         return this.mIcon[0];
     }
 
-    @Override
-    public String getItemStackDisplayName(ItemStack tItem) {
-        return "Lava Filter";
-    }
-
     private static boolean createNBT(ItemStack rStack) {
         final NBTTagCompound tagMain = new NBTTagCompound();
         final NBTTagCompound tagNBT = new NBTTagCompound();
@@ -102,7 +98,7 @@ public class ItemLavaFilter extends CoreItem {
     @SuppressWarnings("unchecked")
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
-        list.add(EnumChatFormatting.GRAY + "Filters Lava within a Thermal Boiler.");
+        list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.itemLavaFilter.tooltip"));
         EnumChatFormatting durability = EnumChatFormatting.GRAY;
         if (100 - getFilterDamage(stack) > 80) {
             durability = EnumChatFormatting.GRAY;
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index ee4fe31bc3..c26cbdac71 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import baubles.api.BaubleType;
@@ -47,11 +47,6 @@ public class ItemSlowBuildingRing extends Item implements IBauble {
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-        return (EnumChatFormatting.YELLOW + "Slow Building Ring" + EnumChatFormatting.GRAY);
-    }
-
-    @Override
     public boolean showDurabilityBar(final ItemStack stack) {
         return false;
     }
@@ -60,12 +55,9 @@ public class ItemSlowBuildingRing extends Item implements IBauble {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         list.add("");
-        list.add(
-                EnumChatFormatting.GREEN + "Worn as a Ring within Baubles. Prevents you from sprinting."
-                        + EnumChatFormatting.GRAY);
-        list.add(EnumChatFormatting.GREEN + "Movement speed reduced to crouch speed." + EnumChatFormatting.GRAY);
-        list.add(
-                EnumChatFormatting.GREEN + "Press shift while worn to toggle crouch on/off." + EnumChatFormatting.GRAY);
+        list.add(StatCollector.translateToLocal("item.SlowBuildingRing.tooltip.0"));
+        list.add(StatCollector.translateToLocal("item.SlowBuildingRing.tooltip.1"));
+        list.add(StatCollector.translateToLocal("item.SlowBuildingRing.tooltip.2"));
         list.add("");
         super.addInformation(stack, aPlayer, list, bool);
     }
diff --git a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index a1f46a46fa..ec1f98a8f3 100644
--- a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java
+++ b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -9,8 +9,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import cofh.api.energy.ItemEnergyContainer;
@@ -108,12 +108,6 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
     }
 
     @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
-        return ("Universally Chargeable Battery");
-    }
-
-    @Override
     public double getDurabilityForDisplay(final ItemStack stack) {
         // return 1.0D - getEnergyStored(stack) / this.capacity;
         return MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack));
@@ -146,53 +140,28 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
 
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        list.add(EnumChatFormatting.YELLOW + "IC2/EU Information" + EnumChatFormatting.GRAY);
+        list.add(StatCollector.translateToLocal("item.rfEUBattery.tooltip.0"));
         list.add(
-                EnumChatFormatting.GRAY + "Tier: ["
-                        + EnumChatFormatting.YELLOW
-                        + this.getTier(this.thisStack)
-                        + EnumChatFormatting.GRAY
-                        + "] Current Power: ["
-                        + EnumChatFormatting.YELLOW
-                        + (long) this.getCharge(stack)
-                        + EnumChatFormatting.GRAY
-                        + "/EU]");
+                StatCollector.translateToLocalFormatted(
+                        "item.rfEUBattery.tooltip.1",
+                        this.getTier(this.thisStack),
+                        (long) this.getCharge(stack)));
         list.add(
-                EnumChatFormatting.GRAY + "Transfer Limit: ["
-                        + EnumChatFormatting.YELLOW
-                        + this.getTransferLimit(this.thisStack)
-                        + EnumChatFormatting.GRAY
-                        + "Eu/t]"
-                        + "Burn Time: ["
-                        + EnumChatFormatting.YELLOW
-                        + (this.getBurnTime(stack) / 20)
-                        + EnumChatFormatting.GRAY
-                        + "s]");
+                StatCollector.translateToLocalFormatted(
+                        "item.rfEUBattery.tooltip.2",
+                        this.getTransferLimit(this.thisStack),
+                        (this.getBurnTime(stack) / 20)));
         list.add("");
-        list.add(EnumChatFormatting.RED + "RF Information");
+        list.add(StatCollector.translateToLocal("item.rfEUBattery.tooltip.3"));
         list.add(
-                EnumChatFormatting.GRAY + "Extraction Rate: ["
-                        + EnumChatFormatting.RED
-                        + this.maxExtract
-                        + EnumChatFormatting.GRAY
-                        + "Rf/t]"
-                        + " Insert Rate: ["
-                        + EnumChatFormatting.RED
-                        + this.maxReceive
-                        + EnumChatFormatting.GRAY
-                        + "Rf/t]");
+                StatCollector
+                        .translateToLocalFormatted("item.rfEUBattery.tooltip.4", this.maxExtract, this.maxReceive));
         list.add(
-                EnumChatFormatting.GRAY + "Current Charge: ["
-                        + EnumChatFormatting.RED
-                        + this.getEnergyStored(stack)
-                        + EnumChatFormatting.GRAY
-                        + "Rf / "
-                        + this.getMaxEnergyStored(stack)
-                        + "Rf] "
-                        + EnumChatFormatting.RED
-                        + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))
-                        + EnumChatFormatting.GRAY
-                        + "%");
+                StatCollector.translateToLocalFormatted(
+                        "item.rfEUBattery.tooltip.5",
+                        this.getEnergyStored(stack),
+                        this.getMaxEnergyStored(stack),
+                        MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))));
         super.addInformation(stack, aPlayer, list, bool);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
index 26668b567c..014e6ed5c0 100644
--- a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
+++ b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
@@ -9,6 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -180,10 +181,12 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
         if (hasEntity(p_77624_1_)) {
             String mName = NBTUtils.getString(p_77624_1_, "mEntityName");
             if (mName != null && !mName.equals("")) {
-                p_77624_3_.add(EnumChatFormatting.GRAY + "Contains a " + mName + ".");
+                p_77624_3_.add(
+                        EnumChatFormatting.GRAY
+                                + StatCollector.translateToLocalFormatted("item.itemDragonJar.1.tooltip", mName));
             }
         } else {
-            p_77624_3_.add(EnumChatFormatting.GRAY + "Does not contain anything.");
+            p_77624_3_.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.itemDragonJar.0.tooltip"));
         }
     }
 
@@ -236,8 +239,8 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         if (hasEntity(aStack)) {
-            return "Captured Dragon Jar";
+            return StatCollector.translateToLocal("item.itemDragonJar.1.name");
         }
-        return "Dragon Capture Jar";
+        return StatCollector.translateToLocal("item.itemDragonJar.0.name");
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
index 22d851938b..565d6dd632 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
@@ -7,6 +7,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -50,16 +51,7 @@ public class ItemBoilerChassis extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        String itemName = "Advanced Boiler Chassis";
-        String suffixName = "";
-        if (tItem.getItemDamage() == 0) {
-            suffixName = " [Tier 1]";
-        } else if (tItem.getItemDamage() == 1) {
-            suffixName = " [Tier 2]";
-        } else if (tItem.getItemDamage() == 2) {
-            suffixName = " [Tier 3]";
-        }
-        return (itemName + suffixName);
+        return StatCollector.translateToLocalFormatted("item.itemBoilerChassis.name", tItem.getItemDamage());
     }
 
     @Override // TODO
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
index 3fd7a7ee1e..0bd1e1d2e0 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
@@ -7,8 +7,10 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 
@@ -52,18 +54,8 @@ public class ItemDehydratorCoil extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        String itemName = "Dehydrator Coil";
-        String suffixName = "";
-        if (tItem.getItemDamage() == 0) {
-            suffixName = " [EV]";
-        } else if (tItem.getItemDamage() == 1) {
-            suffixName = " [IV]";
-        } else if (tItem.getItemDamage() == 2) {
-            suffixName = " [LuV]";
-        } else if (tItem.getItemDamage() == 3) {
-            suffixName = " [ZPM]";
-        }
-        return (itemName + suffixName);
+        return StatCollector
+                .translateToLocalFormatted("item.itemDehydratorCoil.name", GT_Values.VN[tItem.getItemDamage() + 4]);
     }
 
     /*
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
index e987030b6e..59d7b7e8e8 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
@@ -7,8 +7,10 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 
@@ -52,18 +54,8 @@ public class ItemDehydratorCoilWire extends Item {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        String itemName = "Coil Wire";
-        String suffixName = "";
-        if (tItem.getItemDamage() == 0) {
-            suffixName = " [EV]";
-        } else if (tItem.getItemDamage() == 1) {
-            suffixName = " [IV]";
-        } else if (tItem.getItemDamage() == 2) {
-            suffixName = " [LuV]";
-        } else if (tItem.getItemDamage() == 3) {
-            suffixName = " [ZPM]";
-        }
-        return (itemName + suffixName);
+        return StatCollector
+                .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GT_Values.VN[tItem.getItemDamage() + 4]);
     }
 
     /*
diff --git a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java
index 60a4eddef1..8daf1fc8c7 100644
--- a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java
+++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java
@@ -240,7 +240,10 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
     // Doing this override means that there is no localization for language
     // unless you specifically check for localization here and convert
     public String getItemStackDisplayName(ItemStack par1ItemStack) {
-        return "Spawn " + mEntityNameMap.get(par1ItemStack.getItemDamage());
+        return StatCollector.translateToLocalFormatted(
+                "item.ItemCustomSpawnEgg.name",
+                StatCollector
+                        .translateToLocal("entity." + mEntityNameMap.get(par1ItemStack.getItemDamage()) + ".name"));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index 9750f0818b..eed1fe42a3 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -98,9 +99,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 
     private final HashMap<Integer, IIcon> mIconMap = new LinkedHashMap<Integer, IIcon>();
     private final HashMap<Integer, EnumRarity> rarity = new LinkedHashMap<Integer, EnumRarity>();
-    private final HashMap<Integer, EnumChatFormatting> descColour = new LinkedHashMap<Integer, EnumChatFormatting>();
     private final HashMap<Integer, String> itemName = new LinkedHashMap<Integer, String>();
-    private final HashMap<Integer, String> itemDescription = new LinkedHashMap<Integer, String>();
     private final HashMap<Integer, Boolean> hasEffect = new LinkedHashMap<Integer, Boolean>();
 
     public final HashMap<Short, Long[]> mElectricStats = new LinkedHashMap<Short, Long[]>();
@@ -111,12 +110,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
                 aID, // ID
                 aPumpName, // Name
                 aEuMax, // Eu Storage
-                (short) aTier, // Tier
-                "Can be used to remove fluids from GT machine input & output slots.", // Tooltip
+                (short) aTier, // Tier/ Tooltip
                 aTier <= 0 ? EnumRarity.common
                         : aTier == 1 ? EnumRarity.uncommon
                                 : aTier == 2 ? EnumRarity.rare : aTier == 3 ? EnumRarity.epic : EnumRarity.common, // Rarity
-                EnumChatFormatting.GRAY, // Desc colour
                 false // Effect?
         );
     }
@@ -141,43 +138,26 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         }
     }
 
-    public void registerItem(final int id, final String localizedName, final long euStorage, final int tier,
-            final String description) {
-        this.registerItem(
-                id,
-                localizedName,
-                euStorage,
-                (short) tier,
-                description,
-                EnumRarity.common,
-                EnumChatFormatting.GRAY,
-                false);
+    public void registerItem(final int id, final String localizedName, final long euStorage, final int tier) {
+        this.registerItem(id, localizedName, euStorage, (short) tier, EnumRarity.common, false);
     }
 
     public void registerItem(final int id, final String localizedName, final long euStorage, final int tier,
-            final String description, final int burnTime) {
-        this.registerItem(
-                id,
-                localizedName,
-                euStorage,
-                (short) tier,
-                description,
-                EnumRarity.common,
-                EnumChatFormatting.GRAY,
-                false);
+            final int burnTime) {
+        this.registerItem(id, localizedName, euStorage, (short) tier, EnumRarity.common, false);
         this.setBurnValue(id, burnTime);
     }
 
     public void registerItem(final int id, final String localizedName, final long euStorage, final short tier,
-            final String description, final EnumRarity regRarity, final EnumChatFormatting colour,
-            final boolean Effect) {
-        this.addItem(id, localizedName, EnumChatFormatting.YELLOW + "Electric", new Object[] {});
+            final EnumRarity regRarity, final boolean Effect) {
+        this.addItem(
+                id,
+                localizedName,
+                EnumChatFormatting.GRAY + "Can be used to remove fluids from GT machine input & output slots");
         if (euStorage > 0 && tier > 0)
             this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true);
         this.rarity.put(id, regRarity);
         this.itemName.put(id, localizedName);
-        this.itemDescription.put(id, description);
-        this.descColour.put(id, colour);
         this.hasEffect.put(id, Effect);
     }
 
@@ -204,19 +184,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
     @Override
     public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) {
         // aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
-
         int aOffsetMeta = getCorrectMetaForItemstack(aStack);
-
-        if ((this.descColour.get(aOffsetMeta) != null) && (this.itemDescription.get(aOffsetMeta) != null)) {
-            aList.add(this.descColour.get(aOffsetMeta) + this.itemDescription.get(aOffsetMeta));
-        }
+        aList.add(
+                GT_LanguageManager.getTranslation(
+                        "gtplusplus." + this.getUnlocalizedName(aStack) + "." + aOffsetMeta + ".tooltip"));
 
         if (aOffsetMeta <= 3) {
             FluidStack f = getFluid(aStack);
-            aList.add("Cannot drain any other standard fluid container block");
-            aList.add("Cannot be emptied via RMB, use inside a tank with GUI");
-            aList.add(EnumChatFormatting.DARK_GRAY + "This is technically just a fancy fluid cell");
-            aList.add(EnumChatFormatting.BLUE + (f != null ? f.getLocalizedName() : "No Fluids Contained"));
+            aList.add(StatCollector.translateToLocal("item.itemGregtechPump.tooltip.0"));
+            aList.add(StatCollector.translateToLocal("item.itemGregtechPump.tooltip.1"));
+            aList.add(EnumChatFormatting.DARK_GRAY + StatCollector.translateToLocal("item.itemGregtechPump.tooltip.2"));
+            aList.add(
+                    EnumChatFormatting.BLUE + (f != null ? f.getLocalizedName()
+                            : StatCollector.translateToLocal("item.itemGregtechPump.tooltip.3")));
             aList.add(
                     EnumChatFormatting.BLUE + (f != null ? "" + f.amount : "" + 0)
                             + "L"
@@ -229,25 +209,23 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         if (tStats != null) {
             if (tStats[3] > 0) {
                 aList.add(
-                        EnumChatFormatting.AQUA + "Contains "
-                                + GT_Utility.formatNumbers(tStats[3])
-                                + " EU   Tier: "
-                                + (tStats[2] >= 0 ? tStats[2] : 0)
-                                + EnumChatFormatting.GRAY);
+                        EnumChatFormatting.AQUA + StatCollector.translateToLocalFormatted(
+                                "item.itemBaseEuItem.tooltip.1",
+                                GT_Utility.formatNumbers(tStats[3]),
+                                (tStats[2] >= 0 ? tStats[2] : 0)) + EnumChatFormatting.GRAY);
             } else {
                 final long tCharge = this.getRealCharge(aStack);
                 if ((tStats[3] == -2) && (tCharge <= 0)) {
                     aList.add(
-                            EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
+                            EnumChatFormatting.AQUA + StatCollector.translateToLocal("item.itemBaseEuItem.tooltip.2")
                                     + EnumChatFormatting.GRAY);
                 } else {
                     aList.add(
-                            EnumChatFormatting.AQUA + ""
-                                    + GT_Utility.formatNumbers(tCharge)
-                                    + " / "
-                                    + GT_Utility.formatNumbers(Math.abs(tStats[0]))
-                                    + " EU - Voltage: "
-                                    + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
+                            EnumChatFormatting.AQUA + StatCollector.translateToLocalFormatted(
+                                    "item.itemBaseEuItem.tooltip.3",
+                                    GT_Utility.formatNumbers(tCharge),
+                                    GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: ",
+                                    V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)])
                                     + EnumChatFormatting.GRAY);
                 }
             }
@@ -650,8 +628,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
             GT_ModHandler.registerBoxableItemToToolBox(rStack);
             this.mEnabledItems.set(aID);
             this.mVisibleItems.set(aID);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip);
+            GT_LanguageManager.addStringLocalization(
+                    "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".name",
+                    aEnglish);
+            GT_LanguageManager.addStringLocalization(
+                    "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".tooltip",
+                    aToolTip);
             final List<TC_AspectStack> tAspects = new ArrayList<>();
             // Important Stuff to do first
             for (final Object tRandomData : aRandomData) {
@@ -713,7 +695,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
         if (keyValue < 0 || keyValue > 3) {
             keyValue = 0;
         }
-        return this.itemName.get(keyValue);
+        return GT_LanguageManager
+                .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + keyValue + ".name");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 82ecda5f53..fcd58e6db5 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.config.Configuration;
@@ -69,23 +69,10 @@ public class CORE {
             "[GT++]");
     public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>();
     // Tooltips;
-    public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN
-            + "Alkalus "
-            + EnumChatFormatting.GRAY
-            + "- "
-            + EnumChatFormatting.RED
-            + "[GT++]";
-    public static final String GT_Tooltip_Builder = "" + EnumChatFormatting.DARK_GREEN
-            + "Alkalus "
-            + EnumChatFormatting.GRAY
-            + "- "
-            + EnumChatFormatting.RED
-            + "[GT++]";
-    public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY + "Warning: "
-            + EnumChatFormatting.GREEN
-            + "Radioactive! "
-            + EnumChatFormatting.GOLD
-            + " Avoid direct handling without hazmat protection.";
+    public static final String GT_Tooltip = StatCollector.translateToLocal("GTPP.core.GT_Tooltip");
+    public static final String GT_Tooltip_Builder = StatCollector.translateToLocal("GTPP.core.GT_Tooltip_Builder");
+    public static final String GT_Tooltip_Radioactive = StatCollector
+            .translateToLocal("GTPP.core.GT_Tooltip_Radioactive");
     public static final String noItem = "";
 
     // Because I want to be lazy Gregtech New Horizons Var.
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 13e88ab30f..1722d22c13 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -26,6 +26,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -430,6 +431,7 @@ public class ItemUtils {
 
     public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName,
             String mChemForm, final int Colour) {
+        GT_LanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName);
         final Item[] output = {
                 new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"),
                 new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"),
@@ -548,7 +550,7 @@ public class ItemUtils {
 
     public static Item[] generateSpecialUseDusts(final Material material, final boolean onlyLargeDust,
             final boolean disableExtraRecipes) {
-        final String materialName = material.getLocalizedName();
+        final String materialName = material.getUnlocalizedName();
         final String unlocalizedName = Utils.sanitizeString(materialName);
         final int Colour = material.getRgbAsHex();
         final String aChemForm = material.vChemicalFormula;
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
index 72ab766652..0d3b59e166 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
@@ -2,7 +2,6 @@ package gtPlusPlus.everglades.block;
 
 import net.minecraft.block.BlockGrass;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 
@@ -13,7 +12,6 @@ public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip {
         this.setBlockName("blockDarkWorldGround");
         this.setHardness(1.0F);
         this.setBlockTextureName("minecraft" + ":" + "grass");
-        LanguageRegistry.addName(this, "Unstable Earth");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
index 8d74fdd087..7590af19ef 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
@@ -4,7 +4,6 @@ import net.minecraft.block.BlockDirt;
 import net.minecraft.world.ColorizerGrass;
 import net.minecraft.world.IBlockAccess;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.interfaces.ITileTooltip;
@@ -17,7 +16,6 @@ public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti
         this.setBlockName("blockDarkWorldGround2");
         this.setHardness(0.5F);
         this.setBlockTextureName("minecraft" + ":" + "dirt");
-        LanguageRegistry.addName(this, "Polluted Soil");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
index e9cf49b447..e034d3e09e 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
@@ -3,7 +3,6 @@ package gtPlusPlus.everglades.block;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -17,7 +16,6 @@ public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip {
         this.setHardness(3.0F);
         this.setLightLevel(0.5F);
         this.setBlockTextureName(CORE.MODID + ":" + "metro/TEXTURE_TECH_PANEL_A");
-        LanguageRegistry.addName(this, "Containment Frame");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
index f33b4de9c4..8c8b712c07 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -14,7 +14,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
@@ -38,7 +37,6 @@ public class LeavesBase extends BlockLeaves {
         this.setBlockName(blockName);
         ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "treeLeaves", true);
         this.setCreativeTab(AddToCreativeTab.tabBOP);
-        LanguageRegistry.addName(this, blockNameLocalized + " Leaves");
         Blocks.fire.setFireInfo(this, 80, 150);
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
index 4723403ea0..10f217a42d 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
@@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -38,7 +37,6 @@ public abstract class LogBase extends BlockLog {
                 true);
         ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "logWood", true);
         this.setCreativeTab(AddToCreativeTab.tabBOP);
-        LanguageRegistry.addName(this, blockNameLocalized);
         Blocks.fire.setFireInfo(this, 20, 100);
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
index 42ca117573..6a8e1f9cc7 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
@@ -19,7 +19,6 @@ import net.minecraft.world.gen.feature.WorldGenTrees;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
@@ -46,7 +45,6 @@ public class SaplingBase extends BlockSapling {
         this.setBlockName(blockName);
         ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "treeSapling", true);
         this.setCreativeTab(AddToCreativeTab.tabBOP);
-        LanguageRegistry.addName(this, blockNameLocalized);
     }
 
     private final void setVanillaVariable(Object toSet, Object value) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
index cc29daf6b6..3495869c97 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
@@ -38,6 +38,7 @@ public enum GTPP_CombType {
         this.mColour = aColour;
         map(aID, this);
         this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+        GT_LanguageManager.addStringLocalization("gtplusplus.comb." + this.mNameUnlocal, this.mName + " Comb");
     }
 
     public void setHidden() {
@@ -45,7 +46,7 @@ public enum GTPP_CombType {
     }
 
     public String getName() {
-        return GT_LanguageManager.addStringLocalization("comb." + this.mNameUnlocal, this.mName + " Comb");
+        return GT_LanguageManager.getTranslation("gtplusplus.comb." + this.mNameUnlocal);
     }
 
     public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
index f045dc9b26..cbf448b7f6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
@@ -37,6 +37,7 @@ public enum GTPP_DropType {
         this.mColour = aColour;
         map(aID, this);
         this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+        GT_LanguageManager.addStringLocalization("gtplusplus.drop." + this.mNameUnlocal, this.mName + " Drop");
     }
 
     public void setHidden() {
@@ -44,7 +45,7 @@ public enum GTPP_DropType {
     }
 
     public String getName() {
-        return GT_LanguageManager.addStringLocalization("drop." + this.mNameUnlocal, this.mName + " Drop");
+        return GT_LanguageManager.getTranslation("gtplusplus.drop." + this.mNameUnlocal);
     }
 
     public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
index d4591b5094..ec49643001 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
@@ -36,6 +36,7 @@ public enum GTPP_PollenType {
         this.mColour = aColour;
         map(aID, this);
         this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+        GT_LanguageManager.addStringLocalization("gtplusplus.pollen." + this.mNameUnlocal, this.mName + " Pollen");
     }
 
     public void setHidden() {
@@ -43,7 +44,7 @@ public enum GTPP_PollenType {
     }
 
     public String getName() {
-        return GT_LanguageManager.addStringLocalization("pollen." + this.mNameUnlocal, this.mName + " Pollen");
+        return GT_LanguageManager.getTranslation("gtplusplus.pollen." + this.mNameUnlocal);
     }
 
     public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
index 5049053773..b857827d62 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
@@ -37,6 +37,7 @@ public enum GTPP_PropolisType {
         this.mColour = aColour;
         map(aID, this);
         this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+        GT_LanguageManager.addStringLocalization("gtplusplus.propolis." + this.mNameUnlocal, this.mName + " Propolis");
     }
 
     public void setHidden() {
@@ -44,7 +45,7 @@ public enum GTPP_PropolisType {
     }
 
     public String getName() {
-        return GT_LanguageManager.addStringLocalization("propolis." + this.mNameUnlocal, this.mName + " Propolis");
+        return GT_LanguageManager.getTranslation("gtplusplus.propolis." + this.mNameUnlocal);
     }
 
     public int getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
index e34ca2b77f..e41e3ad47b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
@@ -4,6 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
@@ -40,9 +41,9 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        return EnumChatFormatting.LIGHT_PURPLE
-                + GT_Values.VOLTAGE_NAMES[MathUtils
-                        .balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]
-                + " Machine Plate Cover"; // super.getItemStackDisplayName(tItem);
+        return EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocalFormatted(
+                "item.itemCustomMetaCover.miscutils.GtMachineCasings",
+                GT_Values.VOLTAGE_NAMES[MathUtils
+                        .balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem);
     }
 }
diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang
index 162de1740e..adab67111d 100644
--- a/src/main/resources/assets/miscutils/lang/en_US.lang
+++ b/src/main/resources/assets/miscutils/lang/en_US.lang
@@ -43,6 +43,13 @@ entity.sickBlaze.name=Infected Zealot
 
 //Tile Entities
 tile.blockToolBuilder.name=GregTech Tool Constructor
+tile.blockEggBox.name=Egg Box
+tile.blockCircuitProgrammer.name=Circuit Programmer
+tile.blockDecayablesChest.name=Lead Lined Box
+tile.blockVolumetricFlaskSetter.name=Volumetric Flask Configurator
+tile.blockSuperLight.name=Shining Star
+tile.blockPestKiller.name=Pest Killer
+tile.blockSuperJukebox.name=Sir Mixalot [Jukebox]
 
 //Tools
 item.itemBufferCore.name=Energy Core
@@ -53,6 +60,9 @@ item.itemSandstoneHammer.name=Cobblestone Breaker
 # Tooltips
 GTPP.machines.chisel_slot.tooltip=Target Slot
 GTPP.machines.chisel_slot.tooltip.1=§7Put chiseled item to specify output
+GTPP.core.GT_Tooltip=Added by: §2Alkalus §7- §c[GT++]
+GTPP.core.GT_Tooltip_Builder=§2Alkalus §7- §c[GT++]
+GTPP.core.GT_Tooltip_Radioactive=§7Warning: §aRadioactive! §6 Avoid direct handling without hazmat protection.
 
 //Thermal Foundation Stuff
 item.MiscUtils.bucket.bucketPyrotheum.name=Blazing Pyrotheum Bucket
@@ -164,7 +174,14 @@ item.backpackGray.name=Gray Backpack
 item.backpackBlack.name=Black Backpack
 item.backpackWhite.name=White Backpack
 item.itemBlueprint.name=Blueprint [I am useless]
-item.itemGemShards.name=Diamond Shards
+item.itemBlueprint.tooltip.0=Technical Document No. %d
+item.itemBlueprint.tooltip.1=Currently holding a blueprint for %s
+item.itemBlueprint.tooltip.2=Currently not holding a blueprint for anything.
+item.itemGemShards.0.name=Diamond Shards
+item.itemGemShards.1.name=Emerald Shards
+item.itemGemShards.2.name=Ruby Shards
+item.itemGemShards.3.name=Sapphire Shards
+item.itemGemShards.tooltip=Diamond Shards
 item.itemHalfCompleteCasings.name=Half Complete Casing
 item.itemSulfuricPotion.name=Throwable Vial of Sulfuric Acid
 item.itemHydrofluoricPotion.name=Throwable Vial of Hydrofluoric Acid
@@ -174,7 +191,25 @@ item.itemFoodRaisinToast.name=A Serving of Raisin Toast
 item.itemHotFoodRaisinToast.name=A Serving of Hot Raisin Toast
 item.itemFoodCurriedSausages.name=A Serving of Curried Sausages
 item.itemHotFoodCurriedSausages.name=A Serving of Hot Curried Sausages
-
+item.itemBaseItemHotFood.tooltip.0=§7Warning: §cVery hot!§7 Avoid direct handling..
+item.itemBaseItemHotFood.tooltip.1=This food has %d seconds left, until it is cool.
+item.itemBoilerChassis.name=Advanced Boiler Chassis [Tier %d]
+item.itemDehydratorCoilWire.name=Coil Wire [%s]
+item.itemDehydratorCoil.name=Dehydrator Coil [%s]
+item.itemLavaFilter.name=Lava Filter
+item.itemLavaFilter.tooltip=Filters Lava within a Thermal Boiler.
+item.itemGrindleTablet.name=Grindle
+item.itemGrindleTablet.tooltip=Used to read data from DataSticks & DataOrbs.
+item.itemDragonJar.0.name=Dragon Capture Jar
+item.itemDragonJar.0.tooltip=Does not contain anything.
+item.itemDragonJar.1.name=Captured Dragon Jar
+item.itemDragonJar.1.tooltip=Contains a %s.
+item.itemControlCore.name=Control Core [%s]
+item.itemControlCore.tooltip.0=Allows a Multiblock to function upto %s
+item.itemControlCore.tooltip.1=Required Tier is determined by the sum of the eu/t of all Energy Inputs
+item.itemControlCore.tooltip.2=Lower tiers may be used to underclock, which is useful in some situations
+item.thekeytothecity.tooltip.0=You feel like you're on top of the world.
+item.thekeytothecity.tooltip.1=Wear it around your neck like an amulet.
 
 //Conversion Dusts
 item.dustNeptunium238.name=Neptunium 238 Dust
@@ -1443,6 +1478,10 @@ item.dustPureYellorium.name=Purified Yellorium Dust
 
 //Shards
 item.itemDrained.name=Drained Shard
+item.itemAer.name=Aer Shard
+item.itemIgnis.name=Ignis Shard
+item.itemTerra.name=Terra Shard
+item.itemAqua.name=Aqua Shard
 item.itemDustInfusedAir.name=Infused Air Dust
 item.itemDustInfusedFire.name=Infused Fire Dust
 item.itemDustInfusedEarth.name=Infused Earth Dust
@@ -1497,7 +1536,18 @@ item.itemPlateDoublePlutonium239.name=Double Plutonium 239 Plate
 item.itemDustPlutonium239.name=Plutonium 239 Dust
 item.itemDustSmallPlutonium239.name=Small Plutonium 239 Dust 
 item.itemDustTinyPlutonium239.name=Tiny Plutonium 239 Dust
-
+item.itemCustomMetaCover.miscutils.GtMachineCasings=%s Machine Plate Cover
+item.itemGregtechPump.tooltip.0=Cannot drain any other standard fluid container block
+item.itemGregtechPump.tooltip.1=Cannot be emptied via RMB, use inside a tank with GUI
+item.itemGregtechPump.tooltip.2=This is technically just a fancy fluid cell
+item.itemGregtechPump.tooltip.3=No Fluids Contained
+item.itemBaseEuItem.tooltip.0=§eElectric
+item.itemBaseEuItem.tooltip.1=Contains %d EU   Tier: %d
+item.itemBaseEuItem.tooltip.2=Empty. You should recycle it properly.
+item.itemBaseEuItem.tooltip.3=%d / %d EU - Voltage: %d
+item.itemDebugClearing.name=Debug Square [%d]
+item.itemDebugClearing.0.tooltip=Mode: Clear
+item.itemDebugClearing.1.tooltip=Mode: Fill
 
 //Multitools
 item.AluminiumMultipick.name=Aluminium Multipick
@@ -1734,9 +1784,24 @@ item.itemPlateLudicrite.name=Ludicrite plate
 item.itemPlateVoid.name=Void plate
 item.itemPlateDimensionShard.name=Dimensional Shard plate
 item.rfEUBattery.name=Universally Chargeable Battery
+item.rfEUBattery.tooltip.0=§eIC2/EU Information§7);
+item.rfEUBattery.tooltip.1=§7Tier: [§e%d§7] Current Power: [§e%d§7/EU]
+item.rfEUBattery.tooltip.2=§7Transfer Limit: [§e%d§7Eu/t] Burn Time: [§e%d§7s]
+item.rfEUBattery.tooltip.3=§cRF Information§7
+item.rfEUBattery.tooltip.4=§7Extraction Rate: [§%d§7Rf/t] Insert Rate: [§c%d§7Rf/t]
+item.rfEUBattery.tooltip.5=§7Current Charge: [§c%d§7Rf / %dRf] §c%.2f%%§7
 item.personalCloakingDevice.name=§9Personal Cloaking Device§7
+item.personalCloakingDevice.tooltip.0=§aWorn as a Belt within Baubles.§7
+item.personalCloakingDevice.tooltip.1=§aDrains 10,000EU/t to provide invisibility.§7
+item.personalCloakingDevice.tooltip.2=§6IC2/EU Information§7
+item.personalCloakingDevice.tooltip.3=§7Tier: [§e%d§7] Input Limit: [§e%d§7EU/t]
+item.personalCloakingDevice.tooltip.4=§7Current Power: [§e%d§7EU] [§e%.2f%%§7]
+item.personalCloakingDevice.tooltip.5=§7Time Remaining: [§e%d§7 seconds]
 item.personalHealingDevice.name=§9Personal Healing NanoBooster§r
 item.SlowBuildingRing.name=§eSlow Building Ring§7
+item.SlowBuildingRing.tooltip.0=§aWorn as a Ring within Baubles. Prevents you from sprinting.§7
+item.SlowBuildingRing.tooltip.1=§aMovement speed reduced to crouch speed.§7
+item.SlowBuildingRing.tooltip.2=§aPress shift while worn to toggle crouch on/off.§7
 item.itemBufferCore1.name=Energy Core [ULV].
 item.itemBufferCore2.name=Energy Core [LV].
 item.itemBufferCore3.name=Energy Core [MV].
@@ -1762,6 +1827,9 @@ item.everglades.trigger.name=§6Alkalus Disk [§cActivated§6]
 tile.blockRainforestOakLog.name=Rainforest Oak
 tile.blockRainforestOakLeaves.name=Oak Leaves
 tile.blockRainforestOakSapling.name=Rainforest Oak Sapling
+tile.blockPineLogLog.name=Pine Log
+tile.blockPineLeaves.name=Pine Leaves
+tile.blockPineSapling.name=Pine Sapling
 
 //TC Stuff
 tile.blockFastAlchemyFurnace.0.name=Broken
@@ -3397,4 +3465,10 @@ item.BasicGenericChemItem.23.name=Simple Naquadah Catalyst
 item.BasicGenericChemItem.24.name=Advanced Naquadah Catalyst
 item.BasicGenericChemItem.25.name=Raw Intelligence Catalyst
 item.BasicGenericChemItem.26.name=Ultimate Plasticizer Catalyst
-item.BasicGenericChemItem.27.name=Biological Intelligence Catalyst
\ No newline at end of file
+item.BasicGenericChemItem.27.name=Biological Intelligence Catalyst
+
+item.ItemCustomSpawnEgg.name=Spawn %s
+item.itemSimpleFiremaker.message.0=You light the fire pit.
+item.itemSimpleFiremaker.message.1=You somehow managed to set yourself on fire...
+item.itemSimpleFiremaker.message.2=You created a fire!
+item.itemSimpleFiremaker.message.3=Your attemp does nothing.
\ No newline at end of file