diff options
| author | Alkalus <draknyte1@hotmail.com> | 2018-04-08 16:12:44 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 16:12:44 +1000 |
| commit | c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7 (patch) | |
| tree | 53bb1b97c8302abf5204d980239a1ef18af18b99 /src/Java/gtPlusPlus/xmod/gregtech/common/blocks | |
| parent | 2cf95a2b3e82ceb3a8eec69e33262cf36b797ae6 (diff) | |
| parent | 31996894fd1dd04ef4850dbc470664c5766bffb8 (diff) | |
| download | GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.tar.gz GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.tar.bz2 GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.zip | |
Merge branch 'master' into power-substation-structure
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks')
3 files changed, 7 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index 7baa8ec36a..0ea26debe4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -54,7 +54,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");; GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Placeholder"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder"); @@ -70,12 +70,7 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_Vanadium_Redox_ZPM.set(new ItemStack(this, 1, 6)); GregtechItemList.Casing_Vanadium_Redox_UV.set(new ItemStack(this, 1, 7)); GregtechItemList.Casing_Vanadium_Redox_MAX.set(new ItemStack(this, 1, 8)); - //GregtechItemList.Casing_WashPlant.set(new ItemStack(this, 1, 4)); - //GregtechItemList.Casing_Sifter.set(new ItemStack(this, 1, 5)); - //GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6)); - //GregtechItemList.Casing_Vanadium_Redox.set(new ItemStack(this, 1, 7)); - //GregtechItemList.Casing_Power_SubStation.set(new ItemStack(this, 1, 8)); - //GregtechItemList.Casing_Cyclotron_Coil.set(new ItemStack(this, 1, 9)); + GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 9)); //GregtechItemList.Casing_Cyclotron_External.set(new ItemStack(this, 1, 10)); //GregtechItemList.Casing_ThermalContainment.set(new ItemStack(this, 1, 11)); //GregtechItemList.Casing_Autocrafter.set(new ItemStack(this, 1, 12)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index e83ce098c8..45ca6c56dc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -35,7 +35,8 @@ public class CasingTextureHandler3 { //Vanadium Redox MAX return TexturesGtBlock.Casing_Redox_6.getIcon(); case 9: - return TexturesGtBlock._PlaceHolder.getIcon(); + //Amazon Warehouse Casing + return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); case 10: return TexturesGtBlock._PlaceHolder.getIcon(); case 11: diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 0c187480bb..b3d751a58f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -205,6 +205,9 @@ public class TexturesGtBlock { public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A; private static final CustomIcon Internal_Overlay_Machine_Cyber_B = new CustomIcon("chrono/CyberPanel2"); public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B; + + + public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); //Overlays //Fan Textures |