From 58cac62bf41436ce157676df09031aa8aa6ed2a0 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sat, 25 Feb 2017 14:53:04 -0500
Subject: [PATCH] clean up greyscale portion of extended palette remap greys
 slightly, tweak related recipes

---
 init.lua                                  |  12 ++++++------
 textures/unifieddyes_palette_extended.png | Bin 299 -> 290 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/init.lua b/init.lua
index dd86fbd..00c3cf2 100644
--- a/init.lua
+++ b/init.lua
@@ -747,7 +747,7 @@ end
 
 for y = 1, 14 do -- colors 0 and 15 are black and white, default dyes
 
-	if y ~= 5 and y ~= 8 and Y~= 11 then -- don't register the three greys, they're done separately.
+	if y ~= 4 and y ~= 8 and Y~= 11 then -- don't register the three greys, they're done separately.
 
 		local rgb = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
 		local name = "grey_"..y
@@ -864,9 +864,9 @@ local greymixes = {
 	{ 1,	"dye:black",			"dye:black",		"dye:black",		"dye:dark_grey",	4 },
 	{ 2,	"dye:black",			"dye:black",		"dye:dark_grey",	nil,				3 },
 	{ 3,	"dye:black",			"dye:dark_grey",	nil,				nil,				2 },
-	{ 4,	"dye:dark_grey",		"dye:dark_grey",	"dye:black",		nil,				3 },
-	{ 5,	"dye:white",			"dye:black",		"dye:black",		nil,				3 },
-	{ 6,	"dye:dark_grey",		"dye:dark_grey",	"dye:grey",			nil,				3 },
+	{ 4,	"dye:white",			"dye:black",		"dye:black",		nil,				3 },
+	{ 5,	"dye:dark_grey",		"dye:dark_grey",	"dye:grey",			nil,				3 },
+	{ 6,	"dye:dark_grey",		"dye:grey",			nil,				nil,				2 },
 	{ 7,	"dye:dark_grey",		"dye:grey",			"dye:grey",			nil,				3 },
 	{ 8,	"dye:white",			"dye:black",		nil,				nil,				2 },
 	{ 9,	"dye:grey", 			"dye:grey",			"dye:light_grey",	nil,				3 },
@@ -885,7 +885,7 @@ for _, i in ipairs(greymixes) do
 	local dye4 = i[5]
 	local yield = i[6]
 	local color = "grey_"..shade
-	if shade == 5 then
+	if shade == 4 then
 		color = "dark_grey"
 	elseif shade == 8 then
 		color = "grey"
@@ -916,7 +916,7 @@ minetest.register_alias("unifieddyes:light_grey", "dye:light_grey")
 minetest.register_alias("unifieddyes:white",      "dye:white")
 
 minetest.register_alias("unifieddyes:grey_0",     "dye:black")
-minetest.register_alias("unifieddyes:grey_5",     "dye:dark_grey")
+minetest.register_alias("unifieddyes:grey_4",     "dye:dark_grey")
 minetest.register_alias("unifieddyes:grey_8",     "dye:grey")
 minetest.register_alias("unifieddyes:grey_11",    "dye:light_grey")
 minetest.register_alias("unifieddyes:grey_15",    "dye:white")
diff --git a/textures/unifieddyes_palette_extended.png b/textures/unifieddyes_palette_extended.png
index b3a0da0c8de5cd5a4d67588bc1e5f30ea46080f3..2ff0323aadaa03a49133702f67c0d4a47d37a158 100644
GIT binary patch
delta 262
zcmV+h0r~!`0-^$tB!B5iL_t(2&y~?JP69y`fZ=bG4Y3eI;gV=WXsJB_m++vR0O*yH
zg2F@#*{~2zHd1J0EZBi9n8KG={ol(plZEM2&uKrMR{~nqspeKIcl^?!XU~pz)<{6B
z5+PTXI&`@e_@QP;i3G$-3v!c*2fpdb2DYqt<_QUi)j%dfZhx_G!#y?BtXZ)@0$TM9
z`FuP!B=G7m_eNmY99@Q3%^gI@%h}9^n!uG8mT@JZRf&)<M<abu2}@gOf&|2BDTt6g
zqM%Pfp`v0#B?+y1e6V7ZS4H6(d<pEK2@(+N@%tOdLI@xK8NtQ*1CTkvInE&fDF6Tf
M07*qoM6N<$g7}VgVE_OC

delta 272
zcmV+r0q_2z0;>X$B!BWrL_t(2&yCT&P69y`fYGzbhFFN9a7nZ=wA4NTFX4mo1VFEp
z6ci>}2x0j#*+`+tSiry*OybS0zH>9pWMMGSa@tSlm4I4xs=4XZ9ltba*|Oq;84^&d
zM99tO8Z@~T_@QFO90`b(8sz$Yk9^aVJy<g3g=ZunRu3`}a)0Bo8}6x~V#bs)5>TsW
z$Va`N4uLoOk#_=}<I!b^)yQ6id_EjnP!YKD$|SA?)G873Nw=#FN?~FN#~=Z*ng}9f
zPbg?pP$(%`P)b6r9v&=N<YiH~244bOI0gxb_3-^i$U+F~f6QjHS+Cc--A-_E{s4@c
W!8zDkBsKs500{s|MNUMnLSTX!&wB*`