From 723db44933721cc14e85ec40ada5ae5e936cb7d7 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 5 Oct 2018 18:46:55 +0100 Subject: [PATCH 1/7] Make wood_tile_center craftable (#129) place wood_tile_center craft recipe before wood_tile so that it's craftable, otherwise crafting a wood_tile_center gives a normal wood_tile since they all belong to group:wood. --- crafting.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/crafting.lua b/crafting.lua index 3fb9830..5b14602 100644 --- a/crafting.lua +++ b/crafting.lua @@ -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 = { From 01ec8290f6e7ded9da087340be63644b35b9cfef Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 23 Nov 2018 11:25:04 -0500 Subject: [PATCH 2/7] basic_materials stairs/slopes/et. al (keeping original technic item names) --- depends.txt | 1 + stairsplus/registrations.lua | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/depends.txt b/depends.txt index e8ecf06..d27d8a5 100644 --- a/depends.txt +++ b/depends.txt @@ -3,3 +3,4 @@ intllib? stairs? farming? wool? +basic_materials? diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index dc89234..5d681e8 100644 --- a/stairsplus/registrations.lua +++ b/stairsplus/registrations.lua @@ -112,6 +112,21 @@ if minetest.get_modpath("wool") then end end +-- basic_materials, keeping the original technic-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") +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") From 1482a7810fdb40bb5cf30d6e8377a3eadfa67e42 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 24 Nov 2018 10:44:35 -0500 Subject: [PATCH 3/7] make stairs from cement too. --- stairsplus/registrations.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index 5d681e8..d4f3430 100644 --- a/stairsplus/registrations.lua +++ b/stairsplus/registrations.lua @@ -125,6 +125,15 @@ if minetest.get_modpath("basic_materials") then 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, + }) + end -- Alias cuts of split_stone_tile_alt which was renamed checker_stone_tile. From ca45478761403bdd220c88f182a9a96b5a6b7ddc Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 24 Nov 2018 11:27:16 -0500 Subject: [PATCH 4/7] brass block stairs/slabs/etc (#135) --- stairsplus/registrations.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index d4f3430..254450f 100644 --- a/stairsplus/registrations.lua +++ b/stairsplus/registrations.lua @@ -112,7 +112,7 @@ if minetest.get_modpath("wool") then end end --- basic_materials, keeping the original technic-oriented names +-- basic_materials, keeping the original other-mod-oriented names -- for backwards compatibility if minetest.get_modpath("basic_materials") then @@ -134,6 +134,12 @@ if minetest.get_modpath("basic_materials") then 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. From 0ace9fe493257597e8f0de656563f6abb92f7767 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 24 Nov 2018 17:34:55 +0100 Subject: [PATCH 5/7] Update the changelog to reflect recent commits --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b9c5f2..91c5af7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### 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. From 26f59baba0658dc677a4279a6d81c5a963e06b84 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 24 Nov 2018 17:36:04 +0100 Subject: [PATCH 6/7] Update copyright year range for 2018 --- LICENSE.md | 2 +- README.md | 2 +- aliases.lua | 2 +- circular_saw.lua | 2 +- config.lua | 2 +- crafting.lua | 2 +- init.lua | 2 +- nodes.lua | 2 +- ownership.lua | 2 +- redefinitions.lua | 2 +- stairsplus/aliases.lua | 2 +- stairsplus/conversion.lua | 2 +- stairsplus/init.lua | 2 +- stairsplus/microblocks.lua | 2 +- stairsplus/panels.lua | 2 +- stairsplus/recipes.lua | 4 ++-- stairsplus/registrations.lua | 2 +- stairsplus/slabs.lua | 2 +- stairsplus/slopes.lua | 2 +- stairsplus/stairs.lua | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a3511ad..f68debf 100644 --- 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.** diff --git a/README.md b/README.md index 6c37b74..33b9d6b 100644 --- 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. diff --git a/aliases.lua b/aliases.lua index f1dbe84..59f5d5c 100644 --- 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. --]] diff --git a/circular_saw.lua b/circular_saw.lua index fe241e5..94e680e 100644 --- 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. --]] diff --git a/config.lua b/config.lua index 8d49c3b..84dcaf2 100644 --- 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. --]] diff --git a/crafting.lua b/crafting.lua index 5b14602..5fdd82f 100644 --- 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. --]] diff --git a/init.lua b/init.lua index c12f5e0..168768a 100644 --- 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. ===================================================================== --]] diff --git a/nodes.lua b/nodes.lua index efa1f94..f898068 100644 --- 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. --]] diff --git a/ownership.lua b/ownership.lua index c569ae7..eb1ae0e 100644 --- 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. --]] diff --git a/redefinitions.lua b/redefinitions.lua index 437c2d3..fd24c80 100644 --- 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. --]] diff --git a/stairsplus/aliases.lua b/stairsplus/aliases.lua index a4d95f0..224dce7 100644 --- 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. --]] diff --git a/stairsplus/conversion.lua b/stairsplus/conversion.lua index 887f3e3..bc8e77e 100644 --- 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. --]] diff --git a/stairsplus/init.lua b/stairsplus/init.lua index 4f3a17e..624b7c8 100644 --- 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. --]] diff --git a/stairsplus/microblocks.lua b/stairsplus/microblocks.lua index 22c20a3..dc8ddfd 100644 --- 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. --]] diff --git a/stairsplus/panels.lua b/stairsplus/panels.lua index ac641d8..5e2bf7b 100644 --- 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. --]] diff --git a/stairsplus/recipes.lua b/stairsplus/recipes.lua index 56fcf68..ec908bd 100644 --- 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 \ No newline at end of file +end diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index 254450f..6262a6d 100644 --- 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. --]] diff --git a/stairsplus/slabs.lua b/stairsplus/slabs.lua index 3fa119e..11618a2 100644 --- 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. --]] diff --git a/stairsplus/slopes.lua b/stairsplus/slopes.lua index 7b82733..63635eb 100644 --- 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. --]] diff --git a/stairsplus/stairs.lua b/stairsplus/stairs.lua index 5c38864..0ccf081 100644 --- 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. --]] From 9d953ccebfeabb366ad3dcf89142167d183ff8fe Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 24 Nov 2018 17:39:42 +0100 Subject: [PATCH 7/7] Bump to version v1.2.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91c5af7..53c4458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ 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. @@ -56,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