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

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

src/main/java/appeng/container/implementations/ContainerCraftConfirm.java

@@ -76,7 +76,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
 
 	protected long cpuIdx = Long.MIN_VALUE;
 
-	public ArrayList<CraftingCPURecord> cpus = new ArrayList();
+	public ArrayList<CraftingCPURecord> cpus = new ArrayList<CraftingCPURecord>();
 
 	public ContainerCraftConfirm(InventoryPlayer ip, ITerminalHost te) {
 		super( ip, te );

src/main/java/appeng/container/implementations/ContainerCraftingStatus.java

@@ -23,7 +23,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU
 	@GuiSync(7)
 	public String myName = "";
 
-	public ArrayList<CraftingCPURecord> cpus = new ArrayList();
+	public ArrayList<CraftingCPURecord> cpus = new ArrayList<CraftingCPURecord>();
 
 	private void sendCPUs()
 	{

src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java

@@ -61,8 +61,8 @@ public class ContainerInterfaceTerminal extends AEBaseContainer
 
 	}
 
-	Map<IInterfaceHost, InvTracker> diList = new HashMap();
-	Map<Long, InvTracker> byId = new HashMap();
+	Map<IInterfaceHost, InvTracker> diList = new HashMap<IInterfaceHost, InvTracker>();
+	Map<Long, InvTracker> byId = new HashMap<Long, InvTracker>();
 	IGrid g;
 
 	public ContainerInterfaceTerminal(InventoryPlayer ip, PartMonitor anchor) {

src/main/java/appeng/container/implementations/ContainerPatternTerm.java

@@ -259,7 +259,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		}
 		else
 		{
-			List<ItemStack> list = new ArrayList( 3 );
+			List<ItemStack> list = new ArrayList<ItemStack>( 3 );
 			boolean hasValue = false;
 
 			for (int x = 0; x < outputSlots.length; x++)