From c901a1fe05e3a0203d926b1ec7d8dcaa5336edab Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 27 Oct 2015 20:31:39 +0100 Subject: [PATCH] Removed Pink Fluffy Unicloud Name because of serverz --- .../ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java | 6 ------ src/main/resources/assets/actuallyadditions/lang/en_US.lang | 1 - 2 files changed, 7 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java index a10491cc6..bbae639d8 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java @@ -14,7 +14,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.ActuallyAdditions; import ellpeck.actuallyadditions.inventory.GuiHandler; -import ellpeck.actuallyadditions.proxy.ClientProxy; import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; @@ -91,11 +90,6 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO } } - @Override - public String getUnlocalizedName(){ - return super.getUnlocalizedName()+(ClientProxy.bulletForMyValentine ? "Valentine" : ""); - } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 016c6a7b6..4da4eddba 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -102,7 +102,6 @@ tile.actuallyadditions.blockFlax.name=Flax Plant tile.actuallyadditions.blockCoffeeMachine.name=Coffee Machine tile.actuallyadditions.blockXPSolidifier.name=Experience Solidifier tile.actuallyadditions.blockSmileyCloud.name=Smiley Cloud -tile.actuallyadditions.blockSmileyCloudValentine.name=Pink Fluffy Unicloud tile.actuallyadditions.blockLeafGenerator.name=Leaf-Eating Generator tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker tile.actuallyadditions.blockRangedCollector.name=Ranged Collector