diff --git a/resources/assets/enderio/textures/blocks/fusedGlassFrame.png b/resources/assets/enderio/textures/blocks/fusedGlassFrame.png index 1e9364d9..9bcfeaf1 100644 Binary files a/resources/assets/enderio/textures/blocks/fusedGlassFrame.png and b/resources/assets/enderio/textures/blocks/fusedGlassFrame.png differ diff --git a/resources/assets/enderio/textures/blocks/fusedGlassItem.png b/resources/assets/enderio/textures/blocks/fusedGlassItem.png index ff1fb99e..b2a8e3dd 100644 Binary files a/resources/assets/enderio/textures/blocks/fusedGlassItem.png and b/resources/assets/enderio/textures/blocks/fusedGlassItem.png differ diff --git a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java index 77515d78..c2d6a2c9 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -56,6 +56,11 @@ public class FacadeRenderer implements IItemRenderer { // Render the facade block RenderUtil.bindBlockTexture(); + if(!block.isOpaqueCube()) { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } + if("appeng.block.solids.BlockSkyStone".equals(block.getClass().getName())) { //Yes, this is a horrible hack, but stumped as to why it is rendered invisible if this isn't done. renderBlocks.setOverrideBlockTexture(block.getIcon(0, PainterUtil.getSourceBlockMetadata(item))); diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index ba4f2975..0205070f 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -151,6 +151,9 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider if(!Config.allowTileEntitiesAsPaintSource && block instanceof ITileEntityProvider) { return false; } + if(block == EnderIO.blockFusedQuartz && paintSource.getItemDamage() < 2) { + return true; + } return block.getRenderType() == 0 || block.isOpaqueCube() || block.isNormalCube(); }