From c62e0c5989e702fe1049232802bc1a0ff8988cd4 Mon Sep 17 00:00:00 2001
From: root <root@milan-minetest2-devel-testing.lxd>
Date: Wed, 22 Sep 2021 11:53:40 +0200
Subject: [PATCH] update

---
 .../Minetest-WorldEdit/worldedit_gui/init.lua |  2 +-
 mods/moreores/init.lua                        | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/mods/Minetest-WorldEdit/worldedit_gui/init.lua b/mods/Minetest-WorldEdit/worldedit_gui/init.lua
index 08ecc1bd..378abab3 100644
--- a/mods/Minetest-WorldEdit/worldedit_gui/init.lua
+++ b/mods/Minetest-WorldEdit/worldedit_gui/init.lua
@@ -216,7 +216,7 @@ elseif minetest.global_exists("sfinv") then -- sfinv installed
 		end
 	end
 else
-	error(
+	return minetest.log("error",
 		"worldedit_gui requires a supported gui management mod to be installed.\n"..
 		"To use the it you need to either:\n"..
 		"* use minetest_game or another sfinv-compatible subgame\n"..
diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua
index 73cf0eaf..7a6303e0 100644
--- a/mods/moreores/init.lua
+++ b/mods/moreores/init.lua
@@ -185,25 +185,25 @@ local function add_ore(modname, description, mineral_name, oredef)
 
 		if tool_name == "sword" then
 			tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
-			tdef.tool_capabilities.damage_groups = oredef.damage_groups
+			tdef.tool_capabilities.damage_groups = oredef.tools.sword.damage_groups
 			tdef.description = S("@1 Sword", S(description))
 		end
 
 		if tool_name == "pick" then
 			tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
-			tdef.tool_capabilities.damage_groups = oredef.damage_groups
+			tdef.tool_capabilities.damage_groups = oredef.tools.pick.damage_groups
 			tdef.description = S("@1 Pickaxe", S(description))
 		end
 
 		if tool_name == "axe" then
 			tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
-			tdef.tool_capabilities.damage_groups = oredef.damage_groups
+			tdef.tool_capabilities.damage_groups = oredef.tools.axe.damage_groups
 			tdef.description = S("@1 Axe", S(description))
 		end
 
 		if tool_name == "shovel" then
 			tdef.full_punch_interval = oredef.full_punch_interval
-			tdef.tool_capabilities.damage_groups = oredef.damage_groups
+			tdef.tool_capabilities.damage_groups = oredef.tools.shovel.damage_groups
 			tdef.description = S("@1 Shovel", S(description))
 			tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
 		end
@@ -260,25 +260,28 @@ local oredefs = {
 		tools = {
 			pick = {
 				cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
+				damage_groups = {fleshy = 4},
 			},
 			hoe = {
 				uses = 300,
 			},
 			shovel = {
 				crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
+				damage_groups = {fleshy = 3},
 			},
 			axe = {
 				choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1},
-				fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}
+				fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1},
+				damage_groups = {fleshy = 5},
 			},
 			sword = {
 				fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
-				snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
+				snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
 				choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0},
+				damage_groups = {fleshy = 6},
 			},
 		},
 		full_punch_interval = 1.0,
-		damage_groups = {fleshy = 6},
 	},
 	mithril = {
 		description = "Mithril",
@@ -292,26 +295,29 @@ local oredefs = {
 		},
 		tools = {
 			pick = {
-				cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2}
+				cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3},
+				damage_groups = {fleshy = 6},
 			},
 			hoe = {
 				uses = 1000,
 			},
 			shovel = {
-				crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2},
+				crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3},
+				damage_groups = {fleshy = 5},
 			},
 			axe = {
-				choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 2},
-				fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 1}
+				choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3},
+				fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2},
+				damage_groups = {fleshy = 8},
 			},
 			sword = {
 				fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2},
-				snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 2},
+				snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3},
 				choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0},
+				damage_groups = {fleshy = 10},
 			},
 		},
 		full_punch_interval = 0.45,
-		damage_groups = {fleshy = 9},
 	}
 }