aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-03-03 16:01:10 +0100
committerTechnus <daniel112092@gmail.com>2017-03-03 16:01:10 +0100
commit8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a (patch)
tree698983182a71d2cd028aae765b040f7c84ab0d74 /src/main/java/gregtech/api/enums
parent68202491c6247d64fe1559552857b527c4d16d2e (diff)
parent5932e76f836b8bb023c66e21f3b11058abd497eb (diff)
downloadGT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.tar.gz
GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.tar.bz2
GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.zip
Merge not EM related stuff from branch 'eM' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Dyes.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java
index c59b310d55..656afc4890 100644
--- a/src/main/java/gregtech/api/enums/Dyes.java
+++ b/src/main/java/gregtech/api/enums/Dyes.java
@@ -16,7 +16,7 @@ public enum Dyes implements IColorModulationContainer {
dyeRed(1, 255, 0, 0, "Red"),
dyeGreen(2, 0, 255, 0, "Green"),
dyeBrown(3, 96, 64, 0, "Brown"),
- dyeBlue(4, 0, 0, 255, "Blue"),
+ dyeBlue(4, 0, 32, 255, "Blue"),
dyePurple(5, 128, 0, 128, "Purple"),
dyeCyan(6, 0, 255, 255, "Cyan"),
dyeLightGray(7, 192, 192, 192, "Light Gray"),
@@ -24,7 +24,7 @@ public enum Dyes implements IColorModulationContainer {
dyePink(9, 255, 192, 192, "Pink"),
dyeLime(10, 128, 255, 128, "Lime"),
dyeYellow(11, 255, 255, 0, "Yellow"),
- dyeLightBlue(12, 128, 128, 255, "Light Blue"),
+ dyeLightBlue(12, 96, 128, 255, "Light Blue"),
dyeMagenta(13, 255, 0, 255, "Magenta"),
dyeOrange(14, 255, 128, 0, "Orange"),
dyeWhite(15, 255, 255, 255, "White"),
@@ -37,7 +37,7 @@ public enum Dyes implements IColorModulationContainer {
*/
CABLE_INSULATION(-1, 64, 64, 64, "Cable Insulation"),
CONSTRUCTION_FOAM(-1, 64, 64, 64, "Construction Foam"),
- MACHINE_METAL(-1, 220, 220, 255, "Machine Metal");
+ MACHINE_METAL(-1, 210, 220, 255, "Machine Metal");
public static final Dyes VALUES[] = {dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite};