Merge branch 'NALC2' into NALC

mods/builtin_falling/func.lua

@@ -154,7 +154,21 @@ function add_protected_bukket_liquid(nameofbukket,liquidsourcename)
 				return itemstack
 			end
 
-			if minetest.registered_nodes[n.name].buildable_to then
+			local ndef
+			if n then
+				ndef = minetest.registered_nodes[n.name]
+			end
+
+			-- Call on_rightclick if the pointed node defines it
+			if ndef and ndef.on_rightclick and
+				user and not user:get_player_control().sneak
+			then
+				return ndef.on_rightclick(
+					pointed_thing.under,
+					n, user, itemstack) or itemstack
+			end
+
+			if ndef and ndef.buildable_to then
 				-- buildable; replace the node
 				minetest.log("action", user:get_player_name().. " use "..nameofbukket.." at  ".. minetest.pos_to_string(pointed_thing.under))
 				minetest.add_node(pointed_thing.under, {name=liquidsourcename})

mods/nalc/depends.txt

@@ -1,3 +1,5 @@
 default
 witchcraft?
-
+bones?
+bonemeal?
+vessels?

mods/nalc/init.lua

@@ -1,4 +1,4 @@
--- Change craft recipe of Witchcraft:tooth
+-- Change some craft recipe of Witchcraft
 if minetest.get_modpath("witchcraft") then
 
 	-- clear crafts with this particular recipe
@@ -24,5 +24,41 @@ if minetest.get_modpath("witchcraft") then
 				{"default:sand", "", "default:sand"},
 				{"", "default:sand", ""},
 			}
-		})	
+		})
+
+	-- Register craft recipe of bones:bones with bonemeal:bone
+	if minetest.get_modpath("bones")
+		and minetest.get_modpath("bonemeal") and bonemeal
+	then
+		minetest.register_craft(
+			{
+				output = "bones:bones",
+				recipe = {
+					{"bonemeal:bone", "bonemeal:bone", "bonemeal:bone"},
+					{"bonemeal:bone", "bonemeal:bone", "bonemeal:bone"},
+					{"bonemeal:bone", "bonemeal:bone", "bonemeal:bone"},
+				}
+			})
+	end
+
+	-- Override craft recipe of witchcraft:shelf
+	if minetest.get_modpath("vessels") then
+		minetest.clear_craft(
+			{
+				recipe = {
+					{"group:wood", "group:wood", "group:wood"},
+					{"group:potion", "group:potion", "group:potion"},
+					{"group:wood", "group:wood", "group:wood"},
+				}
+			})
+
+		minetest.register_craft(
+			{
+				output = "witchcraft:shelf",
+				recipe = {
+					{"", "group:potion", ""},
+					{"group:potion", "vessels:shelf", "group:potion"},
+				}
+			})
+	end
 end