diff options
Diffstat (limited to 'moreblocks')
28 files changed, 1013 insertions, 455 deletions
diff --git a/moreblocks/.luacheckrc b/moreblocks/.luacheckrc new file mode 100644 index 0000000..fbf3483 --- /dev/null +++ b/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/moreblocks/aliases.lua b/moreblocks/aliases.lua index c34472d..e1ddc64 100644 --- a/moreblocks/aliases.lua +++ b/moreblocks/aliases.lua @@ -77,4 +77,3 @@ minetest.register_abm({ }) end, }) - diff --git a/moreblocks/circular_saw.lua b/moreblocks/circular_saw.lua index 09fbd90..61d53a7 100644 --- a/moreblocks/circular_saw.lua +++ b/moreblocks/circular_saw.lua @@ -145,7 +145,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 +327,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 +369,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 +387,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/moreblocks/crafting.lua b/moreblocks/crafting.lua index 501c9f4..16753c3 100644 --- a/moreblocks/crafting.lua +++ b/moreblocks/crafting.lua @@ -207,6 +207,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 +477,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/moreblocks/models/moreblocks_slope.obj b/moreblocks/models/moreblocks_slope.obj index 22a833f..57298d7 100644 --- a/moreblocks/models/moreblocks_slope.obj +++ b/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 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 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 15/15/5 16/16/5 17/17/5 18/18/5 diff --git a/moreblocks/models/moreblocks_slope_cut.obj b/moreblocks/models/moreblocks_slope_cut.obj index a9ea83d..bf2dd79 100644 --- a/moreblocks/models/moreblocks_slope_cut.obj +++ b/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/moreblocks/models/moreblocks_slope_half.obj b/moreblocks/models/moreblocks_slope_half.obj index a6b1a56..1fa631c 100644 --- a/moreblocks/models/moreblocks_slope_half.obj +++ b/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 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 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 15/15/5 16/16/5 17/17/5 18/18/5 diff --git a/moreblocks/models/moreblocks_slope_half_raised.obj b/moreblocks/models/moreblocks_slope_half_raised.obj index 6f985e3..86139d7 100644 --- a/moreblocks/models/moreblocks_slope_half_raised.obj +++ b/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 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 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 21/21/6 23/22/6 24/23/6 22/24/6 diff --git a/moreblocks/models/moreblocks_slope_inner.obj b/moreblocks/models/moreblocks_slope_inner.obj index d4a444e..c6f811e 100644 --- a/moreblocks/models/moreblocks_slope_inner.obj +++ b/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 -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 -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 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/moreblocks/models/moreblocks_slope_inner_cut.obj b/moreblocks/models/moreblocks_slope_inner_cut.obj index b687b11..babe502 100644 --- a/moreblocks/models/moreblocks_slope_inner_cut.obj +++ b/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/moreblocks/models/moreblocks_slope_inner_cut_half.obj b/moreblocks/models/moreblocks_slope_inner_cut_half.obj index 82a387b..5af38b5 100644 --- a/moreblocks/models/moreblocks_slope_inner_cut_half.obj +++ b/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/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj b/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj index 8231ee4..d8c1f81 100644 --- a/moreblocks/models/moreblocks_slope_inner_cut_half_raised.obj +++ b/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 +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.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.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 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/moreblocks/models/moreblocks_slope_inner_half.obj b/moreblocks/models/moreblocks_slope_inner_half.obj index 3e54dea..3158b57 100644 --- a/moreblocks/models/moreblocks_slope_inner_half.obj +++ b/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.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 -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 +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 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 26/22/7 27/23/7 29/24/7 diff --git a/moreblocks/models/moreblocks_slope_inner_half_raised.obj b/moreblocks/models/moreblocks_slope_inner_half_raised.obj index e6c2205..bd41389 100644 --- a/moreblocks/models/moreblocks_slope_inner_half_raised.obj +++ b/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 +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 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 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 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 28/22/7 26/23/7 27/24/7 30/25/7 +l 29 26 diff --git a/moreblocks/models/moreblocks_slope_outer.obj b/moreblocks/models/moreblocks_slope_outer.obj index b8f4e9e..c779309 100644 --- a/moreblocks/models/moreblocks_slope_outer.obj +++ b/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 +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 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.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 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 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 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 14/14/5 12/15/5 13/16/5 diff --git a/moreblocks/models/moreblocks_slope_outer_cut.obj b/moreblocks/models/moreblocks_slope_outer_cut.obj index e6cbfb4..4dcd46a 100644 --- a/moreblocks/models/moreblocks_slope_outer_cut.obj +++ b/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 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.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 1.0000 0.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vn 1.0000 0.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 12/10/4 10/11/4 11/12/4 diff --git a/moreblocks/models/moreblocks_slope_outer_cut_half.obj b/moreblocks/models/moreblocks_slope_outer_cut_half.obj index bd64194..c309a4e 100644 --- a/moreblocks/models/moreblocks_slope_outer_cut_half.obj +++ b/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 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.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 1.0000 0.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 -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 12/10/4 10/11/4 11/12/4 diff --git a/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj b/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj index c65e08d..78cdfed 100644 --- a/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj +++ b/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 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 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 15/15/5 16/16/5 17/17/5 18/18/5 diff --git a/moreblocks/models/moreblocks_slope_outer_half.obj b/moreblocks/models/moreblocks_slope_outer_half.obj index 7bbb38d..b87be69 100644 --- a/moreblocks/models/moreblocks_slope_outer_half.obj +++ b/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 +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 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.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 0.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/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 12/14/5 14/15/5 13/16/5 diff --git a/moreblocks/models/moreblocks_slope_outer_half_raised.obj b/moreblocks/models/moreblocks_slope_outer_half_raised.obj index 51a929a..e06304d 100644 --- a/moreblocks/models/moreblocks_slope_outer_half_raised.obj +++ b/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/moreblocks/nodes.lua b/moreblocks/nodes.lua index da61b3f..8d90614 100644 --- a/moreblocks/nodes.lua +++ b/moreblocks/nodes.lua @@ -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, @@ -186,6 +190,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"] = { @@ -319,7 +324,7 @@ local nodes = { ["copperpatina"] = { description = S("Copper Patina Block"), groups = {cracky = 1, level = 2}, - sounds = sound_stone, + sounds = sound_metal, }, } @@ -353,4 +358,3 @@ minetest.register_craftitem("moreblocks:nothing", { inventory_image = "invisible.png", on_use = function() end, }) - diff --git a/moreblocks/ownership.lua b/moreblocks/ownership.lua index 1c2431b..355d7f1 100644 --- a/moreblocks/ownership.lua +++ b/moreblocks/ownership.lua @@ -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/moreblocks/stairsplus/conversion.lua b/moreblocks/stairsplus/conversion.lua index 13966b6..37f2a25 100644 --- a/moreblocks/stairsplus/conversion.lua +++ b/moreblocks/stairsplus/conversion.lua @@ -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/moreblocks/stairsplus/microblocks.lua b/moreblocks/stairsplus/microblocks.lua index a457d10..a3b94d3 100644 --- a/moreblocks/stairsplus/microblocks.lua +++ b/moreblocks/stairsplus/microblocks.lua @@ -88,7 +88,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 @@ -98,53 +98,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/moreblocks/stairsplus/panels.lua b/moreblocks/stairsplus/panels.lua index 314939b..66e736d 100644 --- a/moreblocks/stairsplus/panels.lua +++ b/moreblocks/stairsplus/panels.lua @@ -88,7 +88,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) @@ -98,7 +98,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: @@ -110,7 +110,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields) {recipeitem, recipeitem}, }, }) - + minetest.register_craft({ output = modname .. ":panel_" .. subname .. " 12", recipe = { @@ -118,13 +118,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/moreblocks/stairsplus/slabs.lua b/moreblocks/stairsplus/slabs.lua index 2acdd41..9fa2494 100644 --- a/moreblocks/stairsplus/slabs.lua +++ b/moreblocks/stairsplus/slabs.lua @@ -59,7 +59,7 @@ function stairsplus:register_slab(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 = ("%s (%d/16)"):format(desc_base, num) def.groups = stairsplus:prepare_groups(fields.groups) @@ -78,27 +78,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 = { @@ -113,109 +113,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/moreblocks/stairsplus/slopes.lua b/moreblocks/stairsplus/slopes.lua index da524b6..1868cb3 100644 --- a/moreblocks/stairsplus/slopes.lua +++ b/moreblocks/stairsplus/slopes.lua @@ -242,7 +242,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) @@ -261,99 +261,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/moreblocks/stairsplus/stairs.lua b/moreblocks/stairsplus/stairs.lua index 6609466..fc47dbd 100644 --- a/moreblocks/stairsplus/stairs.lua +++ b/moreblocks/stairsplus/stairs.lua @@ -128,7 +128,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) |