diff options
author | Richard Hendricks <richardhendricks@pobox.com> | 2018-07-21 19:38:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 19:38:57 -0500 |
commit | e0141f6f8b3b71b499cf6057fb99dfb37e4975f0 (patch) | |
tree | 35e455d0923a3d13c24d31f15a4e5730515e8e87 /src/main/java/gregtech/api/gui | |
parent | 3f1dbea050ca43850a006c04cf928a3203ca216c (diff) | |
parent | b10ffbbffb71ab223e147a0fe195e5cee0306bd7 (diff) | |
download | GT5-Unofficial-e0141f6f8b3b71b499cf6057fb99dfb37e4975f0.tar.gz GT5-Unofficial-e0141f6f8b3b71b499cf6057fb99dfb37e4975f0.tar.bz2 GT5-Unofficial-e0141f6f8b3b71b499cf6057fb99dfb37e4975f0.zip |
Merge pull request #137 from GTNewHorizons/use_machine_metal_fix
Revert changes for machine metal support, using different method now …
Diffstat (limited to 'src/main/java/gregtech/api/gui')
-rw-r--r-- | src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java index db4a070072..9cdb74c2f1 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java @@ -31,7 +31,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer { byte colorByte=mContainer.mTileEntity.getColorization(); Dyes color; if(colorByte != -1) color= Dyes.get(colorByte); - else color=(GregTech_API.sUseMachineMetal) ? Dyes.MACHINE_METAL : Dyes.dyeWhite; // Maybe not use white here? + else color=Dyes.MACHINE_METAL; GL11.glColor3ub((byte)color.mRGBa[0], (byte)color.mRGBa[1], (byte)color.mRGBa[2]); } else GL11.glColor3ub((byte)255,(byte)255,(byte)255); } |