Merge remote-tracking branch 'upstream/master'

This commit is contained in:
SenseiKiwi
2013-07-19 07:24:35 -04:00
9 changed files with 24 additions and 21 deletions

View File

@@ -62,7 +62,7 @@ public class BlockDimWall extends Block
public void registerIcons(IconRegister par1IconRegister)
{
this.blockIcon[0] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2());
this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2() + "perm");
this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2() + "Perm");
}
@SideOnly(Side.CLIENT)