Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Desert cobblestone can be obtained in large quantities from deserts, so makes sense to add a compressed node.

.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,8 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Removed
+
+- Legacy Stairs+ conversion code.
+  - It was only required to import worlds last edited before Q3 2013.
+
 ### Added
 
+- Compressed desert cobblestone.
+
+## [2.0.0] - 2019-11-25
+
+### Added
+
+- Stairs+ nodes for ice.
 - `settingtypes.txt` file to allow configuring settings in the main menu.
 - Polish translation.
 
@@ -87,7 +99,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

LICENSE.md

@@ -1,6 +1,6 @@
 # zlib license
 
-Copyright © 2011-2019 Hugo Locurcio and contributors
+Copyright © 2011-2020 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

@@ -18,9 +18,7 @@ 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. If you do so, you will need to extract the archive then rename
+of More Blocks.
-the resulting folder from `moreblocks-master` to `moreblocks` – this is
-**absolutely** required, as the mod won't work otherwise.
 
 ### Enable the mod
 
@@ -60,13 +58,13 @@ 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
 
-Copyright © 2011-2019 Hugo Locurcio and contributors
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio, Sokomine and contributors.
+Copyright © 2011-2020 Hugo Locurcio, Sokomine and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

config.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: configuration handling
 
-Copyright © 2011-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -512,6 +512,22 @@ 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
@@ -20,6 +20,7 @@ dofile(modpath .. "/config.lua")
 dofile(modpath .. "/circular_saw.lua")
 dofile(modpath .. "/stairsplus/init.lua")
 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-2019 Hugo Locurcio and contributors
+# Copyright © 2011-2020 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,6 +132,10 @@ 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-2019 Hugo Locurcio and contributors
+# Copyright © 2011-2020 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,6 +128,10 @@ 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-2019 Hugo Locurcio and contributors
+# Copyright © 2011-2020 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,6 +133,10 @@ 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-2019 Hugo Locurcio and contributors
+# Copyright © 2011-2020 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,6 +132,10 @@ 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-2019 Hugo Locurcio and contributors
+# Copyright © 2011-2020 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,6 +132,10 @@ 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"
@@ -286,4 +290,4 @@ msgstr "%s Panel"
 #: stairsplus/common.lua
 #, lua-format
 msgid "%s Stairs"
-msgstr "% Schody"
+msgstr "%s Schody"

locale/ru.po

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

mod.conf

@@ -2,3 +2,4 @@ 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -175,6 +175,12 @@ 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",

ownership.lua

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

redefinitions.lua

@@ -1,52 +0,0 @@
---[[
-More Blocks: redefinitions of default stuff
-
-Copyright © 2011-2019 Hugo Locurcio and contributors.
-Licensed under the zlib license. See LICENSE.md for more information.
---]]
-
--- Redefinitions of some default crafting recipes:
-
-minetest.register_craft({
-	output = "default:sign_wall 4",
-	recipe = {
-		{"default:wood", "default:wood", "default:wood"},
-		{"default:wood", "default:wood", "default:wood"},
-		{"", "default:stick", ""},
-	}
-})
-
-minetest.register_craft({
-	output = "default:ladder 4",
-	recipe = {
-		{"default:stick", "", "default:stick"},
-		{"default:stick", "default:stick", "default:stick"},
-		{"default:stick", "", "default:stick"},
-	}
-})
-
-minetest.clear_craft({
-	recipe = {
-		{"default:papyrus", "default:papyrus", "default:papyrus"}
-	}
-})
-minetest.register_craft({
-	output = "default:paper 4",
-	recipe = {
-		{"default:papyrus", "default:papyrus", "default:papyrus"},
-	}
-})
-
-minetest.register_craft({
-	output = "default:rail 24",
-	recipe = {
-		{"default:steel_ingot", "", "default:steel_ingot"},
-		{"default:steel_ingot", "default:stick", "default:steel_ingot"},
-		{"default:steel_ingot", "", "default:steel_ingot"},
-	}
-})
-
-minetest.register_craft({
-	type = "toolrepair",
-	additional_wear = -0.10, -- Tool repair buff (10% bonus instead of 2%).
-})

settingtypes.txt

@@ -1,2 +1,3 @@
 # 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

@@ -1,70 +0,0 @@
---[[
-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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/conversion.lua

@@ -1,139 +0,0 @@
---[[
-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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -42,7 +42,6 @@ function stairsplus:register_all(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)
@@ -71,8 +70,6 @@ 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 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-2019 Hugo Locurcio and contributors.
+Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -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

stairsplus/slabs.lua

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