Merge branch 'master' into nalc-1.2

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

CHANGELOG.md

@@ -7,11 +7,8 @@ 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.
 
@@ -90,8 +87,7 @@ 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/v2.0.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.3.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 5.1.0.
+More Blocks 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,3 +23,5 @@ dofile(modpath .. "/nodes.lua")
 dofile(modpath .. "/redefinitions.lua")
 dofile(modpath .. "/crafting.lua")
 dofile(modpath .. "/aliases.lua")
+
+minetest.log("action", "[moreblocks] loaded.")

locale/pl.po

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

stairsplus/registrations.lua

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