diff options
4 files changed, 21 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java index 4acb5fa69f..df331d4539 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -52,7 +52,7 @@ public class ItemAirFilter extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { - String itemName = "Air Filter"; + String itemName = tItem == null ? "Air Filter" : tItem.getDisplayName(); String suffixName = ""; if (tItem.getItemDamage() == 0){ suffixName = " [Tier 1]"; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java index 0404e6f083..ee5a106bd3 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java @@ -18,7 +18,7 @@ public class blockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti this.setBlockTextureName("minecraft" + ":" + "dirt"); LanguageRegistry.addName(this, "Polluted Soil"); } - + @Override @SideOnly(Side.CLIENT) public int getBlockColor() diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java index 6f3a713058..41bc620722 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java @@ -21,6 +21,7 @@ public class ItemBlockToxicEverglades extends ItemBlock { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.mID == 0){ //blockDarkWorldPortalFrame + list.add("Use this to access the Toxic Everglades."); list.add("Assembled in the same shape as the Nether Portal."); } else if (this.mID == 1){ //blockDarkWorldPortal @@ -30,7 +31,10 @@ public class ItemBlockToxicEverglades extends ItemBlock { list.add("Will burn very quickly if it happens to catch fire."); } else if (this.mID == 3){ //blockDarkWorldPollutedDirt - list.add("Maybe you can do something with this?."); + list.add("Maybe you can do something with this?."); + if (stack.getItemDamage() > 0) { + list.add("This smells worse than a bean fart..."); + } } } diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 4322c4e48e..2c65dd3953 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -111,6 +111,11 @@ item.Fertiliser.name=Fertiliser Cell item.UN32Fertiliser.name=UN-32 Fertiliser Cell item.UN18Fertiliser.name=UN-18 Fertiliser Cell item.RaisinJuice.name=Raisin Juice Cell +item.BerylliumHydroxide.name=Beryllium Hydroxide Cell +item.AmmoniumBifluoride.name=Ammonium Bifluoride Cell +item.Hydroxide.name=Hydroxide Cell +item.Ammonium.name=Ammonium Cell +item.AmmoniumTetrafluoroberyllate.name=Ammonium Tetrafluoroberyllate Cell //Resources item.itemStickyRubber.name=Gumlet of Sticky Rubber @@ -1606,16 +1611,16 @@ item.TungstenCarbideMultispade.name=Tungsten Carbide Multispade item.TantalumCarbideMultipick.name=Tantalum Carbide Multipick item.TantalumCarbideMultispade.name=Tantalum Carbide Multispade -item.mobessence.name=mobessence Cell +item.mobessence.name=Mob Essence Cell item.itemPlateClay.name=Clay Plate item.itemPlateDoubleClay.name=Double Clay Plate -item.itemSmallGearWroughtIron.name=Small WroughtIron Gear +item.itemSmallGearWroughtIron.name=Small Wrought Iron Gear item.itemPlateLithium.name=Lithium Plate item.itemPlateDoubleEuropium.name=Double Europium Plate item.itemBoilerChassis_0.name=Advanced Boiler Chassis [Tier 1] item.itemDehydratorCoilWire_0.name=Coil Wire [EV] item.itemDehydratorCoil_0.name=Dehydrator Coil [EV] -item.itemAirFilter_0.name=Air Filter [Tier 1] +item.itemAirFilter_0.name=Air Filter item.itemLavaFilter.name=Lava Filter item.itemGrindleTablet.name=Git item.itemDragonJar.name=Dragon Capture Jar @@ -1714,7 +1719,7 @@ tile.blockRainforestOakSapling.name=Rainforest Oak Sapling //TC Stuff tile.blockFastAlchemyFurnace.0.name=Broken -tile.blockFastArcaneAlembic.0.name=Broken +tile.blockFastArcaneAlembic.1.name=Broken //Frame Boxes tile.Block of Selenium.name=Block of Selenium @@ -1894,7 +1899,8 @@ tile.blockTankXpConverter.name=Experience Converter //Everglades Blocks tile.fluidSludge.0.name=Stagnant Waste Water -tile.blockDarkWorldPortal.name=tile.blockDarkWorldPortal.name -tile.blockDarkWorldGround.name=tile.blockDarkWorldGround.name -tile.blockDarkWorldGround2.name=tile.blockDarkWorldGround2.name -tile.blockDarkWorldPortalFrame.name=tile.blockDarkWorldPortalFrame.name
\ No newline at end of file +tile.blockDarkWorldPortal.name=A Glimpse of the Future +tile.blockDarkWorldGround.name=Unstable Earth +tile.blockDarkWorldGround2.name=Polluted Soil +tile.blockDarkWorldGround2.2.name=Highly Polluted Soil +tile.blockDarkWorldPortalFrame.name=Containment Frame
\ No newline at end of file |