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
@@ -55,7 +55,7 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
 		}
 		else if ( te instanceof ArrayList )
 		{
-			return new AdaptorList( (ArrayList) te );
+			return new AdaptorList( (ArrayList<ItemStack>) te );
 		}
 		else if ( bs != null && bs.isStorageCrate( te )  )
 		{