Merge branch 'cursorcolors' into master

This commit is contained in:
yugecin 2016-10-01 12:17:29 +02:00
commit f233361a9b

View File

@ -36,25 +36,25 @@ public enum CursorColorOverrides {
COMBO6 ("Combo6", 6), COMBO6 ("Combo6", 6),
COMBO7 ("Combo7", 7), COMBO7 ("Combo7", 7),
COMBO8 ("Combo8", 8), COMBO8 ("Combo8", 8),
RAINBOW ("Rainbow", 10) { RAINBOW ("Rainbow", 9) {
@Override @Override
public Color getColor(boolean mirrored) { public Color getColor(boolean mirrored) {
return nextRainbowColor(); return nextRainbowColor();
} }
}, },
RAINBOWSHIFT ("Rainbow + 180° hue shift", 11) { RAINBOWSHIFT ("Rainbow + 180° hue shift", 10) {
@Override @Override
public Color getColor(boolean mirrored) { public Color getColor(boolean mirrored) {
return nextMirrorRainbowColor(); return nextMirrorRainbowColor();
} }
}, },
BLACK ("Black", 12) { BLACK ("Black", 11) {
@Override @Override
public Color getColor(boolean mirrored) { public Color getColor(boolean mirrored) {
return Color.black; return Color.black;
} }
}, },
LASTOBJ ("Use last object's colors", 13) { LASTOBJ ("Use last object's colors", 12) {
@Override @Override
public Color getColor(boolean mirrored) { public Color getColor(boolean mirrored) {
if (mirrored) { if (mirrored) {