Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-15 09:35:56 -05:00
parent cfeebae5ac 9ba1b133d7
commit d10e7ee6df
6 changed files with 41 additions and 29 deletions
@@ -151,7 +151,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	@Override
 	public void setInventorySlotContents(int var1, ItemStack var2)
 	{
-		if ( var2 == null )
+		if ( var2 == null && Platform.isServer() )
 			makePlate();
 	}