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/textures | |
| 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/textures')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java | 3 |
2 files changed, 5 insertions, 1 deletions
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 |