diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-01-30 19:38:39 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2023-01-30 19:38:39 +0100 |
| commit | b089262fefebd333c907b83aa1035c8e4173bd55 (patch) | |
| tree | 01872e63b80d308719795db55249fc700f5dd7d3 | |
| parent | 7f3b2d2d90e0f1e075dedce786f839dad7160cc9 (diff) | |
| download | GT5-Unofficial-b089262fefebd333c907b83aa1035c8e4173bd55.tar.gz GT5-Unofficial-b089262fefebd333c907b83aa1035c8e4173bd55.tar.bz2 GT5-Unofficial-b089262fefebd333c907b83aa1035c8e4173bd55.zip | |
fix merge conflict
| -rw-r--r-- | src/main/java/gregtech/common/render/GT_RenderUtil.java | 7 |
1 files changed, 4 insertions, 3 deletions
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); |