wool to make use of global dye.dyes
This commit is contained in:
parent
3e54b6e430
commit
97c2de8b79
|
@ -10,12 +10,12 @@ local S = minetest.get_translator()
|
|||
dye.dyes = {
|
||||
{"white", S("White")},
|
||||
{"grey", S("Grey")},
|
||||
{"dark_grey", S("Dark grey")},
|
||||
{"dark_grey", S("Dark Grey")},
|
||||
{"black", S("Black")},
|
||||
{"violet", S("Violet")},
|
||||
{"blue", S("Blue")},
|
||||
{"cyan", S("Cyan")},
|
||||
{"dark_green", S("Dark green")},
|
||||
{"dark_green", S("Dark Green")},
|
||||
{"green", S("Green")},
|
||||
{"yellow", S("Yellow")},
|
||||
{"brown", S("Brown")},
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
local dyes = dye.dyes
|
||||
=======
|
||||
>>>>>>> ref luacheck whitespace warnings
|
||||
|
||||
for i = 1, #dyes do
|
||||
local name, desc = unpack(dyes[i])
|
||||
|
|
Loading…
Reference in New Issue