mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2025-06-28 14:16:06 +02: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:
@ -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"},
|
||||
},
|
||||
})
|
||||
|
||||
|
@ -57,6 +57,22 @@ coloredwood.shades2 = {
|
||||
"" -- represents "no special shade name", e.g. full.
|
||||
}
|
||||
|
||||
coloredwood.default_hues = {
|
||||
"white",
|
||||
"grey",
|
||||
"dark_grey",
|
||||
"black",
|
||||
"violet",
|
||||
"blue",
|
||||
"cyan",
|
||||
"dark_green",
|
||||
"green",
|
||||
"yellow",
|
||||
"orange",
|
||||
"red",
|
||||
"magenta"
|
||||
}
|
||||
|
||||
coloredwood.hues = {
|
||||
"red",
|
||||
"orange",
|
||||
|
@ -5,7 +5,6 @@
|
||||
|
||||
local colored_block_modname = "coloredwood"
|
||||
local colored_block_description = "Stick"
|
||||
local neutral_block = "default:stick"
|
||||
|
||||
for shade = 1, 3 do
|
||||
|
||||
@ -41,13 +40,13 @@ for shade = 1, 3 do
|
||||
minetest.register_craftitem(colorname, {
|
||||
description = itemdesc,
|
||||
inventory_image = pngname,
|
||||
groups = { coloredsticks=1}
|
||||
groups = { coloredsticks=1, stick=1 }
|
||||
})
|
||||
|
||||
minetest.register_craftitem(s50colorname, {
|
||||
description = s50itemdesc,
|
||||
inventory_image = s50pngname,
|
||||
groups = { coloredsticks=1}
|
||||
groups = { coloredsticks=1, stick=1 }
|
||||
})
|
||||
|
||||
minetest.register_craft( {
|
||||
@ -82,7 +81,7 @@ for hue = 1, 12 do
|
||||
minetest.register_craftitem(colorname, {
|
||||
description = itemdesc,
|
||||
inventory_image = pngname,
|
||||
groups = { coloredsticks=1}
|
||||
groups = { coloredsticks=1, stick=1 }
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
@ -121,7 +120,7 @@ for grey = 1,5 do
|
||||
minetest.register_craftitem(greyshadename, {
|
||||
description = itemdesc,
|
||||
inventory_image = pngname,
|
||||
groups = { coloredsticks=1}
|
||||
groups = { coloredsticks=1, stick=1 }
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
|
Reference in New Issue
Block a user