Merge branch 'development' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-05-01 23:57:29 +01:00
commit 85c67666ad
20 files changed
+296 -53

No files matched your search

@@ -194,9 +194,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
if(hasSecurity(itemstack))
{
list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack)));
list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack));
list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT));
if(SecurityUtils.isOverridden(itemstack))
if(SecurityUtils.isOverridden(itemstack, Side.CLIENT))
{
list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")");
}