Merge remote-tracking branch 'upstream/rv2' into rv2

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java

src/main/java/appeng/parts/misc/PartToggleBus.java

@@ -236,7 +236,7 @@ public class PartToggleBus extends PartBasicState
 	{
 		if ( is.stackSize > 0 )
 		{
-			List<ItemStack> items = new ArrayList();
+			List<ItemStack> items = new ArrayList<ItemStack>();
 			items.add( is.copy() );
 			host.removePart( side, false );
 			Platform.spawnDrops( tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, items );