fix mergeconflicts

2017-07-30 12:15:29 +02:00 · 2017-07-30 12:15:29 +02:00 · 8a3f06a18f
commit 8a3f06a18f
parent 34075ee529 71dff2ac4a
47 changed files with 1139 additions and 330 deletions
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@ -283,7 +283,7 @@ minetest.register_tool("default:axe_diamond", {
 		full_punch_interval = 0.9,
 		max_drop_level=1,
 		groupcaps={
-			choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=2},
+			choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=3},
 		},
 		damage_groups = {fleshy=7},
 	},