From b2f20a3583d5cbd54fe1ee813083c71815b0457b Mon Sep 17 00:00:00 2001 From: Zweihorn Date: Sun, 19 May 2019 15:00:19 +0200 Subject: [PATCH] wool to make use of global dye.dyes --- mods/dye/init.lua | 4 ++-- mods/wool/depends.txt | 1 + mods/wool/init.lua | 20 ++------------------ 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/mods/dye/init.lua b/mods/dye/init.lua index 7db8c0e..381eb75 100644 --- a/mods/dye/init.lua +++ b/mods/dye/init.lua @@ -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")}, diff --git a/mods/wool/depends.txt b/mods/wool/depends.txt index 4ad96d5..2717bef 100644 --- a/mods/wool/depends.txt +++ b/mods/wool/depends.txt @@ -1 +1,2 @@ default +dye diff --git a/mods/wool/init.lua b/mods/wool/init.lua index 2846bb4..0dfe847 100644 --- a/mods/wool/init.lua +++ b/mods/wool/init.lua @@ -3,24 +3,8 @@ -- Load support for MT game translation. local S = minetest.get_translator() - -local dyes = { - {"white", S("White")}, - {"grey", S("Grey")}, - {"black", S("Black")}, - {"red", S("Red")}, - {"yellow", S("Yellow")}, - {"green", S("Green")}, - {"cyan", S("Cyan")}, - {"blue", S("Blue")}, - {"magenta", S("Magenta")}, - {"orange", S("Orange")}, - {"violet", S("Violet")}, - {"brown", S("Brown")}, - {"pink", S("Pink")}, - {"dark_grey", S("Dark Grey")}, - {"dark_green", S("Dark Green")}, -} +-- make use of the global dyes of the `dye` mod +local dyes = dye.dyes for i = 1, #dyes do local name, desc = unpack(dyes[i])