mirror of
https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git
synced 2026-11-21 04:32:21 +00:00
Merge remote-tracking branch 'upstream/rv2' into rv2
Conflicts: src/main/java/appeng/items/tools/powered/ToolMassCannon.java
This commit is contained in:
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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user