Bump to version 2.0.0

This closes #109.

.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,6 +7,24 @@ 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.
+
+### Fixed
+
+- Fixed a recipe conflict that made Centered Wooden Tiles impossible to craft.
+
 ## [1.3.0] - 2019-03-23
 
 ### Changed
@@ -72,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
 

circular_saw.lua

@@ -152,7 +152,7 @@ function circular_saw:update_inventory(pos, amount)
 
 	amount = meta:get_int("anz") + amount
 
-	-- The material is recycled automaticly.
+	-- The material is recycled automatically.
 	inv:set_list("recycle",  {})
 
 	if amount < 1 then -- If the last block is taken out.
@@ -246,7 +246,7 @@ function circular_saw.allow_metadata_inventory_put(
 	local stackname = stack:get_name()
 	local count = stack:get_count()
 
-	-- Only alow those items that are offered in the output inventory to be recycled:
+	-- Only allow those items that are offered in the output inventory to be recycled:
 	if listname == "recycle" then
 		if not inv:contains_item("output", stackname) then
 			return 0
@@ -345,7 +345,7 @@ function circular_saw.on_metadata_inventory_take(
 	end
 
 	-- If it is one of the offered stairs: find out how many
-	-- microblocks have to be substracted:
+	-- microblocks have to be subtracted:
 	if listname == "output" then
 		-- We do know how much each block at each position costs:
 		local cost = circular_saw.cost_in_microblocks[index]

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",

depends.txt

@@ -1,6 +0,0 @@
-default
-intllib?
-stairs?
-farming?
-wool?
-basic_materials?

description.txt

@@ -1 +0,0 @@
-Adds various miscellaneous blocks to the game.

init.lua

@@ -23,7 +23,3 @@ dofile(modpath .. "/nodes.lua")
 dofile(modpath .. "/redefinitions.lua")
 dofile(modpath .. "/crafting.lua")
 dofile(modpath .. "/aliases.lua")
-
-if minetest.settings:get_bool("log_mods") then
-	minetest.log("action", S("[moreblocks] loaded."))
-end

locale/pl.po

@@ -0,0 +1,289 @@
+# Polish translation for More Blocks.
+# Copyright © 2011-2019 Hugo Locurcio and contributors
+# This file is distributed under the same license as the More Blocks package.
+# mat9117, 2019
+# CodeXP <codexp@gmx.net>, 2018.
+msgid ""
+msgstr ""
+"Project-Id-Version: More Blocks\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-13 12:37+0200\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CodeXP <codexp@gmx.net>\n"
+"Language-Team: \n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: circular_saw.lua
+msgid "Circular Saw"
+msgstr "Piła tarczowa"
+
+#: circular_saw.lua
+msgid ""
+"Input\n"
+"material"
+msgstr ""
+"wejście\n"
+"materiał"
+
+#: circular_saw.lua
+msgid "Left-over"
+msgstr "Resztki"
+
+#: circular_saw.lua
+msgid "Max"
+msgstr "Maks"
+
+#: circular_saw.lua
+msgid ""
+"Recycle\n"
+"output"
+msgstr ""
+"Przetwarzanie\n"
+"Wyjście"
+
+#: circular_saw.lua
+msgid "Set"
+msgstr "Ustaw"
+
+#: circular_saw.lua
+msgid "owned by @1"
+msgstr "Należy do @1"
+
+#: circular_saw.lua
+msgid "Circular Saw is empty"
+msgstr "Piła tarczowa jest pusta"
+
+#: circular_saw.lua
+msgid "Circular Saw is working on @1"
+msgstr "Piła tarczowa pracuje na @1"
+
+#: init.lua
+msgid "[moreblocks] loaded."
+msgstr "[moreblocks] załadowane."
+
+#: nodes.lua
+msgid "Deprecated"
+msgstr "Przestarzałe"
+
+#: nodes.lua
+msgid "All-faces Acacia Tree"
+msgstr "Wielostronna tekstura akacji"
+
+#: nodes.lua
+msgid "All-faces Aspen Tree"
+msgstr "Wielostronna tekstura osiki"
+
+#: nodes.lua
+msgid "All-faces Jungle Tree"
+msgstr "Wielostronna tekstura drzewa dżunglowego"
+
+#: nodes.lua
+msgid "All-faces Pine Tree"
+msgstr "Wielostronna tekstura sosny"
+
+#: nodes.lua
+msgid "All-faces Tree"
+msgstr "Wielostronna tekstura drzewa"
+
+#: nodes.lua
+msgid "Cactus Brick"
+msgstr "Kaktusowa cegła"
+
+#: nodes.lua
+msgid "Cactus Checker"
+msgstr "Kaktusowa szachownica"
+
+#: nodes.lua
+msgid "Centered Wooden Tile"
+msgstr "Wyśrodkowany drewniany kafelek"
+
+#: nodes.lua
+msgid "Checker Stone Tile"
+msgstr "Kamienna szachownica"
+
+#: nodes.lua
+msgid "Circle Stone Bricks"
+msgstr "Okrągłe kamienne cegły"
+
+#: nodes.lua
+msgid "Clean Glass"
+msgstr "Czyste szkło"
+
+#: nodes.lua
+msgid "Coal Checker"
+msgstr "Węglowa szachownica"
+
+#: nodes.lua
+msgid "Coal Glass"
+msgstr "Szkło węglowe"
+
+#: nodes.lua
+msgid "Coal Stone"
+msgstr "Kamień węglowy"
+
+#: nodes.lua
+msgid "Coal Stone Bricks"
+msgstr "Węglowe kamienne cegły"
+
+#: nodes.lua
+msgid "Compressed Cobblestone"
+msgstr "Skompresowany bruk"
+
+#: nodes.lua
+msgid "Compressed Dirt"
+msgstr "Skompresowana ziemia"
+
+#: nodes.lua
+msgid "Copper Patina Block"
+msgstr "Blok patynowanej miedzi"
+
+#: nodes.lua
+msgid "Empty Shelf"
+msgstr "Pusta półka"
+
+#: nodes.lua
+msgid "Full Wooden Tile"
+msgstr "Pełny drewniany kafelek"
+
+#: nodes.lua
+msgid "Glow Glass"
+msgstr "Świecące szkło"
+
+#: nodes.lua
+msgid "Iron Checker"
+msgstr "Żelazna szachownica"
+
+#: nodes.lua
+msgid "Iron Glass"
+msgstr "Żelazne szkło"
+
+#: nodes.lua
+msgid "Iron Stone"
+msgstr "Żelazny kamień"
+
+#: nodes.lua
+msgid "Iron Stone Bricks"
+msgstr "Żelazne kamienne cegły"
+
+#: nodes.lua
+msgid "Plankstone"
+msgstr "Deskokamień"
+
+#: nodes.lua
+msgid "Rope"
+msgstr "Lina"
+
+#: nodes.lua
+msgid "Split Stone Tile"
+msgstr "Kamienny blok kafelkowy"
+
+#: nodes.lua
+msgid "Stone Bricks"
+msgstr "Kamienne cegły"
+
+#: nodes.lua
+msgid "Stone Tile"
+msgstr "Kamienny kafelek"
+
+#: nodes.lua
+msgid "Super Glow Glass"
+msgstr "Super świecące szkło"
+
+#: nodes.lua
+msgid "Sweeper"
+msgstr "Miotła"
+
+#: nodes.lua
+msgid "Tar"
+msgstr "Smoła"
+
+#: nodes.lua
+msgid "Trap Desert Stone"
+msgstr "Pułapka z pustynnego kamienia"
+
+#: nodes.lua
+msgid "Trap Glass"
+msgstr "Szklana pułapka"
+
+#: nodes.lua
+msgid "Trap Glow Glass"
+msgstr "Pułapka ze świecącego szkłą"
+
+#: nodes.lua
+msgid "Trap Obsidian"
+msgstr "Obsydianowa pułapka"
+
+#: nodes.lua
+msgid "Trap Obsidian Glass"
+msgstr "Pułapka z obsydianowego szkła"
+
+#: nodes.lua
+msgid "Trap Sandstone"
+msgstr "Pułapka z piaskowca"
+
+#: nodes.lua
+msgid "Trap Stone"
+msgstr "Kamienna pułapka"
+
+#: nodes.lua
+msgid "Trap Super Glow Glass"
+msgstr "Pułapka z super świecącego szkła"
+
+#: nodes.lua
+msgid "Wooden Tile"
+msgstr "Drewniany kafelek"
+
+#: nodes.lua
+msgid "Offset Wooden Tile"
+msgstr ""
+
+# @deprecated
+#: nodes.lua
+msgid "Downwards Wooden Tile"
+msgstr "Dolny drewniany kafelek"
+
+# @deprecated
+#: nodes.lua
+msgid "Leftwards Wooden Tile"
+msgstr "Lewy drewniany kafelek"
+
+# @deprecated
+#: nodes.lua
+msgid "Rightwards Wooden Tile"
+msgstr "Prawy drewniany kafelek"
+
+#: ownership.lua
+msgid "Sorry, @1 owns that spot."
+msgstr "Przykro mi, to miejsce należy do @1"
+
+#: ownership.lua
+msgid "someone"
+msgstr "ktoś"
+
+#: stairsplus/common.lua
+#, lua-format
+msgid "%s Microblock"
+msgstr "%s Mikroblok"
+
+#: stairsplus/common.lua stairsplus/slabs.lua
+#, lua-format
+msgid "%s Slab"
+msgstr "%s Płyta"
+
+#: stairsplus/common.lua
+#, lua-format
+msgid "%s Slope"
+msgstr "%s Spad"
+
+#: stairsplus/common.lua
+#, lua-format
+msgid "%s Panel"
+msgstr "%s Panel"
+
+#: stairsplus/common.lua
+#, lua-format
+msgid "%s Stairs"
+msgstr "%s Schody"

mod.conf

@@ -1 +1,4 @@
 name = moreblocks
+description = Adds various miscellaneous blocks to the game.
+depends = default
+optional_depends = intllib,stairs,farming,wool,basic_materials

settingtypes.txt

@@ -0,0 +1,2 @@
+# If enabled, Stairs+ nodes will be displayed in the inventory when playing in creative mode.
+moreblocks.stairsplus_in_creative_inventory (Display Stairs+ nodes in creative inventory) bool true

stairsplus/API.md

@@ -6,7 +6,7 @@
 	This also registers the node with the circular saw.
 	Example:
 	```lua
-	stairsplus:register_all("moreblocks", "wood", "defaut:wood", {
+	stairsplus:register_all("moreblocks", "wood", "default:wood", {
 		description = "Wooden",
 		tiles = {"default_wood.png"},
 		groups = {oddly_breakabe_by_hand=1},

stairsplus/common.lua

@@ -35,6 +35,9 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
 	-- This makes node rotation work on placement
 	def.place_param2 = nil
 
+	-- Darken light sources slightly to make up for their smaller visual size
+	def.light_source = math.max(0, (def.light_source or 0) - 1)
+
 	def.on_place = minetest.rotate_node
 	def.groups = stairsplus:prepare_groups(fields.groups)
 

stairsplus/init.lua

@@ -14,8 +14,10 @@ stairsplus.expect_infinite_stacks = false
 
 stairsplus.shapes_list = {}
 
-if not minetest.get_modpath("unified_inventory")
+if
-and minetest.settings:get_bool("creative_mode") then
+	not minetest.get_modpath("unified_inventory")
+	and minetest.settings:get_bool("creative_mode")
+then
 	stairsplus.expect_infinite_stacks = true
 end
 
@@ -36,7 +38,7 @@ end
 
 function stairsplus:register_all(modname, subname, recipeitem, fields)
 	self:register_stair(modname, subname, recipeitem, fields)
-	self:register_slab (modname, subname, recipeitem, fields)
+	self:register_slab(modname, subname, recipeitem, fields)
 	self:register_slope(modname, subname, recipeitem, fields)
 	self:register_panel(modname, subname, recipeitem, fields)
 	self:register_micro(modname, subname, recipeitem, fields)

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