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

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

src/main/java/appeng/container/AEBaseContainer.java

@@ -72,7 +72,7 @@ public abstract class AEBaseContainer extends Container
 	int ticksSinceCheck = 900;
 
 	IAEItemStack clientRequestedTargetItem = null;
-	List<PacketPartialItem> dataChunks = new LinkedList();
+	List<PacketPartialItem> dataChunks = new LinkedList<PacketPartialItem>();
 
 	public void postPartial(PacketPartialItem packetPartialItem)
 	{
@@ -129,7 +129,7 @@ public abstract class AEBaseContainer extends Container
 				CompressedStreamTools.writeCompressed( item, stream );
 
 				int maxChunkSize = 30000;
-				List<byte[]> miniPackets = new LinkedList();
+				List<byte[]> miniPackets = new LinkedList<byte[]>();
 
 				byte[] data = stream.toByteArray();
 
@@ -216,7 +216,7 @@ public abstract class AEBaseContainer extends Container
 	public ContainerOpenContext openContext;
 
 	protected IMEInventoryHandler<IAEItemStack> cellInv;
-	protected HashSet<Integer> locked = new HashSet();
+	protected HashSet<Integer> locked = new HashSet<Integer>();
 	protected IEnergySource powerSrc;
 
 	public void lockPlayerInventorySlot(int idx)
@@ -774,7 +774,7 @@ public abstract class AEBaseContainer extends Container
 
 			if ( action == InventoryAction.MOVE_REGION )
 			{
-				List<Slot> from = new LinkedList();
+				List<Slot> from = new LinkedList<Slot>();
 
 				for (Object j : inventorySlots)
 				{

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++)

src/main/java/appeng/container/slot/SlotCraftingTerm.java

@@ -149,7 +149,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 
 	public void postCraft(EntityPlayer p, IMEMonitor<IAEItemStack> inv, ItemStack set[], ItemStack result)
 	{
-		List<ItemStack> drops = new ArrayList();
+		List<ItemStack> drops = new ArrayList<ItemStack>();
 
 		// add one of each item to the items on the board...
 		if ( Platform.isServer() )
@@ -219,7 +219,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 				ItemStack extra = ia.addItems( craftItem( who, rs, inv, all ) );
 				if ( extra != null )
 				{
-					List<ItemStack> drops = new ArrayList();
+					List<ItemStack> drops = new ArrayList<ItemStack>();
 					drops.add( extra );
 					Platform.spawnDrops( who.worldObj, (int) who.posX, (int) who.posY, (int) who.posZ, drops );
 					return;