Update homedecor modpack to Git commit 81e0d4e & patch...

https://gitlab.com/VanessaE/homedecor_modpack/tree/81e0d4e

README.md

@@ -139,7 +139,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 
 * [3d_armor][] ([LGPL / CC BY-SA][lic.3d_armor]) - version: [7e2d942 Git][ver.3d_armor] *2019-01-19* ([patched][patch.3d_armor])
 * [deploy_nodes][] ([BSD 3-Clause][lic.deploy_nodes]) -- version [b67e162 Git][ver.deploy_nodes] *2017-06-08*
-* [homedecor][] ([LGPL / WTFPL / CC BY-SA / CC0][lic.homedecor]) -- version: [2021-03-27-1][ver.homedecor]
+* [homedecor][] ([LGPL / WTFPL / CC BY-SA / CC0][lic.homedecor]) -- version: [81e0d4e Git][ver.homedecor] *2021-03-30* ([patched][patch.homedecor])
 * [mesecons][] ([LGPL / CC BY-SA][lic.mesecons]) -- version [1.2 (d4e05f3 Git)][ver.mesecons] *2018-07-23*
 * [minetest_game][] ([LGPL][lic.lgpl2.1] / [CC BY-SA][lic.ccbysa3.0]) -- version: [5.4.1][ver.minetest_game] *2021-04-10*
 * [moremesecons][] ([MPL][lic.mpl2.0]) -- version [8a56370 Git][ver.moremesecons] *2018-02-27*
@@ -434,7 +434,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.helicopter_pm]: https://github.com/petermaloney/helicopter/tree/95c5287
 [ver.hill_nodebox]: https://github.com/cornernote/minetest-hill_nodebox/tree/41bbfa2
 [ver.home_gui]: https://github.com/cornernote/minetest-home_gui/tree/90086d0
-[ver.homedecor]: https://gitlab.com/VanessaE/homedecor_modpack/tree/2021-03-27-1
+[ver.homedecor]: https://gitlab.com/VanessaE/homedecor_modpack/tree/81e0d4e
 [ver.hovercraft]: https://github.com/stujones11/hovercraft/tree/4d50e68
 [ver.hudbars]: http://repo.or.cz/minetest_hudbars.git/tree/ba21f47
 [ver.hudmap]: https://github.com/stujones11/hudmap/tree/3b8bdc0
@@ -517,7 +517,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [patch.hbarmor]: https://github.com/AntumMT/mod-hbarmor/tree/12a7dea
 [patch.hbsprint]: https://github.com/AntumMT/mod-hbsprint/tree/3fb29a9
 [patch.home_gui]: https://github.com/AntumMT/mod-home_gui/tree/5409fb1
-[patch.homedecor]: https://github.com/AntumMT/mp-homedecor/tree/b882d73
+[patch.homedecor]: https://github.com/AntumMT/mp-homedecor/tree/b974431
 [patch.hovercraft]: https://github.com/AntumMT/mod-hovercraft/tree/73a6223
 [patch.hud]: https://github.com/AntumMT/mod-hud/tree/6846e20
 [patch.invisibility]: https://github.com/AntumMT/mod-invisibility/tree/0ef4c18

mods/modpacks/homedecor/bower.json

@@ -1,19 +0,0 @@
-{
-    "name": "homedecor_modpack",
-    "description": "This mod adds a whole bunch of new items to Minetest suitable for decorating inside and outside a home.",
-    "keywords": [
-		"building",
-		"cosmetic",
-        "homedecor modpack",
-		"homedecor_modpack"
-    ],
-    "homepage": "http://daconcepts.com/vanessa/hobbies/minetest/homedecor-crafting-guide/homedecor-craft-guide.html",
-	"project": "https://github.com/minetest-mods/homedecor_modpack",
-    "forum": "http://forum.minetest.net/viewtopic.php?f=11&t=2041",
-    "screenshots": [
-        "http://daconcepts.com/vanessa/hobbies/minetest/screenshots/homedecor1.png"
-    ],
-    "authors": [
-        "VanessaE"
-    ]
-}

mods/modpacks/homedecor/building_blocks/others.lua

@@ -1,5 +1,12 @@
 local S = minetest.get_translator("building_blocks")
 
+local tool_wear = minetest.settings:get_bool("enable_tool_wear") ~= false
+
+local knife_uses = 100
+if not tool_wear then
+       knife_uses = 0
+end
+
 minetest.register_craftitem("building_blocks:sticks", {
 	description = S("Small bundle of sticks"),
 	image = "building_blocks_sticks.png",
@@ -16,8 +23,8 @@ minetest.register_tool("building_blocks:knife", {
 	tool_capabilities = {
 		max_drop_level=0,
 		groupcaps={
-			choppy={times={[2]=7.50, [3]=2.80}, uses=100, maxlevel=1},
-			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
+			choppy={times={[2]=7.50, [3]=2.80}, uses=knife_uses, maxlevel=1},
+			fleshy={times={[2]=5.50, [3]=2.80}, uses=knife_uses, maxlevel=1}
 		}
 	},
 })

mods/modpacks/homedecor/homedecor_bathroom/init.lua

@@ -239,9 +239,7 @@ local function taps_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
 	local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
 	if below and
 	  below.name == "homedecor:shower_tray" or
-	  below.name == "homedecor:sink" or
-	  below.name == "homedecor:kitchen_cabinet_with_sink" or
-	  below.name == "homedecor:kitchen_cabinet_with_sink_locked" then
+	  string.find(below.name, "homedecor:.*sink") then
 		local particledef = {
 			outlet      = { x = 0, y = -0.44, z = 0.28 },
 			velocity_x  = { min = -0.1, max = 0.1 },

mods/modpacks/homedecor/homedecor_kitchen/init.lua

@@ -154,6 +154,7 @@ homedecor.kitchen_convert_nodes = {}
 for _, mat in ipairs(counter_materials) do
 
 	local desc = S("Kitchen Cabinet")
+	local desc2 = S("Kitchen Cabinet with drawers")
 	local material = ""
 
 	if mat ~= "" then
@@ -240,7 +241,6 @@ for _, mat in ipairs(counter_materials) do
 		paramtype2 = "wallmounted",
 		palette = "unifieddyes_palette_colorwallmounted.png",
 		airbrush_replacement_node = "homedecor:kitchen_cabinet_colored_with_drawers"..material,
-		place_param2 = 0,
 		groups = { snappy = 3, ud_param2_colorable = 1},
 		sounds = default.node_sound_wood_defaults(),
 		infotext=S("Kitchen Cabinet with drawers"),
@@ -469,10 +469,7 @@ homedecor.register("kitchen_faucet", {
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
-		if below and
-		  below.name == "homedecor:sink" or
-		  below.name == "homedecor:kitchen_cabinet_with_sink" or
-		  below.name == "homedecor:kitchen_cabinet_with_sink_locked" then
+		if below and string.find(below.name, "homedecor:.*sink") then
 			local particledef = {
 				outlet      = { x = 0, y = -0.19, z = 0.13 },
 				velocity_x  = { min = -0.05, max = 0.05 },