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

2014-04-10 22:02:23 -05:00
parent f8d60e801a 02a8aef5a3
commit 2de3ab4505
9 changed files with 98 additions and 49 deletions
@@ -271,7 +271,7 @@ public class BusRenderHelper implements IPartRenderHelper

 		bbr.renderBlockBounds( renderer, minX, minY, minZ, maxX, maxY, maxZ, ax, ay, az );

-		renderer.renderStandardBlock( renderer.blockAccess.getBlock( x, y, z ), x, y, z );
+		renderer.renderStandardBlock( blk, x, y, z );
 	}

 	@Override