diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-25 23:45:45 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-25 23:45:45 +0200 |
| commit | f698d3f8e00eb3309db6fe3f837bf521ad9be507 (patch) | |
| tree | 95e8987ff3a7c485ec1899c4f253dbbf669d6757 /src/main/java/gregtech/common/blocks | |
| parent | 18f5945d8027750435c811f76d8f69ba10028273 (diff) | |
| parent | c0c498fb8cec35d35cc5fd2b8524cd5510082a9b (diff) | |
| download | GT5-Unofficial-f698d3f8e00eb3309db6fe3f837bf521ad9be507.tar.gz GT5-Unofficial-f698d3f8e00eb3309db6fe3f837bf521ad9be507.tar.bz2 GT5-Unofficial-f698d3f8e00eb3309db6fe3f837bf521ad9be507.zip | |
Merge branch 'BrickedBlastFurnace' into unstable
Conflicts:
src/main/java/gregtech/GT_Mod.java
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/common/GT_Proxy.java
src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Casings4.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index d5930907a5..02940414b3 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -38,6 +38,7 @@ public class GT_Block_Casings4 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Mining Osmiridium Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Firebricks"); ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0)); ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1)); @@ -52,6 +53,7 @@ public class GT_Block_Casings4 ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12)); ItemList.Casing_EngineIntake.set(new ItemStack(this, 1, 13)); ItemList.Casing_MiningOsmiridium.set(new ItemStack(this, 1, 14)); + ItemList.Casing_Firebricks.set(new ItemStack(this, 1, 15)); } public IIcon getIcon(int aSide, int aMeta) { @@ -89,7 +91,7 @@ public class GT_Block_Casings4 case 14: return Textures.BlockIcons.MACHINE_CASING_MINING_OSMIRIDIUM.getIcon(); case 15: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_DENSEBRICKS.getIcon(); } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } |