diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-04-16 17:23:05 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-04-16 17:23:05 +1000 |
| commit | e6b5d70bfa92812d9bc7269c7cd432ebb4b860d0 (patch) | |
| tree | e8c1b4eb8d9b4e30e1048be5e9e551d0cd642aa3 /src/Java/gtPlusPlus/xmod/gregtech/common | |
| parent | 6614f8e961edcf4f4dfe337b5ffe02e6b4ae3440 (diff) | |
| download | GT5-Unofficial-e6b5d70bfa92812d9bc7269c7cd432ebb4b860d0.tar.gz GT5-Unofficial-e6b5d70bfa92812d9bc7269c7cd432ebb4b860d0.tar.bz2 GT5-Unofficial-e6b5d70bfa92812d9bc7269c7cd432ebb4b860d0.zip | |
% Multiblock Casing shapeless crafting now only grants one per craft in GTNH.
$ Fixed missing tooltips for UV/MAX PSS Batteries.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
3 files changed, 6 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index 0ea26debe4..88e690f43d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -52,7 +52,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)"); 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() + ".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", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder"); 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 45ca6c56dc..f2ec97c42c 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,7 @@ public class CasingTextureHandler3 { //Vanadium Redox MAX return TexturesGtBlock.Casing_Redox_6.getIcon(); case 9: - //Amazon Warehouse Casing + //Amazon Warehouse Casing return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); case 10: return TexturesGtBlock._PlaceHolder.getIcon(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 4746dc2728..d15820514f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -118,6 +118,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe return 6; } else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 6) { return 7; + } else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 7) { + return 8; + } else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 8) { + return 9; } else { return -1; } |