Add support for minetest game pine tree.

6 files changed, 18 insertions, 15 deletions

diff --git a/LICENSE.txt b/LICENSE.md
index 76c1791..45c5ff5 100644
--- a/LICENSE.txt
+++ b/LICENSE.md
@@ -1,9 +1,9 @@
 zlib license
 ============
 
-Copyright (c) 2011-2014 Calinou and contributors
+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.
+**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:
 
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 <http://minetest.net>, 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:** <https://forum.minetest.net/viewtopic.php?f=11&t=509>
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",