Merge branch 'master' of yunohost.local:minetest-mods/moreblocks into nalc-1.2-dev

.pre-commit-config.yaml

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

.travis.yml

@@ -1,15 +1,15 @@
-language: generic
+dist: bionic
+language: python
 
-addons:
+python:
-  apt:
+  - 3.7.1
-    packages:
-    - luarocks
 
 install:
-  - pyenv global 3.6.3
+  - sudo apt-get update -qq
-  - pip3 install --user pre-commit
+  - sudo apt-get install -qqq luarocks
+  - pip3 install pre-commit
   - luarocks install --local luacheck
 
 script:
-  - $HOME/.local/bin/pre-commit run --all-files
+  - pre-commit run --all-files
   - $HOME/.luarocks/bin/luacheck .

CHANGELOG.md

@@ -7,16 +7,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.0] - 2019-11-25
+
 ### Added
 
+- Stairs+ nodes for ice.
 - `settingtypes.txt` file to allow configuring settings in the main menu.
 - Polish translation.
 
 ### Changed
 
+- The minimum supported Minetest version is now 5.0.0.
 - Stairs+ nodes now emit one light level less compared to full nodes to make up
   for their smaller visual size.
-- The minimum supported Minetest version is now 5.0.0.
+
+### Fixed
+
+- Fixed a recipe conflict that made Centered Wooden Tiles impossible to craft.
 
 ## [1.3.0] - 2019-03-23
 
@@ -83,7 +90,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...v2.0.0
 [1.3.0]: https://github.com/minetest-mods/moreblocks/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/minetest-mods/moreblocks/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...v1.1.0

README.md

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

crafting.lua

@@ -35,15 +35,6 @@ minetest.register_craft({
 	recipe = {"default:junglegrass", "default:cobble"},
 })
 
-minetest.register_craft({
-	output = "moreblocks:wood_tile_center 9",
-	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "moreblocks:wood_tile", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
-	}
-})
-
 minetest.register_craft({
 	output = "moreblocks:wood_tile 9",
 	recipe = {
@@ -53,6 +44,17 @@ minetest.register_craft({
 	}
 })
 
+-- This must be registered after `moreblocks:wood_tile` to avoid recipe conflicts,
+-- since `moreblocks:wood_tile` is part of `group:wood`
+minetest.register_craft({
+	output = "moreblocks:wood_tile_center 9",
+	recipe = {
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "moreblocks:wood_tile", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+	}
+})
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "moreblocks:wood_tile",

locale/pl.po

@@ -286,4 +286,4 @@ msgstr "%s Panel"
 #: stairsplus/common.lua
 #, lua-format
 msgid "%s Stairs"
-msgstr "% Schody"
+msgstr "%s Schody"

stairsplus/registrations.lua

@@ -49,6 +49,7 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
 	"desert_sandstone_block",
 	"sandstone_block",
 	"coral_skeleton",
+	"ice",
 }
 
 for _, name in pairs(default_nodes) do