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

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

src/main/java/appeng/tile/AEBaseTile.java

@@ -40,12 +40,12 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 {
 
 	static private final HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>> handlers = new HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>>();
-	static private final HashMap<Class, ItemStackSrc> myItem = new HashMap();
+	static private final HashMap<Class, ItemStackSrc> myItem = new HashMap<Class, ItemStackSrc>();
 
 	private ForgeDirection forward = ForgeDirection.UNKNOWN;
 	private ForgeDirection up = ForgeDirection.UNKNOWN;
 
-	public static ThreadLocal<WeakReference<AEBaseTile>> dropNoItems = new ThreadLocal();
+	public static ThreadLocal<WeakReference<AEBaseTile>> dropNoItems = new ThreadLocal<WeakReference<AEBaseTile>>();
 
 	public void disableDrops()
 	{
@@ -122,7 +122,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 		List<AETileEventHandler> list = handlerSet.get( value );
 
 		if ( list == null )
-			handlerSet.put( value, list = new ArrayList() );
+			handlerSet.put( value, list = new ArrayList<AETileEventHandler>() );
 
 		list.add( new AETileEventHandler( m, value ) );
 	}

src/main/java/appeng/tile/grindstone/TileGrinder.java

@@ -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 );

src/main/java/appeng/tile/misc/TileCharger.java

@@ -229,7 +229,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable
 		}
 		else
 		{
-			List<ItemStack> drops = new ArrayList();
+			List<ItemStack> drops = new ArrayList<ItemStack>();
 			drops.add( myItem );
 			setInventorySlotContents( 0, null );
 			Platform.spawnDrops( worldObj, xCoord + getForward().offsetX, yCoord + getForward().offsetY, zCoord + getForward().offsetZ, drops );

src/main/java/appeng/tile/misc/TilePaint.java

@@ -182,7 +182,7 @@ public class TilePaint extends AEBaseTile
 			boolean lit = ipb.isLumen( type );
 
 			if ( dots == null )
-				dots = new ArrayList();
+				dots = new ArrayList<Splotch>();
 
 			if ( dots.size() > 20 )
 				dots.remove( 0 );

src/main/java/appeng/tile/storage/TileDrive.java

@@ -48,8 +48,8 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 	boolean isCached = false;
 	ICellHandler handlersBySlot[] = new ICellHandler[10];
 	DriveWatcher<IAEItemStack> invBySlot[] = new DriveWatcher[10];
-	List<MEInventoryHandler> items = new LinkedList();
-	List<MEInventoryHandler> fluids = new LinkedList();
+	List<MEInventoryHandler> items = new LinkedList<MEInventoryHandler>();
+	List<MEInventoryHandler> fluids = new LinkedList<MEInventoryHandler>();
 
 	BaseActionSource mySrc;
 	long lastStateChange = 0;