Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

This information can be used by ContentDB.

init.lua

@@ -216,11 +216,19 @@ local function add_ore(modname, description, mineral_name, oredef)
 			farming.register_hoe(fulltool_name, tdef)
 		end
 
-		if oredef.makes.ingot then
-			minetest.register_craft({
-				output = fulltool_name,
-				recipe = get_recipe(ingot, tool_name)
-			})
+		-- Hoe registration is handled above.
+		-- There are no crafting recipes for hoes, as they have been
+		-- deprecated from Minetest Game:
+		-- https://github.com/minetest/minetest_game/commit/9c459e77a
+		if tool_name ~= "hoe" then
+			minetest.register_tool(fulltool_name, tdef)
+
+			if oredef.makes.ingot then
+				minetest.register_craft({
+					output = fulltool_name,
+					recipe = get_recipe(ingot, tool_name)
+				})
+			end
 		end
 
 		-- Toolranks support

mod.conf

@@ -2,3 +2,4 @@ name = moreores
 description = Adds new ore types.
 depends = default
 optional_depends = carts,farming,frame,mg,toolranks
+min_minetest_version = 5.0.0