From 41bb46fb3668627ec2bbcb3d0c55899cabb8cf35 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Mon, 5 Jan 2015 12:33:11 +0100 Subject: Add support for minetest game pine tree. --- LICENSE.md | 14 ++++++++++++++ LICENSE.txt | 14 -------------- README.md | 11 +++++++++++ README.txt | 12 ------------ init.lua | 2 +- stairsplus/aliases.lua | 2 ++ stairsplus/registrations.lua | 2 ++ 7 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 LICENSE.md delete mode 100644 LICENSE.txt create mode 100644 README.md delete mode 100644 README.txt diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..45c5ff5 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,14 @@ +zlib license +============ + +Copyright (c) 2011-2015 Calinou 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.** + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 76c1791..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,14 +0,0 @@ -zlib license -============ - -Copyright (c) 2011-2014 Calinou 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. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source distribution. diff --git a/README.md b/README.md new file mode 100644 index 0000000..228ce97 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +More Blocks +=========== + +More Blocks for Minetest , a free/libre infinite +world block sandbox game. + +To install, just clone this repository into your "mods" directory. + +More Blocks code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported. + +**Forum topic:** diff --git a/README.txt b/README.txt deleted file mode 100644 index ac2654f..0000000 --- a/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -More Blocks -=========== - -More Blocks for Minetest (http://minetest.net), a free and open source infinite -world block sandbox game. - -To install, just clone this repository into your "mods" directory. - -More Blocks code is under the zlib license, textures are under CC BY-SA 3.0 unported. - -Forum topic: http://forum.minetest.net/viewtopic.php?id=509 - diff --git a/init.lua b/init.lua index 7e3b4d9..d25e14c 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-2014 Calinou and contributors. +Copyright (c) 2011-2015 Calinou and contributors. Licensed under the zlib license. See LICENSE.txt for more information. ====================================================================== --]] diff --git a/stairsplus/aliases.lua b/stairsplus/aliases.lua index c92df48..9ad0e76 100644 --- a/stairsplus/aliases.lua +++ b/stairsplus/aliases.lua @@ -33,12 +33,14 @@ 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") diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index 69f4e2f..aa77c72 100644 --- a/stairsplus/registrations.lua +++ b/stairsplus/registrations.lua @@ -16,6 +16,8 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks: "wood", "jungletree", "junglewood", + "pinetree", + "pinewood", "obsidian", "obsidian_glass", "stonebrick", -- cgit v1.2.3