Version MFF.

.luacheckrc

@@ -1,14 +0,0 @@
-unused_args = false
-allow_defined_top = true
-
-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"dump",
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-	"intllib",
-	"default",
-}
-

CHANGELOG.md

@@ -1,10 +0,0 @@
-# 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/).
-
-## [1.0.0] - 2017-02-19
-
-- Initial versioned release.

LICENSE.md

@@ -1,6 +1,7 @@
-# zlib license
+zlib license
+============
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors
+Copyright (c) 2011-2015 Calinou and contributors
 
 **This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.**
 

README.md

@@ -1,12 +1,11 @@
-# More Blocks
+More Blocks
+===========
 
-More Blocks for [Minetest](http://minetest.net), a free and open source infinite
+More Blocks for Minetest <http://minetest.net>, a free/libre infinite
 world block sandbox game.
 
 To install, just clone this repository into your "mods" directory.
 
 More Blocks code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported.
 
-moreblocks_copperpatina.png is by pithydon licensed under CC0 1.0
-
 **Forum topic:** <https://forum.minetest.net/viewtopic.php?f=11&t=509>

aliases.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -10,6 +10,37 @@ minetest.register_alias("sweeper", "moreblocks:sweeper")
 minetest.register_alias("circular_saw", "moreblocks:circular_saw")
 minetest.register_alias("jungle_stick", "moreblocks:jungle_stick")
 
+-- Wrong drops
+
+-- //MFF(Mg|10/11/15)
+
+-- Microblocks
+for _,i in pairs({"", "_1", "_2", "_4", "_12", "_14", "_15"}) do
+	minetest.register_alias("moreblocks:micro_clay_brick" .. i, "moreblocks:micro_brick" .. i)
+end
+
+-- Panels
+for _,i in pairs({"", "_1", "_2", "_4", "_12", "_14", "_15"}) do
+	minetest.register_alias("moreblocks:panel_clay_brick" .. i, "moreblocks:panel_brick" .. i)
+end
+
+-- Slabs
+for _,i in pairs({"", "_1", "_2", "_quarter", "_three_quarter", "_14", "_15"}) do
+	minetest.register_alias("moreblocks:slab_clay_brick" .. i, "moreblocks:slab_brick" .. i)
+end
+
+-- Stairs
+for _,i in pairs({"", "_outer", "_inner", "_alt", "_alt_1", "_alt_2", "_alt_4", "_half"}) do
+	minetest.register_alias("moreblocks:stair_clay_brick" .. i, "moreblocks:stair_brick" .. i)
+end
+
+-- Slopes
+for _,i in pairs({"", "_half", "_half_raised", "_outer", "_outer_cut", "_outer_cut_half", "_outer_half", "_outer_half_raised", "_inner", "_inner_half", "_inner_half_raised"}) do
+	minetest.register_alias("moreblocks:slope_clay_brick" .. i, "moreblocks:slope_brick" .. i)
+end
+
+
+
 -- Old block/item replacement:
 minetest.register_alias("moreblocks:oerkkiblock", "default:mossycobble")
 minetest.register_alias("moreblocks:screwdriver", "screwdriver:screwdriver")
@@ -19,8 +50,6 @@ minetest.register_alias("moreblocks:stone_bricks", "default:stonebrick")
 minetest.register_alias("moreblocks:stonebrick", "default:stonebrick")
 minetest.register_alias("moreblocks:junglewood", "default:junglewood")
 minetest.register_alias("moreblocks:jungle_wood", "default:junglewood")
-minetest.register_alias("moreblocks:fence_jungle_wood", "default:fence_junglewood")
-minetest.register_alias("moreblocks:jungle_stick", "default:stick")
 
 for _, t in pairs(circular_saw.names) do
 	minetest.register_alias("moreblocks:" .. t[1] .. "_jungle_wood" .. t[2],
@@ -61,19 +90,17 @@ minetest.register_alias("moreblocks:allfacestree","moreblocks:all_faces_tree")
 local horizontal_tree_convert_facedir = {7, 12, 9, 18}
 
 minetest.register_abm({
-	nodenames = {"moreblocks:horizontal_tree","moreblocks:horizontal_jungle_tree"},
+	nodenames = {"moreblocks:horizontal_tree"},
 	interval = 1,
 	chance = 1,
 	action = function(pos, node)
-		if node.name == "moreblocks:horizontal_tree" then
-			node.name = "default:tree"
-		else
-			node.name = "default:jungletree"
-		end
 		node.param2 = node.param2 < 3 and node.param2 or 0
 		minetest.set_node(pos, {
-			name = node.name,
+			name = "default:tree",
 			param2 = horizontal_tree_convert_facedir[node.param2 + 1]
 		})
 	end,
 })
+
+minetest.register_alias("moreblocks:jungle_stick", "default:stick")
+minetest.register_alias("moreblocks:fence_jungle_wood", "default:fence_junglewood")

circular_saw.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: circular saw
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -31,36 +31,33 @@ circular_saw.cost_in_microblocks = {
 	6, 2, 1, 3, 4,
 }
 
+-- This parameter is legacy node
 circular_saw.names = {
 	{"micro", "_1"},
 	{"panel", "_1"},
-	{"micro", "_2"},
-	{"panel", "_2"},
-	{"micro", "_4"},
-	{"panel", "_4"},
 	{"micro", ""},
 	{"panel", ""},
+
 	{"micro", "_12"},
 	{"panel", "_12"},
-	{"micro", "_14"},
-	{"panel", "_14"},
 	{"micro", "_15"},
 	{"panel", "_15"},
+
 	{"stair", "_outer"},
 	{"stair", ""},
 	{"stair", "_inner"},
+
 	{"slab", "_1"},
-	{"slab", "_2"},
 	{"slab", "_quarter"},
 	{"slab", ""},
 	{"slab", "_three_quarter"},
-	{"slab", "_14"},
 	{"slab", "_15"},
+
 	{"stair", "_half"},
 	{"stair", "_alt_1"},
-	{"stair", "_alt_2"},
 	{"stair", "_alt_4"},
 	{"stair", "_alt"},
+
 	{"slope", ""},
 	{"slope", "_half"},
 	{"slope", "_half_raised"},
@@ -100,12 +97,14 @@ function circular_saw:get_output_inv(modname, material, amount, max)
 
 	for i = 1, #circular_saw.names do
 		local t = circular_saw.names[i]
-		local cost = circular_saw.cost_in_microblocks[i]
+		if not t[3] then
-		local balance = math.min(math.floor(amount/cost), max)
+			local cost = circular_saw.cost_in_microblocks[i]
-		local nodename = modname .. ":" .. t[1] .. "_" .. material .. t[2]
+			local balance = math.min(math.floor(amount/cost), max)
-		if  minetest.registered_nodes[nodename] then
+			local nodename = modname .. ":" .. t[1] .. "_" .. material .. t[2]
-			pos = pos + 1
+			if  minetest.registered_nodes[nodename] then
-			list[pos] = nodename .. " " .. balance
+				pos = pos + 1
+				list[pos] = nodename .. " " .. balance
+			end
 		end
 	end
 	return list
@@ -327,6 +326,8 @@ 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

config.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: configuration handling
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

crafting.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: crafting recipes
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -23,8 +23,10 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "default:wood",
 	recipe = {
-		{"default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"},
-		{"default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"}
+		-- MODIFICATION MADE FOR MFF ^
 	}
 })
 
@@ -186,8 +188,6 @@ 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({
@@ -421,14 +421,14 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "moreblocks:cobble_compressed",
 	recipe = {
-		{"default:cobble", "default:cobble", "default:cobble"},
+		{"default:cobble"},
-		{"default:cobble", "default:cobble", "default:cobble"},
+		{"default:cobble"},
-		{"default:cobble", "default:cobble", "default:cobble"},
+		-- MODIFICATION MADE FOR MFF
 	}
 })
 
 minetest.register_craft({
-	output = "default:cobble 9",
+	output = "default:cobble 2", -- MODIFICATION MADE FOR MFF
 	recipe = {
 		{"moreblocks:cobble_compressed"},
 	}
@@ -438,22 +438,6 @@ minetest.register_craft({
 	type = "cooking", output = "moreblocks:tar", recipe = "default:gravel",
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "moreblocks:copperpatina",
-	recipe = {"bucket:bucket_water", "default:copperblock"},
-	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty"}
-	}
-})
-
-minetest.register_craft({
-	output = "default:copper_ingot 9",
-	recipe = {
-		{"moreblocks:copperpatina"},
-	}
-})
-
 if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then -- “If nil or true then”
 	minetest.register_craft({
 		output = "moreblocks:circular_saw",
@@ -464,3 +448,30 @@ if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then --
 		}
 	})
 end
+
+-- MODIFICATION MADE FOR MFF //MFF(Mg|08/09/15)
+
+
+minetest.register_craft({
+	output = "moreblocks:horizontal_jungle_tree 2",
+	recipe = {
+		{"default:jungletree", "", "default:jungletree"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:jungletree 2",
+	recipe = {
+		{"moreblocks:horizontal_jungle_tree"},
+		{"moreblocks:horizontal_jungle_tree"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:junglewood 4",
+	recipe = {
+		{"moreblocks:horizontal_jungle_tree"},
+	}
+})
+
+-- END OF MODIFICATIONS

init.lua

@@ -3,7 +3,7 @@
 ** More Blocks **
 By Calinou, with the help of ShadowNinja and VanessaE.
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]

locale/it.txt

@@ -1,70 +0,0 @@
-#
-# Italian translation
-# Translator: Emon
-#
-
-
-###init.lua###
-[moreblocks] loaded. = [moreblocks] caricato.
-
-###nodes.lua###
-Jungle Wood Fence = Recinzione in legno della giungla
-Empty Bookshelf = Libreria vuota
-Clean Glass = Vetro pulito
-Plankstone = Pietra e legno
-Wooden Tile = Mattonella in legno
-Full Wooden Tile = Mattonella in legno pieno
-Centered Wooden Tile = Mattonella in legno centrata
-Up Wooden Tile = Mattonella in legno verso l'alto
-Down Wooden Tile = Mattonella in legno verso il basso
-Left Wooden Tile = Mattonella in legno verso sinistra
-Right Wooden Tile = Mattonella in legno verso destra
-Circle Stone Bricks = Mattoni concentrici in pietra
-Stone Tile = Mattonella in pietra
-Split Stone Tile = Mattonella in pietra divisa
-Glow Glass = Vetro luminoso
-Super Glow Glass = Super vetro luminoso
-Coal Glass = Vetro e carbone
-Iron Glass = Vetro e ferro
-Coal Checker = Scacchiera in carbone
-Iron Checker = Scacchiera in ferro
-Trap Stone = Pietra trappola
-Trap Glass = Vetro trappola
-Trap Glow Glass = Vetro luminoso trappola
-Trap Super Glow Glass = Super vetro luminoso trappola
-Coal Stone = Pietra in carbone
-Iron Stone = Pietra in ferro 
-Coal Stone Bricks = Mattoni di pietra in carbone
-Iron Stone Bricks = Mattoni di pietra in ferro
-Cactus Checker = Scacchiera in cactus
-Cactus Brick = Mattoni di cactus
-Sweeper = Spazzola
-Jungle Stick = Bastone in legno della giungla
-Rope = Corda
-All-faces Tree = Albero su ogni lato
-
-###circular_saw.lua###
-Circular Saw = Sega circolare
-Circular saw, empty (owned by %s) = Sega circolare, vuota (di proprietà di %s)
-Circular saw, working with %s (owned by %s) = Sega circolare, in funzione su %s (di proprietà di %s)
-Circular saw, empty = Sega circolare, vuota
-Circular saw is empty (owned by %s) = La sega circolare è vuota (di proprietà di %s)
-
-Input\nmaterial = Materiale\niniziale
-Left-over = Scarto
-Max = Max.
-Set = Imp.
-Recycle\noutput = Ricicla\nfinale
-
-###ownership.lua###
-someone = qualcuno
-Sorry, %s owns that spot. = Spiacente, quel punto è di proprietà di %s
-
-###./stairsplus/*###
-%s Stairs = Scale - %s
-%s Slab =  Lastra - %s
-%s Panel = Pannello - %s
-%s Microblock = Microblocco %s
-
-%s Pane = Pannello - %s
-%s Fence = Recinzione - %s

models/moreblocks_slope.obj

@@ -1,56 +1,26 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.500000 0.500000
+# www.blender.org
-v -0.500000 0.500000 0.500000
+mtllib moreblocks_slope.mtl
-v -0.500000 -0.500000 -0.500000
+o Cube_Cube.002
-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 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 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
+v -0.500000 -0.500000 -0.500000
-vt 0.0000 1.0000
+v 0.500000 -0.500000 -0.500000
-vt 0.0000 0.0000
+vt 1.000000 1.000000
-vt 1.0000 0.0000
+vt 0.000000 1.000000
-vn 0.0000 -0.0000 1.0000
+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
 s off
-f 15/15/5 16/16/5 17/17/5 18/18/5
+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

models/moreblocks_slope_cut.obj

@@ -1,68 +1,33 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.500000 0.500000
+# www.blender.org
-v -0.500000 -0.000000 0.500000
+mtllib moreblocks_slope_cut.mtl
-v 0.500000 0.000000 -0.500000
+o moreblocks_slope_cut
-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.0000 0.0000
+vt 0.000000 0.000000
-vt 1.0000 0.0000
+vt 1.000000 0.000000
-vt 0.0000 0.5000
+vt 1.000000 1.000000
-vn 0.0000 0.0000 -1.0000
+vt 0.000000 0.500000
-s 1
+vt 1.000000 0.500000
-f 20/20/6 22/21/6 21/22/6
+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

models/moreblocks_slope_half.obj

@@ -1,56 +1,28 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 -0.000000 0.500000
+# www.blender.org
-v -0.500000 -0.000000 0.500000
+mtllib moreblocks_slope_half.mtl
-v -0.500000 -0.500000 -0.500000
+o Cube_Cube.002
-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 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 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
+v -0.500000 -0.500000 -0.500000
-vt 0.0000 0.5000
+v 0.500000 -0.500000 -0.500000
-vt 0.0000 0.0000
+vt 1.000000 0.500000
-vt 1.0000 0.0000
+vt 0.000000 0.500000
-vn 0.0000 -0.0000 1.0000
+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
 s off
-f 15/15/5 16/16/5 17/17/5 18/18/5
+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

models/moreblocks_slope_half_raised.obj

@@ -1,72 +1,32 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v -0.500000 0.500000 0.500000
+# www.blender.org
-v -0.500000 0.000000 -0.500000
+mtllib moreblocks_slope_half_raised.mtl
-v 0.500000 0.000000 -0.500000
+o Cube.001
-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.0000 0.5000
+vt 1.000000 1.000000
-vt 0.0000 1.0000
+vt 0.000000 0.500000
-vt 0.0000 0.0000
+vt 0.000000 0.000000
-vt 1.0000 0.0000
+vt 1.000000 0.000000
-vn 1.0000 0.0000 0.0000
+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
 s off
-f 13/13/4 15/14/4 16/15/4 14/16/4
+f 1/1/1 2/2/1 3/3/1 4/4/1
-g back
+f 2/5/2 5/2/2 6/3/2 3/4/2
-v -0.500000 0.500000 0.500000
+f 5/5/3 7/6/3 8/3/3 6/4/3
-v -0.500000 -0.500000 0.500000
+f 7/1/4 1/6/4 4/3/4 8/4/4
-v 0.500000 0.500000 0.500000
+f 4/4/5 3/1/5 6/6/5 8/3/5
-v 0.500000 -0.500000 0.500000
+f 2/4/6 1/1/6 7/6/6 5/3/6
-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

models/moreblocks_slope_inner.obj

@@ -1,81 +1,35 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.500000 -0.500000
+# www.blender.org
-v 0.500000 0.500000 0.500000
+mtllib moreblocks_slope_inner.mtl
-v -0.500000 0.500000 0.500000
+o Cube_Cube.000
-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
-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
+v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 0.500000
-vt 0.0000 0.0000
+vt 1.000000 1.000000
-vt 1.0000 0.0000
+vt 0.000000 1.000000
-vt 1.0000 1.0000
+vt 0.000000 0.000000
-vt 0.0000 1.0000
+vt 1.000000 0.000000
-vn 0.0000 -0.0000 1.0000
+vn 1.000000 0.000000 0.000000
-s 1
+vn -1.000000 0.000000 0.000000
-f 22/18/6 20/19/6 19/20/6 21/21/6
+vn 0.000000 0.707100 -0.707100
-l 22 23
+vn 0.000000 0.000000 -1.000000
-l 19 23
+vn 0.000000 -1.000000 -0.000000
-g front
+vn 0.000000 -0.000000 1.000000
-v 0.500000 0.500000 -0.500000
+vn -0.707100 0.707100 0.000000
-v 0.500000 -0.500000 -0.500000
+usemtl None
-v -0.500000 -0.500000 -0.500000
+s off
-v -0.500000 -0.500000 -0.500000
+f 1/1/1 2/2/1 3/3/1 4/4/1
-vt 0.0000 1.0000
+f 5/1/2 6/3/2 7/4/2
-vt 0.0000 0.0000
+f 5/1/3 2/2/3 6/4/3
-vt 1.0000 0.0000
+f 1/2/4 4/3/4 8/4/4
-vn 0.0000 0.0000 -1.0000
+f 8/1/5 4/2/5 3/3/5 7/4/5
-s 1
+f 7/3/6 3/4/6 2/1/6 5/2/6
-f 24/22/7 25/23/7 27/24/7
+f 2/1/7 1/2/7 8/3/7
+l 7 9
+l 2 9

models/moreblocks_slope_inner_cut.obj

@@ -1,72 +1,32 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.500000 -0.500000
+# www.blender.org
-v 0.500000 0.500000 0.500000
+mtllib moreblocks_slope_inner_cut.mtl
-v -0.500000 0.500000 0.500000
+o moreblocks_slope_inner_cut
-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.0000 0.0000
+vt 0.000000 0.000000
-vt 1.0000 0.0000
+vt 1.000000 0.000000
-vt 0.0000 1.0000
+vt 1.000000 1.000000
-vn 0.0000 0.0000 -1.0000
+vt 0.000000 1.000000
-s 1
+vt 0.500000 0.000000
-f 20/22/7 22/23/7 21/24/7
+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

models/moreblocks_slope_inner_cut_half.obj

@@ -1,72 +1,34 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.000000 -0.500000
+# www.blender.org
-v 0.500000 -0.000000 0.500000
+mtllib moreblocks_slope_inner_cut_half.mtl
-v -0.500000 -0.000000 0.500000
+o moreblocks_slope_inner_cut_half
-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.0000 0.0000
+vt 0.000000 0.000000
-vt 1.0000 0.0000
+vt 1.000000 0.000000
-vt 0.0000 0.5000
+vt 1.000000 0.500000
-vn 0.0000 0.0000 -1.0000
+vt 0.000000 0.500000
-s 1
+vt 1.000000 1.000000
-f 20/22/7 22/23/7 21/24/7
+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

models/moreblocks_slope_inner_cut_half_raised.obj

@@ -1,76 +1,35 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.500000 -0.500000
+# www.blender.org
-v 0.500000 0.500000 0.500000
+mtllib moreblocks_slope_inner_cut_half_raised.mtl
-v -0.500000 0.500000 0.500000
+o moreblocks_slope_inner_cut_half_raised
-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.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 0.000000 0.000000
-vt 1.0000 0.0000
+vt 1.000000 0.000000
-vt 1.0000 0.5000
+vt 1.000000 1.000000
-vt 0.0000 1.0000
+vt 0.000000 1.000000
-vn -0.0000 0.0000 -1.0000
+vt 0.000000 0.500000
-s 1
+vt 1.000000 0.500000
-f 21/23/7 23/24/7 24/25/7 22/26/7
+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

models/moreblocks_slope_inner_half.obj

@@ -1,85 +1,35 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.000000 -0.500000
+# www.blender.org
-v 0.500000 -0.000000 0.500000
+mtllib moreblocks_slope_inner_half.mtl
-v -0.500000 -0.000000 0.500000
+o Cube_Cube.001
-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.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 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
+v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 0.500000
-vt 0.0000 0.0000
+vt 1.000000 1.000000
-vt 1.0000 0.0000
+vt 0.000000 1.000000
-vt 1.0000 1.0000
+vt 0.000000 0.000000
-vt 0.0000 1.0000
+vt 1.000000 0.000000
-vn 0.0000 -0.0000 1.0000
+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
 s off
-f 24/18/6 22/19/6 21/20/6 23/21/6
+f 1/1/1 2/2/1 3/3/1 4/4/1
-l 25 24
+f 5/1/2 6/3/2 7/4/2
-l 25 21
+f 5/1/3 2/2/3 6/4/3
-g front
+f 1/2/4 4/3/4 8/4/4
-v 0.500000 0.000000 -0.500000
+f 8/1/5 4/2/5 3/3/5 7/4/5
-v 0.500000 -0.500000 -0.500000
+f 7/3/6 3/4/6 2/1/6 5/2/6
-v -0.500000 -0.500000 -0.500000
+f 2/1/7 1/2/7 8/3/7
-v -0.500000 -0.500000 -0.500000
+l 7 9
-vt 0.0000 1.0000
+l 2 9
-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

models/moreblocks_slope_inner_half_raised.obj

@@ -1,86 +1,38 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib moreblocks_slope_inner_half_raised.mtl
+o Cube_Cube.003
 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
-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 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
+vt 1.000000 1.000000
-v 0.500000 -0.500000 0.500000
+vt 0.000000 1.000000
-vt 1.0000 1.0000
+vt 0.000000 0.000000
-vt 0.0000 1.0000
+vt 1.000000 0.000000
-vt 0.0000 0.0000
+vt 1.000000 0.500000
-vt 1.0000 0.0000
+vt 0.000000 0.500000
-vn 1.0000 0.0000 0.0000
+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
 s off
-f 16/14/5 17/15/5 18/16/5 19/17/5
+f 1/1/1 2/2/1 3/3/1 4/4/1
-l 20 17
+f 5/1/2 2/2/2 6/4/2
-g back
+f 7/3/3 3/4/3 2/1/3 5/2/3
-v 0.500000 0.500000 0.500000
+f 2/2/4 1/3/4 8/4/4
-v 0.500000 -0.500000 0.500000
+f 7/1/5 9/2/5 4/3/5 3/4/5
-v -0.500000 0.500000 0.500000
+f 6/5/6 1/2/6 4/3/6 9/4/6
-v -0.500000 -0.500000 0.500000
+f 7/4/7 5/1/7 6/6/7 9/3/7
-v 0.500000 -0.500000 0.500000
+l 2 10
-vt 0.0000 0.0000
+l 7 10
-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

models/moreblocks_slope_outer.obj

@@ -1,48 +1,25 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v -0.500000 -0.500000 0.500000
+# www.blender.org
-v -0.500000 -0.500000 -0.500000
+mtllib moreblocks_slope_outer.mtl
-v 0.500000 -0.500000 -0.500000
+o Cube_Cube.004
-v 0.500000 0.500000 0.500000
-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 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.000000 1.000000
-vt 1.0000 0.0000
+vt 0.000000 1.000000
-vt 1.0000 1.0000
+vt 0.000000 0.000000
-vn 0.0000 -0.0000 1.0000
+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
 s off
-f 10/11/4 9/12/4 11/13/4
+f 1/1/1 2/2/1 3/3/1 4/4/1
-g left
+f 5/2/2 1/3/2 4/4/2
-v 0.500000 -0.500000 0.500000
+f 2/3/3 1/4/3 5/1/3
-v 0.500000 -0.500000 -0.500000
+f 5/1/4 3/3/4 2/4/4
-v 0.500000 0.500000 0.500000
+f 5/2/5 4/3/5 3/4/5
-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

models/moreblocks_slope_outer_cut.obj

@@ -1,40 +1,23 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 0.500000 0.500000
+# www.blender.org
-v -0.500000 -0.500000 0.500000
+mtllib moreblocks_slope_outer_cut.mtl
-v 0.500000 -0.500000 -0.500000
+o Cube.002
-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 0.0000 0.0000
-vt 1.0000 0.0000
-vt 0.0000 1.0000
-vn 0.0000 -1.0000 -0.0000
-s off
-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 1.000000 1.000000
-vt 0.0000 1.0000
+vt 0.000000 0.000000
-vt 0.0000 0.0000
+vt 1.000000 0.000000
-vn 1.0000 0.0000 0.0000
+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
 s off
-f 12/10/4 10/11/4 11/12/4
+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

models/moreblocks_slope_outer_cut_half.obj

@@ -1,40 +1,24 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v 0.500000 -0.000000 0.500000
+# www.blender.org
-v -0.500000 -0.500000 0.500000
+mtllib moreblocks_slope_outer_cut_half.mtl
-v 0.500000 -0.500000 -0.500000
+o Cube.003
-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 0.0000 0.0000
-vt 1.0000 0.0000
-vt 0.0000 1.0000
-vn 0.0000 -1.0000 -0.0000
-s off
-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 1.000000 0.500000
-vt 0.0000 0.5000
+vt 0.000000 0.000000
-vt 0.0000 0.0000
+vt 1.000000 0.000000
-vn 1.0000 0.0000 0.0000
+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
 s off
-f 12/10/4 10/11/4 11/12/4
+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

models/moreblocks_slope_outer_cut_half_raised.obj

@@ -1,56 +1,28 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v -0.500000 -0.000000 0.500000
+# www.blender.org
-v 0.500000 0.500000 0.500000
+mtllib moreblocks_slope_outer_cut_half_raised.mtl
-v 0.500000 0.000000 -0.500000
+o Cube_Cube.005
-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.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 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
+v 0.500000 -0.500000 -0.500000
-vt 0.0000 0.0000
+v 0.500000 0.000000 -0.500000
-vt 1.0000 0.0000
+vt 0.000000 0.500000
-vt 1.0000 1.0000
+vt 0.000000 0.000000
-vn -0.0000 -0.0000 1.0000
+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
 s off
-f 15/15/5 16/16/5 17/17/5 18/18/5
+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

models/moreblocks_slope_outer_half.obj

@@ -1,48 +1,27 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v -0.500000 -0.500000 0.500000
+# www.blender.org
-v -0.500000 -0.500000 -0.500000
+mtllib moreblocks_slope_outer_half.mtl
-v 0.500000 -0.500000 -0.500000
+o Cube.004
-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
-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.000000 0.500000
-vt 1.0000 0.5000
+vt 1.000000 1.000000
-vt 0.0000 0.0000
+vt 0.000000 1.000000
-vt 1.0000 0.0000
+vt 0.000000 0.000000
-vn 0.0000 -0.0000 1.0000
+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
 s off
-f 11/11/4 9/12/4 10/13/4
+f 1/1/1 2/2/1 3/3/1 4/4/1
-g left
+f 5/5/2 1/3/2 4/4/2
-v 0.500000 -0.500000 -0.500000
+f 3/4/3 5/6/3 4/3/3
-v 0.500000 -0.500000 0.500000
+f 2/4/4 5/2/4 3/3/4
-v 0.500000 -0.000000 0.500000
+f 1/4/5 5/1/5 2/3/5
-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

models/moreblocks_slope_outer_half_raised.obj

@@ -1,74 +1,34 @@
-g top
+# Blender v2.72 (sub 0) OBJ File: ''
-v -0.500000 -0.000000 0.500000
+# www.blender.org
-v 0.500000 0.500000 0.500000
+mtllib moreblocks_slope_outer_half_raised.mtl
-v 0.500000 0.000000 -0.500000
+o Cube_Cube.006
-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.0000 0.5000
+vt 0.000000 0.500000
-vt 0.0000 0.0000
+vt 0.000000 0.000000
-vt 1.0000 0.0000
+vt 1.000000 0.000000
-vt 1.0000 0.5000
+vt 1.000000 1.000000
-vn 0.0000 0.0000 -1.0000
+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
 s off
-f 22/21/7 21/22/7 24/23/7 23/24/7
+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

nodes.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: node definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -12,10 +12,6 @@ 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"}
@@ -35,7 +31,7 @@ local nodes = {
 	},
 	["wood_tile_flipped"] = {
 		description = S("Wooden Tile"),
-		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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",
@@ -47,40 +43,40 @@ local nodes = {
 	},
 	["wood_tile_center"] = {
 		description = S("Centered Wooden Tile"),
-		groups = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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 = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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 = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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 = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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 = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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 = {wood = 1, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+		groups = {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,
@@ -141,8 +137,7 @@ local nodes = {
 	["iron_glass"] = {
 		description = S("Iron Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"},
+		tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_iron_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -151,8 +146,7 @@ local nodes = {
 	["coal_glass"] = {
 		description = S("Coal Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"},
+		tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_coal_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -161,8 +155,7 @@ local nodes = {
 	["clean_glass"] = {
 		description = S("Clean Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
+		tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_clean_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -190,7 +183,6 @@ 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"] = {
@@ -235,8 +227,7 @@ local nodes = {
 	["trap_glass"] = {
 		description = S("Trap Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"},
+		tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_trap_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -258,11 +249,23 @@ local nodes = {
 		sounds = sound_wood,
 		furnace_burntime = 30,
 	},
+	["horizontal_jungle_tree"] = {
+		description = S("Horizontal Jungle Tree"),
+		tiles = {"default_jungletree.png",
+		"default_jungletree.png",
+		"default_jungletree.png^[transformR90",
+		"default_jungletree.png^[transformR90",
+		"default_jungletree_top.png",
+		"default_jungletree_top.png"},
+		paramtype2 = "facedir",
+		groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+		sounds = sound_wood,
+		furnace_burntime = 30,
+	},
 	["glow_glass"] = {
 		description = S("Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"},
+		tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_glow_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -272,8 +275,7 @@ local nodes = {
 	["trap_glow_glass"] = {
 		description = S("Trap Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"},
+		tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_trap_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -285,22 +287,20 @@ local nodes = {
 	["super_glow_glass"] = {
 		description = S("Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
+		tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_super_glow_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
-		light_source = 14,
+		light_source = default.LIGHT_MAX,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
 	},
 	["trap_super_glow_glass"] = {
 		description = S("Trap Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
+		tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, --MFF connected glass
-		tiles = {"moreblocks_trap_super_glow_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
-		light_source = 14,
+		light_source = default.LIGHT_MAX,
 		walkable = false,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -321,11 +321,6 @@ local nodes = {
 		sounds = sound_leaves,
 		no_stairs = true,
 	},
-	["copperpatina"] = {
-		description = S("Copper Patina Block"),
-		groups = {cracky = 1, level = 2},
-		sounds = sound_metal,
-	},
 }
 
 for name, def in pairs(nodes) do
@@ -358,3 +353,4 @@ minetest.register_craftitem("moreblocks:nothing", {
 	inventory_image = "invisible.png",
 	on_use = function() end,
 })
+

ownership.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: ownership handling
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou 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

redefinitions.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: redefinitions of default stuff
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -10,9 +10,9 @@ Licensed under the zlib license. See LICENSE.md for more information.
 minetest.register_craft({
 	output = "default:sign_wall 4",
 	recipe = {
-		{"default:wood", "default:wood", "default:wood"},
+		{"group:wood", "group:wood", "group:wood"},
-		{"default:wood", "default:wood", "default:wood"},
+		{"group:wood", "group:wood", "group:wood"},
-		{"", "default:stick", ""},
+		{"", "group:stick", ""},
 	}
 })
 
@@ -32,16 +32,69 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
+--[[minetest.register_craft({
-	output = "default:rail 24",
+	output = "default:rail 16", -- /MFF (Mg|06/10/15) => (Ombridride|26/07/15)
 	recipe = {
 		{"default:steel_ingot", "", "default:steel_ingot"},
 		{"default:steel_ingot", "default:stick", "default:steel_ingot"},
 		{"default:steel_ingot", "", "default:steel_ingot"},
 	}
-})
+})--]]
 
 minetest.register_craft({
 	type = "toolrepair",
 	additional_wear = -0.10, -- Tool repair buff (10% bonus instead of 2%).
 })
+
+-- Redefinitions of some default nodes
+-- ===================================
+
+-- Let there be light. This makes some nodes let light pass through:
+minetest.override_item("default:ladder", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:sapling", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:dry_shrub", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:papyrus", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:fence_wood", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:junglegrass", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:junglesapling", {
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+minetest.override_item("default:grass_1", {
+	inventory_image = "default_grass_3.png", -- Use a bigger inventory image.
+	wield_image = "default_grass_3.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+})
+
+for i = 2, 5 do
+	minetest.override_item("default:grass_" ..i, {
+		paramtype = "light",
+		sunlight_propagates = true,
+	})
+end

stairsplus/API.md

@@ -1,4 +1,5 @@
-# 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

stairsplus/aliases.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: alias definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

stairsplus/conversion.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: conversion
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -80,7 +80,6 @@ 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
 					nfdir = dirs1[fdir + 2]
@@ -137,3 +136,4 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 		})
 	end
 end
+

stairsplus/init.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: Stairs+
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -17,21 +17,6 @@ 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
@@ -56,21 +41,6 @@ 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,

stairsplus/microblocks.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: microblock definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,82 +20,57 @@ function register_micro(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
-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},
-		},
-	},
-	["_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},
-		},
-	},
-	["_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},
-		},
-	},
-	["_15"] = {
-		node_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, 0, 0, 0.4375, 0.5},
-		},
-	}
-}
-
-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 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},
+			},
+		},
+		["_2"] = {legacy = "_1"},
+		["_4"] = {legacy = ""},
+		["_12"] = {
+			node_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, 0, 0, 0.25, 0.5},
+			},
+		},
+		["_14"] = {legacy = "_15"},
+		["_15"] = {
+			node_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, 0, 0, 0.4375, 0.5},
+			},
+		}
+	}
+
 	local desc = S("%s Microblock"):format(fields.description)
 	for alternate, def in pairs(defs) do
-		for k, v in pairs(fields) do
+		if def.legacy then
-			def[k] = v
+			minetest.register_alias(modname .. ":micro_" .. subname .. alternate,
+				modname .. ":micro_" .. subname .. def.legacy)
+		else
+			for k, v in pairs(fields) do
+				def[k] = v
+			end
+			def.drawtype = "nodebox"
+			def.paramtype = "light"
+			def.paramtype2 = "facedir"
+			def.on_place = minetest.rotate_node
+			def.groups = stairsplus:prepare_groups(fields.groups)
+			def.description = desc
+			if fields.drop then
+				def.drop = modname.. ":micro_" ..fields.drop..alternate
+			end
+			minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
 		end
-		def.drawtype = "nodebox"
-		def.paramtype = "light"
-		def.paramtype2 = def.paramtype2 or "facedir"
-		def.on_place = minetest.rotate_node
-		def.groups = stairsplus:prepare_groups(fields.groups)
-		def.description = desc
-		if fields.drop and not (type(fields.drop) == "table") then
-			def.drop = modname.. ":micro_" ..fields.drop..alternate
-		end
-		minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
 	end
 	minetest.register_alias(modname.. ":micro_" ..subname.. "_bottom", modname.. ":micro_" ..subname)
 

stairsplus/panels.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: panel definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,82 +20,57 @@ function register_panel(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
-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},
-		},
-	},
-	["_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},
-		},
-	},
-	["_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},
-		},
-	},
-	["_15"] = {
-		node_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, 0, 0.5, 0.4375, 0.5},
-		},
-	}
-}
-
-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 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},
+			},
+		},
+		["_2"] = {legacy = "_1"},
+		["_4"] = {legacy = ""},
+		["_12"] = {
+			node_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, 0, 0.5, 0.25, 0.5},
+			},
+		},
+		["_14"] = {legacy = "_15"},
+		["_15"] = {
+			node_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, 0, 0.5, 0.4375, 0.5},
+			},
+		}
+	}
+
 	local desc = S("%s Panel"):format(fields.description)
 	for alternate, def in pairs(defs) do
-		for k, v in pairs(fields) do
+		if def.legacy then
-			def[k] = v
+			minetest.register_alias(modname .. ":panel_" .. subname .. alternate,
+				modname .. ":panel_" .. subname .. def.legacy)
+		else
+			for k, v in pairs(fields) do
+				def[k] = v
+			end
+			def.drawtype = "nodebox"
+			def.paramtype = "light"
+			def.paramtype2 = "facedir"
+			def.on_place = minetest.rotate_node
+			def.description = desc
+			def.groups = stairsplus:prepare_groups(fields.groups)
+			if fields.drop then
+				def.drop = modname.. ":panel_" ..fields.drop..alternate
+			end
+			minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
 		end
-		def.drawtype = "nodebox"
-		def.paramtype = "light"
-		def.paramtype2 = def.paramtype2 or "facedir"
-		def.on_place = minetest.rotate_node
-		def.description = desc
-		def.groups = stairsplus:prepare_groups(fields.groups)
-		if fields.drop and not (type(fields.drop) == "table") then
-			def.drop = modname.. ":panel_" ..fields.drop..alternate
-		end
-		minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
 	end
 	minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname)
 

stairsplus/registrations.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: registrations
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -26,10 +26,10 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
 	"junglewood",
 	"pine_tree",
 	"pine_wood",
+	"cherry_tree",
+	"cherry_plank",
 	"acacia_tree",
 	"acacia_wood",
-	"aspen_tree",
-	"aspen_wood",
 	"obsidian",
 	"obsidian_glass",
 	"stonebrick",
@@ -44,7 +44,7 @@ for _, name in pairs(default_nodes) do
 	if ndef then
 		local drop
 		if type(ndef.drop) == "string" then
-			drop = ndef.drop:sub(9)
+			drop = ndef.drop:split(" ")[1]:sub(9)
 		end
 
 		local tiles = ndef.tiles

stairsplus/slabs.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: slab definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,53 +20,43 @@ function register_slab(modname, subname, recipeitem, groups, images, description
 	})
 end
 
-local slabs_defs = {
-	[""] = 8,
-	["_quarter"] = 4,
-	["_three_quarter"] = 12,
-	["_1"] = 1,
-	["_2"] = 2,
-	["_14"] = 14,
-	["_15"] = 15,
-}
-
-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 defs = {
+		[""] = 8,
+		["_quarter"] = 4,
+		["_three_quarter"] = 12,
+		["_1"] = 1,
+		["_2"] = "_1",
+		["_14"] = "_three_quarter",
+		["_15"] = 15,
+	}
+
 	local desc_base = S("%s Slab"):format(fields.description)
 	for alternate, num in pairs(defs) do
-		local def = {
+		if type(num) == type("moo") then
-			node_box = {
+			minetest.register_alias(modname .. ":slab_" .. subname .. alternate,
-				type = "fixed",
+				modname .. ":slab_" .. subname .. num)
-				fixed = {-0.5, -0.5, -0.5, 0.5, (num/16)-0.5, 0.5},
+		else
+			local def = {
+				node_box = {
+					type = "fixed",
+					fixed = {-0.5, -0.5, -0.5, 0.5, (num/16)-0.5, 0.5},
+				}
 			}
-		}
+			for k, v in pairs(fields) do
-		for k, v in pairs(fields) do
+				def[k] = v
-			def[k] = v
+			end
+			def.drawtype = "nodebox"
+			def.paramtype = "light"
+			def.paramtype2 = "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 then
+					def.drop = modname.. ":slab_" .. fields.drop .. alternate
+			end
+			minetest.register_node(":" .. modname .. ":slab_" .. subname .. alternate, def)
 		end
-		def.drawtype = "nodebox"
-		def.paramtype = "light"
-		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
-		end
-		minetest.register_node(":" .. modname .. ":slab_" .. subname .. alternate, def)
 	end
 	minetest.register_alias("stairs:slab_" .. subname, modname .. ":slab_" .. subname)
 
@@ -86,11 +76,11 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 		})
 
 		-- 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",
+		-- 	type = "shapeless",
-		--	output = modname .. ":slab_" .. subname,
+		-- 	output = modname .. ":slab_" .. subname,
-		--	recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
+		-- 	recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
 		-- })
 
 		-- then remove these two

stairsplus/slopes.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: slope definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -123,118 +123,103 @@ 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,
-	},
-}
-
-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 = stairsplus.copytable(slopes_defs)
+	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 desc = S("%s Slope"):format(fields.description)
 	for alternate, def in pairs(defs) do
 		for k, v in pairs(fields) do
@@ -242,11 +227,11 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "mesh"
 		def.paramtype = "light"
-		def.paramtype2 = def.paramtype2 or "facedir"
+		def.paramtype2 = "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)
-		if fields.drop and not (type(fields.drop) == "table") then
+		if fields.drop then
 			def.drop = modname.. ":slope_" ..fields.drop..alternate
 		end
 		minetest.register_node(":" ..modname.. ":slope_" ..subname..alternate, def)

stairsplus/stairs.lua

@@ -1,7 +1,7 @@
 --[[
 More Blocks: stair definitions
 
-Copyright (c) 2011-2017 Hugo Locurcio and contributors.
+Copyright (c) 2011-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -20,122 +20,104 @@ function register_stair(modname, subname, recipeitem, groups, images, descriptio
 	})
 end
 
-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},
-			},
-		},
-	},
-	["_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},
-			},
-		},
-	},
-	["_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_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_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},
-			},
-		},
-	},
-}
-
-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 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},
+				},
+			},
+		},
+		["_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},
+				},
+			},
+		},
+		["_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_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"] = {legacy = "_alt_1"},
+		["_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},
+				},
+			},
+		},
+	}
+
 	local desc = S("%s Stairs"):format(fields.description)
 	for alternate, def in pairs(defs) do
-		for k, v in pairs(fields) do
+		if def.legacy then
-			def[k] = v
+			minetest.register_alias(modname .. ":stair_" .. subname .. alternate,
+				modname .. ":stair_" .. subname .. def.legacy)
+		else
+			for k, v in pairs(fields) do
+				def[k] = v
+			end
+			def.drawtype = "nodebox"
+			def.paramtype = "light"
+			def.paramtype2 = "facedir"
+			def.on_place = minetest.rotate_node
+			def.description = desc
+			def.groups = stairsplus:prepare_groups(fields.groups)
+			if fields.drop then
+				def.drop = modname .. ":stair_" .. fields.drop .. alternate
+			end
+			minetest.register_node(":" .. modname .. ":stair_" .. subname .. alternate, def)
 		end
-		def.drawtype = "nodebox"
-		def.paramtype = "light"
-		def.paramtype2 = def.paramtype2 or "facedir"
-		def.on_place = minetest.rotate_node
-		def.description = desc
-		def.groups = stairsplus:prepare_groups(fields.groups)
-		if fields.drop and not (type(fields.drop) == "table") then
-			def.drop = modname .. ":stair_" .. fields.drop .. alternate
-		end
-		minetest.register_node(":" .. modname .. ":stair_" .. subname .. alternate, def)
 	end
 	minetest.register_alias("stairs:stair_" .. subname, modname .. ":stair_" .. subname)
 
@@ -144,7 +126,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 	-- Some saw-less recipes:
 
 	minetest.register_craft({
-		output = modname .. ":stair_" .. subname .. " 8",
+		output = modname .. ":stair_" .. subname .. " 6",
 		recipe = {
 			{recipeitem, "", ""},
 			{recipeitem, recipeitem, ""},
@@ -153,7 +135,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 	})
 
 	minetest.register_craft({
-		output = modname .. ":stair_" .. subname .. " 8",
+		output = modname .. ":stair_" .. subname .. " 6",
 		recipe = {
 			{"", "", recipeitem},
 			{"", recipeitem, recipeitem},