Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts: items/tools/powered/ToolMassCannon.java
2014-06-04 23:05:22 -05:00
parent ea52fb5ebc 1ab7f7c110
commit f6d7762725
12 changed files with 13 additions and 15 deletions
@@ -156,6 +156,6 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
 	@Override
 	public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e)
 	{
-		out.add( AxisAlignedBB.getAABBPool().getAABB( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
+		out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
 	}
 }