diff --git a/README.md b/README.md
index 3ff5ab13..db8b43d7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
     * [christmas][] ([MIT](mods/buildings/christmas/LICENSE.txt))
     * [elevator][] ([WTFPL](mods/buildings/elevator/readme.txt))
     * [fort_spikes][] ([MIT/CC0](mods/buildings/fort_spikes/LICENSE))
-    * [moreblocks][] ([zlib](mods/buildings/moreblocks/LICENSE.md))
+    * [moreblocks][] ([zlib][lic.moreblocks]) -- version: [fbfb079 Git][ver.moreblocks]
     * my_garage_door ([mydoors modpack][mydoors])
     * [stairsplus][] ([zlib][lic.stairsplus]) -- version: [311e1f0 Git][ver.stairsplus]
     * [windmill][] ([WTFPL](mods/buildings/windmill/README.md))
@@ -323,6 +323,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [lic.mdoors.2]: doc/modpacks/mydoors/licence.txt
 [lic.mobf]: mods/mobf_core/License.txt
 [lic.mobs_monster]: mods/mobs_aggressive/mobs_monster/license.txt
+[lic.moreblocks]: mods/buildings/moreblocks/LICENSE.md
 [lic.mywoodslopes]: mods/wood/mywoodslopes/licence.txt
 [lic.playeranim.1]: mods/player_visuals/playeranim/LICENSE.txt
 [lic.playeranim.2]: mods/player_visuals/playeranim/LICENSE-original.txt
@@ -354,6 +355,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.jukebox]: https://github.com/minetest-mods/jukebox/tree/e6a507f
 [ver.mobs_monster]: https://github.com/tenplus1/mobs_monster/tree/91cbcf7
 [ver.mobs_redo]: https://github.com/tenplus1/mobs_redo/tree/e64530a
+[ver.moreblocks]: https://github.com/minetest-mods/moreblocks/tree/fbfb079
 [ver.mywoodslopes]: https://github.com/minetest-mods/mywoodslopes/tree/3a1b531
 [ver.playeranim]: https://github.com/minetest-mods/playeranim/tree/f1c542e
 [ver.privilegeareas]: https://github.com/minetest-mods/privilegeareas/tree/aebaa00
diff --git a/mods/buildings/moreblocks/.luacheckrc b/mods/buildings/moreblocks/.luacheckrc
new file mode 100644
index 00000000..fbf3483f
--- /dev/null
+++ b/mods/buildings/moreblocks/.luacheckrc
@@ -0,0 +1,14 @@
+unused_args = false
+allow_defined_top = true
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"dump",
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"intllib",
+	"default",
+}
+
diff --git a/mods/buildings/moreblocks/CHANGELOG.md b/mods/buildings/moreblocks/CHANGELOG.md
new file mode 100644
index 00000000..23564f85
--- /dev/null
+++ b/mods/buildings/moreblocks/CHANGELOG.md
@@ -0,0 +1,20 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+### Added
+
+- 3 new node shapes in the circular saw (thin slabs, available in
+  "L-shaped", "corner-shaped" and "U-shaped" variations), all with 1/16
+  thickness.
+- Stone Block, Desert Stone Block, Obsidian Block, Sandstone Block, Coral
+  Skeleton and Straw are now present as Stairs+ nodes.
+
+## [1.0.0] - 2017-02-19
+
+- Initial versioned release.
diff --git a/mods/buildings/moreblocks/CONTRIBUTING.md b/mods/buildings/moreblocks/CONTRIBUTING.md
new file mode 100644
index 00000000..56fb5042
--- /dev/null
+++ b/mods/buildings/moreblocks/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+# Contribution Guide
+
+Thank you for your interest in this mod! Before contributing, be sure to know
+about these few guidelines:
+
+- Contributions have to be under the zlib license (or compatible) for code,
+  and CC BY-SA 3.0 license (or compatible) for assets.
+- Make sure to update the change log, keeping the
+  [change log format](http://keepachangelog.com/) we use.
+- Don't bump the version yourself. Maintainers will do this when necessary.
diff --git a/mods/buildings/moreblocks/LICENSE.md b/mods/buildings/moreblocks/LICENSE.md
index 45c5ff5a..a3511ade 100644
--- a/mods/buildings/moreblocks/LICENSE.md
+++ b/mods/buildings/moreblocks/LICENSE.md
@@ -1,7 +1,6 @@
-zlib license
-============
+# zlib license
 
-Copyright (c) 2011-2015 Calinou and contributors
+Copyright (c) 2011-2017 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/mods/buildings/moreblocks/README.md b/mods/buildings/moreblocks/README.md
index 511fda4c..767cb7c0 100644
--- a/mods/buildings/moreblocks/README.md
+++ b/mods/buildings/moreblocks/README.md
@@ -1,13 +1,12 @@
-More Blocks
-===========
+# More Blocks
 
-More Blocks for Minetest <http://minetest.net>, a free/libre infinite
+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 licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported.
 
-moreblocks_copperpatina.png is by pithydon licensed under WTFPL
+moreblocks_copperpatina.png is by pithydon licensed under CC0 1.0
 
 **Forum topic:** <https://forum.minetest.net/viewtopic.php?f=11&t=509>
diff --git a/mods/buildings/moreblocks/aliases.lua b/mods/buildings/moreblocks/aliases.lua
index c34472dc..b9b21063 100644
--- a/mods/buildings/moreblocks/aliases.lua
+++ b/mods/buildings/moreblocks/aliases.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -77,4 +77,3 @@ minetest.register_abm({
 		})
 	end,
 })
-
diff --git a/mods/buildings/moreblocks/circular_saw.lua b/mods/buildings/moreblocks/circular_saw.lua
index 09fbd90d..7c4eb61b 100644
--- a/mods/buildings/moreblocks/circular_saw.lua
+++ b/mods/buildings/moreblocks/circular_saw.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: circular saw
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -26,9 +26,9 @@ circular_saw.cost_in_microblocks = {
 	1, 1, 1, 1, 1, 1, 1, 2,
 	2, 3, 2, 4, 2, 4, 5, 6,
 	7, 1, 1, 2, 4, 6, 7, 8,
-	3, 1, 1, 2, 4, 4, 2, 6,
-	7, 3, 7, 7, 4, 8, 3, 2,
-	6, 2, 1, 3, 4,
+	1, 2, 2, 3, 1, 1, 2, 4,
+	4, 2, 6, 7, 3, 7, 7, 4,
+	8, 3, 2, 6, 2, 1, 3, 4
 }
 
 circular_saw.names = {
@@ -40,6 +40,7 @@ circular_saw.names = {
 	{"panel", "_4"},
 	{"micro", ""},
 	{"panel", ""},
+
 	{"micro", "_12"},
 	{"panel", "_12"},
 	{"micro", "_14"},
@@ -48,6 +49,7 @@ circular_saw.names = {
 	{"panel", "_15"},
 	{"stair", "_outer"},
 	{"stair", ""},
+
 	{"stair", "_inner"},
 	{"slab", "_1"},
 	{"slab", "_2"},
@@ -56,11 +58,16 @@ circular_saw.names = {
 	{"slab", "_three_quarter"},
 	{"slab", "_14"},
 	{"slab", "_15"},
+
+	{"slab", "_two_sides"},
+	{"slab", "_three_sides"},
+	{"slab", "_three_sides_u"},
 	{"stair", "_half"},
 	{"stair", "_alt_1"},
 	{"stair", "_alt_2"},
 	{"stair", "_alt_4"},
 	{"stair", "_alt"},
+
 	{"slope", ""},
 	{"slope", "_half"},
 	{"slope", "_half_raised"},
@@ -69,6 +76,7 @@ circular_saw.names = {
 	{"slope", "_inner_half_raised"},
 	{"slope", "_inner_cut"},
 	{"slope", "_inner_cut_half"},
+
 	{"slope", "_inner_cut_half_raised"},
 	{"slope", "_outer"},
 	{"slope", "_outer_half"},
@@ -145,7 +153,7 @@ function circular_saw:update_inventory(pos, amount)
 		self:reset(pos)
 		return
 	end
- 
+
 	local stack = inv:get_stack("input",  1)
 	-- At least one "normal" block is necessary to see what kind of stairs are requested.
 	if stack:is_empty() then
@@ -327,8 +335,6 @@ function circular_saw.on_metadata_inventory_take(
 	-- The recycle field plays no role here since it is processed immediately.
 end
 
-gui_slots = "listcolors[#606060AA;#808080;#101010;#202020;#FFF]"
-
 function circular_saw.on_construct(pos)
 	local meta = minetest.get_meta(pos)
 	local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
@@ -371,14 +377,14 @@ function circular_saw.can_dig(pos,player)
 end
 
 minetest.register_node("moreblocks:circular_saw",  {
-	description = S("Circular Saw"), 
-	drawtype = "nodebox", 
+	description = S("Circular Saw"),
+	drawtype = "nodebox",
 	node_box = {
-		type = "fixed", 
+		type = "fixed",
 		fixed = {
 			{-0.4, -0.5, -0.4, -0.25, 0.25, -0.25}, -- Leg
 			{0.25, -0.5, 0.25, 0.4, 0.25, 0.4}, -- Leg
-			{-0.4, -0.5, 0.25, -0.25, 0.25, 0.4}, -- Leg 
+			{-0.4, -0.5, 0.25, -0.25, 0.25, 0.4}, -- Leg
 			{0.25, -0.5, -0.4, 0.4, 0.25, -0.25}, -- Leg
 			{-0.5, 0.25, -0.5, 0.5, 0.375, 0.5}, -- Tabletop
 			{-0.01, 0.4375, -0.125, 0.01, 0.5, 0.125}, -- Saw blade (top)
@@ -389,9 +395,9 @@ minetest.register_node("moreblocks:circular_saw",  {
 	tiles = {"moreblocks_circular_saw_top.png",
 		"moreblocks_circular_saw_bottom.png",
 		"moreblocks_circular_saw_side.png"},
-	paramtype = "light", 
+	paramtype = "light",
 	sunlight_propagates = true,
-	paramtype2 = "facedir", 
+	paramtype2 = "facedir",
 	groups = {choppy = 2,oddly_breakable_by_hand = 2},
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = circular_saw.on_construct,
diff --git a/mods/buildings/moreblocks/config.lua b/mods/buildings/moreblocks/config.lua
index d646dacd..da5cd6ef 100644
--- a/mods/buildings/moreblocks/config.lua
+++ b/mods/buildings/moreblocks/config.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: configuration handling
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
diff --git a/mods/buildings/moreblocks/crafting.lua b/mods/buildings/moreblocks/crafting.lua
index 501c9f4f..88862b75 100644
--- a/mods/buildings/moreblocks/crafting.lua
+++ b/mods/buildings/moreblocks/crafting.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: crafting recipes
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -28,14 +28,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "default:junglewood",
-	recipe = {
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-	}
-})
-
 minetest.register_craft({
 	output = "default:dirt_with_grass",
 	type = "shapeless",
@@ -121,19 +113,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "moreblocks:junglestick 4",
-	recipe = {{"default:junglewood"},}
-})
-
-minetest.register_craft({
-	output = "moreblocks:fence_jungle_wood 2",
-	recipe = {
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-	}
-})
-
 minetest.register_craft({
 	output = "moreblocks:circle_stone_bricks 8",
 	recipe = {
@@ -207,6 +186,8 @@ minetest.register_craft({
 	output = "moreblocks:empty_bookshelf",
 	type = "shapeless",
 	recipe = {"moreblocks:sweeper", "default:bookshelf"},
+	replacements = {{"default:bookshelf", "default:book 3"}},
+	-- When obtaining an empty bookshelf, return the books used in it as well
 })
 
 minetest.register_craft({
@@ -475,7 +456,7 @@ minetest.register_craft({
 
 if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then -- “If nil or true then”
 	minetest.register_craft({
-		output = "moreblocks:circular_saw", 
+		output = "moreblocks:circular_saw",
 		recipe = {
 			{ "",  "default:steel_ingot",  "" },
 			{ "group:wood",  "group:wood",  "group:wood"},
diff --git a/mods/buildings/moreblocks/depends.txt b/mods/buildings/moreblocks/depends.txt
index 198fe8a6..74e86246 100644
--- a/mods/buildings/moreblocks/depends.txt
+++ b/mods/buildings/moreblocks/depends.txt
@@ -1,2 +1,4 @@
 default
 intllib?
+farming?
+wool?
diff --git a/mods/buildings/moreblocks/init.lua b/mods/buildings/moreblocks/init.lua
index 2919a308..5e7fc6b4 100644
--- a/mods/buildings/moreblocks/init.lua
+++ b/mods/buildings/moreblocks/init.lua
@@ -3,7 +3,7 @@
 ** More Blocks **
 By Calinou, with the help of ShadowNinja and VanessaE.
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope.obj b/mods/buildings/moreblocks/models/moreblocks_slope.obj
index 22a833f3..57298d7d 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope.obj
@@ -1,26 +1,56 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope.mtl
-o Cube_Cube.002
+g top
 v 0.500000 0.500000 0.500000
 v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 0.7071 -0.7071
+s off
+f 2/1/1 1/2/1 4/3/1 3/4/1
+g bottom
 v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn -1.000000 0.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.707100 -0.707100
-usemtl None
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 4/3/2 3/4/2 5/1/2 6/2/2
-f 2/1/3 5/3/3 3/4/3
-f 1/2/4 4/3/4 6/4/4
-f 2/1/5 1/2/5 6/3/5 5/4/5
+f 6/5/2 5/6/2 7/7/2 8/8/2
+g right
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s off
+f 9/9/3 11/10/3 10/11/3
+g left
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 12/12/4 13/13/4 14/14/4
+g back
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 15/15/5 16/16/5 17/17/5 18/18/5
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_cut.obj b/mods/buildings/moreblocks/models/moreblocks_slope_cut.obj
index a9ea83dc..bf2dd79f 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_cut.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_cut.obj
@@ -1,33 +1,68 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_cut.mtl
-o moreblocks_slope_cut
+g top
+v 0.500000 0.500000 0.500000
+v -0.500000 -0.000000 0.500000
+v 0.500000 0.000000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.5000 0.0000
+vt 1.0000 1.0000
+vt 0.5000 2.0000
+vt 0.0000 1.0000
+vn -0.4082 0.8165 -0.4082
+s 1
+f 4/1/1 2/2/1 1/3/1 3/4/1
+g bottom
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
+s 1
+f 6/5/2 5/6/2 8/7/2 7/8/2
+g right
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vn -1.0000 0.0000 0.0000
+s 1
+f 11/9/3 9/10/3 10/11/3
+g left
+v 0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.000000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vt 0.0000 1.0000
+vn 1.0000 0.0000 0.0000
+s 1
+f 12/12/4 14/13/4 15/14/4 13/15/4
+g back
 v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v 0.500000 0.500000 0.500000
 v -0.500000 -0.000000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 0.5000
+vn -0.0000 -0.0000 1.0000
+s 1
+f 16/16/5 17/17/5 18/18/5 19/19/5
+g front
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.000000 -0.500000
 v -0.500000 -0.500000 -0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 0.500000
-vt 1.000000 0.500000
-vt 0.000000 1.000000
-vt 0.500000 0.000000
-vt 0.500000 2.000000
-vn 0.000000 -0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -1.000000 -0.000000
-vn -0.408200 0.816500 -0.408200
-vn 0.000000 0.000000 -1.000000
-vn -1.000000 0.000000 0.000000
-usemtl None
-s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 2/1/2 5/2/2 6/5/2 3/6/2
-f 2/3/3 1/6/3 7/1/3 5/2/3
-f 7/7/4 4/3/4 3/8/4 6/6/4
-f 5/1/5 7/2/5 6/4/5
-f 7/1/6 1/2/6 4/5/6
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 0.0000 0.5000
+vn 0.0000 0.0000 -1.0000
+s 1
+f 20/20/6 22/21/6 21/22/6
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_half.obj b/mods/buildings/moreblocks/models/moreblocks_slope_half.obj
index a6b1a562..1fa631ce 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_half.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_half.obj
@@ -1,28 +1,56 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_half.mtl
-o Cube_Cube.002
+g top
 v 0.500000 -0.000000 0.500000
 v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 0.8944 -0.4472
+s off
+f 2/1/1 1/2/1 4/3/1 3/4/1
+g bottom
 v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
-vt 1.000000 0.500000
-vt 0.000000 0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn -1.000000 0.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.894400 -0.447200
-usemtl None
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 4/3/2 3/4/2 5/5/2 6/6/2
-f 2/1/3 5/3/3 3/4/3
-f 1/2/4 4/3/4 6/4/4
-f 2/5/5 1/6/5 6/3/5 5/4/5
+f 6/5/2 5/6/2 7/7/2 8/8/2
+g right
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s off
+f 9/9/3 11/10/3 10/11/3
+g left
+v 0.500000 -0.000000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 12/12/4 13/13/4 14/14/4
+g back
+v 0.500000 -0.000000 0.500000
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 0.5000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 15/15/5 16/16/5 17/17/5 18/18/5
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_half_raised.obj b/mods/buildings/moreblocks/models/moreblocks_slope_half_raised.obj
index 6f985e37..86139d7b 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_half_raised.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_half_raised.obj
@@ -1,32 +1,72 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_half_raised.mtl
-o Cube.001
+g top
+v -0.500000 0.500000 0.500000
+v -0.500000 0.000000 -0.500000
+v 0.500000 0.000000 -0.500000
+v 0.500000 0.500000 0.500000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vn 0.0000 0.8944 -0.4472
+s off
+f 2/1/1 1/2/1 4/3/1 3/4/1
+g bottom
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
+s off
+f 6/5/2 5/6/2 7/7/2 8/8/2
+g right
 v -0.500000 0.500000 0.500000
 v -0.500000 0.000000 -0.500000
 v -0.500000 -0.500000 -0.500000
 v -0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s off
+f 9/9/3 10/10/3 11/11/3 12/12/3
+g left
 v 0.500000 0.000000 -0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.500000 0.500000
 v 0.500000 -0.500000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.500000
-vt 0.000000 1.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 0.894400 -0.447200
-usemtl None.001
+vt 1.0000 0.5000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 2/5/2 5/2/2 6/3/2 3/4/2
-f 5/5/3 7/6/3 8/3/3 6/4/3
-f 7/1/4 1/6/4 4/3/4 8/4/4
-f 4/4/5 3/1/5 6/6/5 8/3/5
-f 2/4/6 1/1/6 7/6/6 5/3/6
+f 13/13/4 15/14/4 16/15/4 14/16/4
+g back
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 19/17/5 17/18/5 18/19/5 20/20/5
+g front
+v -0.500000 0.000000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 0.000000 -0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 0.5000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+s off
+f 21/21/6 23/22/6 24/23/6 22/24/6
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_inner.obj b/mods/buildings/moreblocks/models/moreblocks_slope_inner.obj
index d4a444ea..c6f811e2 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_inner.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_inner.obj
@@ -1,35 +1,81 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_inner.mtl
-o Cube_Cube.000
+g top
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vn 0.0000 0.7071 -0.7071
+vn -0.7071 0.7071 0.0000
+s 1
+f 3/1/1 2/2/1 4/3/1
+f 2/4/2 1/5/2 5/6/2
+g bottom
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
+s 1
+f 9/7/3 7/8/3 6/9/3 8/10/3
+l 8 10
+g right
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s 1
+f 11/11/4 12/12/4 13/13/4
+g left
 v 0.500000 0.500000 -0.500000
 v 0.500000 0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v -0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.707100 -0.707100
-vn 0.000000 0.000000 -1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 -0.000000 1.000000
-vn -0.707100 0.707100 0.000000
-usemtl None
-s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/1/2 6/3/2 7/4/2
-f 5/1/3 2/2/3 6/4/3
-f 1/2/4 4/3/4 8/4/4
-f 8/1/5 4/2/5 3/3/5 7/4/5
-f 7/3/6 3/4/6 2/1/6 5/2/6
-f 2/1/7 1/2/7 8/3/7
-l 7 9
-l 2 9
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s 1
+f 14/14/5 15/15/5 16/16/5 17/17/5
+l 15 18
+g back
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
+s 1
+f 22/18/6 20/19/6 19/20/6 21/21/6
+l 22 23
+l 19 23
+g front
+v 0.500000 0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+s 1
+f 24/22/7 25/23/7 27/24/7
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut.obj b/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut.obj
index b687b112..babe502c 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut.obj
@@ -1,32 +1,72 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_inner_cut.mtl
-o moreblocks_slope_inner_cut
+g top
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.5000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 1.0000 0.0000
+vn -0.5774 0.5774 -0.5774
+s 1
+f 3/1/1 2/2/1 1/3/1
+f 4/4/2 3/5/2 1/6/2
+g bottom
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
+s 1
+f 6/7/3 5/8/3 7/9/3 8/10/3
+g right
+v -0.500000 -0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn -1.0000 0.0000 0.0000
+s 1
+f 11/11/4 9/12/4 10/13/4
+g left
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.500000 -0.500000
 v 0.500000 0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 1.0000 0.0000 0.0000
+s 1
+f 12/14/5 13/15/5 14/16/5 15/17/5
+g back
+v 0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
 v -0.500000 -0.500000 0.500000
 v -0.500000 0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
+s 1
+f 18/18/6 16/19/6 17/20/6 19/21/6
+g front
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
 v -0.500000 -0.500000 -0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.500000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 1.000000 0.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn -0.577400 0.577400 -0.577400
-usemtl None
-s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/1/2 1/2/2 4/3/2 6/4/2
-f 2/1/3 1/2/3 5/3/3 7/4/3
-f 6/1/4 4/2/4 3/3/4
-f 7/1/5 5/2/5 6/3/5
-f 2/1/6 7/2/6 3/4/6
-f 7/5/7 6/3/7 3/4/7
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vn 0.0000 0.0000 -1.0000
+s 1
+f 20/22/7 22/23/7 21/24/7
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half.obj b/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half.obj
index 82a387bf..5af38b58 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half.obj
@@ -1,34 +1,72 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_inner_cut_half.mtl
-o moreblocks_slope_inner_cut_half
+g top
+v 0.500000 0.000000 -0.500000
+v 0.500000 -0.000000 0.500000
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.5000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 1.0000 0.0000
+vn -0.4082 0.8165 -0.4082
+s 1
+f 3/1/1 2/2/1 1/3/1
+f 4/4/2 3/5/2 1/6/2
+g bottom
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
+s 1
+f 6/7/3 5/8/3 7/9/3 8/10/3
+g right
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vn -1.0000 0.0000 0.0000
+s 1
+f 11/11/4 9/12/4 10/13/4
+g left
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.000000 -0.500000
 v 0.500000 -0.000000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vt 0.0000 0.5000
+vn 1.0000 0.0000 0.0000
+s 1
+f 12/14/5 13/15/5 14/16/5 15/17/5
+g back
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.000000 0.500000
 v -0.500000 -0.500000 0.500000
 v -0.500000 -0.000000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vt 0.0000 0.5000
+vn 0.0000 -0.0000 1.0000
+s 1
+f 18/18/6 16/19/6 17/20/6 19/21/6
+g front
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.000000 -0.500000
 v -0.500000 -0.500000 -0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.500000
-vt 0.000000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.500000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 1.000000 0.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn -0.408200 0.816500 -0.408200
-usemtl None
-s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/1/2 1/2/2 4/3/2 6/4/2
-f 2/1/3 1/2/3 5/5/3 7/6/3
-f 6/1/4 4/2/4 3/5/4
-f 7/1/5 5/2/5 6/3/5
-f 2/1/6 7/2/6 3/4/6
-f 7/7/7 6/5/7 3/6/7
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 0.0000 0.5000
+vn 0.0000 0.0000 -1.0000
+s 1
+f 20/22/7 22/23/7 21/24/7
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj b/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj
index 8231ee44..d8c1f81f 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj
@@ -1,35 +1,76 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_inner_cut_half_raised.mtl
-o moreblocks_slope_inner_cut_half_raised
-v 0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 -0.500000
+g top
 v 0.500000 0.500000 -0.500000
 v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.000000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.5000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 1.0000 0.0000
+vn -0.4082 0.8165 -0.4082
+s 1
+f 3/1/1 2/2/1 1/3/1
+f 4/4/2 3/5/2 1/6/2
+g bottom
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
+s 1
+f 6/7/3 5/8/3 7/9/3 8/10/3
+g right
 v -0.500000 -0.500000 0.500000
 v -0.500000 0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v -0.500000 0.000000 -0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.500000
-vt 1.000000 0.500000
-vt 0.500000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 1.000000 0.000000
-vn -1.000000 0.000000 0.000000
-vn -0.000000 0.000000 -1.000000
-vn -0.408200 0.816500 -0.408200
-usemtl None
-s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/1/2 1/2/2 4/3/2 6/4/2
-f 2/1/3 1/2/3 5/3/3 7/4/3
-f 6/1/4 4/2/4 3/3/4
-f 7/1/5 5/2/5 6/3/5 8/5/5
-f 2/1/6 7/2/6 8/6/6 3/4/6
-f 8/7/7 6/3/7 3/4/7
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 0.5000
+vn -1.0000 0.0000 0.0000
+s 1
+f 11/11/4 9/12/4 10/13/4 12/14/4
+g left
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 1.0000 0.0000 0.0000
+s 1
+f 13/15/5 14/16/5 15/17/5 16/18/5
+g back
+v 0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
+s 1
+f 19/19/6 17/20/6 18/21/6 20/22/6
+g front
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 0.000000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vt 0.0000 1.0000
+vn -0.0000 0.0000 -1.0000
+s 1
+f 21/23/7 23/24/7 24/25/7 22/26/7
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_inner_half.obj b/mods/buildings/moreblocks/models/moreblocks_slope_inner_half.obj
index 3e54dead..3158b573 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_inner_half.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_inner_half.obj
@@ -1,35 +1,85 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_inner_half.mtl
-o Cube_Cube.001
+g top
 v 0.500000 0.000000 -0.500000
 v 0.500000 -0.000000 0.500000
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vn 0.0000 0.8944 -0.4472
+vn -0.4472 0.8944 0.0000
+s off
+f 3/1/1 2/2/1 4/3/1
+f 2/4/2 1/5/2 5/6/2
+g bottom
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
-v -0.500000 -0.000000 0.500000
 v -0.500000 -0.500000 -0.500000
 v -0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.894400 -0.447200
-vn 0.000000 0.000000 -1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 -0.000000 1.000000
-vn -0.447200 0.894400 0.000000
-usemtl None.002
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/1/2 6/3/2 7/4/2
-f 5/1/3 2/2/3 6/4/3
-f 1/2/4 4/3/4 8/4/4
-f 8/1/5 4/2/5 3/3/5 7/4/5
-f 7/3/6 3/4/6 2/1/6 5/2/6
-f 2/1/7 1/2/7 8/3/7
-l 7 9
-l 2 9
+f 10/7/3 7/8/3 6/9/3 9/10/3
+l 9 8
+l 11 9
+g right
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s off
+f 12/11/4 13/12/4 14/13/4
+l 15 14
+g left
+v 0.500000 0.000000 -0.500000
+v 0.500000 -0.000000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 16/14/5 17/15/5 18/16/5 19/17/5
+l 20 17
+g back
+v 0.500000 -0.000000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 24/18/6 22/19/6 21/20/6 23/21/6
+l 25 24
+l 25 21
+g front
+v 0.500000 0.000000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+s off
+f 26/22/7 27/23/7 29/24/7
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_inner_half_raised.obj b/mods/buildings/moreblocks/models/moreblocks_slope_inner_half_raised.obj
index e6c22058..bd413897 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_inner_half_raised.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_inner_half_raised.obj
@@ -1,38 +1,86 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_inner_half_raised.mtl
-o Cube_Cube.003
+g top
 v 0.500000 0.500000 -0.500000
 v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.000000 -0.500000
+v -0.500000 0.000000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 1.0000 0.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 0.8944 -0.4472
+vn -0.4472 0.8944 0.0000
+s off
+f 3/1/1 2/2/1 4/3/1
+f 2/2/2 1/4/2 5/5/2
+g bottom
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
+s off
+f 8/6/3 9/7/3 7/8/3 6/9/3
+l 10 8
+g right
 v -0.500000 0.500000 0.500000
 v -0.500000 0.000000 -0.500000
 v -0.500000 -0.500000 0.500000
 v -0.500000 0.000000 -0.500000
 v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.500000
-vt 0.000000 0.500000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.894400 -0.447200
-vn 0.000000 -0.000000 1.000000
-vn -0.447200 0.894400 0.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 0.000000 -1.000000
-vn -1.000000 0.000000 0.000000
-usemtl None.003
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vn -1.0000 0.0000 0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/1/2 2/2/2 6/4/2
-f 7/3/3 3/4/3 2/1/3 5/2/3
-f 2/2/4 1/3/4 8/4/4
-f 7/1/5 9/2/5 4/3/5 3/4/5
-f 6/5/6 1/2/6 4/3/6 9/4/6
-f 7/4/7 5/1/7 6/6/7 9/3/7
-l 2 10
-l 7 10
+f 13/10/4 11/11/4 12/12/4 15/13/4
+g left
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 16/14/5 17/15/5 18/16/5 19/17/5
+l 20 17
+g back
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 24/18/6 22/19/6 21/20/6 23/21/6
+l 25 21
+l 25 24
+g front
+v 0.500000 0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 0.000000 -0.500000
+v -0.500000 0.000000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 0.5000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -0.0000 0.0000 -1.0000
+s off
+f 28/22/7 26/23/7 27/24/7 30/25/7
+l 29 26
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_outer.obj b/mods/buildings/moreblocks/models/moreblocks_slope_outer.obj
index b8f4e9e9..c779309c 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_outer.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_outer.obj
@@ -1,25 +1,48 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_outer.mtl
-o Cube_Cube.004
-v 0.500000 -0.500000 0.500000
+g top
 v -0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.500000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 0.000000 -1.000000 -0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn -0.707100 0.707100 0.000000
-vn 0.000000 0.707100 -0.707100
-usemtl None
+vt 1.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -0.7071 0.7071 0.0000
+vn 0.0000 0.7071 -0.7071
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/2/2 1/3/2 4/4/2
-f 2/3/3 1/4/3 5/1/3
-f 5/1/4 3/3/4 2/4/4
-f 5/2/5 4/3/5 3/4/5
+f 4/1/1 2/2/1 1/3/1
+f 4/4/2 3/5/2 2/6/2
+g bottom
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
+s off
+f 5/7/3 6/8/3 7/9/3 8/10/3
+g right
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 10/11/4 9/12/4 11/13/4
+g left
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 14/14/5 12/15/5 13/16/5
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut.obj b/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut.obj
index e6cbfb48..4dcd46af 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut.obj
@@ -1,23 +1,40 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_outer_cut.mtl
-o Cube.002
+g top
 v 0.500000 0.500000 0.500000
 v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 0.0000
+vt 0.5000 1.0000
+vt 0.0000 0.0000
+vn -0.5774 0.5774 -0.5774
+s off
+f 2/1/1 1/2/1 3/3/1
+g bottom
+v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
-vt 1.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 0.000000 1.000000
-vt 0.500000 1.000000
-vn 0.000000 -0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -1.000000 0.000000
-vn -0.577400 0.577400 -0.577400
-usemtl None.004
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
 s off
-f 1/1/1 2/2/1 3/3/1
-f 4/3/2 1/4/2 3/2/2
-f 3/2/3 2/3/3 4/4/3
-f 2/3/4 1/5/4 4/2/4
+f 5/4/2 4/5/2 6/6/2
+g right
+v 0.500000 0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 7/7/3 8/8/3 9/9/3
+g left
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 12/10/4 10/11/4 11/12/4
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half.obj b/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half.obj
index bd641941..c309a4e4 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half.obj
@@ -1,24 +1,40 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_outer_cut_half.mtl
-o Cube.003
+g top
 v 0.500000 -0.000000 0.500000
 v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 0.0000
+vt 0.5000 1.0000
+vt 0.0000 0.0000
+vn -0.4082 0.8165 -0.4082
+s off
+f 2/1/1 1/2/1 3/3/1
+g bottom
+v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
-vt 1.000000 0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 0.000000 0.500000
-vt 0.000000 1.000000
-vt 0.500000 1.000000
-vn 0.000000 -0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -1.000000 0.000000
-vn -0.408200 0.816500 -0.408200
-usemtl None.005
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
 s off
-f 1/1/1 2/2/1 3/3/1
-f 4/3/2 1/4/2 3/2/2
-f 3/2/3 2/3/3 4/5/3
-f 2/3/4 1/6/4 4/2/4
+f 5/4/2 4/5/2 6/6/2
+g right
+v 0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+vt 1.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 7/7/3 8/8/3 9/9/3
+g left
+v 0.500000 -0.000000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 1.0000 0.0000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 12/10/4 10/11/4 11/12/4
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj b/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj
index c65e08dd..78cdfede 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj
@@ -1,28 +1,56 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_outer_cut_half_raised.mtl
-o Cube_Cube.005
+g top
+v -0.500000 -0.000000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 0.000000 -0.500000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn -0.4082 0.8165 -0.4082
+s off
+f 1/1/1 2/2/1 3/3/1
+g bottom
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+vt 0.0000 1.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
+s off
+f 4/4/2 6/5/2 5/6/2
+g right
 v -0.500000 -0.000000 0.500000
 v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.000000 -0.500000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vn -0.7071 0.0000 -0.7071
+s off
+f 8/7/3 7/8/3 10/9/3 9/10/3
+g left
 v 0.500000 -0.500000 0.500000
 v 0.500000 0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.000000 -0.500000
-vt 0.000000 0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 1.000000 0.500000
-vn 0.000000 -0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -1.000000 0.000000
-vn -0.408200 0.816500 -0.408200
-vn -0.707100 0.000000 -0.707100
-usemtl None.006
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vn 1.0000 0.0000 0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 4/5/2 3/2/2 5/3/2 6/6/2
-f 2/5/3 5/3/3 3/4/3
-f 1/2/4 4/3/4 6/4/4
-f 2/3/5 1/6/5 6/1/5 5/2/5
+f 12/11/4 11/12/4 13/13/4 14/14/4
+g back
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn -0.0000 -0.0000 1.0000
+s off
+f 15/15/5 16/16/5 17/17/5 18/18/5
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_outer_half.obj b/mods/buildings/moreblocks/models/moreblocks_slope_outer_half.obj
index 7bbb38de..b87be69a 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_outer_half.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_outer_half.obj
@@ -1,27 +1,48 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_outer_half.mtl
-o Cube.004
+g top
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.000000 0.500000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vt 0.0000 0.0000
+vn 0.0000 0.8944 -0.4472
+vn -0.4472 0.8944 0.0000
+s off
+f 2/1/1 4/2/1 3/3/1
+f 1/4/2 4/5/2 2/6/2
+g bottom
 v -0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 0.500000
-v 0.500000 -0.000000 0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.500000
-vt 0.000000 0.500000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 -0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.894400 -0.447200
-vn -0.447200 0.894400 0.000000
-usemtl None.007
+vt 1.0000 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/5/2 1/3/2 4/4/2
-f 3/4/3 5/6/3 4/3/3
-f 2/4/4 5/2/4 3/3/4
-f 1/4/5 5/1/5 2/3/5
+f 5/7/3 6/8/3 7/9/3 8/10/3
+g right
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.000000 0.500000
+vt 1.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+s off
+f 11/11/4 9/12/4 10/13/4
+g left
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.000000 0.500000
+vt 1.0000 0.0000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 12/14/5 14/15/5 13/16/5
diff --git a/mods/buildings/moreblocks/models/moreblocks_slope_outer_half_raised.obj b/mods/buildings/moreblocks/models/moreblocks_slope_outer_half_raised.obj
index 51a929a2..e06304d0 100644
--- a/mods/buildings/moreblocks/models/moreblocks_slope_outer_half_raised.obj
+++ b/mods/buildings/moreblocks/models/moreblocks_slope_outer_half_raised.obj
@@ -1,34 +1,74 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib moreblocks_slope_outer_half_raised.mtl
-o Cube_Cube.006
+g top
+v -0.500000 -0.000000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 0.000000 -0.500000
+v -0.500000 0.000000 -0.500000
+vt 1.0000 0.0000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 1.0000
+vn 0.0000 0.8944 -0.4472
+vn -0.4472 0.8944 0.0000
+s off
+f 4/1/1 2/2/1 3/3/1
+f 4/1/2 1/4/2 2/2/2
+g bottom
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
+s off
+f 7/5/3 6/6/3 5/7/3 8/8/3
+g right
 v -0.500000 -0.000000 0.500000
 v -0.500000 -0.500000 0.500000
+v -0.500000 0.000000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 1.0000 0.5000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s off
+f 9/9/4 11/10/4 12/11/4 10/12/4
+g left
 v 0.500000 -0.500000 0.500000
 v 0.500000 0.500000 0.500000
 v 0.500000 -0.500000 -0.500000
 v 0.500000 0.000000 -0.500000
+vt 0.0000 1.0000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vn 1.0000 0.0000 0.0000
+s off
+f 14/13/5 13/14/5 15/15/5 16/16/5
+g back
+v -0.500000 -0.000000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 0.500000 0.500000
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 1.0000
+vn -0.0000 -0.0000 1.0000
+s off
+f 17/17/6 18/18/6 19/19/6 20/20/6
+g front
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.000000 -0.500000
 v -0.500000 0.000000 -0.500000
 v -0.500000 -0.500000 -0.500000
-vt 0.000000 0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 1.000000 0.500000
-vn 0.000000 -0.000000 1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.894400 -0.447200
-vn -1.000000 0.000000 0.000000
-vn -0.447200 0.894400 0.000000
-vn 0.000000 0.000000 -1.000000
-vn 0.000000 -1.000000 -0.000000
-usemtl None.008
+vt 0.0000 0.5000
+vt 0.0000 0.0000
+vt 1.0000 0.0000
+vt 1.0000 0.5000
+vn 0.0000 0.0000 -1.0000
 s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 4/5/2 3/2/2 5/3/2 6/6/2
-f 7/3/3 4/5/3 6/2/3
-f 1/6/4 7/1/4 8/2/4 2/3/4
-f 7/3/5 1/4/5 4/5/5
-f 6/1/6 5/2/6 8/3/6 7/6/6
-f 5/5/7 3/2/7 2/3/7 8/4/7
+f 22/21/7 21/22/7 24/23/7 23/24/7
diff --git a/mods/buildings/moreblocks/nodes.lua b/mods/buildings/moreblocks/nodes.lua
index 4457a688..29d4a89b 100644
--- a/mods/buildings/moreblocks/nodes.lua
+++ b/mods/buildings/moreblocks/nodes.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: node definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -12,6 +12,10 @@ local sound_stone = default.node_sound_stone_defaults()
 local sound_glass = default.node_sound_glass_defaults()
 local sound_leaves = default.node_sound_leaves_defaults()
 
+-- Don't break on 0.4.14 and earlier.
+local sound_metal = (default.node_sound_metal_defaults
+		and default.node_sound_metal_defaults() or sound_stone)
+
 local function tile_tiles(name)
 	local tex = "moreblocks_" ..name.. ".png"
 	return {tex, tex, tex, tex, tex.. "^[transformR90", tex.. "^[transformR90"}
@@ -31,7 +35,7 @@ local nodes = {
 	},
 	["wood_tile_flipped"] = {
 		description = S("Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = {"default_wood.png^moreblocks_wood_tile.png^[transformR90",
 		"default_wood.png^moreblocks_wood_tile.png^[transformR90",
 		"default_wood.png^moreblocks_wood_tile.png^[transformR90",
@@ -43,40 +47,40 @@ local nodes = {
 	},
 	["wood_tile_center"] = {
 		description = S("Centered Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = {"default_wood.png^moreblocks_wood_tile_center.png"},
 		sounds = sound_wood,
 	},
 	["wood_tile_full"] = {
 		description = S("Full Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = tile_tiles("wood_tile_full"),
 		sounds = sound_wood,
 	},
 	["wood_tile_up"] = {
 		description = S("Upwards Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = {"default_wood.png^moreblocks_wood_tile_up.png"},
 		sounds = sound_wood,
 		no_stairs = true,
 	},
 	["wood_tile_down"] = {
 		description = S("Downwards Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = {"default_wood.png^[transformR180^moreblocks_wood_tile_up.png^[transformR180"},
 		sounds = sound_wood,
 		no_stairs = true,
 	},
 	["wood_tile_left"] = {
 		description = S("Leftwards Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = {"default_wood.png^[transformR270^moreblocks_wood_tile_up.png^[transformR270"},
 		sounds = sound_wood,
 		no_stairs = true,
 	},
 	["wood_tile_right"] = {
 		description = S("Rightwards Wooden Tile"),
-		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
 		tiles = {"default_wood.png^[transformR90^moreblocks_wood_tile_up.png^[transformR90"},
 		sounds = sound_wood,
 		no_stairs = true,
@@ -183,6 +187,7 @@ local nodes = {
 			"moreblocks_empty_bookshelf.png"},
 		groups = {snappy = 2, choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
 		sounds = sound_wood,
+		furnace_burntime = 15,
 		no_stairs = true,
 	},
 	["coal_stone"] = {
@@ -277,7 +282,7 @@ local nodes = {
 		tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
-		light_source = 15,
+		light_source = 14,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
 	},
@@ -287,7 +292,7 @@ local nodes = {
 		tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
-		light_source = 15,
+		light_source = 14,
 		walkable = false,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -311,7 +316,7 @@ local nodes = {
 	["copperpatina"] = {
 		description = S("Copper Patina Block"),
 		groups = {cracky = 1, level = 2},
-		sounds = sound_stone,
+		sounds = sound_metal,
 	},
 }
 
@@ -345,4 +350,3 @@ minetest.register_craftitem("moreblocks:nothing", {
 	inventory_image = "invisible.png",
 	on_use = function() end,
 })
-
diff --git a/mods/buildings/moreblocks/ownership.lua b/mods/buildings/moreblocks/ownership.lua
index 1c2431ba..c569ae70 100644
--- a/mods/buildings/moreblocks/ownership.lua
+++ b/mods/buildings/moreblocks/ownership.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: ownership handling
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -22,11 +22,11 @@ function moreblocks.node_is_owned(pos, placer)
 			end
 		end
 
-	elseif type(isprotect)=="function" then 					-- glomie's protection mod
+	elseif type(isprotect)=="function" then						-- glomie's protection mod
 		if not isprotect(5, pos, placer) then
 			ownername = S("someone")
 		end
-	elseif type(protector)=="table" and type(protector.can_dig)=="function" then 					-- Zeg9's protection mod
+	elseif type(protector)=="table" and type(protector.can_dig)=="function" then					-- Zeg9's protection mod
 		if not protector.can_dig(5, pos, placer) then
 			ownername = S("someone")
 		end
diff --git a/mods/buildings/moreblocks/redefinitions.lua b/mods/buildings/moreblocks/redefinitions.lua
index d1113896..13b8f0bc 100644
--- a/mods/buildings/moreblocks/redefinitions.lua
+++ b/mods/buildings/moreblocks/redefinitions.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: redefinitions of default stuff
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
diff --git a/mods/buildings/moreblocks/stairsplus/API.md b/mods/buildings/moreblocks/stairsplus/API.md
index 2db0f2b3..1011487d 100644
--- a/mods/buildings/moreblocks/stairsplus/API.md
+++ b/mods/buildings/moreblocks/stairsplus/API.md
@@ -1,5 +1,4 @@
-API documentation for Stairs+
-=============================
+# API documentation for Stairs+
 
 * `stairsplus:register_all(modname, subname, recipeitem, fields)`
 	Registers a stair, slab, panel, microblock, and any other types of
diff --git a/mods/buildings/moreblocks/stairsplus/aliases.lua b/mods/buildings/moreblocks/stairsplus/aliases.lua
index c235d342..a4d95f06 100644
--- a/mods/buildings/moreblocks/stairsplus/aliases.lua
+++ b/mods/buildings/moreblocks/stairsplus/aliases.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
diff --git a/mods/buildings/moreblocks/stairsplus/conversion.lua b/mods/buildings/moreblocks/stairsplus/conversion.lua
index 13966b66..887f3e3e 100644
--- a/mods/buildings/moreblocks/stairsplus/conversion.lua
+++ b/mods/buildings/moreblocks/stairsplus/conversion.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: conversion
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -80,8 +80,9 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 			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 
+				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]
@@ -125,7 +126,7 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 				local fdir = node.param2
 				local nfdir = 20
 
-				if flip_upside_down and not flip_to_wall then 
+				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]
@@ -136,4 +137,3 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 		})
 	end
 end
-
diff --git a/mods/buildings/moreblocks/stairsplus/init.lua b/mods/buildings/moreblocks/stairsplus/init.lua
index 44f59720..598f21c9 100644
--- a/mods/buildings/moreblocks/stairsplus/init.lua
+++ b/mods/buildings/moreblocks/stairsplus/init.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: Stairs+
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -12,11 +12,28 @@ local modpath = minetest.get_modpath("moreblocks").. "/stairsplus"
 stairsplus = {}
 stairsplus.expect_infinite_stacks = false
 
+stairsplus.shapes_list = {}
+
 if not minetest.get_modpath("unified_inventory")
 and minetest.setting_getbool("creative_mode") then
 	stairsplus.expect_infinite_stacks = true
 end
 
+function stairsplus.copytable(orig)
+	local orig_type = type(orig)
+	local copy
+	if orig_type == 'table' then
+		copy = {}
+		for orig_key, orig_value in next, orig, nil do
+			copy[stairsplus.copytable(orig_key)] = stairsplus.copytable(orig_value)
+		end
+		setmetatable(copy, stairsplus.copytable(getmetatable(orig)))
+	else
+		copy = orig
+	end
+	return copy
+end
+
 function stairsplus:prepare_groups(groups)
 	local result = {}
 	if groups then
@@ -41,6 +58,21 @@ function stairsplus:register_all(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)
+	self:register_stair_alias(modname_old, subname_old, modname_new, subname_new)
+	self:register_slab_alias(modname_old, subname_old, modname_new, subname_new)
+	self:register_slope_alias(modname_old, subname_old, modname_new, subname_new)
+	self:register_panel_alias(modname_old, subname_old, modname_new, subname_new)
+	self:register_micro_alias(modname_old, subname_old, modname_new, subname_new)
+end
+function stairsplus:register_alias_force_all(modname_old, subname_old, modname_new, subname_new)
+	self:register_stair_alias_force(modname_old, subname_old, modname_new, subname_new)
+	self:register_slab_alias_force(modname_old, subname_old, modname_new, subname_new)
+	self:register_slope_alias_force(modname_old, subname_old, modname_new, subname_new)
+	self:register_panel_alias_force(modname_old, subname_old, modname_new, subname_new)
+	self:register_micro_alias_force(modname_old, subname_old, modname_new, subname_new)
+end
+
 function register_stair_slab_panel_micro(modname, subname, recipeitem, groups, images, description, drop, light)
 	stairsplus:register_all(modname, subname, recipeitem, {
 		groups = groups,
diff --git a/mods/buildings/moreblocks/stairsplus/microblocks.lua b/mods/buildings/moreblocks/stairsplus/microblocks.lua
index 3d5de1ff..50d84875 100644
--- a/mods/buildings/moreblocks/stairsplus/microblocks.lua
+++ b/mods/buildings/moreblocks/stairsplus/microblocks.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: microblock definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,52 +20,71 @@ function register_micro(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
-function stairsplus:register_micro(modname, subname, recipeitem, fields)
-	local defs = {
-		[""] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, 0, 0.5},
-			},
+local microblocks_defs = {
+	[""] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, 0, 0.5},
 		},
-		["_1"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, -0.4375, 0.5},
-			},
+	},
+	["_1"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, -0.4375, 0.5},
 		},
-		["_2"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, -0.375, 0.5},
-			},
+	},
+	["_2"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, -0.375, 0.5},
 		},
-		["_4"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, -0.25, 0.5},
-			},
+	},
+	["_4"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, -0.25, 0.5},
 		},
-		["_12"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, 0.25, 0.5},
-			},
+	},
+	["_12"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, 0.25, 0.5},
 		},
-		["_14"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, 0.375, 0.5},
-			},
+	},
+	["_14"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, 0.375, 0.5},
+		},
+	},
+	["_15"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0, 0.4375, 0.5},
 		},
-		["_15"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, 0.4375, 0.5},
-			},
-		}
 	}
+}
 
+for k,v in pairs(microblocks_defs) do
+	table.insert(stairsplus.shapes_list, { "micro_", k })
+end
+
+function stairsplus:register_micro_alias(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(microblocks_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias(modname_old .. ":micro_" .. subname_old .. alternate, modname_new .. ":micro_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_micro_alias_force(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(microblocks_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias_force(modname_old .. ":micro_" .. subname_old .. alternate, modname_new .. ":micro_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_micro(modname, subname, recipeitem, fields)
+	local defs = stairsplus.copytable(microblocks_defs)
 	local desc = S("%s Microblock"):format(fields.description)
 	for alternate, def in pairs(defs) do
 		for k, v in pairs(fields) do
@@ -73,7 +92,7 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.groups = stairsplus:prepare_groups(fields.groups)
 		def.description = desc
@@ -83,53 +102,53 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 		minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
 	end
 	minetest.register_alias(modname.. ":micro_" ..subname.. "_bottom", modname.. ":micro_" ..subname)
-	
+
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
 
 	-- Some saw-less recipes:
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 7",
 		recipe = {modname .. ":stair_" .. subname .. "_inner"},
 	})
-	
+
 	minetest.register_craft({
 	output = modname .. ":micro_" .. subname .. " 6",
 		type = "shapeless",
 	recipe = {modname .. ":stair_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 5",
 		recipe = {modname .. ":stair_" .. subname .. "_outer"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 4",
 		recipe = {modname .. ":slab_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 4",
 		recipe = {modname .. ":stair_" .. subname .. "_alt"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 3",
 		recipe = {modname .. ":stair_" .. subname .. "_right_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 2",
 		recipe = {modname .. ":panel_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
diff --git a/mods/buildings/moreblocks/stairsplus/panels.lua b/mods/buildings/moreblocks/stairsplus/panels.lua
index ab6ef83d..98e77fdc 100644
--- a/mods/buildings/moreblocks/stairsplus/panels.lua
+++ b/mods/buildings/moreblocks/stairsplus/panels.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: panel definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,52 +20,71 @@ function register_panel(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
-function stairsplus:register_panel(modname, subname, recipeitem, fields)
-	local defs = {
-		[""] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, 0, 0.5},
-			},
+local panels_defs = {
+	[""] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, 0, 0.5},
 		},
-		["_1"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, -0.4375, 0.5},
-			},
+	},
+	["_1"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, -0.4375, 0.5},
 		},
-		["_2"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, -0.375, 0.5},
-			},
+	},
+	["_2"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, -0.375, 0.5},
 		},
-		["_4"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, -0.25, 0.5},
-			},
+	},
+	["_4"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, -0.25, 0.5},
 		},
-		["_12"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, 0.25, 0.5},
-			},
+	},
+	["_12"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, 0.25, 0.5},
 		},
-		["_14"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, 0.375, 0.5},
-			},
+	},
+	["_14"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, 0.375, 0.5},
+		},
+	},
+	["_15"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, 0, 0.5, 0.4375, 0.5},
 		},
-		["_15"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, 0.4375, 0.5},
-			},
-		}
 	}
+}
 
+for k,v in pairs(panels_defs) do
+	table.insert(stairsplus.shapes_list, { "panel_", k })
+end
+
+function stairsplus:register_panel_alias(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(panels_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias(modname_old .. ":panel_" .. subname_old .. alternate, modname_new .. ":panel_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_panel_alias_force(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(panels_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias_force(modname_old .. ":panel_" .. subname_old .. alternate, modname_new .. ":panel_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_panel(modname, subname, recipeitem, fields)
+	local defs = stairsplus.copytable(panels_defs)
 	local desc = S("%s Panel"):format(fields.description)
 	for alternate, def in pairs(defs) do
 		for k, v in pairs(fields) do
@@ -73,7 +92,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)
@@ -83,7 +102,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 		minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
 	end
 	minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname)
-	
+
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
 
 	-- Some saw-less recipes:
@@ -95,7 +114,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 			{recipeitem, recipeitem},
 		},
 	})
-	
+
 	minetest.register_craft({
 		output = modname .. ":panel_" .. subname .. " 12",
 		recipe = {
@@ -103,13 +122,13 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 			{recipeitem, recipeitem},
 		},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":panel_" .. subname,
 		recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
diff --git a/mods/buildings/moreblocks/stairsplus/registrations.lua b/mods/buildings/moreblocks/stairsplus/registrations.lua
index 13a9be79..065bc9da 100644
--- a/mods/buildings/moreblocks/stairsplus/registrations.lua
+++ b/mods/buildings/moreblocks/stairsplus/registrations.lua
@@ -1,12 +1,13 @@
 --[[
 More Blocks: registrations
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 local default_nodes = { -- Default stairs/slabs/panels/microblocks:
 	"stone",
+	"stone_block",
 	"cobble",
 	"mossycobble",
 	"brick",
@@ -17,6 +18,7 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
 	"bronzeblock",
 	"diamondblock",
 	"desert_stone",
+	"desert_stone_block",
 	"desert_cobble",
 	"meselamp",
 	"glass",
@@ -31,20 +33,29 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
 	"aspen_tree",
 	"aspen_wood",
 	"obsidian",
+	"obsidian_block",
+	"obsidianbrick",
 	"obsidian_glass",
 	"stonebrick",
 	"desert_stonebrick",
 	"sandstonebrick",
-	"obsidianbrick",
+	"sandstone_block",
+	"coral_skeleton",
+	"farming:straw"
 }
 
 for _, name in pairs(default_nodes) do
-	local nodename = "default:" .. name
+	local nodename = "default:"..name
+	local a,b = string.find(name, ":")
+	if b then
+		nodename = name
+		name = string.sub(name, b+1)
+	end
 	local ndef = minetest.registered_nodes[nodename]
 	if ndef then
 		local drop
 		if type(ndef.drop) == "string" then
-			drop = ndef.drop:sub(9)
+			drop = ndef.drop:sub((b or 8)+1)
 		end
 
 		local tiles = ndef.tiles
@@ -63,3 +74,40 @@ for _, name in pairs(default_nodes) do
 		})
 	end
 end
+
+-- wool registrations
+
+if minetest.get_modpath("wool") then
+
+	local colorlist = {
+		{"white",      "White Wool"},
+		{"grey",       "Grey Wool"},
+		{"black",      "Black Wool"},
+		{"red",        "Red Wool"},
+		{"yellow",     "Yellow Wool"},
+		{"green",      "Green Wool"},
+		{"cyan",       "Cyan Wool"},
+		{"blue",       "Blue Wool"},
+		{"magenta",    "Magenta Wool"},
+		{"orange",     "Orange Wool"},
+		{"violet",     "Violet Wool"},
+		{"brown",      "Brown Wool"},
+		{"pink",       "Pink Wool"},
+		{"dark_grey",  "Dark Grey Wool"},
+		{"dark_green", "Dark Green Wool"},
+	}
+
+	for i in ipairs(colorlist) do
+		local color = colorlist[i][1]
+		local colordesc = colorlist[i][2]
+		
+		stairsplus:register_all("wool", color, "wool:"..color, {
+			description = colordesc,
+			tiles = {"wool_"..color..".png"},
+			groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,
+					flammable=3,wool=1,not_in_creative_inventory=1},
+			sounds = default.node_sound_defaults(),
+			sunlight_propagates = true,
+		})
+	end
+end
diff --git a/mods/buildings/moreblocks/stairsplus/slabs.lua b/mods/buildings/moreblocks/stairsplus/slabs.lua
index 236d91e7..ea9dbc56 100644
--- a/mods/buildings/moreblocks/stairsplus/slabs.lua
+++ b/mods/buildings/moreblocks/stairsplus/slabs.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: slab definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,33 +20,81 @@ function register_slab(modname, subname, recipeitem, groups, images, description
 	})
 end
 
-function stairsplus:register_slab(modname, subname, recipeitem, fields)
-	local defs = {
-		[""] = 8,
-		["_quarter"] = 4,
-		["_three_quarter"] = 12,
-		["_1"] = 1,
-		["_2"] = 2,
-		["_14"] = 14,
-		["_15"] = 15,
-	}
+local slabs_defs = {
+	[""] = 8,
+	["_quarter"] = 4,
+	["_three_quarter"] = 12,
+	["_1"] = 1,
+	["_2"] = 2,
+	["_14"] = 14,
+	["_15"] = 15,
+	["_two_sides"] = {
+						{ -0.5, -0.5, -0.5, 0.5, -7/16, 7/16 },
+						{ -0.5, -0.5, 7/16, 0.5, 0.5, 0.5 }
+					},
+	["_three_sides"] = {
+						{ -7/16, -0.5, -0.5, 0.5, -7/16, 7/16 },
+						{ -7/16, -0.5, 7/16, 0.5, 0.5, 0.5 },
+						{ -0.5, -0.5, -0.5, -7/16, 0.5, 0.5 }
+					},
+	["_three_sides_u"] = {
+						{ -0.5, -0.5, -0.5, 0.5, 0.5, -7/16 },
+						{ -0.5, -0.5, -7/16, 0.5, -7/16, 7/16 },
+						{ -0.5, -0.5, 7/16, 0.5, 0.5, 0.5 }
+					}
+}
 
+for k,v in pairs(slabs_defs) do
+	table.insert(stairsplus.shapes_list, { "slab_", k })
+end
+
+function stairsplus:register_slab_alias(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(slabs_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias(modname_old .. ":slab_" .. subname_old .. alternate, modname_new .. ":slab_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_slab_alias_force(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(slabs_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias_force(modname_old .. ":slab_" .. subname_old .. alternate, modname_new .. ":slab_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_slab(modname, subname, recipeitem, fields)
+	local defs = stairsplus.copytable(slabs_defs)
 	local desc_base = S("%s Slab"):format(fields.description)
-	for alternate, num in pairs(defs) do
-		local def = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, -0.5, 0.5, (num/16)-0.5, 0.5},
+	for alternate, shape in pairs(defs) do
+
+		local def = {}
+
+		if type(shape) ~= "table" then
+			def = {
+					node_box = {
+						type = "fixed",
+						fixed = {-0.5, -0.5, -0.5, 0.5, (shape/16)-0.5, 0.5},
+					},
+					description = ("%s (%d/16)"):format(desc_base, shape)
+				}
+		else
+			def = {
+				node_box = {
+					type = "fixed",
+					fixed = shape,
+				},
+				description = desc_base
 			}
-		}
+		end
+
 		for k, v in pairs(fields) do
 			def[k] = v
 		end
+
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
-		def.description = ("%s (%d/16)"):format(desc_base, num)
 		def.groups = stairsplus:prepare_groups(fields.groups)
 		if fields.drop and not (type(fields.drop) == "table") then
 			def.drop = modname.. ":slab_" .. fields.drop .. alternate
@@ -63,27 +111,27 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 			output = modname .. ":slab_" .. subname .. " 6",
 			recipe = {{recipeitem, recipeitem, recipeitem}},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 		})
-		
+
 		-- uncomment this rule when conflict is no longer likely to happen
-		-- 	https://github.com/minetest/minetest/issues/2881
+		--	https://github.com/minetest/minetest/issues/2881
 		-- minetest.register_craft({
-		-- 	type = "shapeless",
-		-- 	output = modname .. ":slab_" .. subname,
-		-- 	recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
+		--	type = "shapeless",
+		--	output = modname .. ":slab_" .. subname,
+		--	recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
 		-- })
-		
+
 		-- then remove these two
 		minetest.register_craft({
 			output = modname .. ":slab_" .. subname,
 			recipe = {{modname .. ":panel_" .. subname, modname .. ":panel_" .. subname}},
 		})
-		
+
 		minetest.register_craft({
 			output = modname .. ":slab_" .. subname,
 			recipe = {
@@ -98,109 +146,109 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_15", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_2",
 			recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_three_quarter",
 			recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_three_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_three_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_14",
 			recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_14",
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_15",
 			recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. " 3",
diff --git a/mods/buildings/moreblocks/stairsplus/slopes.lua b/mods/buildings/moreblocks/stairsplus/slopes.lua
index f0e8c20b..7d18b3d3 100644
--- a/mods/buildings/moreblocks/stairsplus/slopes.lua
+++ b/mods/buildings/moreblocks/stairsplus/slopes.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: slope definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -123,103 +123,122 @@ function register_slope(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
+local slopes_defs = {
+	[""] = {
+		mesh = "moreblocks_slope.obj",
+		collision_box = box_slope,
+		selection_box = box_slope,
+
+	},
+	["_half"] = {
+		mesh = "moreblocks_slope_half.obj",
+		collision_box = box_slope_half,
+		selection_box = box_slope_half,
+	},
+	["_half_raised"] = {
+		mesh = "moreblocks_slope_half_raised.obj",
+		collision_box = box_slope_half_raised,
+		selection_box = box_slope_half_raised,
+	},
+
+	--==============================================================
+
+	["_inner"] = {
+		mesh = "moreblocks_slope_inner.obj",
+		collision_box = box_slope_inner,
+		selection_box = box_slope_inner,
+	},
+	["_inner_half"] = {
+		mesh = "moreblocks_slope_inner_half.obj",
+		collision_box = box_slope_inner_half,
+		selection_box = box_slope_inner_half,
+	},
+	["_inner_half_raised"] = {
+		mesh = "moreblocks_slope_inner_half_raised.obj",
+		collision_box = box_slope_inner_half_raised,
+		selection_box = box_slope_inner_half_raised,
+	},
+
+	--==============================================================
+
+	["_inner_cut"] = {
+		mesh = "moreblocks_slope_inner_cut.obj",
+		collision_box = box_slope_inner,
+		selection_box = box_slope_inner,
+	},
+	["_inner_cut_half"] = {
+		mesh = "moreblocks_slope_inner_cut_half.obj",
+		collision_box = box_slope_inner_half,
+		selection_box = box_slope_inner_half,
+	},
+	["_inner_cut_half_raised"] = {
+		mesh = "moreblocks_slope_inner_cut_half_raised.obj",
+		collision_box = box_slope_inner_half_raised,
+		selection_box = box_slope_inner_half_raised,
+	},
+
+	--==============================================================
+
+	["_outer"] = {
+		mesh = "moreblocks_slope_outer.obj",
+		collision_box = box_slope_outer,
+		selection_box = box_slope_outer,
+	},
+	["_outer_half"] = {
+		mesh = "moreblocks_slope_outer_half.obj",
+		collision_box = box_slope_outer_half,
+		selection_box = box_slope_outer_half,
+	},
+	["_outer_half_raised"] = {
+		mesh = "moreblocks_slope_outer_half_raised.obj",
+		collision_box = box_slope_outer_half_raised,
+		selection_box = box_slope_outer_half_raised,
+	},
+
+	--==============================================================
+
+	["_outer_cut"] = {
+		mesh = "moreblocks_slope_outer_cut.obj",
+		collision_box = box_slope_outer,
+		selection_box = box_slope_outer,
+	},
+	["_outer_cut_half"] = {
+		mesh = "moreblocks_slope_outer_cut_half.obj",
+		collision_box = box_slope_outer_half,
+		selection_box = box_slope_outer_half,
+	},
+	["_outer_cut_half_raised"] = {
+		mesh = "moreblocks_slope_outer_cut_half_raised.obj",
+		collision_box = box_slope_outer_half_raised,
+		selection_box = box_slope_outer_half_raised,
+	},
+	["_cut"] = {
+		mesh = "moreblocks_slope_cut.obj",
+		collision_box = box_slope_outer,
+		selection_box = box_slope_outer,
+	},
+}
+
+for k,v in pairs(slopes_defs) do
+	table.insert(stairsplus.shapes_list, { "slope_", k })
+end
+
+function stairsplus:register_slope_alias(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(slopes_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias(modname_old .. ":slope_" .. subname_old .. alternate, modname_new .. ":slope_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_slope_alias_force(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(slopes_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias_force(modname_old .. ":slope_" .. subname_old .. alternate, modname_new .. ":slope_" .. subname_new .. alternate)
+	end
+end
+
 function stairsplus:register_slope(modname, subname, recipeitem, fields)
-	local defs = {
-		[""] = {
-			mesh = "moreblocks_slope.obj",
-			collision_box = box_slope,
-			selection_box = box_slope,
-			
-		},
-		["_half"] = {
-			mesh = "moreblocks_slope_half.obj",
-			collision_box = box_slope_half,
-			selection_box = box_slope_half,
-		},
-		["_half_raised"] = {
-			mesh = "moreblocks_slope_half_raised.obj",
-			collision_box = box_slope_half_raised,
-			selection_box = box_slope_half_raised,
-		},
-		
---==============================================================
-		
-		["_inner"] = {
-			mesh = "moreblocks_slope_inner.obj",
-			collision_box = box_slope_inner,
-			selection_box = box_slope_inner,
-		},
-		["_inner_half"] = {
-			mesh = "moreblocks_slope_inner_half.obj",
-			collision_box = box_slope_inner_half,
-			selection_box = box_slope_inner_half,
-		},
-		["_inner_half_raised"] = {
-			mesh = "moreblocks_slope_inner_half_raised.obj",
-			collision_box = box_slope_inner_half_raised,
-			selection_box = box_slope_inner_half_raised,
-		},
-		
---==============================================================
-		
-		["_inner_cut"] = {
-			mesh = "moreblocks_slope_inner_cut.obj",
-			collision_box = box_slope_inner,
-			selection_box = box_slope_inner,
-		},
-		["_inner_cut_half"] = {
-			mesh = "moreblocks_slope_inner_cut_half.obj",
-			collision_box = box_slope_inner_half,
-			selection_box = box_slope_inner_half,
-		},
-		["_inner_cut_half_raised"] = {
-			mesh = "moreblocks_slope_inner_cut_half_raised.obj",
-			collision_box = box_slope_inner_half_raised,
-			selection_box = box_slope_inner_half_raised,
-		},
-
---==============================================================
-
-		["_outer"] = {
-			mesh = "moreblocks_slope_outer.obj",
-			collision_box = box_slope_outer,
-			selection_box = box_slope_outer,
-		},
-		["_outer_half"] = {
-			mesh = "moreblocks_slope_outer_half.obj",
-			collision_box = box_slope_outer_half,
-			selection_box = box_slope_outer_half,
-		},
-		["_outer_half_raised"] = {
-			mesh = "moreblocks_slope_outer_half_raised.obj",
-			collision_box = box_slope_outer_half_raised,
-			selection_box = box_slope_outer_half_raised,
-		},
-		
---==============================================================
-		
-		["_outer_cut"] = {
-			mesh = "moreblocks_slope_outer_cut.obj",
-			collision_box = box_slope_outer,
-			selection_box = box_slope_outer,
-		},
-		["_outer_cut_half"] = {
-			mesh = "moreblocks_slope_outer_cut_half.obj",
-			collision_box = box_slope_outer_half,
-			selection_box = box_slope_outer_half,
-		},
-		["_outer_cut_half_raised"] = {
-			mesh = "moreblocks_slope_outer_cut_half_raised.obj",
-			collision_box = box_slope_outer_half_raised,
-			selection_box = box_slope_outer_half_raised,
-		},
-		["_cut"] = {
-			mesh = "moreblocks_slope_cut.obj",
-			collision_box = box_slope_outer,
-			selection_box = box_slope_outer,
-		},
-	}
-
+	local defs = stairsplus.copytable(slopes_defs)
 	local desc = S("%s Slope"):format(fields.description)
 	for alternate, def in pairs(defs) do
 		for k, v in pairs(fields) do
@@ -227,7 +246,7 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "mesh"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)
@@ -246,99 +265,99 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half_raised"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half",
 				   modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer", modname .. ":slope_" .. subname .. "_inner"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half_raised"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_half_raised", modname .. ":slope_" .. subname .. "_inner_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_inner_cut"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half_raised"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_cut", modname .. ":slope_" .. subname .. "_cut"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slab_" .. subname,
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slab_" .. subname,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slab_" .. subname,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_half_raised",
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half",
 				   modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_half_raised",
 		recipe =  {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_inner_half_raised",
 		recipe =  {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_inner_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_outer_half_raised",
 		recipe =  {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_inner_cut_half_raised",
diff --git a/mods/buildings/moreblocks/stairsplus/stairs.lua b/mods/buildings/moreblocks/stairsplus/stairs.lua
index ee8075f5..0291e7dd 100644
--- a/mods/buildings/moreblocks/stairsplus/stairs.lua
+++ b/mods/buildings/moreblocks/stairsplus/stairs.lua
@@ -1,7 +1,7 @@
 --[[
 More Blocks: stair definitions
 
-Copyright (c) 2011-2015 Calinou and contributors.
+Copyright (c) 2011-2017 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,92 +20,111 @@ function register_stair(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
-function stairsplus:register_stair(modname, subname, recipeitem, fields)
-	local defs = {
-		[""] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-					{-0.5, 0, 0, 0.5, 0.5, 0.5},
-				},
+local stairs_defs = {
+	[""] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+				{-0.5, 0, 0, 0.5, 0.5, 0.5},
 			},
 		},
-		["_half"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.5, -0.5, 0, 0, 0.5},
-					{-0.5, 0, 0, 0, 0.5, 0.5},
-				},
+	},
+	["_half"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0, 0, 0.5},
+				{-0.5, 0, 0, 0, 0.5, 0.5},
 			},
 		},
-		["_right_half" ]= {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{0, -0.5, -0.5, 0.5, 0, 0.5},
-					{0, 0, 0, 0.5, 0.5, 0.5},
-				},
+	},
+	["_right_half" ]= {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{0, -0.5, -0.5, 0.5, 0, 0.5},
+				{0, 0, 0, 0.5, 0.5, 0.5},
 			},
 		},
-		["_inner"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-					{-0.5, 0, 0, 0.5, 0.5, 0.5},
-					{-0.5, 0, -0.5, 0, 0.5, 0},
-				},
+	},
+	["_inner"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+				{-0.5, 0, 0, 0.5, 0.5, 0.5},
+				{-0.5, 0, -0.5, 0, 0.5, 0},
 			},
 		},
-		["_outer"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-					{-0.5, 0, 0, 0, 0.5, 0.5},
-				},
+	},
+	["_outer"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+				{-0.5, 0, 0, 0, 0.5, 0.5},
 			},
 		},
-		["_alt"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.5, -0.5, 0.5, 0, 0},
-					{-0.5, 0, 0, 0.5, 0.5, 0.5},
-				},
+	},
+	["_alt"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0.5, 0, 0},
+				{-0.5, 0, 0, 0.5, 0.5, 0.5},
 			},
 		},
-		["_alt_1"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.0625, -0.5, 0.5, 0, 0},
-					{-0.5, 0.4375, 0, 0.5, 0.5, 0.5},
-				},
+	},
+	["_alt_1"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.0625, -0.5, 0.5, 0, 0},
+				{-0.5, 0.4375, 0, 0.5, 0.5, 0.5},
 			},
 		},
-		["_alt_2"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.125, -0.5, 0.5, 0, 0},
-					{-0.5, 0.375, 0, 0.5, 0.5, 0.5},
-				},
+	},
+	["_alt_2"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.125, -0.5, 0.5, 0, 0},
+				{-0.5, 0.375, 0, 0.5, 0.5, 0.5},
 			},
 		},
-		["_alt_4"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.25, -0.5, 0.5, 0, 0},
-					{-0.5, 0.25, 0, 0.5, 0.5, 0.5},
-				},
+	},
+	["_alt_4"] = {
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.25, -0.5, 0.5, 0, 0},
+				{-0.5, 0.25, 0, 0.5, 0.5, 0.5},
 			},
 		},
-	}
+	},
+}
 
+for k,v in pairs(stairs_defs) do
+	table.insert(stairsplus.shapes_list, { "stair_", k })
+end
+
+function stairsplus:register_stair_alias(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(stairs_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias(modname_old .. ":stair_" .. subname_old .. alternate, modname_new .. ":stair_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_stair_alias_force(modname_old, subname_old, modname_new, subname_new)
+	local defs = stairsplus.copytable(stairs_defs)
+	for alternate, def in pairs(defs) do
+		minetest.register_alias_force(modname_old .. ":stair_" .. subname_old .. alternate, modname_new .. ":stair_" .. subname_new .. alternate)
+	end
+end
+
+function stairsplus:register_stair(modname, subname, recipeitem, fields)
+	local defs = stairsplus.copytable(stairs_defs)
 	local desc = S("%s Stairs"):format(fields.description)
 	for alternate, def in pairs(defs) do
 		for k, v in pairs(fields) do
@@ -113,7 +132,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)
@@ -127,7 +146,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
 
 	-- Some saw-less recipes:
-	
+
 	minetest.register_craft({
 		output = modname .. ":stair_" .. subname .. " 8",
 		recipe = {
@@ -145,67 +164,67 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 			{recipeitem, recipeitem, recipeitem},
 		},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname,
 		recipe = {modname .. ":panel_" .. subname, modname .. ":slab_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname,
 		recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname .. "_outer",
 		recipe = {modname .. ":micro_" .. subname, modname .. ":slab_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname .. "_half",
 		recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname .. "_half",
 		recipe = {modname .. ":panel_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname .. "_right_half",
 		recipe = {modname .. ":stair_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname,
 		recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname .. "_inner",
 		recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname .. "_outer",
 		recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":stair_" .. subname,
 		recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
 	})
-	
+
 	minetest.register_craft({ -- See mirrored variation of the recipe below.
 		output = modname .. ":stair_" .. subname .. "_alt",
 		recipe = {
@@ -213,7 +232,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 			{""                            , modname .. ":panel_" .. subname},
 		},
 	})
-	
+
 	minetest.register_craft({ -- Mirrored variation of the recipe above.
 		output = modname .. ":stair_" .. subname .. "_alt",
 		recipe = {