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

- Moreores est devenue une dépendance de farming afin de définir les
  hoes en argent et mythril. Les hoes définies par moreores sont donc
  devenues redondantes. De plus, cela a créé une dépendance circulaire
  entre les mods farming -> toolranks -> moreores -> farming

.luacheckrc

@@ -28,6 +28,7 @@ read_globals = {
 	"carts",
 	"farming",
 	"frame",
+	"intllib",
 	"mg",
 	"toolranks",
 }

.pre-commit-config.yaml

@@ -1,8 +1,7 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v2.3.0
     hooks:
-      - id: fix-byte-order-marker
       - id: end-of-file-fixer
       - id: trailing-whitespace
 

CHANGELOG.md

@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [2.1.0] - 2021-06-28
-
 ### Added
 
 - More Ores tools now have [`toolranks`](https://github.com/lisacvuk/minetest-toolranks) support.
@@ -63,7 +61,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.1.0...HEAD
-[2.1.0]: https://github.com/minetest-mods/moreores/compare/v2.0.0...v2.1.0
+[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.0.0...HEAD
 [2.0.0]: https://github.com/minetest-mods/moreores/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/minetest-mods/moreores/compare/v1.0.0...v1.1.0

init.lua

@@ -216,19 +216,11 @@ local function add_ore(modname, description, mineral_name, oredef)
 			farming.register_hoe(fulltool_name, tdef)
 		end
 
-		-- 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
+		if oredef.makes.ingot then
+			minetest.register_craft({
+				output = fulltool_name,
+				recipe = get_recipe(ingot, tool_name)
+			})
 		end
 
 		-- Toolranks support
@@ -261,9 +253,6 @@ local oredefs = {
 			pick = {
 				cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
 			},
-			hoe = {
-				uses = 300,
-			},
 			shovel = {
 				crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
 			},
@@ -294,9 +283,6 @@ local oredefs = {
 			pick = {
 				cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2}
 			},
-			hoe = {
-				uses = 1000,
-			},
 			shovel = {
 				crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2},
 			},
@@ -371,11 +357,11 @@ if minetest.get_modpath("carts") then
 end
 
 minetest.register_craft({
-	output = "moreores:copper_rail 24",
+	output = "moreores:copper_rail 18",
 	recipe = {
+		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
 		{"default:copper_ingot", "", "default:copper_ingot"},
-		{"default:copper_ingot", "group:stick", "default:copper_ingot"},
-		{"default:copper_ingot", "", "default:copper_ingot"},
+		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
 	},
 })
 

mod.conf

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