From b089262fefebd333c907b83aa1035c8e4173bd55 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 30 Jan 2023 19:38:39 +0100 Subject: fix merge conflict --- src/main/java/gregtech/common/render/GT_RenderUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/common/render') diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GT_RenderUtil.java index 29ba761c63..f3d2a54b5c 100644 --- a/src/main/java/gregtech/common/render/GT_RenderUtil.java +++ b/src/main/java/gregtech/common/render/GT_RenderUtil.java @@ -20,9 +20,10 @@ public class GT_RenderUtil { GL11.glColor4f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F, 255.0f); } else { System.out.println("WARNING: " + aStack.getDisplayName() + " does not have an associated GT colour."); - -public static void renderBlockIcon( - RenderBlocks aRenderer, Block aBlock, double aX, double aY, double aZ, IIcon aIcon, byte aSide) { + } + } + public static void renderBlockIcon( + RenderBlocks aRenderer, Block aBlock, double aX, double aY, double aZ, IIcon aIcon, byte aSide) { switch (aSide) { case 0: aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); -- cgit