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

2014-06-28 17:34:03 -05:00
parent c8bdf1bd45 6718fae629
commit e5e373ce10
7 changed files with 91 additions and 41 deletions
@@ -271,6 +271,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 		return cb( world, x, y, z ).isEmpty();
 	}

+	@SuppressWarnings("deprecation")
 	@Override
 	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z)
 	{