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

2014-06-19 01:36:07 -05:00
parent b8a8f2f202 77dcf6c5cf
commit f574f7533d
1 changed files with 12 additions and 6 deletions
@@ -325,6 +325,12 @@ public class BlockCableBus extends AEBaseBlock
 		cb( w, x, y, z ).onNeighborChanged();
 	}
 	@Override
 	public void onNeighborChange(IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ)
 	{
 		cb( w, x, y, z ).onNeighborChanged();
 	}
 	@Override
 	public Item getItemDropped(int i, Random r, int k)
 	{