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

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
This commit is contained in:
Andrew committed 2014-09-29 00:26:15 -07:00
commit 5c5aaa21ee
113 files changed
+410 -238

No files matched your search

@@ -280,7 +280,7 @@ public class ClientHelper extends ServerHelper
{
if ( Platform.isClient() )
{
List<EntityPlayer> o = new ArrayList();
List<EntityPlayer> o = new ArrayList<EntityPlayer>();
o.add( Minecraft.getMinecraft().thePlayer );
return o;
}