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
@@ -499,7 +499,7 @@ public class Platform
 			AELog.error( t );
 		}

-		return new ArrayList();
+		return new ArrayList<NBTBase>();
 	}

 	/*
@@ -1445,7 +1445,7 @@ public class Platform
 	static public <T extends IAEStack<T>> void postListChanges(IItemList<T> before, IItemList<T> after, IMEMonitorHandlerReceiver<T> meMonitorPassthrough,
 			BaseActionSource source)
 	{
-		LinkedList<T> changes = new LinkedList();
+		LinkedList<T> changes = new LinkedList<T>();

 		for (T is : before)
 			is.setStackSize( -is.getStackSize() );