diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c72498..f9254a4 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/.travis.yml b/.travis.yml index 1c4c0d8..211285a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ -language: generic +dist: bionic +language: python -addons: - apt: - packages: - - luarocks +python: + - 3.7.1 install: - - pyenv global 3.6.3 - - pip3 install --user pre-commit + - sudo apt-get update -qq + - 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 . diff --git a/CHANGELOG.md b/CHANGELOG.md index 6199159..fd5cbb4 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 45b5af6..6ca4aa8 100644 --- a/README.md +++ b/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 diff --git a/crafting.lua b/crafting.lua index 468667d..0655391 100644 --- a/crafting.lua +++ b/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", diff --git a/locale/pl.po b/locale/pl.po index 237e5eb..aedc07b 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -286,4 +286,4 @@ msgstr "%s Panel" #: stairsplus/common.lua #, lua-format msgid "%s Stairs" -msgstr "% Schody" +msgstr "%s Schody" diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index 189ca84..3caab34 100644 --- a/stairsplus/registrations.lua +++ b/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 diff --git a/textures/moreblocks_clean_glass.png b/textures/moreblocks_clean_glass.png index 73febdb..b766956 100644 Binary files a/textures/moreblocks_clean_glass.png and b/textures/moreblocks_clean_glass.png differ diff --git a/textures/moreblocks_coal_glass_stairsplus.png b/textures/moreblocks_coal_glass_stairsplus.png index 7aee70a..cc2e797 100644 Binary files a/textures/moreblocks_coal_glass_stairsplus.png and b/textures/moreblocks_coal_glass_stairsplus.png differ diff --git a/textures/moreblocks_copperpatina.png b/textures/moreblocks_copperpatina.png index 1216d8d..d4e98b0 100644 Binary files a/textures/moreblocks_copperpatina.png and b/textures/moreblocks_copperpatina.png differ diff --git a/textures/moreblocks_dirt_compressed.png b/textures/moreblocks_dirt_compressed.png index a307202..bdc8220 100644 Binary files a/textures/moreblocks_dirt_compressed.png and b/textures/moreblocks_dirt_compressed.png differ diff --git a/textures/moreblocks_empty_shelf.png b/textures/moreblocks_empty_shelf.png index af874d7..bf29124 100644 Binary files a/textures/moreblocks_empty_shelf.png and b/textures/moreblocks_empty_shelf.png differ diff --git a/textures/moreblocks_glass_stairsplus.png b/textures/moreblocks_glass_stairsplus.png index 30aadfb..8e4cb98 100644 Binary files a/textures/moreblocks_glass_stairsplus.png and b/textures/moreblocks_glass_stairsplus.png differ diff --git a/textures/moreblocks_glow_glass_stairsplus.png b/textures/moreblocks_glow_glass_stairsplus.png index cdb8044..db2831e 100644 Binary files a/textures/moreblocks_glow_glass_stairsplus.png and b/textures/moreblocks_glow_glass_stairsplus.png differ diff --git a/textures/moreblocks_iron_checker.png b/textures/moreblocks_iron_checker.png index d27f4df..117cac2 100644 Binary files a/textures/moreblocks_iron_checker.png and b/textures/moreblocks_iron_checker.png differ diff --git a/textures/moreblocks_iron_glass_stairsplus.png b/textures/moreblocks_iron_glass_stairsplus.png index 52e3bf3..799fbc4 100644 Binary files a/textures/moreblocks_iron_glass_stairsplus.png and b/textures/moreblocks_iron_glass_stairsplus.png differ diff --git a/textures/moreblocks_junglestick.png b/textures/moreblocks_junglestick.png index 23644fd..7bc6bc4 100644 Binary files a/textures/moreblocks_junglestick.png and b/textures/moreblocks_junglestick.png differ diff --git a/textures/moreblocks_rope.png b/textures/moreblocks_rope.png index 19787fe..f86c07d 100644 Binary files a/textures/moreblocks_rope.png and b/textures/moreblocks_rope.png differ diff --git a/textures/moreblocks_super_glow_glass_stairsplus.png b/textures/moreblocks_super_glow_glass_stairsplus.png index ae3f01f..c9a2da6 100644 Binary files a/textures/moreblocks_super_glow_glass_stairsplus.png and b/textures/moreblocks_super_glow_glass_stairsplus.png differ diff --git a/textures/moreblocks_trap_box.png b/textures/moreblocks_trap_box.png index 292ae88..6d2aa10 100644 Binary files a/textures/moreblocks_trap_box.png and b/textures/moreblocks_trap_box.png differ diff --git a/textures/moreblocks_trap_box_glass.png b/textures/moreblocks_trap_box_glass.png index b0c0993..77234d0 100644 Binary files a/textures/moreblocks_trap_box_glass.png and b/textures/moreblocks_trap_box_glass.png differ diff --git a/textures/moreblocks_wood_tile.png b/textures/moreblocks_wood_tile.png index 6e34453..7d9a43c 100644 Binary files a/textures/moreblocks_wood_tile.png and b/textures/moreblocks_wood_tile.png differ diff --git a/textures/moreblocks_wood_tile_center.png b/textures/moreblocks_wood_tile_center.png index a7d399a..035b1cb 100644 Binary files a/textures/moreblocks_wood_tile_center.png and b/textures/moreblocks_wood_tile_center.png differ diff --git a/textures/moreblocks_wood_tile_offset.png b/textures/moreblocks_wood_tile_offset.png index fde40a2..4379598 100644 Binary files a/textures/moreblocks_wood_tile_offset.png and b/textures/moreblocks_wood_tile_offset.png differ