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

2014-06-11 00:44:00 -05:00
parent 70fe6b4bae 4f4dbc4307
commit 734663f521
19 changed files with 605 additions and 274 deletions
@@ -29,6 +29,9 @@ public class CableRenderHelper
 		TileEntity te = cableBusContainer.getTile();
 		RenderBlocksWorkaround renderer = BusRenderer.instance.renderer;

+		if ( renderer.overrideBlockTexture != null )
+			BusRenderHelper.instance.setPass( 0 );
+
 		if ( renderer.blockAccess == null )
 			renderer.blockAccess = Minecraft.getMinecraft().theWorld;