1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-12-26 11:15:22 +01:00

Merge server with github repository

Pas mal de changement n’ont pas été pushé sur le github du serveur,
voici l’occasion de faire une bonne synchronisation :)
This commit is contained in:
Ombridride
2014-11-16 22:23:16 +01:00
parent 87b1cd745f
commit 2e895a7790
4474 changed files with 1121 additions and 1097 deletions

View File

@@ -99,8 +99,8 @@ for shade = 1, 3 do
output = colorname.." 2",
recipe = {
{ "unifieddyes:"..shadename..huename, "", "" },
{"default:stick", "default:stick", "default:stick"},
{"default:stick", "default:stick", "default:stick"},
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})
@@ -108,8 +108,8 @@ for shade = 1, 3 do
output = s50colorname.." 2",
recipe = {
{ "unifieddyes:"..shadename..huename.."_s50", "", "" },
{"default:stick", "default:stick", "default:stick"},
{"default:stick", "default:stick", "default:stick"},
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})
@@ -182,8 +182,8 @@ for hue = 1, 12 do
output = colorname.." 2",
recipe = {
{ "unifieddyes:light_"..huename, "", "" },
{"default:stick", "default:stick", "default:stick"},
{"default:stick", "default:stick", "default:stick"},
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})
@@ -197,7 +197,37 @@ for hue = 1, 12 do
},
})
end
-- extra recipes for default dye colors.
for _, color in ipairs(coloredwood.default_hues) do
minetest.register_craft({
output = "coloredwood:fence_"..color.." 2",
recipe = {
{ "dye:"..color, "", "" },
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})
end
minetest.register_craft({
output = "coloredwood:fence_light_red 2",
recipe = {
{ "dye:pink", "", "" },
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})
minetest.register_craft({
output = "coloredwood:fence_dark_orange 2",
recipe = {
{ "dye:brown", "", "" },
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})
-- ============================================================
-- The 5 levels of greyscale.
@@ -253,8 +283,8 @@ for grey = 1,5 do
output = greyshadename.." 2",
recipe = {
{ greyname3, "", "" },
{"default:stick", "default:stick", "default:stick"},
{"default:stick", "default:stick", "default:stick"},
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
},
})