diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiEnergyStorageModule.java b/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiEnergyStorageModule.java
index d0036514b9..9bc52df3da 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiEnergyStorageModule.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiEnergyStorageModule.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
@@ -42,14 +43,22 @@ protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         if (energy + 49 > this.tileEntity.getMaxEnergyStoredGC()) {
             energy = this.tileEntity.getMaxEnergyStoredGC();
         }
-        String displayStr = EnergyDisplayHelper.getEnergyDisplayS(energy);
+        String displayStr = (StatCollector.canTranslate("gui.EnergyStorageModule.numbers1")
+                ? GCCoreUtil.translate("gui.EnergyStorageModule.numbers1")
+                : "") + EnergyDisplayHelper.getEnergyDisplayS(energy);
         this.fontRendererObj
                 .drawString(displayStr, 122 - this.fontRendererObj.getStringWidth(displayStr) / 2, 25, 4210752);
         displayStr = GCCoreUtil.translate("gui.message.of.name") + " "
+                + (StatCollector.canTranslate("gui.EnergyStorageModule.numbers2")
+                        ? GCCoreUtil.translate("gui.EnergyStorageModule.numbers2")
+                        : "")
                 + EnergyDisplayHelper.getEnergyDisplayS(this.tileEntity.getMaxEnergyStoredGC());
         this.fontRendererObj
                 .drawString(displayStr, 122 - this.fontRendererObj.getStringWidth(displayStr) / 2, 34, 4210752);
         displayStr = GCCoreUtil.translate("gui.maxOutput.desc") + ": "
+                + (StatCollector.canTranslate("gui.EnergyStorageModule.numbers3")
+                        ? GCCoreUtil.translate("gui.EnergyStorageModule.numbers3")
+                        : "")
                 + EnergyDisplayHelper.getEnergyDisplayS(this.tileEntity.storage.getMaxExtract())
                 + "/t";
         this.fontRendererObj
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiOxygenStorageModule.java b/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiOxygenStorageModule.java
index 84269653ea..15b5e4d888 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiOxygenStorageModule.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/client/gui/container/GuiOxygenStorageModule.java
@@ -5,6 +5,7 @@
 
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
@@ -53,12 +54,15 @@ public void initGui() {
      */
     @Override
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-        final String guiTitle = GCCoreUtil.translate("tile.machine2.6.name");
+        final String guiTitle = GCCoreUtil.translate("gui.tile.machine2.6.name.title");
         this.fontRendererObj
                 .drawString(guiTitle, this.xSize / 2 - this.fontRendererObj.getStringWidth(guiTitle) / 2, 6, 4210752);
-        final String displayJoules = (int) (this.tileEntity.storedOxygen + 0.5F) + " "
-                + GCCoreUtil.translate("gui.message.of.name");
-        final String displayMaxJoules = "" + (int) this.tileEntity.maxOxygen;
+        final String displayJoules = (StatCollector.canTranslate("gui.OxygenStorageModule.numbers1")
+                ? GCCoreUtil.translate("gui.OxygenStorageModule.numbers1")
+                : "") + (int) (this.tileEntity.storedOxygen + 0.5F) + " " + GCCoreUtil.translate("gui.message.of.name");
+        final String displayMaxJoules = (StatCollector.canTranslate("gui.OxygenStorageModule.numbers2")
+                ? GCCoreUtil.translate("gui.OxygenStorageModule.numbers2")
+                : "") + (int) this.tileEntity.maxOxygen;
         final String maxOutputLabel = GCCoreUtil.translate("gui.maxOutput.desc") + ": "
                 + TileEntityOxygenStorageModule.OUTPUT_PER_TICK * 20
                 + GCCoreUtil.translate("gui.perSecond");
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCircuitFabricator.java b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCircuitFabricator.java
index 04c3e58e68..c43048ee79 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCircuitFabricator.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCircuitFabricator.java
@@ -154,7 +154,7 @@ protected ItemStack[] getContainingItems() {
 
     @Override
     public String getInventoryName() {
-        return GCCoreUtil.translate("tile.machine2.5.name");
+        return GCCoreUtil.translate("gui.tile.machine2.5.name.title");
     }
 
     @Override
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCoalGenerator.java b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCoalGenerator.java
index 6a42f0f18a..254ef8db62 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCoalGenerator.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityCoalGenerator.java
@@ -200,7 +200,7 @@ public void setInventorySlotContents(int par1, ItemStack par2ItemStack) {
 
     @Override
     public String getInventoryName() {
-        return GCCoreUtil.translate("tile.machine.0.name");
+        return GCCoreUtil.translate("gui.tile.machine.0.name.title");
     }
 
     @Override
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricFurnace.java b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricFurnace.java
index 1957025218..8a6ca090d8 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricFurnace.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricFurnace.java
@@ -198,7 +198,8 @@ protected ItemStack[] getContainingItems() {
 
     @Override
     public String getInventoryName() {
-        return GCCoreUtil.translate(this.tierGC == 1 ? "tile.machine.2.name" : "tile.machine.7.name");
+        return GCCoreUtil
+                .translate(this.tierGC == 1 ? "gui.tile.machine.2.name.title" : "gui.tile.machine.7.name.title");
     }
 
     @Override
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricIngotCompressor.java b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricIngotCompressor.java
index 65ad39a357..ab95dcc5a2 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricIngotCompressor.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityElectricIngotCompressor.java
@@ -299,7 +299,7 @@ public void setInventorySlotContents(int par1, ItemStack par2ItemStack) {
 
     @Override
     public String getInventoryName() {
-        return GCCoreUtil.translate("tile.machine2.4.name");
+        return GCCoreUtil.translate("gui.tile.machine2.4.name.title");
     }
 
     @Override
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityEnergyStorageModule.java b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityEnergyStorageModule.java
index e2c8ccdbb5..ed815b93b5 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityEnergyStorageModule.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityEnergyStorageModule.java
@@ -209,7 +209,8 @@ public void setInventorySlotContents(int par1, ItemStack par2ItemStack) {
 
     @Override
     public String getInventoryName() {
-        return GCCoreUtil.translate(this.tierGC == 1 ? "tile.machine.1.name" : "tile.machine.8.name");
+        return GCCoreUtil
+                .translate(this.tierGC == 1 ? "gui.tile.machine.1.name.title" : "gui.tile.machine.8.name.title");
     }
 
     @Override
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityIngotCompressor.java b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityIngotCompressor.java
index e4ff513746..b9aa410c26 100644
--- a/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityIngotCompressor.java
+++ b/src/main/java/micdoodle8/mods/galacticraft/core/tile/TileEntityIngotCompressor.java
@@ -350,7 +350,7 @@ public void setInventorySlotContents(int par1, ItemStack par2ItemStack) {
 
     @Override
     public String getInventoryName() {
-        return GCCoreUtil.translate("tile.machine.3.name");
+        return GCCoreUtil.translate("gui.tile.machine.3.name.title");
     }
 
     @Override
diff --git a/src/main/resources/assets/galacticraftcore/lang/cs_CZ.lang b/src/main/resources/assets/galacticraftcore/lang/cs_CZ.lang
index 6f0c9320a9..a78964596a 100644
--- a/src/main/resources/assets/galacticraftcore/lang/cs_CZ.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/cs_CZ.lang
@@ -569,6 +569,17 @@ gui.spaceRace.unnamed=Nepojmenovaný tým
 gui.spaceRace.comingSoon=Již brzy!
 
 gui.message.thermalStatus.name=Teplotní regulátor
+
+gui.tile.machine.0.name.title=Tepelná elektrárna
+gui.tile.machine.1.name.title=Energetická zásobárna
+gui.tile.machine.2.name.title=Elektrická pec
+gui.tile.machine.3.name.title=Kompresor
+gui.tile.machine2.4.name.title=Elektrický kompresor
+gui.tile.machine2.5.name.title=Stroj na výrobu solárních waferů
+gui.tile.machine2.6.name.title=Zásobárna kyslíku
+gui.tile.machine.7.name.title=Elektrická oblouková pec
+gui.tile.machine.8.name.title=Energetický Cluster
+
 gui.status.on.name=Zapnuto
 gui.status.off.name=Vypnuto
 gui.status.notAvailable.name=N/A
diff --git a/src/main/resources/assets/galacticraftcore/lang/de_DE.lang b/src/main/resources/assets/galacticraftcore/lang/de_DE.lang
index 4ecd2a51d0..31c1b8acb0 100644
--- a/src/main/resources/assets/galacticraftcore/lang/de_DE.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/de_DE.lang
@@ -309,6 +309,17 @@ gui.message.help3=Für Hilfe bezüglich Öl
 gui.message.prelaunch=Vor dem Start - Checkliste
 gui.message.thermalStatus.name=Temperaturkontrolle
 
+gui.tile.machine.0.name.title=Kohlegenerator
+gui.tile.machine.1.name.title=Batteriebox
+gui.tile.machine.2.name.title=Elektrischer Ofen
+gui.tile.machine.3.name.title=Kompressor
+gui.tile.machine2.4.name.title=Elektrischer Kompressor
+gui.tile.machine2.5.name.title=Schaltkreisfabrikator
+gui.tile.machine2.6.name.title=Sauerstoff-Speichermodul
+gui.tile.machine.7.name.title=Lichtbogenofen
+gui.tile.machine.8.name.title=Energiespeicher-Cluster
+
+
 gui.status.active.name=Aktiv
 gui.status.missingleaves.name=Nicht genug Blätter
 gui.status.missingpower.name=Nicht genug Energie
diff --git a/src/main/resources/assets/galacticraftcore/lang/en_GB.lang b/src/main/resources/assets/galacticraftcore/lang/en_GB.lang
index fe11704372..fff0554f0b 100644
--- a/src/main/resources/assets/galacticraftcore/lang/en_GB.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/en_GB.lang
@@ -339,6 +339,17 @@ gui.message.help3=For help with oil
 gui.message.prelaunch=Pre-launch checklist
 gui.message.thermalStatus.name=Thermal Control
 
+gui.tile.machine.0.name.title=Coal Generator
+gui.tile.machine.1.name.title=Energy Storage Module
+gui.tile.machine.2.name.title=Electric Furnace
+gui.tile.machine.3.name.title=Compressor
+gui.tile.machine2.4.name.title=Electric Compressor
+gui.tile.machine2.5.name.title=Circuit Fabricator
+gui.tile.machine2.6.name.title=Oxygen Storage Module
+gui.tile.machine.7.name.title=Electric Arc Furnace
+gui.tile.machine.8.name.title=Energy Storage Cluster
+
+
 gui.status.active.name=Active
 gui.status.missingleaves.name=Not Enough Leaf Blocks
 gui.status.missingpower.name=Not Enough Power
diff --git a/src/main/resources/assets/galacticraftcore/lang/en_US.lang b/src/main/resources/assets/galacticraftcore/lang/en_US.lang
index 83297ab68e..7e0b21ea77 100644
--- a/src/main/resources/assets/galacticraftcore/lang/en_US.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/en_US.lang
@@ -337,6 +337,16 @@ gui.message.help3=For help with oil
 gui.message.prelaunch=Pre-launch checklist
 gui.message.thermalStatus.name=Thermal Control
 
+gui.tile.machine.0.name.title=Coal Generator
+gui.tile.machine.1.name.title=Energy Storage Module
+gui.tile.machine.2.name.title=Electric Furnace
+gui.tile.machine.3.name.title=Compressor
+gui.tile.machine2.4.name.title=Electric Compressor
+gui.tile.machine2.5.name.title=Circuit Fabricator
+gui.tile.machine2.6.name.title=Oxygen Storage Module
+gui.tile.machine.7.name.title=Electric Arc Furnace
+gui.tile.machine.8.name.title=Energy Storage Cluster
+
 gui.status.active.name=Active
 gui.status.missingleaves.name=Not Enough Leaf Blocks
 gui.status.missingpower.name=Not Enough Power
diff --git a/src/main/resources/assets/galacticraftcore/lang/es_ES.lang b/src/main/resources/assets/galacticraftcore/lang/es_ES.lang
index 23dbdef511..6fc5e8bdef 100644
--- a/src/main/resources/assets/galacticraftcore/lang/es_ES.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/es_ES.lang
@@ -308,6 +308,17 @@ gui.message.help3=Para ayuda con el petróleo
 gui.message.prelaunch=Lista de pre-lanzamiento
 gui.message.thermalStatus.name=Control térmico
 
+gui.tile.machine.0.name.title=Generador a carbón
+gui.tile.machine.1.name.title=Módulo de almacenamiento de energía
+gui.tile.machine.2.name.title=Horno eléctrico
+gui.tile.machine.3.name.title=Compresor
+gui.tile.machine2.4.name.title=Compresor eléctrico
+gui.tile.machine2.5.name.title=Fabricador de circuito
+gui.tile.machine2.6.name.title=Módulo de almacenamiento de oxígeno
+gui.tile.machine.7.name.title=Horno de arco eléctrico
+gui.tile.machine.8.name.title=Cluster de almacenamiento de energía
+
+
 gui.status.active.name=Activo
 gui.status.missingleaves.name=No hay suficientes hojas
 gui.status.missingpower.name=No hay suficiente energía
diff --git a/src/main/resources/assets/galacticraftcore/lang/fi_FI.lang b/src/main/resources/assets/galacticraftcore/lang/fi_FI.lang
index 1294864f6a..b4aabcb223 100644
--- a/src/main/resources/assets/galacticraftcore/lang/fi_FI.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/fi_FI.lang
@@ -353,6 +353,17 @@ gui.message.help3=For help with oil ##NEEDS TRANSLATE##
 gui.message.prelaunch=Pre-launch checklist ##NEEDS TRANSLATE##
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=Coal Generator ##NEEDS TRANSLATE##
+gui.tile.machine.1.name.title=Energy Storage Module ##NEEDS TRANSLATE##
+gui.tile.machine.2.name.title=Electric Furnace ##NEEDS TRANSLATE##
+gui.tile.machine.3.name.title=Compressor ##NEEDS TRANSLATE##
+gui.tile.machine2.4.name.title=Electric Compressor ##NEEDS TRANSLATE##
+gui.tile.machine2.5.name.title=Circuit Fabricator ##NEEDS TRANSLATE##
+gui.tile.machine2.6.name.title=Oxygen Storage Module ##NEEDS TRANSLATE##
+gui.tile.machine.7.name.title=Electric Arc Furnace ##NEEDS TRANSLATE##
+gui.tile.machine.8.name.title=Energy Storage Cluster ##NEEDS TRANSLATE##
+
+
 gui.status.active.name=Active
 gui.status.missingleaves.name=Not Enough Leaf Blocks
 gui.status.missingpower.name=Not Enough Power
diff --git a/src/main/resources/assets/galacticraftcore/lang/fr_CA.lang b/src/main/resources/assets/galacticraftcore/lang/fr_CA.lang
index 372ac971a1..3f0dd5ecb6 100644
--- a/src/main/resources/assets/galacticraftcore/lang/fr_CA.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/fr_CA.lang
@@ -391,6 +391,17 @@ gui.message.help3=For help with oil ##NEEDS TRANSLATE##
 gui.message.prelaunch=Pre-launch checklist ##NEEDS TRANSLATE##
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=Coal Generator ##NEEDS TRANSLATE##
+gui.tile.machine.1.name.title=Energy Storage Module ##NEEDS TRANSLATE##
+gui.tile.machine.2.name.title=Electric Furnace ##NEEDS TRANSLATE##
+gui.tile.machine.3.name.title=Compressor ##NEEDS TRANSLATE##
+gui.tile.machine2.4.name.title=Electric Compressor ##NEEDS TRANSLATE##
+gui.tile.machine2.5.name.title=Circuit Fabricator ##NEEDS TRANSLATE##
+gui.tile.machine2.6.name.title=Oxygen Storage Module ##NEEDS TRANSLATE##
+gui.tile.machine.7.name.title=Electric Arc Furnace ##NEEDS TRANSLATE##
+gui.tile.machine.8.name.title=Energy Storage Cluster ##NEEDS TRANSLATE##
+
+
 gui.status.active.name=Active
 gui.status.missingleaves.name=Not Enough Leaf Blocks
 gui.status.missingpower.name=Not Enough Power
diff --git a/src/main/resources/assets/galacticraftcore/lang/fr_FR.lang b/src/main/resources/assets/galacticraftcore/lang/fr_FR.lang
index 4a64e3ec01..6f1decff31 100644
--- a/src/main/resources/assets/galacticraftcore/lang/fr_FR.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/fr_FR.lang
@@ -340,6 +340,17 @@ gui.message.help3=Pour de l'aide sur les carburants
 gui.message.prelaunch=Liste de vérification de pré-lancement
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=Générateur à charbon
+gui.tile.machine.1.name.title=Module de stockage d'énergie
+gui.tile.machine.2.name.title=Four électrique
+gui.tile.machine.3.name.title=Compresseur
+gui.tile.machine2.4.name.title=compresseur électrique
+gui.tile.machine2.5.name.title=Constructeur de circuit
+gui.tile.machine2.6.name.title=Module de stockage d'oxygène
+gui.tile.machine.7.name.title=Four à arcs éléctrique
+gui.tile.machine.8.name.title=Groupement de stockage énergétique
+
+
 gui.status.active.name=Actif
 gui.status.missingleaves.name=Pas assez de blocs de feuilles
 gui.status.missingpower.name=Pas assez de puissance
diff --git a/src/main/resources/assets/galacticraftcore/lang/hr_HR.lang b/src/main/resources/assets/galacticraftcore/lang/hr_HR.lang
index 09debc4f5e..ccae817bb7 100644
--- a/src/main/resources/assets/galacticraftcore/lang/hr_HR.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/hr_HR.lang
@@ -307,6 +307,17 @@ gui.message.help2=Za rukovanje svemirskim programom
 gui.message.help3=Za pomoć sa uljem
 gui.message.prelaunch=Popis prije-pokretanja
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
+
+gui.tile.machine.0.name.title=Generator Ugljena
+gui.tile.machine.1.name.title=Energijsko Skladište
+gui.tile.machine.2.name.title=Električna Peć
+gui.tile.machine.3.name.title=Kompresor
+gui.tile.machine2.4.name.title=Električni Kompresor
+gui.tile.machine2.5.name.title=Strujni Krug
+gui.tile.machine2.6.name.title=Zračno Skladište
+gui.tile.machine.7.name.title=Električna Arc Peć
+gui.tile.machine.8.name.title=Energijsko Skladište
+
 gui.status.active.name=Aktivirano
 gui.status.missingleaves.name=Nema Dovoljno Lišča
 gui.status.missingpower.name=Nema Dovoljno Energije
diff --git a/src/main/resources/assets/galacticraftcore/lang/hu_HU.lang b/src/main/resources/assets/galacticraftcore/lang/hu_HU.lang
index 5f6e752734..c411e283c1 100644
--- a/src/main/resources/assets/galacticraftcore/lang/hu_HU.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/hu_HU.lang
@@ -306,6 +306,17 @@ gui.message.help3=For help with oil ##NEEDS TRANSLATE##
 gui.message.prelaunch=Pre-launch checklist ##NEEDS TRANSLATE##
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=Szénerőmű
+gui.tile.machine.1.name.title=Akkumlátor-Telep
+gui.tile.machine.2.name.title=Elektromos Kemence
+gui.tile.machine.3.name.title=Préselőgép
+gui.tile.machine2.4.name.title=Elektromos Préselőgép
+gui.tile.machine2.5.name.title=Áramkör-Készítő
+gui.tile.machine2.6.name.title=Légraktár
+gui.tile.machine.7.name.title=Elektromos Duplázó-Kemence
+gui.tile.machine.8.name.title=Nehéz Akkumlátortelep
+
+
 gui.status.active.name=Üzemel
 gui.status.missingleaves.name=Nincs Elég Falevél
 gui.status.missingpower.name=Nincs Elég Energia
diff --git a/src/main/resources/assets/galacticraftcore/lang/it_IT.lang b/src/main/resources/assets/galacticraftcore/lang/it_IT.lang
index f28b458968..5b0b1ce9d6 100644
--- a/src/main/resources/assets/galacticraftcore/lang/it_IT.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/it_IT.lang
@@ -308,6 +308,17 @@ gui.message.help3=per aiuto con il petrolio
 gui.message.prelaunch=Lista di partenza
 gui.message.thermalStatus.name=Controllo termale
 
+gui.tile.machine.0.name.title=Generatore a Carbone
+gui.tile.machine.1.name.title=Stoccaggio di energia
+gui.tile.machine.2.name.title=Fornace elettrica
+gui.tile.machine.3.name.title=Compressore
+gui.tile.machine2.4.name.title=Compressore elettrico
+gui.tile.machine2.5.name.title=Fabbricatore di circuiti
+gui.tile.machine2.6.name.title=Stoccaggio di ossigeno
+gui.tile.machine.7.name.title=Forno elettrico ad arco
+gui.tile.machine.8.name.title=Aggregato spaziale elettrico
+
+
 gui.status.active.name=Attivo
 gui.status.missingleaves.name=Non ci sono abbastanza foglie
 gui.status.missingpower.name=Non c'è abbastanza corrente
diff --git a/src/main/resources/assets/galacticraftcore/lang/ja_JP.lang b/src/main/resources/assets/galacticraftcore/lang/ja_JP.lang
index fdfb4720de..ed4a6d0b08 100644
--- a/src/main/resources/assets/galacticraftcore/lang/ja_JP.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/ja_JP.lang
@@ -422,6 +422,17 @@ gui.message.help3=オイルのヘルプ
 gui.message.prelaunch=起動前のチェックリスト
 gui.message.thermalStatus.name=熱コントローラ
 
+gui.tile.machine.0.name.title=火力発電機
+gui.tile.machine.1.name.title=エネルギー蓄積モジュール
+gui.tile.machine.2.name.title=電気ファーネス
+gui.tile.machine.3.name.title=圧縮機
+gui.tile.machine2.4.name.title=電気圧縮機
+gui.tile.machine2.5.name.title=回路製作機
+gui.tile.machine2.6.name.title=酸素蓄積モジュール
+gui.tile.machine.7.name.title=電気アークファーネス
+gui.tile.machine.8.name.title=エネルギー蓄積クラスター
+
+
 gui.status.active.name=アクティブ
 gui.status.missingleaves.name=葉ブロックが不足している
 gui.status.missingpower.name=エネが不足している
diff --git a/src/main/resources/assets/galacticraftcore/lang/ko_KR.lang b/src/main/resources/assets/galacticraftcore/lang/ko_KR.lang
index 5c11fb663c..63f0cbc033 100644
--- a/src/main/resources/assets/galacticraftcore/lang/ko_KR.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/ko_KR.lang
@@ -308,6 +308,17 @@ gui.message.help3=기름에 대한 도움말
 gui.message.prelaunch=발사전 체크리스트
 gui.message.thermalStatus.name=열 제어
 
+gui.tile.machine.0.name.title=석탄 발전기
+gui.tile.machine.1.name.title=에너지 저장 모듈
+gui.tile.machine.2.name.title=전기 화로
+gui.tile.machine.3.name.title=압축기
+gui.tile.machine2.4.name.title=전기 압축기
+gui.tile.machine2.5.name.title=회로 조립기
+gui.tile.machine2.6.name.title=산소 저장 모듈
+gui.tile.machine.7.name.title=전기 아크 화로
+gui.tile.machine.8.name.title=에너지 저장 클러스터
+
+
 gui.status.active.name=활성
 gui.status.missingleaves.name=나뭇잎 블록 부족
 gui.status.missingpower.name=전력 부족
diff --git a/src/main/resources/assets/galacticraftcore/lang/nl_NL.lang b/src/main/resources/assets/galacticraftcore/lang/nl_NL.lang
index a7b23e7680..59d9833586 100644
--- a/src/main/resources/assets/galacticraftcore/lang/nl_NL.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/nl_NL.lang
@@ -371,6 +371,17 @@ gui.message.help3=Voor Help Met olie
 gui.message.prelaunch=Voor Lancering Checklist
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=Kool Generator
+gui.tile.machine.1.name.title=Energie Opslag Module
+gui.tile.machine.2.name.title=Elektrische Oven
+gui.tile.machine.3.name.title=Compressor
+gui.tile.machine2.4.name.title=Elektrische Compressor
+gui.tile.machine2.5.name.title=Omloop Fabricator
+gui.tile.machine2.6.name.title=Zuurstof Opslag Module
+gui.tile.machine.7.name.title=Elektrische Vlamboogoven
+gui.tile.machine.8.name.title=Energie Opslag Bundel
+
+
 gui.status.active.name=Actief
 gui.status.missingleaves.name=Niet genoeg bladeren
 gui.status.missingpower.name=Niet genoeg stroom
diff --git a/src/main/resources/assets/galacticraftcore/lang/pl_PL.lang b/src/main/resources/assets/galacticraftcore/lang/pl_PL.lang
index 41f110e4c2..f4fe6cb772 100644
--- a/src/main/resources/assets/galacticraftcore/lang/pl_PL.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/pl_PL.lang
@@ -356,6 +356,17 @@ gui.message.help3=Pomoc z ropą
 gui.message.prelaunch=lista Przedstartowa
 gui.message.thermalStatus.name=Kontrola Termalna
 
+gui.tile.machine.0.name.title=Generator Węglowy
+gui.tile.machine.1.name.title=Akumulator
+gui.tile.machine.2.name.title=Piec Elektryczny
+gui.tile.machine.3.name.title=Kompresor
+gui.tile.machine2.4.name.title=Kompresor Elektryczny
+gui.tile.machine2.5.name.title=Fabrykator Obwodowy
+gui.tile.machine2.6.name.title=Magazyn Tlenu
+gui.tile.machine.7.name.title=Piec Arc
+gui.tile.machine.8.name.title=Akumulator Klastrowy
+
+
 gui.status.active.name=Aktywne
 gui.status.missingleaves.name=Za Mało Bloków  Liści
 gui.status.missingpower.name=Za Mało Energii
diff --git a/src/main/resources/assets/galacticraftcore/lang/pt_BR.lang b/src/main/resources/assets/galacticraftcore/lang/pt_BR.lang
index 7936cd0392..651875fa89 100644
--- a/src/main/resources/assets/galacticraftcore/lang/pt_BR.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/pt_BR.lang
@@ -308,6 +308,17 @@ gui.message.help3=Para ajuda com petróleo
 gui.message.prelaunch=Checklist de Pré-Lançamento
 gui.message.thermalStatus.name=Controle Térmico
 
+gui.tile.machine.0.name.title=Gerador a Carvão
+gui.tile.machine.1.name.title=Módulo de Armazenagem de Energia
+gui.tile.machine.2.name.title=Fornalha Elétrica
+gui.tile.machine.3.name.title=Prensa
+gui.tile.machine2.4.name.title=Prensa Elétrica
+gui.tile.machine2.5.name.title=Fabricador de Circuitos
+gui.tile.machine2.6.name.title=Módulo de Armazenagem de Oxigênio
+gui.tile.machine.7.name.title=Fornalha a Arco Voltaico
+gui.tile.machine.8.name.title=Grupo de Armazenagem de Energia
+
+
 gui.status.active.name=Ativo
 gui.status.missingleaves.name=Folhas Insuficientes
 gui.status.missingpower.name=Energia Insuficiente
diff --git a/src/main/resources/assets/galacticraftcore/lang/pt_PT.lang b/src/main/resources/assets/galacticraftcore/lang/pt_PT.lang
index 849aa59ae5..380bdabc31 100644
--- a/src/main/resources/assets/galacticraftcore/lang/pt_PT.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/pt_PT.lang
@@ -308,6 +308,17 @@ gui.message.help3=Para ajuda com petróleo
 gui.message.prelaunch=Checklist de Pré-Lançamento
 gui.message.thermalStatus.name=Controle Térmico
 
+gui.tile.machine.0.name.title=Gerador a Carvão
+gui.tile.machine.1.name.title=Módulo de Armazenamento de Energia
+gui.tile.machine.2.name.title=Fornalha Elétrica
+gui.tile.machine.3.name.title=Compressor
+gui.tile.machine2.4.name.title=Compressor Elétrico
+gui.tile.machine2.5.name.title=Fabricador de Circuitos
+gui.tile.machine2.6.name.title=Módulo de Armazenamento de Oxigénio
+gui.tile.machine.7.name.title=Fornalha a Arco Voltaico
+gui.tile.machine.8.name.title=Grupo de Armazenamento de Energia
+
+
 gui.status.active.name=Ativo
 gui.status.missingleaves.name=Folhas Insuficientes
 gui.status.missingpower.name=Energia Insuficiente
diff --git a/src/main/resources/assets/galacticraftcore/lang/ru_RU.lang b/src/main/resources/assets/galacticraftcore/lang/ru_RU.lang
index b0b9afa41a..961c60c5e0 100644
--- a/src/main/resources/assets/galacticraftcore/lang/ru_RU.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/ru_RU.lang
@@ -308,6 +308,17 @@ gui.message.help3=Для помощи по добычи нефти, напеча
 gui.message.prelaunch=Контрольный список
 gui.message.thermalStatus.name=Тепловой контроль
 
+gui.tile.machine.0.name.title=Угольный генератор
+gui.tile.machine.1.name.title=Модуль «Хранилище энергии»
+gui.tile.machine.2.name.title=Электропечь
+gui.tile.machine.3.name.title=Компрессор
+gui.tile.machine2.4.name.title=Электрический компрессор
+gui.tile.machine2.5.name.title=Производитель микросхем
+gui.tile.machine2.6.name.title=Модуль «Хранилище кислорода»
+gui.tile.machine.7.name.title=Электрическая дуговая печь
+gui.tile.machine.8.name.title=Энергетический массив
+
+
 gui.status.active.name=Активно
 gui.status.missingleaves.name=Отсутствуют блоки листвы
 gui.status.missingpower.name=Отсутствует энергия
diff --git a/src/main/resources/assets/galacticraftcore/lang/sv_SE.lang b/src/main/resources/assets/galacticraftcore/lang/sv_SE.lang
index 4a55e22e3a..ea5249a4c8 100644
--- a/src/main/resources/assets/galacticraftcore/lang/sv_SE.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/sv_SE.lang
@@ -307,6 +307,17 @@ gui.message.help3=För hjälp med olja
 gui.message.prelaunch=Startchecklista
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=Kolgenerator
+gui.tile.machine.1.name.title=Energilagringsmodul
+gui.tile.machine.2.name.title=Elugn
+gui.tile.machine.3.name.title=Plåtmaskin
+gui.tile.machine2.4.name.title=Elplåtmaskin
+gui.tile.machine2.5.name.title=Kretskortstillverkare
+gui.tile.machine2.6.name.title=Syrgaslagringsmodul
+gui.tile.machine.7.name.title=Ljusbågsugn
+gui.tile.machine.8.name.title=Energilagringskluster
+
+
 gui.status.active.name=Aktiv
 gui.status.missingleaves.name=Brist på vegetation
 gui.status.missingpower.name=Strömbrist
diff --git a/src/main/resources/assets/galacticraftcore/lang/th_TH.lang b/src/main/resources/assets/galacticraftcore/lang/th_TH.lang
index f0c24d9755..1162f6c55c 100644
--- a/src/main/resources/assets/galacticraftcore/lang/th_TH.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/th_TH.lang
@@ -308,6 +308,17 @@ gui.message.help3=สำหรับช่วยเหลือเรื่อ
 gui.message.prelaunch=ตรวจสอบรายการก่อนปล่อย
 gui.message.thermalStatus.name=สถานะเครื่องควบคุมอุณหภูมิ
 
+gui.tile.machine.0.name.title=เครื่องกำเนิดไฟฟ้าถ่านหิน
+gui.tile.machine.1.name.title=โมดูลเก็บพลังงาน
+gui.tile.machine.2.name.title=เตาไฟฟ้า
+gui.tile.machine.3.name.title=เครื่องบีบอัด
+gui.tile.machine2.4.name.title=เครื่องบีบอัดไฟฟ้า
+gui.tile.machine2.5.name.title=เครื่องประดิษฐ์แผงวงจร
+gui.tile.machine2.6.name.title=โมดูลเก็บออกซิเจน
+gui.tile.machine.7.name.title=เตาอาร์คไฟฟ้า
+gui.tile.machine.8.name.title=โมดูลเก็บพลังงานแบบคลัสเตอร์
+
+
 gui.status.active.name=กำลังทำงาน
 gui.status.missingleaves.name=บล็อกใบไม้ไม่พอ
 gui.status.missingpower.name=ไฟฟ้าไม่พอ
diff --git a/src/main/resources/assets/galacticraftcore/lang/tr_TR.lang b/src/main/resources/assets/galacticraftcore/lang/tr_TR.lang
index 20db722967..9e05778cc0 100644
--- a/src/main/resources/assets/galacticraftcore/lang/tr_TR.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/tr_TR.lang
@@ -308,6 +308,17 @@ gui.message.help3=2. Ham petrol ile yardım edin
 gui.message.prelaunch=Ön fırlatış kontrol listesi
 gui.message.thermalStatus.name=Sıcaklık Kontrolü
 
+gui.tile.machine.0.name.title=Kömür Jeneratörü
+gui.tile.machine.1.name.title=Enerji Depolama Modülü
+gui.tile.machine.2.name.title=Elektrikli Ocak
+gui.tile.machine.3.name.title=Kompresör
+gui.tile.machine2.4.name.title=Elektrikli Kompresör
+gui.tile.machine2.5.name.title=Devre Fabrikatörü
+gui.tile.machine2.6.name.title=Oksijen Depolama Modülü
+gui.tile.machine.7.name.title=Elektrik Ark Ocağı
+gui.tile.machine.8.name.title=Enerji Depolama Makinesi
+
+
 gui.status.active.name=Aktif
 gui.status.missingleaves.name=Yaprak Blokları Yetersiz
 gui.status.missingpower.name=Yeterli Enerji Yok
diff --git a/src/main/resources/assets/galacticraftcore/lang/zh_CN.lang b/src/main/resources/assets/galacticraftcore/lang/zh_CN.lang
index d2394d5432..2aaf0ac447 100644
--- a/src/main/resources/assets/galacticraftcore/lang/zh_CN.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/zh_CN.lang
@@ -313,6 +313,17 @@ gui.message.help3=寻求关于石油的帮助信息
 gui.message.prelaunch=发射前检查表
 gui.message.thermalStatus.name=温度控制器
 
+gui.tile.machine.0.name.title=燃煤发电机
+gui.tile.machine.1.name.title=能量存储模块
+gui.tile.machine.2.name.title=电炉
+gui.tile.machine.3.name.title=压缩机
+gui.tile.machine2.4.name.title=电动压缩机
+gui.tile.machine2.5.name.title=元件制造台
+gui.tile.machine2.6.name.title=储氧模块
+gui.tile.machine.7.name.title=电弧炉
+gui.tile.machine.8.name.title=储能簇
+
+
 gui.status.active.name=活动的
 gui.status.missingleaves.name=树叶不足
 gui.status.missingpower.name=能量不足
diff --git a/src/main/resources/assets/galacticraftcore/lang/zh_TW.lang b/src/main/resources/assets/galacticraftcore/lang/zh_TW.lang
index f5aeb33ecf..852e54908f 100644
--- a/src/main/resources/assets/galacticraftcore/lang/zh_TW.lang
+++ b/src/main/resources/assets/galacticraftcore/lang/zh_TW.lang
@@ -306,6 +306,17 @@ gui.message.help3=For help with oil ##NEEDS TRANSLATE##
 gui.message.prelaunch=Pre-launch checklist ##NEEDS TRANSLATE##
 gui.message.thermalStatus.name=Thermal Control ##NEEDS TRANSLATE##
 
+gui.tile.machine.0.name.title=燃煤發電機
+gui.tile.machine.1.name.title=能量存儲模組
+gui.tile.machine.2.name.title=電爐
+gui.tile.machine.3.name.title=壓縮機
+gui.tile.machine2.4.name.title=電動壓縮機
+gui.tile.machine2.5.name.title=元件製造臺
+gui.tile.machine2.6.name.title=氧氣儲存模組
+gui.tile.machine.7.name.title=電弧爐
+gui.tile.machine.8.name.title=儲能簇
+
+
 gui.status.active.name=活動的
 gui.status.missingleaves.name=樹葉不足
 gui.status.missingpower.name=能量不足