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

Conflicts: container/AEBaseContainer.java core/sync/AppEngPacketHandlerBase.java
2014-05-13 19:25:07 -05:00
parent d84ec9c0bf 62aa5c4175
commit 25a588f303
57 changed files with 1270 additions and 152 deletions
@@ -191,10 +191,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
 		super.getDrops( w, x, y, z, drops );

 		if ( cell.getStackInSlot( 0 ) != null )
-		{
 			drops.add( cell.getStackInSlot( 0 ) );
-			cell.setInventorySlotContents( 0, null );
-		}
 	}

 	public ICellWorkbenchItem getCell()