Ajoute message de chargement du mod dans le journal action

.github/workflows/build.yml

@@ -1,24 +0,0 @@
-name: build
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-python@master
-
-      - run: |
-         sudo apt-get update -qq
-         sudo apt-get install -qqq luarocks
-      - name: Install pre-commit
-        run: pip3 install pre-commit
-
-      - name: Install LuaCheck
-        run: luarocks install --local luacheck
-
-      - name: Run LuaCheck using pre-commit
-        run: |
-         pre-commit run --all-files
-         $HOME/.luarocks/bin/luacheck .

.pre-commit-config.yaml

@@ -1,8 +1,7 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v2.1.0
     hooks:
-      - id: fix-byte-order-marker
       - id: end-of-file-fixer
       - id: trailing-whitespace
 

.travis.yml

@@ -0,0 +1,15 @@
+language: generic
+
+addons:
+  apt:
+    packages:
+    - luarocks
+
+install:
+  - pyenv global 3.6.3
+  - pip3 install --user pre-commit
+  - luarocks install --local luacheck
+
+script:
+  - $HOME/.local/bin/pre-commit run --all-files
+  - $HOME/.luarocks/bin/luacheck .

CHANGELOG.md

@@ -7,66 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [2.2.0] - 2021-06-28
-
-### Changed
-
-- Refactored recipe override mechanism to avoid re-coding recipes
-  when we only want to change the amount produced.
-- [Realigned rail recipe to the changes made in Minetest Game.](https://github.com/minetest-mods/moreblocks/pull/169)
-  - All rail recipes (standard, power, break) were boosted by 50%.
-
-### Fixed
-
-- [Shapeless crafting recipes are now handled in redefinitions.](https://github.com/minetest-mods/moreblocks/pull/171)
-- [Aliases are now resolved in Stairs+ circular saw cost calculation.](https://github.com/minetest-mods/moreblocks/pull/175)
-- [Fixed strange placement behavior for non-default Stairs+ nodes.](https://github.com/minetest-mods/moreblocks/pull/168)
-- [Fixed stairs placement over oddly-shaped nodes.](https://github.com/minetest-mods/moreblocks/pull/166)
-
-## [2.1.0] - 2020-12-14
-
 ### Added
 
-- Clean Glass versions of Trap and (Super) Glowing Glass.
-- Compressed desert cobblestone.
-
-### Changed
-
-- Revised placing strategy that takes into account which side of the face
-  (top/bottom for horizontal, left/right for vertical placement) is being clicked.
-  Aux (sprint/special, default E) key can be used to place the node with the orientation
-  it would have if placed from the other side.
-  When placing nodes next to nodes of the same gategory (e.g.slab to slab) the other
-  node's orientation is copied, flipping it placing on top or below an upright or
-  upside-down node. In this case the aux key will disable the special processing of
-  same-category nodes.
-
-### Fixed
-
-- Revised minetest_game crafting recipe overrides to match Minetest 5.0.0 and later.
-
-### Removed
-
-- Legacy Stairs+ conversion code.
-  - It was only required to import worlds last edited before Q3 2013.
-
-## [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
 
@@ -133,10 +81,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.2.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.3.0...HEAD
-[2.2.0]: https://github.com/minetest-mods/moreblocks/compare/v2.1.0...v2.2.0
-[2.1.0]: https://github.com/minetest-mods/moreblocks/compare/v2.0.0...v2.1.0
-[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

LICENSE.md

@@ -1,6 +1,6 @@
 # zlib license
 
-Copyright © 2011-2020 Hugo Locurcio and contributors
+Copyright © 2011-2019 Hugo Locurcio and contributors
 
 **This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.**
 

README.md

@@ -1,4 +1,4 @@
-# More Blocks [![Build status](https://github.com/minetest-mods/moreblocks/workflows/build/badge.svg)](https://github.com/minetest-mods/moreblocks/actions)
+# More Blocks
 
 More Blocks for [Minetest](https://www.minetest.net/), a free and open source infinite
 world block sandbox game.
@@ -18,7 +18,9 @@ git clone https://github.com/minetest-mods/moreblocks.git
 
 You can also
 [download a ZIP archive](https://github.com/minetest-mods/moreblocks/archive/master.zip)
-of More Blocks.
+of More Blocks. If you do so, you will need to extract the archive then rename
+the resulting folder from `moreblocks-master` to `moreblocks` – this is
+**absolutely** required, as the mod won't work otherwise.
 
 ### Enable the mod
 
@@ -58,13 +60,13 @@ on that line.
 
 ## Version compatibility
 
-More Blocks is currently primarily tested with Minetest 5.3.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
 
-Copyright © 2011-2020 Hugo Locurcio and contributors
+Copyright © 2011-2019 Hugo Locurcio and contributors
 
 - More Blocks code is licensed under the zlib license, see
   [`LICENSE.md`](LICENSE.md) for details.

aliases.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

circular_saw.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: circular saw
 
-Copyright © 2011-2020 Hugo Locurcio, Sokomine and contributors.
+Copyright © 2011-2019 Hugo Locurcio, Sokomine and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -89,9 +89,8 @@ circular_saw.names = {
 }
 
 function circular_saw:get_cost(inv, stackname)
-	local name = minetest.registered_aliases[stackname] or stackname
 	for i, item in pairs(inv:get_list("output")) do
-		if item:get_name() == name then
+		if item:get_name() == stackname then
 			return circular_saw.cost_in_microblocks[i]
 		end
 	end

config.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: configuration handling
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

crafting.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: crafting recipes
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -35,17 +35,6 @@ minetest.register_craft({
 	recipe = {"default:junglegrass", "default:cobble"},
 })
 
-minetest.register_craft({
-	output = "moreblocks:wood_tile 9",
-	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
-	}
-})
-
--- 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 = {
@@ -55,6 +44,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "moreblocks:wood_tile 9",
+	recipe = {
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+	}
+})
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "moreblocks:wood_tile",
@@ -348,36 +346,12 @@ minetest.register_craft({
 	recipe = {"moreblocks:sweeper", "default:glass"},
 })
 
-minetest.register_craft({
-	output = "moreblocks:trap_clean_glass",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "moreblocks:clean_glass"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:trap_clean_glass",
-	type = "shapeless",
-	recipe = {"moreblocks:sweeper", "moreblocks:trap_glass"},
-})
-
 minetest.register_craft({
 	output = "moreblocks:glow_glass",
 	type = "shapeless",
 	recipe = {"default:torch", "default:glass"},
 })
 
-minetest.register_craft({
-	output = "moreblocks:clean_glow_glass",
-	type = "shapeless",
-	recipe = {"default:torch", "moreblocks:clean_glass"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:clean_glow_glass",
-	type = "shapeless",
-	recipe = {"moreblocks:sweeper", "moreblocks:glow_glass"},
-})
-
 minetest.register_craft({
 	output = "moreblocks:trap_glow_glass",
 	type = "shapeless",
@@ -390,26 +364,6 @@ minetest.register_craft({
 	recipe = {"default:mese_crystal_fragment", "moreblocks:glow_glass"},
 })
 
--- several recipes are possible for the trap+clean+glow, we only present 3 of them
-minetest.register_craft({
-	output = "moreblocks:trap_clean_glow_glass",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "moreblocks:clean_glow_glass"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:trap_clean_glow_glass",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "moreblocks:clean_glass", "default:torch"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:trap_clean_glow_glass",
-	type = "shapeless",
-	recipe = {"moreblocks:sweeper", "moreblocks:trap_glow_glass" },
-})
-
-
 minetest.register_craft({
 	output = "moreblocks:super_glow_glass",
 	type = "shapeless",
@@ -422,24 +376,6 @@ minetest.register_craft({
 	recipe = {"default:torch", "moreblocks:glow_glass"},
 })
 
-minetest.register_craft({
-	output = "moreblocks:clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"default:torch", "default:torch", "moreblocks:clean_glass"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"default:torch", "moreblocks:clean_glow_glass"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"moreblocks:sweeper", "moreblocks:super_glow_glass"},
-})
-
 
 minetest.register_craft({
 	output = "moreblocks:trap_super_glow_glass",
@@ -453,32 +389,6 @@ minetest.register_craft({
 	recipe = {"default:mese_crystal_fragment", "moreblocks:super_glow_glass"},
 })
 
--- several recipes are possible for the trap+clean+glow, we only present 4 of them
-minetest.register_craft({
-	output = "moreblocks:trap_clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "moreblocks:clean_super_glow_glass"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:trap_clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "moreblocks:clean_glow_glass", "default:torch"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:trap_clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"default:mese_crystal_fragment", "moreblocks:clean_glass", "default:torch", "default:torch"},
-})
-
-minetest.register_craft({
-	output = "moreblocks:trap_clean_super_glow_glass",
-	type = "shapeless",
-	recipe = {"moreblocks:sweeper", "moreblocks:trap_super_glow_glass" },
-})
-
-
 minetest.register_craft({
 	output = "moreblocks:coal_stone",
 	type = "shapeless",
@@ -600,22 +510,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "moreblocks:desert_cobble_compressed",
-	recipe = {
-		{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
-		{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
-		{"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"},
-	}
-})
-
-minetest.register_craft({
-	output = "default:desert_cobble 9",
-	recipe = {
-		{"moreblocks:desert_cobble_compressed"},
-	}
-})
-
 minetest.register_craft({
 	type = "cooking", output = "moreblocks:tar", recipe = "default:pine_tree",
 })

init.lua

@@ -3,7 +3,7 @@
 ** More Blocks **
 By Calinou, with the help of ShadowNinja and VanessaE.
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
@@ -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/de.po

@@ -1,5 +1,5 @@
 # German translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
+# Copyright © 2011-2019 Hugo Locurcio and contributors
 # This file is distributed under the same license as the More Blocks package.
 # Xanthin, 2014.
 # CodeXP <codexp@gmx.net>, 2018.
@@ -132,10 +132,6 @@ msgstr "Kohlesteinziegel"
 msgid "Compressed Cobblestone"
 msgstr "Gepresster Kopfsteinpflaster"
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "Gepresste Erde"

locale/es.po

@@ -1,5 +1,5 @@
 # Spanish translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
+# Copyright © 2011-2019 Hugo Locurcio and contributors
 # This file is distributed under the same license as the More Blocks package.
 # kaeza, 2013.
 # CodeXP <codexp@gmx.net>, 2018.
@@ -128,10 +128,6 @@ msgstr ""
 msgid "Compressed Cobblestone"
 msgstr ""
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr ""

locale/fr.po

@@ -1,5 +1,5 @@
 # French translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
+# Copyright © 2011-2019 Hugo Locurcio and contributors
 # This file is distributed under the same license as the More Blocks package.
 # Hugo Locurcio <hugo.locurcio@hugo.pro>, 2013-2019.
 # Jat15, 2013.
@@ -133,10 +133,6 @@ msgstr "Briques en pierre de charbon"
 msgid "Compressed Cobblestone"
 msgstr "Pierre taillée compressée"
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "Terre compressée"

locale/it.po

@@ -1,5 +1,5 @@
 # Italian translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
+# Copyright © 2011-2019 Hugo Locurcio and contributors
 # This file is distributed under the same license as the More Blocks package.
 # Emon, 2016.
 # CodeXP <codexp@gmx.net>, 2018.
@@ -132,10 +132,6 @@ msgstr "Mattoni di pietra in carbone"
 msgid "Compressed Cobblestone"
 msgstr ""
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr ""

locale/pl.po

@@ -1,5 +1,5 @@
 # Polish translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
+# 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.
@@ -132,10 +132,6 @@ msgstr "Węglowe kamienne cegły"
 msgid "Compressed Cobblestone"
 msgstr "Skompresowany bruk"
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "Skompresowana ziemia"
@@ -290,4 +286,4 @@ msgstr "%s Panel"
 #: stairsplus/common.lua
 #, lua-format
 msgid "%s Stairs"
-msgstr "%s Schody"
+msgstr "% Schody"

locale/ru.po

@@ -133,10 +133,6 @@ msgstr "угольно-каменный кирпич"
 msgid "Compressed Cobblestone"
 msgstr "прессованный булыжник"
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr "прессованная земля"

locale/template.pot

@@ -1,5 +1,5 @@
 # Template translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
+# Copyright © 2011-2019 Hugo Locurcio and contributors
 # This file is distributed under the same license as the More Blocks package.
 # CodeXP <codexp@gmx.net>, 2018.
 msgid ""
@@ -127,10 +127,6 @@ msgstr ""
 msgid "Compressed Cobblestone"
 msgstr ""
 
-#: nodes.lua
-msgid "Compressed Desert Cobblestone"
-msgstr ""
-
 #: nodes.lua
 msgid "Compressed Dirt"
 msgstr ""

locale/zh_CN.po

@@ -1,288 +0,0 @@
-# Template translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# IFRFSX <IFRFSX@protonmail.com>, 2020.
-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: \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 "圆锯"
-
-#: circular_saw.lua
-msgid ""
-"Input\n"
-"material"
-msgstr ""
-"输入\n"
-"材料"
-
-#: circular_saw.lua
-msgid "Left-over"
-msgstr "剩余材料"
-
-#: circular_saw.lua
-msgid "Max"
-msgstr "最大值"
-
-#: circular_saw.lua
-msgid ""
-"Recycle\n"
-"output"
-msgstr ""
-"回收\n"
-"输出物"
-
-#: circular_saw.lua
-msgid "Set"
-msgstr "设置"
-
-#: circular_saw.lua
-msgid "owned by @1"
-msgstr "属于@1所有"
-
-#: circular_saw.lua
-msgid "Circular Saw is empty"
-msgstr "圆锯是空的"
-
-#: circular_saw.lua
-msgid "Circular Saw is working on @1"
-msgstr "圆锯正在加工@1"
-
-#: init.lua
-msgid "[moreblocks] loaded."
-msgstr "[moreblocks] 已加载"
-
-#: nodes.lua
-msgid "Deprecated"
-msgstr "弃用"
-
-#: nodes.lua
-msgid "All-faces Acacia Tree"
-msgstr "全切面相思树木方块"
-
-#: nodes.lua
-msgid "All-faces Aspen Tree"
-msgstr "全切面白杨树木方块"
-
-#: nodes.lua
-msgid "All-faces Jungle Tree"
-msgstr "全切面丛林树木方块"
-
-#: nodes.lua
-msgid "All-faces Pine Tree"
-msgstr "全切面松树木方块"
-
-#: nodes.lua
-msgid "All-faces Tree"
-msgstr "全切面树木方块"
-
-#: nodes.lua
-msgid "Cactus Brick"
-msgstr "仙人掌砖"
-
-#: nodes.lua
-msgid "Cactus Checker"
-msgstr "仙人掌棋盘方块"
-
-#: nodes.lua
-msgid "Centered Wooden Tile"
-msgstr "居中的木瓦"
-
-#: nodes.lua
-msgid "Checker Stone Tile"
-msgstr "棋盘石瓦"
-
-#: nodes.lua
-msgid "Circle Stone Bricks"
-msgstr "圆石砖"
-
-#: nodes.lua
-msgid "Clean Glass"
-msgstr "干净的玻璃"
-
-#: nodes.lua
-msgid "Coal Checker"
-msgstr "棋盘煤块"
-
-#: nodes.lua
-msgid "Coal Glass"
-msgstr "煤玻璃"
-
-#: nodes.lua
-msgid "Coal Stone"
-msgstr "煤炭石"
-
-#: nodes.lua
-msgid "Coal Stone Bricks"
-msgstr "煤炭石砖"
-
-#: nodes.lua
-msgid "Compressed Cobblestone"
-msgstr "压缩圆石"
-
-#: nodes.lua
-msgid "Compressed Dirt"
-msgstr "压缩土"
-
-#: nodes.lua
-msgid "Copper Patina Block"
-msgstr "铜绿方块"
-
-#: nodes.lua
-msgid "Empty Shelf"
-msgstr "空书架"
-
-#: nodes.lua
-msgid "Full Wooden Tile"
-msgstr "全木瓦"
-
-#: nodes.lua
-msgid "Glow Glass"
-msgstr "发光玻璃"
-
-#: nodes.lua
-msgid "Iron Checker"
-msgstr "棋盘铁方块"
-
-#: nodes.lua
-msgid "Iron Glass"
-msgstr "铁玻璃"
-
-#: nodes.lua
-msgid "Iron Stone"
-msgstr "铁石"
-
-#: nodes.lua
-msgid "Iron Stone Bricks"
-msgstr "铁石砖"
-
-#: nodes.lua
-msgid "Plankstone"
-msgstr "板石"
-
-#: nodes.lua
-msgid "Rope"
-msgstr "绳子"
-
-#: nodes.lua
-msgid "Split Stone Tile"
-msgstr "裂石砖"
-
-#: nodes.lua
-msgid "Stone Bricks"
-msgstr "石砖"
-
-#: nodes.lua
-msgid "Stone Tile"
-msgstr "石瓦"
-
-#: nodes.lua
-msgid "Super Glow Glass"
-msgstr "超级发光玻璃"
-
-#: nodes.lua
-msgid "Sweeper"
-msgstr "清扫器"
-
-#: nodes.lua
-msgid "Tar"
-msgstr "焦油"
-
-#: nodes.lua
-msgid "Trap Desert Stone"
-msgstr "陷阱沙漠石"
-
-#: nodes.lua
-msgid "Trap Glass"
-msgstr "陷阱玻璃"
-
-#: nodes.lua
-msgid "Trap Glow Glass"
-msgstr "陷阱发光玻璃"
-
-#: nodes.lua
-msgid "Trap Obsidian"
-msgstr "陷阱黑耀石"
-
-#: nodes.lua
-msgid "Trap Obsidian Glass"
-msgstr "陷阱黑耀石玻璃"
-
-#: nodes.lua
-msgid "Trap Sandstone"
-msgstr "陷阱沙石"
-
-#: nodes.lua
-msgid "Trap Stone"
-msgstr "陷阱石"
-
-#: nodes.lua
-msgid "Trap Super Glow Glass"
-msgstr "陷阱超级发光玻璃"
-
-#: nodes.lua
-msgid "Wooden Tile"
-msgstr "木瓦"
-
-#: nodes.lua
-msgid "Offset Wooden Tile"
-msgstr "胶合木瓦"
-
-# @deprecated
-#: nodes.lua
-msgid "Downwards Wooden Tile"
-msgstr "向下的木瓦"
-
-# @deprecated
-#: nodes.lua
-msgid "Leftwards Wooden Tile"
-msgstr "向左的木瓦"
-
-# @deprecated
-#: nodes.lua
-msgid "Rightwards Wooden Tile"
-msgstr "向右的木瓦"
-
-#: ownership.lua
-msgid "Sorry, @1 owns that spot."
-msgstr "抱歉，那个位置是@1的。"
-
-#: ownership.lua
-msgid "someone"
-msgstr "某人"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Microblock"
-msgstr "%s 小方块"
-
-#: stairsplus/common.lua stairsplus/slabs.lua
-#, lua-format
-msgid "%s Slab"
-msgstr "%s 台阶"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Slope"
-msgstr "%s 斜坡"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Panel"
-msgstr "%s 嵌板"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Stairs"
-msgstr "%s 楼梯"

locale/zh_TW.po

@@ -1,288 +0,0 @@
-# Template translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# IFRFSX <IFRFSX@protonmail.com>, 2020.
-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: \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 "圓鋸"
-
-#: circular_saw.lua
-msgid ""
-"Input\n"
-"material"
-msgstr ""
-"輸入\n"
-"材料"
-
-#: circular_saw.lua
-msgid "Left-over"
-msgstr "剩餘材料"
-
-#: circular_saw.lua
-msgid "Max"
-msgstr "最大值"
-
-#: circular_saw.lua
-msgid ""
-"Recycle\n"
-"output"
-msgstr ""
-"回收\n"
-"輸出物"
-
-#: circular_saw.lua
-msgid "Set"
-msgstr "設置"
-
-#: circular_saw.lua
-msgid "owned by @1"
-msgstr "屬於@1所有"
-
-#: circular_saw.lua
-msgid "Circular Saw is empty"
-msgstr "圓鋸是空的"
-
-#: circular_saw.lua
-msgid "Circular Saw is working on @1"
-msgstr "圓鋸正在加工@1"
-
-#: init.lua
-msgid "[moreblocks] loaded."
-msgstr "[moreblocks] 已加載"
-
-#: nodes.lua
-msgid "Deprecated"
-msgstr "棄用"
-
-#: nodes.lua
-msgid "All-faces Acacia Tree"
-msgstr "全切面相思樹木方塊"
-
-#: nodes.lua
-msgid "All-faces Aspen Tree"
-msgstr "全切面白楊樹木方塊"
-
-#: nodes.lua
-msgid "All-faces Jungle Tree"
-msgstr "全切面叢林樹木方塊"
-
-#: nodes.lua
-msgid "All-faces Pine Tree"
-msgstr "全切面松樹木方塊"
-
-#: nodes.lua
-msgid "All-faces Tree"
-msgstr "全切面樹木方塊"
-
-#: nodes.lua
-msgid "Cactus Brick"
-msgstr "仙人掌磚"
-
-#: nodes.lua
-msgid "Cactus Checker"
-msgstr "仙人掌棋盤方塊"
-
-#: nodes.lua
-msgid "Centered Wooden Tile"
-msgstr "居中的木瓦"
-
-#: nodes.lua
-msgid "Checker Stone Tile"
-msgstr "棋盤石瓦"
-
-#: nodes.lua
-msgid "Circle Stone Bricks"
-msgstr "圓石磚"
-
-#: nodes.lua
-msgid "Clean Glass"
-msgstr "乾淨的玻璃"
-
-#: nodes.lua
-msgid "Coal Checker"
-msgstr "棋盤煤塊"
-
-#: nodes.lua
-msgid "Coal Glass"
-msgstr "煤玻璃"
-
-#: nodes.lua
-msgid "Coal Stone"
-msgstr "煤炭石"
-
-#: nodes.lua
-msgid "Coal Stone Bricks"
-msgstr "煤炭石磚"
-
-#: nodes.lua
-msgid "Compressed Cobblestone"
-msgstr "壓縮圓石"
-
-#: nodes.lua
-msgid "Compressed Dirt"
-msgstr "壓縮土"
-
-#: nodes.lua
-msgid "Copper Patina Block"
-msgstr "銅綠方塊"
-
-#: nodes.lua
-msgid "Empty Shelf"
-msgstr "空書架"
-
-#: nodes.lua
-msgid "Full Wooden Tile"
-msgstr "全木瓦"
-
-#: nodes.lua
-msgid "Glow Glass"
-msgstr "發光玻璃"
-
-#: nodes.lua
-msgid "Iron Checker"
-msgstr "棋盤鐵方塊"
-
-#: nodes.lua
-msgid "Iron Glass"
-msgstr "鐵玻璃"
-
-#: nodes.lua
-msgid "Iron Stone"
-msgstr "鐵石"
-
-#: nodes.lua
-msgid "Iron Stone Bricks"
-msgstr "鐵石磚"
-
-#: nodes.lua
-msgid "Plankstone"
-msgstr "板石"
-
-#: nodes.lua
-msgid "Rope"
-msgstr "繩子"
-
-#: nodes.lua
-msgid "Split Stone Tile"
-msgstr "裂石磚"
-
-#: nodes.lua
-msgid "Stone Bricks"
-msgstr "石磚"
-
-#: nodes.lua
-msgid "Stone Tile"
-msgstr "石瓦"
-
-#: nodes.lua
-msgid "Super Glow Glass"
-msgstr "超級發光玻璃"
-
-#: nodes.lua
-msgid "Sweeper"
-msgstr "清掃器"
-
-#: nodes.lua
-msgid "Tar"
-msgstr "焦油"
-
-#: nodes.lua
-msgid "Trap Desert Stone"
-msgstr "陷阱沙漠石"
-
-#: nodes.lua
-msgid "Trap Glass"
-msgstr "陷阱玻璃"
-
-#: nodes.lua
-msgid "Trap Glow Glass"
-msgstr "陷阱發光玻璃"
-
-#: nodes.lua
-msgid "Trap Obsidian"
-msgstr "陷阱黑耀石"
-
-#: nodes.lua
-msgid "Trap Obsidian Glass"
-msgstr "陷阱黑耀石玻璃"
-
-#: nodes.lua
-msgid "Trap Sandstone"
-msgstr "陷阱沙石"
-
-#: nodes.lua
-msgid "Trap Stone"
-msgstr "陷阱石"
-
-#: nodes.lua
-msgid "Trap Super Glow Glass"
-msgstr "陷阱超級發光玻璃"
-
-#: nodes.lua
-msgid "Wooden Tile"
-msgstr "木瓦"
-
-#: nodes.lua
-msgid "Offset Wooden Tile"
-msgstr "膠合木瓦"
-
-# @deprecated
-#: nodes.lua
-msgid "Downwards Wooden Tile"
-msgstr "向下的木瓦"
-
-# @deprecated
-#: nodes.lua
-msgid "Leftwards Wooden Tile"
-msgstr "向左的木瓦"
-
-# @deprecated
-#: nodes.lua
-msgid "Rightwards Wooden Tile"
-msgstr "向右的木瓦"
-
-#: ownership.lua
-msgid "Sorry, @1 owns that spot."
-msgstr "抱歉，那個位置是@1的。"
-
-#: ownership.lua
-msgid "someone"
-msgstr "某人"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Microblock"
-msgstr "%s 小方塊"
-
-#: stairsplus/common.lua stairsplus/slabs.lua
-#, lua-format
-msgid "%s Slab"
-msgstr "%s 臺階"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Slope"
-msgstr "%s 斜坡"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Panel"
-msgstr "%s 嵌板"
-
-#: stairsplus/common.lua
-#, lua-format
-msgid "%s Stairs"
-msgstr "%s 樓梯"

mod.conf

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

nodes.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: node definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -175,12 +175,6 @@ local nodes = {
 		is_ground_content = false,
 		sounds = sound_stone,
 	},
-	["desert_cobble_compressed"] = {
-		description = S("Compressed Desert Cobblestone"),
-		groups = {cracky = 1},
-		is_ground_content = false,
-		sounds = sound_stone,
-	},
 	["plankstone"] = {
 		description = S("Plankstone"),
 		paramtype2 = "facedir",
@@ -194,7 +188,6 @@ local nodes = {
 		description = S("Iron Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#DEDEDE", "default_glass_detail.png^[colorize:#DEDEDE"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -205,7 +198,6 @@ local nodes = {
 		description = S("Coal Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#828282", "default_glass_detail.png^[colorize:#828282"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -216,7 +208,6 @@ local nodes = {
 		description = S("Clean Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -316,7 +307,6 @@ local nodes = {
 		description = S("Trap Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^moreblocks_trap_box_glass.png", "default_glass_detail.png"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -329,7 +319,6 @@ local nodes = {
 		description = S("Trap Obsidian Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png", "default_obsidian_glass_detail.png"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -349,19 +338,6 @@ local nodes = {
 		sounds = sound_stone,
 		no_stairs = true,
 	},
-	["trap_clean_glass"] = {
-		description = S("Trap Clean Glass"),
-		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_clean_glass.png^moreblocks_trap_box_glass.png", "moreblocks_clean_glass_detail.png"},
-		use_texture_alpha = "clip",
-		paramtype = "light",
-		sunlight_propagates = true,
-		is_ground_content = false,
-		walkable = false,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-		no_stairs = true,
-	},
 	["trap_sandstone"] = {
 		description = S("Trap Sandstone"),
 		drawtype = "glasslike_framed",
@@ -412,19 +388,6 @@ local nodes = {
 		description = S("Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#E9CD61", "default_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = "clip",
-		paramtype = "light",
-		sunlight_propagates = true,
-		is_ground_content = false,
-		light_source = 11,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["clean_glow_glass"] = {
-		description = S("Clean Glow Glass"),
-		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_clean_glass.png^[colorize:#E9CD61", "moreblocks_clean_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -436,21 +399,6 @@ local nodes = {
 		description = S("Trap Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = "clip",
-		paramtype = "light",
-		sunlight_propagates = true,
-		is_ground_content = false,
-		light_source = 11,
-		walkable = false,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-		no_stairs = true,
-	},
-	["trap_clean_glow_glass"] = {
-		description = S("Trap Clean Glow Glass"),
-		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_clean_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "moreblocks_clean_glass_detail.png^[colorize:#E9CD61"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -464,19 +412,6 @@ local nodes = {
 		description = S("Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#FFFF78", "default_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = "clip",
-		paramtype = "light",
-		sunlight_propagates = true,
-		is_ground_content = false,
-		light_source = default.LIGHT_MAX,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["clean_super_glow_glass"] = {
-		description = S("Clean Super Glow Glass"),
-		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_clean_glass.png^[colorize:#FFFF78", "moreblocks_clean_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,
@@ -488,21 +423,6 @@ local nodes = {
 		description = S("Trap Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
 		tiles = {"default_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = "clip",
-		paramtype = "light",
-		sunlight_propagates = true,
-		is_ground_content = false,
-		light_source = default.LIGHT_MAX,
-		walkable = false,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-		no_stairs = true,
-	},
-	["trap_clean_super_glow_glass"] = {
-		description = S("Trap Clean Super Glow Glass"),
-		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_clean_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "moreblocks_clean_glass_detail.png^[colorize:#FFFF78"},
-		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
 		is_ground_content = false,

ownership.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: ownership handling
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

redefinitions.lua

@@ -1,91 +1,49 @@
 --[[
 More Blocks: redefinitions of default stuff
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
-local modname = minetest.get_current_modname()
+-- Redefinitions of some default crafting recipes:
 
--- Redefine some of the default crafting recipes to be more productive
+minetest.register_craft({
-
+	output = "default:sign_wall 4",
--- Auxiliary function: take a recipe as returned by get_all_craft_recipes
+	recipe = {
--- and turn it into a table that can be used to clear a craft or declare a new one
+		{"default:wood", "default:wood", "default:wood"},
-local reconstruct_internal_craft = function(recipe)
+		{"default:wood", "default:wood", "default:wood"},
-	local recp = {
+		{"", "default:stick", ""},
-		{ "", "", "" },
-		{ "", "", "" },
-		{ "", "", "" },
 	}
-	local width = recipe.width
+})
-	for idx, item in pairs(recipe.items) do
-		local row = math.ceil(idx / width)
-		local col = idx - (row-1)*width
-		recp[row][col] = item
-	end
-	return recp
-end
 
--- Change the amount produced by recipe by apply func to the old amount
+minetest.register_craft({
-local change_recipe_amount = function(product, recipe, func)
+	output = "default:ladder 4",
-	-- if width == 0, this is a shapeless recipe, for which the
+	recipe = {
-	-- internal and Lua API recipe table is the same.
+		{"default:stick", "", "default:stick"},
-	-- Otherwise we need to reconstruct the table for the shaped recipe.
+		{"default:stick", "default:stick", "default:stick"},
-	local shapeless = (recipe.width == 0)
+		{"default:stick", "", "default:stick"},
-	local recp = shapeless and recipe.items or reconstruct_internal_craft(recipe)
+	}
+})
 
-	local oldamount = tonumber(recipe.output:match(" [0-9]+$") or "1")
+minetest.clear_craft({
+	recipe = {
+		{"default:papyrus", "default:papyrus", "default:papyrus"}
+	}
+})
+minetest.register_craft({
+	output = "default:paper 4",
+	recipe = {
+		{"default:papyrus", "default:papyrus", "default:papyrus"},
+	}
+})
 
-	local newamount = func(oldamount)
+minetest.register_craft({
-
+	output = "default:rail 24",
-	-- remove old crafting recipe
+	recipe = {
-	local redo = { recipe = recp }
+		{"default:steel_ingot", "", "default:steel_ingot"},
-	-- preserve shapelessness
+		{"default:steel_ingot", "default:stick", "default:steel_ingot"},
-	if shapeless then
+		{"default:steel_ingot", "", "default:steel_ingot"},
-		redo.type = "shapeless"
+	}
-	end
-	minetest.clear_craft(redo)
-
-	-- new output
-	redo.output = ("%s %d"):format(product, newamount)
-	minetest.register_craft(redo)
-
-	minetest.log("action", ("[MOD]%s: recipe for %s production: %d => %d"):format(modname, product, oldamount, newamount))
-end
-
-local increase_craft_production = function(product, func)
-	local recipes = minetest.get_all_craft_recipes(product)
-	for _, r in pairs(recipes) do
-		if r.type == "normal" or r.method == "normal" then
-			change_recipe_amount(product, r, func)
-		end
-	end
-end
-
--- Increase the crafting production according to the rules from the table, which is in the form:
--- {
---   { detector, amount changing function }
---   { detector, amount changing function }
--- }
--- TODO: consider exporting this function to other mods
-local increase_craft_production_table = function(map_table)
-	for product, _ in pairs(minetest.registered_items) do
-		for _, tab in pairs(map_table) do
-			local detector = tab[1]
-			local func = tab[2]
-			if detector(product) then
-				increase_craft_production(product, func)
-				-- only apply one boost
-				break
-			end
-		end
-	end
-end
-
-increase_craft_production_table({
-	{ function(n) return n:match('^default:sign_wall') end, function(old) return old + 1 end },
-	{ function(n) return n == 'default:paper' end, function(old) return old*4 end },
-	{ function(n) return n:match('^carts:.*rail$') or n:match('^default:.*rail$') end, function(old) return old + old/2 end },
 })
 
 minetest.register_craft({

settingtypes.txt

@@ -1,3 +1,2 @@
 # If enabled, Stairs+ nodes will be displayed in the inventory when playing in creative mode.
-# Disabling this can speed up loading times for clients as fewer nodes need to be registered in the creative inventory.
 moreblocks.stairsplus_in_creative_inventory (Display Stairs+ nodes in creative inventory) bool true

stairsplus/aliases.lua

@@ -0,0 +1,70 @@
+--[[
+More Blocks: alias definitions
+
+Copyright © 2011-2019 Hugo Locurcio and contributors.
+Licensed under the zlib license. See LICENSE.md for more information.
+--]]
+
+local function register_stairsplus_alias(modname, origname, newname)
+	minetest.register_alias(modname.. ":slab_" ..origname, "moreblocks:slab_" ..newname)
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_inverted", "moreblocks:slab_" ..newname.. "_inverted")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_wall", "moreblocks:slab_" ..newname.. "_wall")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter", "moreblocks:slab_" ..newname.. "_quarter")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter_inverted", "moreblocks:slab_" ..newname.. "_quarter_inverted")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter_wall", "moreblocks:slab_" ..newname.. "_quarter_wall")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter", "moreblocks:slab_" ..newname.. "_three_quarter")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter_inverted", "moreblocks:slab_" ..newname.. "_three_quarter_inverted")
+	minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter_wall", "moreblocks:slab_" ..newname.. "_three_quarter_wall")
+	minetest.register_alias(modname.. ":stair_" ..origname, "moreblocks:stair_" ..newname)
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_inverted", "moreblocks:stair_" ..newname.. "_inverted")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_wall", "moreblocks:stair_" ..newname.. "_wall")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half", "moreblocks:stair_" ..newname.. "_wall_half")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half_inverted", "moreblocks:stair_" ..newname.. "_wall_half_inverted")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_half", "moreblocks:stair_" ..newname.. "_half")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_half_inverted", "moreblocks:stair_" ..newname.. "_half_inverted")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_right_half", "moreblocks:stair_" ..newname.. "_right_half")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_right_half_inverted", "moreblocks:stair_" ..newname.. "_right_half_inverted")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half", "moreblocks:stair_" ..newname.. "_wall_half")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half_inverted", "moreblocks:stair_" ..newname.. "_wall_half_inverted")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_inner", "moreblocks:stair_" ..newname.. "_inner")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_inner_inverted", "moreblocks:stair_" ..newname.. "_inner_inverted")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_outer", "moreblocks:stair_" ..newname.. "_outer")
+	minetest.register_alias(modname.. ":stair_" ..origname.. "_outer_inverted", "moreblocks:stair_" ..newname.. "_outer_inverted")
+	minetest.register_alias(modname.. ":panel_" ..origname.. "_bottom", "moreblocks:panel_" ..newname.. "_bottom")
+	minetest.register_alias(modname.. ":panel_" ..origname.. "_top", "moreblocks:panel_" ..newname.. "_top")
+	minetest.register_alias(modname.. ":panel_" ..origname.. "_vertical", "moreblocks:panel_" ..newname.. "_vertical")
+	minetest.register_alias(modname.. ":micro_" ..origname.. "_bottom", "moreblocks:micro_" ..newname.. "_bottom")
+	minetest.register_alias(modname.. ":micro_" ..origname.. "_top", "moreblocks:micro_" ..newname.. "_top")
+end
+
+register_stairsplus_alias("stairsplus", "stone", "stone")
+register_stairsplus_alias("stairsplus", "wood", "wood")
+register_stairsplus_alias("stairsplus", "pinewood", "pinewood")
+register_stairsplus_alias("stairsplus", "cobble", "cobble")
+register_stairsplus_alias("stairsplus", "brick", "brick")
+register_stairsplus_alias("stairsplus", "sandstone", "sandstone")
+register_stairsplus_alias("stairsplus", "glass", "glass")
+register_stairsplus_alias("stairsplus", "tree", "tree")
+register_stairsplus_alias("stairsplus", "jungletree", "jungletree")
+register_stairsplus_alias("stairsplus", "pinetree", "pinetree")
+register_stairsplus_alias("stairsplus", "desert_stone", "desert_stone")
+register_stairsplus_alias("stairsplus", "steelblock", "steelblock")
+register_stairsplus_alias("stairsplus", "mossycobble", "mossycobble")
+
+register_stairsplus_alias("moreblocks", "coalstone", "coal_stone")
+register_stairsplus_alias("moreblocks", "junglewood", "jungle_wood")
+register_stairsplus_alias("moreblocks", "circlestonebrick", "circle_stone_bricks")
+register_stairsplus_alias("moreblocks", "ironstone", "iron_stone")
+register_stairsplus_alias("moreblocks", "coalglass", "coal_glass")
+register_stairsplus_alias("moreblocks", "ironglass", "iron_glass")
+register_stairsplus_alias("moreblocks", "glowglass", "glow_glass")
+register_stairsplus_alias("moreblocks", "superglowglass", "super_glow_glass")
+register_stairsplus_alias("moreblocks", "coalchecker", "coal_checker")
+register_stairsplus_alias("moreblocks", "ironchecker", "iron_checker")
+register_stairsplus_alias("moreblocks", "cactuschecker", "cactus_checker")
+register_stairsplus_alias("moreblocks", "ironstonebrick", "iron_stone_bricks")
+register_stairsplus_alias("moreblocks", "stonesquare", "stone_tile")
+register_stairsplus_alias("moreblocks", "splitstonesquare", "split_stone_tile")
+register_stairsplus_alias("moreblocks", "woodtile", "wood_tile")
+register_stairsplus_alias("moreblocks", "woodtile_centered", "wood_tile_centered")
+register_stairsplus_alias("moreblocks", "woodtile_full", "wood_tile_full")

stairsplus/common.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: registrations
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -15,111 +15,7 @@ local descriptions = {
 	["stair"] = S("%s Stairs"),
 }
 
--- Extends the standad rotate_node placement so that it takes into account
--- the side (top/bottom or left/right) of the face being pointed at.
--- As with the standard rotate_node, sneak can be used to force the perpendicular
--- placement (wall placement on floor/ceiling, floor/ceiling placement on walls).
--- Additionally, the aux / sprint / special key can be used to place the node
--- as if from the opposite side.
---
--- When placing a node next to one of the same category (e.g. slab to slab or
--- stair to stair), the default placement (regardless of sneak) is to copy the
--- under node's param2, flipping if placed above or below it. The aux key disable
--- this behavior.
-local wall_right_dirmap = {9, 18, 7, 12}
-local wall_left_dirmap = {11, 16, 5, 14}
-local ceil_dirmap = {20, 23, 22, 21}
-
--- extract the stairsplus category from a node name
--- assumes the name is in the form mod_name:category_original_ndoe_name
-local function name_to_category(name)
-	local colon = name:find(":") or 0
-	colon = colon + 1
-	local under = name:find("_", colon)
-	return name:sub(colon, under)
-end
-
-stairsplus.rotate_node_aux = function(itemstack, placer, pointed_thing)
-	local sneak = placer and placer:get_player_control().sneak
-	local aux = placer and placer:get_player_control().aux1
-
-	-- category for what we are placing
-	local item_prefix = name_to_category(itemstack:get_name())
-	-- category for what we are placing against
-	local under = pointed_thing.under
-	local under_node = minetest.get_node(under)
-	local under_prefix = under_node and name_to_category(under_node.name)
-
-	local same_cat = item_prefix == under_prefix
-
-	-- standard (floor) facedir, also used for sneak placement against the lower half of the wall
-	local p2 = placer and minetest.dir_to_facedir(placer:get_look_dir()) or 0
-
-	-- check which face and which quadrant we are interested in
-	-- this is used both to check if we're handling parallel placement in the same-category case,
-	-- and in general for sneak placement
-	local face_pos = minetest.pointed_thing_to_face_pos(placer, pointed_thing)
-	local face_off = vector.subtract(face_pos, under)
-
-	-- we cannot trust face_off to tell us the correct directionif the
-	-- under node has a non-standard shape, so use the distance between under and above
-	local wallmounted = minetest.dir_to_wallmounted(vector.subtract(pointed_thing.above, under))
-
-	if same_cat and not aux then
-		p2 = under_node.param2
-		-- flip if placing above or below an upright or upside-down node
-		-- TODO should we also flip when placing next to a side-mounted node?
-		if wallmounted < 2 then
-			if p2 < 4 then
-				p2 = (p2 + 2) % 4
-				p2 = ceil_dirmap[p2 + 1]
-			elseif p2 > 19 then
-				p2 = ceil_dirmap[p2 - 19] - 20
-				p2 = (p2 + 2) % 4
-			end
-		end
-	else
-		-- for same-cat placement, aux is used to disable param2 copying
-		if same_cat then
-			aux = not aux
-		end
-
-		local remap = nil
-
-		-- standard placement against the wall
-		local use_wallmap = (wallmounted > 1 and not sneak) or (wallmounted < 2 and sneak)
-
-		-- standard placement against the ceiling, or sneak placement against the upper half of the wall
-		local use_ceilmap = wallmounted == 1 and not sneak
-		use_ceilmap = use_ceilmap or (wallmounted > 1 and sneak and face_off.y > 0)
-
-		if use_wallmap then
-			local left = (p2 == 0 and face_off.x < 0) or
-				(p2 == 1 and face_off.z > 0) or
-				(p2 == 2 and face_off.x > 0) or
-				(p2 == 3 and face_off.z < 0)
-			if aux then
-				left = not left
-			end
-			remap = left and wall_left_dirmap or wall_right_dirmap
-		elseif use_ceilmap then
-			remap = ceil_dirmap
-		end
-
-		if aux then
-			p2 = (p2 + 2) % 4
-		end
-
-		if remap then
-			p2 = remap[p2 + 1]
-		end
-	end
-
-	return minetest.item_place(itemstack, placer, pointed_thing, p2)
-end
-
 stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields)
-	local src_def = minetest.registered_nodes[recipeitem] or {}
 	local desc_base = descriptions[category]:format(fields.description)
 	local def = {}
 
@@ -135,17 +31,11 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
 	def.drawtype = "nodebox"
 	def.paramtype = "light"
 	def.paramtype2 = def.paramtype2 or "facedir"
-	if def.use_texture_alpha == nil then
-		def.use_texture_alpha = src_def.use_texture_alpha
-	end
 
 	-- This makes node rotation work on placement
 	def.place_param2 = nil
 
-	-- Darken light sources slightly to make up for their smaller visual size
+	def.on_place = minetest.rotate_node
-	def.light_source = math.max(0, (def.light_source or 0) - 1)
-
-	def.on_place = stairsplus.rotate_node_aux
 	def.groups = stairsplus:prepare_groups(fields.groups)
 
 	if category == "slab" then

stairsplus/conversion.lua

@@ -0,0 +1,139 @@
+--[[
+More Blocks: conversion
+
+Copyright © 2011-2019 Hugo Locurcio and contributors.
+Licensed under the zlib license. See LICENSE.md for more information.
+--]]
+
+-- Function to convert all stairs/slabs/etc nodes from
+-- inverted, wall, etc to regular + 6d facedir
+
+local dirs1 = {21, 20, 23, 22, 21}
+local dirs2 = {15, 8, 17, 6, 15}
+local dirs3 = {14, 11, 16, 5, 14}
+
+function stairsplus:register_6dfacedir_conversion(modname, material)
+	--print("Register stairsplus 6d facedir conversion")
+	--print('ABM for '..modname..' "'..material..'"')
+
+	local objects_list1 = {
+		modname.. ":slab_" ..material.. "_inverted",
+		modname.. ":slab_" ..material.. "_quarter_inverted",
+		modname.. ":slab_" ..material.. "_three_quarter_inverted",
+		modname.. ":stair_" ..material.. "_inverted",
+		modname.. ":stair_" ..material.. "_wall",
+		modname.. ":stair_" ..material.. "_wall_half",
+		modname.. ":stair_" ..material.. "_wall_half_inverted",
+		modname.. ":stair_" ..material.. "_half_inverted",
+		modname.. ":stair_" ..material.. "_right_half_inverted",
+		modname.. ":panel_" ..material.. "_vertical",
+		modname.. ":panel_" ..material.. "_top",
+	}
+
+	local objects_list2 = {
+		modname.. ":slab_" ..material.. "_wall",
+		modname.. ":slab_" ..material.. "_quarter_wall",
+		modname.. ":slab_" ..material.. "_three_quarter_wall",
+		modname.. ":stair_" ..material.. "_inner_inverted",
+		modname.. ":stair_" ..material.. "_outer_inverted",
+		modname.. ":micro_" ..material.. "_top"
+	}
+
+	for _, object in pairs(objects_list1) do
+		local flip_upside_down = false
+		local flip_to_wall = false
+
+		local dest_object = object
+
+		if string.find(dest_object, "_inverted") then
+			flip_upside_down = true
+			dest_object = string.gsub(dest_object, "_inverted", "")
+		end
+
+		if string.find(object, "_top") then
+			flip_upside_down = true
+			dest_object = string.gsub(dest_object, "_top", "")
+		end
+
+		if string.find(dest_object, "_wall") then
+			flip_to_wall = true
+			dest_object = string.gsub(dest_object, "_wall", "")
+		end
+
+		if string.find(dest_object, "_vertical") then
+			flip_to_wall = true
+			dest_object = string.gsub(dest_object, "_vertical", "")
+		end
+
+		if string.find(dest_object, "_half") and not string.find(dest_object, "_right_half") then
+			dest_object = string.gsub(dest_object, "_half", "_right_half")
+		elseif string.find(dest_object, "_right_half") then
+			dest_object = string.gsub(dest_object, "_right_half", "_half")
+		end
+
+		--print("    +---> convert " ..object)
+		--print("    |     to " ..dest_object)
+
+		minetest.register_abm({
+			nodenames = {object},
+			interval = 1,
+			chance = 1,
+			action = function(pos, node, active_object_count, active_object_count_wider)
+				local fdir = node.param2 or 0
+				local nfdir
+
+				if flip_upside_down and not flip_to_wall then
+					nfdir = dirs1[fdir + 2]
+				elseif flip_to_wall and not flip_upside_down then
+					nfdir = dirs2[fdir + 1]
+				elseif flip_to_wall and flip_upside_down then
+					nfdir = dirs3[fdir + 2]
+				end
+				minetest.set_node(pos, {name = dest_object, param2 = nfdir})
+			end
+		})
+	end
+
+	for _, object in pairs(objects_list2) do
+		local flip_upside_down = false
+		local flip_to_wall = false
+
+		local dest_object = object
+
+		if string.find(dest_object, "_inverted") then
+			flip_upside_down = true
+			dest_object = string.gsub(dest_object, "_inverted", "")
+		end
+
+		if string.find(dest_object, "_top") then
+			flip_upside_down = true
+			dest_object = string.gsub(dest_object, "_top", "")
+		end
+
+		if string.find(dest_object, "_wall") then
+			flip_to_wall = true
+			dest_object = string.gsub(dest_object, "_wall", "")
+		end
+
+		--print("    +---> convert " ..object)
+		--print("    |     to " ..dest_object)
+
+		minetest.register_abm({
+			nodenames = {object},
+			interval = 1,
+			chance = 1,
+			action = function(pos, node, active_object_count, active_object_count_wider)
+				local fdir = node.param2
+				local nfdir = 20
+
+				if flip_upside_down and not flip_to_wall then
+					nfdir = dirs1[fdir + 1]
+				elseif flip_to_wall and not flip_upside_down then
+					nfdir = dirs2[fdir + 2]
+
+				end
+				minetest.set_node(pos, {name = dest_object, param2 = nfdir})
+			end
+		})
+	end
+end

stairsplus/custom.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: microblock definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/defs.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: registrations
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/init.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: Stairs+
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -14,10 +14,8 @@ stairsplus.expect_infinite_stacks = false
 
 stairsplus.shapes_list = {}
 
-if
+if not minetest.get_modpath("unified_inventory")
-	not minetest.get_modpath("unified_inventory")
+and minetest.settings:get_bool("creative_mode") then
-	and minetest.settings:get_bool("creative_mode")
-then
 	stairsplus.expect_infinite_stacks = true
 end
 
@@ -25,7 +23,7 @@ function stairsplus:prepare_groups(groups)
 	local result = {}
 	if groups then
 		for k, v in pairs(groups) do
-			if k ~= "wood" and k ~= "stone" and k ~= "wool" and k ~= "tree" then
+			if k ~= "wood" and k ~= "stone" then
 				result[k] = v
 			end
 		end
@@ -38,10 +36,11 @@ 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)
+	-- self:register_6dfacedir_conversion(modname, subname) -- Not needed as of Q3 2013, uncomment to fix old maps.
 end
 
 function stairsplus:register_alias_all(modname_old, subname_old, modname_new, subname_new)
@@ -70,6 +69,8 @@ local function register_stair_slab_panel_micro(modname, subname, recipeitem, gro
 	})
 end
 
+-- dofile(modpath.. "/aliases.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
+-- dofile(modpath.. "/conversion.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
 dofile(modpath .. "/defs.lua")
 dofile(modpath .. "/recipes.lua")
 dofile(modpath .. "/common.lua")

stairsplus/microblocks.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: microblock definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/panels.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: panel definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/recipes.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: Stairs+
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/registrations.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: registrations
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -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
@@ -106,6 +105,9 @@ if minetest.get_modpath("wool") then
 		local ndef = table.copy(minetest.registered_nodes[nodename])
 		ndef.sunlight_propagates = true
 
+		-- Prevent dye+cut wool recipy from creating a full wool block.
+		ndef.groups.wool = nil
+
 		stairsplus:register_all(mod, name, nodename, ndef)
 	end
 end

stairsplus/slabs.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: slab definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/slopes.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: slope definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/stairs.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: stair definitions
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]