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

Corrige crash au démarrage
À cause du merge précédent mal fait.
2025-06-28 22:26:15 +02:00 · 2020-06-20 15:48:20 +02:00 · 2020-02-29 19:31:06 +01:00 · 2020-02-29 18:17:01 +01:00 · 2020-01-04 18:59:12 +01:00 · 2019-12-22 16:41:39 +01:00
5 changed files with 6 additions and 15 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@ -28,6 +28,7 @@ read_globals = {
 	"carts",
 	"farming",
 	"frame",
+	"intllib",
 	"mg",
 	"toolranks",
 }
--- a/.pre-commit-config.yaml
+++ b/.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

--- a/CHANGELOG.md
+++ b/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
--- a/init.lua
+++ b/init.lua
@ -261,9 +261,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 +291,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 +365,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"},
 	},
 })

--- a/locale/moreores.pt_br.txt
+++ b/locale/moreores.pt_br.txt
Author	SHA1	Message	Date
sys4	66347e148c	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-06-20 15:48:20 +02:00
sys4	f42e7883b4	Corrige crash au démarrage À cause du merge précédent mal fait.	2020-02-29 19:31:06 +01:00
sys4	20b0c60227	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-02-29 18:17:01 +01:00
sys4	2554d1303a	Modifie le craft des rails de cuivre	2020-01-04 18:59:12 +01:00
sys4	dd63bfa1f6	Supprime la dépendance vers farming	2019-12-22 16:41:39 +01:00
sys4	319a694c74	Merge branch 'master' of yunohost.local:minetest-mods/moreores into nalc-1.2-dev	2019-12-22 14:10:01 +01:00
sys4	336d16373e	Supprime la dépendance de farming devenue obsolète et problématique - 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	2019-05-10 10:16:44 +02:00