From b21c3d368077aa3a1c42ff1582cda6263c018585 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 6 Mar 2019 17:01:02 -0500 Subject: updated cottages, areasprotector, bees, biome_lib, technic, facade, farming redo, homedecor, maptools, mesecons, moreblocks, moreores, pipeworks, quartz, travelnet, unified_inventory, unifieddyes, xban2 delete the playeranim mod, not 5.0.0 compatible. --- moreblocks/stairsplus/API.md | 2 +- moreblocks/stairsplus/aliases.lua | 2 +- moreblocks/stairsplus/common.lua | 18 +++++++++++------- moreblocks/stairsplus/conversion.lua | 2 +- moreblocks/stairsplus/custom.lua | 16 +++++++--------- moreblocks/stairsplus/defs.lua | 4 ++-- moreblocks/stairsplus/init.lua | 2 +- moreblocks/stairsplus/microblocks.lua | 4 +--- moreblocks/stairsplus/panels.lua | 4 +--- moreblocks/stairsplus/recipes.lua | 2 +- moreblocks/stairsplus/registrations.lua | 2 +- moreblocks/stairsplus/slabs.lua | 2 +- moreblocks/stairsplus/slopes.lua | 4 +--- moreblocks/stairsplus/stairs.lua | 4 +--- 14 files changed, 31 insertions(+), 37 deletions(-) (limited to 'moreblocks/stairsplus') diff --git a/moreblocks/stairsplus/API.md b/moreblocks/stairsplus/API.md index cd8d1a7..b5cb0c1 100644 --- a/moreblocks/stairsplus/API.md +++ b/moreblocks/stairsplus/API.md @@ -79,4 +79,4 @@ The subset table should have the following format: { "stair", "_alt_4" }, } ``` -You can remove entries as needed. \ No newline at end of file +You can remove entries as needed. diff --git a/moreblocks/stairsplus/aliases.lua b/moreblocks/stairsplus/aliases.lua index 224dce7..b005a06 100644 --- a/moreblocks/stairsplus/aliases.lua +++ b/moreblocks/stairsplus/aliases.lua @@ -1,7 +1,7 @@ --[[ More Blocks: alias definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/common.lua b/moreblocks/stairsplus/common.lua index a7134b2..6ec5101 100644 --- a/moreblocks/stairsplus/common.lua +++ b/moreblocks/stairsplus/common.lua @@ -1,7 +1,7 @@ --[[ More Blocks: registrations -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] @@ -10,11 +10,11 @@ local S = moreblocks.intllib stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields) local descriptions = { - ["micro"] = "Microblock", - ["slab"] = "Slab", - ["slope"] = "Slope", - ["panel"] = "Panel", - ["stair"] = "Stairs", + ["micro"] = S("Microblock"), + ["slab"] = S("Slab"), + ["slope"] = S("Slope"), + ["panel"] = S("Panel"), + ["stair"] = S("Stairs"), } local def = {} if category ~= "slab" then @@ -30,6 +30,10 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam end def.paramtype = "light" def.paramtype2 = def.paramtype2 or "facedir" + + -- This makes node rotation work on placement + def.place_param2 = nil + def.on_place = minetest.rotate_node if category ~= "slab" then def.description = S("%s " .. descriptions[category]):format(fields.description) @@ -58,4 +62,4 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam end minetest.register_node(":" ..modname.. ":" .. category .. "_" .. subname .. alternate, def) stairsplus.register_recipes(category, alternate, modname, subname, recipeitem) -end \ No newline at end of file +end diff --git a/moreblocks/stairsplus/conversion.lua b/moreblocks/stairsplus/conversion.lua index bc8e77e..e73dfb0 100644 --- a/moreblocks/stairsplus/conversion.lua +++ b/moreblocks/stairsplus/conversion.lua @@ -1,7 +1,7 @@ --[[ More Blocks: conversion -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/custom.lua b/moreblocks/stairsplus/custom.lua index e456f7c..ad67009 100644 --- a/moreblocks/stairsplus/custom.lua +++ b/moreblocks/stairsplus/custom.lua @@ -1,12 +1,10 @@ --[[ More Blocks: microblock definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - --[[ Subset table should have the following format: (You can remove entries as needed.) @@ -75,22 +73,22 @@ function register_custom_subset(subset, modname, subname, recipeitem, groups, im end function stairsplus:register_custom_subset_alias(subset, modname_old, subname_old, modname_new, subname_new) - local subset = table.copy(subset) - for k, v in pairs(subset) do + local subset_copy = table.copy(subset) + for k, v in pairs(subset_copy) do minetest.register_alias(modname_old .. ":" .. v[1] .. "_" .. subname_old .. v[2], modname_new .. ":" .. v[1] .. "_" .. subname_new .. v[2]) end end function stairsplus:register_custom_subset_alias_force(subset, modname_old, subname_old, modname_new, subname_new) - local subset = table.copy(subset) - for k, v in pairs(subset) do + local subset_copy = table.copy(subset) + for k, v in pairs(subset_copy) do minetest.register_alias_force(modname_old .. ":" .. v[1] .. "_" .. subname_old .. v[2], modname_new .. ":" .. v[1] .. "_" .. subname_new .. v[2]) end end function stairsplus:register_custom_subset(subset, modname, subname, recipeitem, fields) - local subset = table.copy(subset) - for k, v in pairs(subset) do + local subset_copy = table.copy(subset) + for k, v in pairs(subset_copy) do stairsplus.register_single(v[1], v[2], stairsplus.defs[v[1]][v[2]], modname, subname, recipeitem, fields) end diff --git a/moreblocks/stairsplus/defs.lua b/moreblocks/stairsplus/defs.lua index 560b1f2..a3d2cb1 100644 --- a/moreblocks/stairsplus/defs.lua +++ b/moreblocks/stairsplus/defs.lua @@ -1,7 +1,7 @@ --[[ More Blocks: registrations -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] @@ -406,4 +406,4 @@ for type,a in pairs(stairsplus.defs) do for name,b in pairs(stairsplus.defs[type]) do table.insert(stairsplus.shapes_list, { type .. "_", name }) end -end \ No newline at end of file +end diff --git a/moreblocks/stairsplus/init.lua b/moreblocks/stairsplus/init.lua index 624b7c8..0d99a14 100644 --- a/moreblocks/stairsplus/init.lua +++ b/moreblocks/stairsplus/init.lua @@ -1,7 +1,7 @@ --[[ More Blocks: Stairs+ -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/microblocks.lua b/moreblocks/stairsplus/microblocks.lua index dc8ddfd..a08ec7c 100644 --- a/moreblocks/stairsplus/microblocks.lua +++ b/moreblocks/stairsplus/microblocks.lua @@ -1,12 +1,10 @@ --[[ More Blocks: microblock definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called :micro_ function register_micro(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/stairsplus/panels.lua b/moreblocks/stairsplus/panels.lua index 5e2bf7b..c017af6 100644 --- a/moreblocks/stairsplus/panels.lua +++ b/moreblocks/stairsplus/panels.lua @@ -1,12 +1,10 @@ --[[ More Blocks: panel definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called :panel_ function register_panel(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/stairsplus/recipes.lua b/moreblocks/stairsplus/recipes.lua index ec908bd..f4d259c 100644 --- a/moreblocks/stairsplus/recipes.lua +++ b/moreblocks/stairsplus/recipes.lua @@ -1,7 +1,7 @@ --[[ More Blocks: Stairs+ -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/registrations.lua b/moreblocks/stairsplus/registrations.lua index 6262a6d..189ca84 100644 --- a/moreblocks/stairsplus/registrations.lua +++ b/moreblocks/stairsplus/registrations.lua @@ -1,7 +1,7 @@ --[[ More Blocks: registrations -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/slabs.lua b/moreblocks/stairsplus/slabs.lua index 11618a2..c41b2e3 100644 --- a/moreblocks/stairsplus/slabs.lua +++ b/moreblocks/stairsplus/slabs.lua @@ -1,7 +1,7 @@ --[[ More Blocks: slab definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/stairsplus/slopes.lua b/moreblocks/stairsplus/slopes.lua index 63635eb..0652a51 100644 --- a/moreblocks/stairsplus/slopes.lua +++ b/moreblocks/stairsplus/slopes.lua @@ -1,12 +1,10 @@ --[[ More Blocks: slope definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called :slope_ function register_slope(modname, subname, recipeitem, groups, images, description, drop, light) diff --git a/moreblocks/stairsplus/stairs.lua b/moreblocks/stairsplus/stairs.lua index 0ccf081..c72b268 100644 --- a/moreblocks/stairsplus/stairs.lua +++ b/moreblocks/stairsplus/stairs.lua @@ -1,12 +1,10 @@ --[[ More Blocks: stair definitions -Copyright (c) 2011-2018 Hugo Locurcio and contributors. +Copyright © 2011-2019 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] -local S = moreblocks.intllib - -- Node will be called :stair_ function register_stair(modname, subname, recipeitem, groups, images, description, drop, light) -- cgit v1.2.3