Version 1.2.0

-----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJb+X8mAAoJEDno+L4wsKScmCsIAJcLflaVreRB4Hyqef7s5jUO xVOm0T8Pm4L1PLuXPItofLFo/Gd13Hz0TleHZsRhLnk82zhBuU31j7Ha2Wk9tDEb 70P25UCiiEJRAOlwA2F6OaitdOTK6Mn/sm557z7K/B3xpXqA7IgvkbvucvMmXRyV f5QhHzEWBQkh4lQR+KkpJXw5il8DGvkLaXnjYVfxUOOwbLjn+Eov/r2OQgixNQnW VI1TmJJJRuXmp+Do0qYq3nstCEl0mgMU3EZofFvxxjx2CtqcjHWU5KiQZXh1BBtx N41AB12Nwkk97ptrRA2ilS8nlRZ2rUeqpnVUlM578hR8mffs0V8n5isqAA80PPw= =XYQj -----END PGP SIGNATURE----- Merge tag 'v1.2.0' into nalc Version 1.2.0 # gpg: Signature faite le sam. 24 nov. 2018 17:41:10 CET # gpg: avec la clef RSA 39E8F8BE30B0A49C # gpg: Impossible de vérifier la signature : Pas de clef publique
2018-12-31 16:46:03 +01:00 · 2018-12-31 16:46:03 +01:00 · 6a6a22f699
commit 6a6a22f699
parent 88726c5913 9d953ccebf
22 changed files with 71 additions and 33 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,14 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

 ## [Unreleased]

+## [1.2.0] - 2018-11-24
+
 ### Added

+- Stairs+ nodes for `basic_materials`'s concrete, cement and brass blocks.
 - Listring add for circular saw.
- Stairs+: New API function:
- `stairsplus:register_custom_subset(subset, modname, subname, recipeitem, fields)`
+- **Stairs+:** New API function
+  `stairsplus:register_custom_subset(subset, modname, subname, recipeitem, fields)`.

 ### Fixed

+- The papyrus crafting recipe override is now properly applied over the
+  `default` mod's recipe.
+- Centered wooden tiles are now craftable.
 - Wool Stairs+ nodes can no longer be used in crafting.
 - The circular saw can no longer replace items from the player's inventory
  when it is full.
@ -52,5 +58,6 @@ 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.1.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.2.0...HEAD
+[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
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,6 +1,6 @@
 # zlib license

-Copyright (c) 2011-2017 Hugo Locurcio and contributors
+Copyright (c) 2011-2018 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.**

--- a/README.md
+++ b/README.md
@ -65,7 +65,7 @@ versions than 0.4.16 will generally not be fixed.

 ## License

-Copyright © 2011-2017 Hugo Locurcio and contributors
+Copyright © 2011-2018 Hugo Locurcio and contributors

 - More Blocks code is licensed under the zlib license, see
  [`LICENSE.md`](LICENSE.md) for details.
--- a/aliases.lua
+++ b/aliases.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/circular_saw.lua
+++ b/circular_saw.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: circular saw

-Copyright (c) 2011-2017 Hugo Locurcio, Sokomine and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio, Sokomine and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/config.lua
+++ b/config.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: configuration handling

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/crafting.lua
+++ b/crafting.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: crafting recipes

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

@ -35,6 +35,15 @@ 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 = {
@ -50,15 +59,6 @@ minetest.register_craft({
 	recipe = {"moreblocks:wood_tile_flipped"}
 })

-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_full 4",
 	recipe = {
--- a/depends.txt
+++ b/depends.txt
@ -3,3 +3,4 @@ intllib?
 stairs?
 farming?
 wool?
+basic_materials?
--- a/init.lua
+++ b/init.lua
@ -3,7 +3,7 @@
 ** More Blocks **
 By Calinou, with the help of ShadowNinja and VanessaE.

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
--- a/nodes.lua
+++ b/nodes.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: node definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/ownership.lua
+++ b/ownership.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: ownership handling

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/redefinitions.lua
+++ b/redefinitions.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: redefinitions of default stuff

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/aliases.lua
+++ b/stairsplus/aliases.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/conversion.lua
+++ b/stairsplus/conversion.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: conversion

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/init.lua
+++ b/stairsplus/init.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: Stairs+

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/microblocks.lua
+++ b/stairsplus/microblocks.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: microblock definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/panels.lua
+++ b/stairsplus/panels.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: panel definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/recipes.lua
+++ b/stairsplus/recipes.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: Stairs+

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

@ -440,4 +440,4 @@ stairsplus.register_recipes = function(category, alternate, modname, subname, re
 			})
 		end
 	end
-end
+end
--- a/stairsplus/registrations.lua
+++ b/stairsplus/registrations.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: registrations

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

@ -119,6 +119,36 @@ if minetest.get_modpath("wool") then
 	end
 end

+-- basic_materials, keeping the original other-mod-oriented names
+-- for backwards compatibility
+
+if minetest.get_modpath("basic_materials") then
+	stairsplus:register_all("technic","concrete","basic_materials:concrete_block",{
+		description = "Concrete",
+		tiles = {"basic_materials_concrete_block.png",},
+		groups = {cracky=1, level=2, concrete=1},
+		sounds = default.node_sound_stone_defaults(),
+	})
+
+	minetest.register_alias("prefab:concrete_stair","technic:stair_concrete")
+	minetest.register_alias("prefab:concrete_slab","technic:slab_concrete")
+
+	stairsplus:register_all("gloopblocks", "cement", "basic_materials:cement_block", {
+		description = "Cement",
+		tiles = {"basic_materials_cement_block.png"},
+		groups = {cracky=2, not_in_creative_inventory=1},
+		sounds = default.node_sound_stone_defaults(),
+		sunlight_propagates = true,
+	})
+
+	stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", {
+		description="Brass Block",
+		groups={cracky=1, not_in_creative_inventory=1},
+		tiles={"basic_materials_brass_block.png"},
+	})
+
+end
+
 -- Alias cuts of split_stone_tile_alt which was renamed checker_stone_tile.
 stairsplus:register_alias_all("moreblocks", "split_stone_tile_alt", "moreblocks", "checker_stone_tile")

--- a/stairsplus/slabs.lua
+++ b/stairsplus/slabs.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: slab definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/slopes.lua
+++ b/stairsplus/slopes.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: slope definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]

--- a/stairsplus/stairs.lua
+++ b/stairsplus/stairs.lua
@ -1,7 +1,7 @@
 --[[
 More Blocks: stair definitions

-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2018 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]