Merge branch 'master' into nalc-1.2

- 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

@@ -25,9 +25,7 @@ stds.minetest = {
 }
 
 read_globals = {
-	"carts",
 	"farming",
-	"frame",
 	"intllib",
 	"mg",
 }

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v2.1.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

.travis.yml

@@ -1,16 +1,16 @@
-dist: bionic
-language: python
+language: generic
 
-python:
-  - 3.7.1
+addons:
+  apt:
+    packages:
+    - luarocks
 
 install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qqq luarocks
-  - pip3 install pre-commit
+  - pyenv global 3.6.3
+  - pip3 install --user pre-commit
   - luarocks install --local luacheck
 
 script:
   # All linters are run with pre-commit hooks
   - export PATH="$HOME/.luarocks/bin:$PATH"
-  - pre-commit run --all-files
+  - $HOME/.local/bin/pre-commit run --all-files

CHANGELOG.md

@@ -7,12 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [2.0.0] - 2019-11-25
-
 ### Added
 
-- More Ores nodes/items/tools can now be placed in item frames
-  from the [`frame`](https://github.com/minetest-mods/frame) mod.
 - Polish translation.
 
 ### Changed
@@ -51,6 +47,5 @@ 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.0.0...HEAD
-[2.0.0]: https://github.com/minetest-mods/moreores/compare/v1.1.0...v2.0.0
+[Unreleased]: https://github.com/minetest-mods/moreores/compare/v1.1.0...HEAD
 [1.1.0]: https://github.com/minetest-mods/moreores/compare/v1.0.0...v1.1.0

README.md

@@ -60,9 +60,9 @@ on that line.
 
 ## Version compatibility
 
-More Ores is currently primarily tested with Minetest 5.1.0.
+More Ores is currently primarily tested with Minetest 0.4.17.
 It may or may not work with newer or older versions. Issues arising in older
-versions than 5.0.0 will generally not be fixed.
+versions than 0.4.17 will generally not be fixed.
 
 ## License
 

init.lua

@@ -23,9 +23,6 @@ if minetest.get_modpath("mg") then
 	dofile(modpath .. "/mg.lua")
 end
 
--- `frame` support
-local use_frame = minetest.get_modpath("frame")
-
 local default_stone_sounds = default.node_sound_stone_defaults()
 local default_metal_sounds = default.node_sound_metal_defaults()
 
@@ -92,10 +89,6 @@ local function add_ore(modname, description, mineral_name, oredef)
 			sounds = default_stone_sounds,
 			drop = lump_item,
 		})
-
-		if use_frame then
-			frame.register(modname .. ":mineral_" .. mineral_name)
-		end
 	end
 
 	if oredef.makes.block then
@@ -119,9 +112,6 @@ local function add_ore(modname, description, mineral_name, oredef)
 				}
 			})
 		end
-		if use_frame then
-			frame.register(block_item)
-		end
 	end
 
 	if oredef.makes.lump then
@@ -137,9 +127,6 @@ local function add_ore(modname, description, mineral_name, oredef)
 				recipe = lump_item,
 			})
 		end
-		if use_frame then
-			frame.register(lump_item)
-		end
 	end
 
 	if oredef.makes.ingot then
@@ -148,9 +135,6 @@ local function add_ore(modname, description, mineral_name, oredef)
 			inventory_image = img_base .. "_ingot.png",
 		})
 		minetest.register_alias(mineral_name .. "_ingot", ingot)
-		if use_frame then
-			frame.register(ingot)
-		end
 	end
 
 	if oredef.makes.chest then
@@ -211,31 +195,16 @@ local function add_ore(modname, description, mineral_name, oredef)
 
 		local fulltool_name = tool_base .. tool_name .. tool_post
 
-		if tool_name == "hoe" and minetest.get_modpath("farming") then
-			tdef.max_uses = tooldef.uses
-			tdef.description = S("%s Hoe"):format(S(description))
-			farming.register_hoe(fulltool_name, tdef)
-		end
+		minetest.register_tool(fulltool_name, tdef)
 
-		-- 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
 
 		minetest.register_alias(tool_name .. tool_post, fulltool_name)
-		if use_frame then
-			frame.register(fulltool_name)
-		end
 	end
 end
 
@@ -254,9 +223,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},
 			},
@@ -287,9 +253,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},
 			},

locale/pl.txt

@@ -2,14 +2,14 @@
 
 [moreores] loaded. = [moreores] załadowano.
 
-%s Ore = %s Ruda
-%s Lump = %s Bryłka
-%s Ingot = %s Sztabka
-%s Block = %s Blok
-%s Pickaxe = %s Kilof
-%s Shovel = %s Łopatka
-%s Axe = %s Siekiera
-%s Sword = %s Miecz
+%s Ore = %Ruda
+%s Lump = %Bryłka
+%s Ingot = %Sztabka
+%s Block = %sBlok
+%s Pickaxe = %sKilof
+%s Shovel = %sŁopatka
+%s Axe = %sSiekiera
+%s Sword = %sMiecz
 
 Copper = Miedź
 Tin = Cyna

mod.conf

@@ -1,4 +1,4 @@
 name = moreores
 description = Adds new ore types.
 depends = default
-optional_depends = carts,farming,frame,intllib,mg
+optional_depends = carts,farming,intllib,mg