Conflicts:
	src/main/java/crazypants/enderio/TileEntityEio.java
	src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/render/TechneModelRenderer.java
	src/main/java/crazypants/render/TechneUtil.java
This commit is contained in:
tterrag1098 committed 2015-06-23 15:43:26 -04:00
commit 4bd4e6bff1
6 files changed
+48 -18

No files matched your search

@@ -353,8 +353,9 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerBlockHandler(new PaintedBlockRenderer(BlockTravelAnchor.renderId, EnderIO.blockTravelPlatform));
BlockTelePad.renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(new TelePadRenderer());
ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer());
TelePadRenderer telePadRenderer = new TelePadRenderer();
RenderingRegistry.registerBlockHandler(telePadRenderer);
ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer(telePadRenderer));
MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer());
MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer());