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

Conflicts: src/main/java/appeng/items/tools/powered/ToolMassCannon.java
2014-09-29 00:26:15 -07:00
parent fd18393a8b 72106c877d
commit 5c5aaa21ee
113 changed files with 410 additions and 238 deletions
@@ -45,7 +45,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable

 			wc.add( getForward(), 1 );

-			List<ItemStack> out = new ArrayList();
+			List<ItemStack> out = new ArrayList<ItemStack>();
 			out.add( notAdded );

 			Platform.spawnDrops( worldObj, wc.x, wc.y, wc.z, out );