diff --git a/blends/Adaridge_walls.blend1 b/blends/Adaridge_walls.blend1 deleted file mode 100644 index 10082aa..0000000 Binary files a/blends/Adaridge_walls.blend1 and /dev/null differ diff --git a/blends/Column_toppers.blend1 b/blends/Column_toppers.blend1 deleted file mode 100644 index 84d4a88..0000000 Binary files a/blends/Column_toppers.blend1 and /dev/null differ diff --git a/blends/Deco_wall.blend b/blends/Deco_wall.blend index e35f202..705b9b1 100644 Binary files a/blends/Deco_wall.blend and b/blends/Deco_wall.blend differ diff --git a/blends/Deco_wall.blend1 b/blends/Deco_wall.blend1 deleted file mode 100644 index c068d5e..0000000 Binary files a/blends/Deco_wall.blend1 and /dev/null differ diff --git a/formspec.lua b/formspec.lua index 202ccbe..06f6226 100644 --- a/formspec.lua +++ b/formspec.lua @@ -52,6 +52,7 @@ columns = --Although all the columns are in the wall files they get their own me 'item_image_button[6,1.5;1,1;mylandscaping:column_t_sphere_cement;column_sphere; ]'.. 'item_image_button[7,1.5;1,1;mylandscaping:column_t_dragon_cement;column_dragon; ]'.. 'item_image_button[8,1.5;1,1;mylandscaping:column_t_suzanne_cement;column_suzanne; ]'.. + 'item_image_button[9,1.5;1,1;mylandscaping:column_t_cross_cement;column_cross; ]'.. input patio_pavers = diff --git a/machine.lua b/machine.lua index 1e48cf7..6e980a1 100644 --- a/machine.lua +++ b/machine.lua @@ -260,6 +260,7 @@ or fields['mcolumn3'] or fields['column_sphere'] or fields['column_dragon'] or fields['column_suzanne'] +or fields['column_cross'] then if fields["acolumn1"] then make_ok = false @@ -309,7 +310,7 @@ then return end end - if fields["column_sphere"] then + if fields["column_sphere"] then make_ok = false anzahl = 2 block = "mylandscaping:column_t_sphere_" @@ -332,6 +333,14 @@ then if inv:is_empty("input") then return end + end + if fields["column_cross"] then + make_ok = false + anzahl = 2 + block = "mylandscaping:column_t_cross_" + if inv:is_empty("input") then + return + end end local instack = inv:get_stack("input", 1) local outstack = inv:get_stack("output", 1) diff --git a/models/mylandscaping_column_t_cross.obj b/models/mylandscaping_column_t_cross.obj new file mode 100644 index 0000000..f35e787 --- /dev/null +++ b/models/mylandscaping_column_t_cross.obj @@ -0,0 +1,77 @@ +# Blender v2.76 (sub 2) OBJ File: 'Column_toppers.blend' +# www.blender.org +o Cross_Cube.002 +v -0.141421 -0.000000 -0.000000 +v -0.141421 0.200000 -0.000000 +v 0.000000 -0.000000 -0.141421 +v 0.000000 0.200000 -0.141421 +v -0.000000 -0.000000 0.141421 +v -0.000000 0.200000 0.141421 +v 0.141421 -0.000000 0.000000 +v 0.141421 0.200000 0.000000 +v 0.000000 -0.400000 -0.141421 +v -0.141421 -0.400000 -0.000000 +v 0.141421 -0.400000 0.000000 +v -0.000000 -0.400000 0.141421 +v 0.141421 0.200000 -0.282843 +v 0.141421 -0.000000 -0.282843 +v 0.282843 0.200000 -0.141421 +v 0.282843 -0.000000 -0.141421 +v -0.282843 -0.000000 0.141421 +v -0.282843 0.200000 0.141421 +v -0.141421 0.200000 0.282843 +v -0.141421 -0.000000 0.282843 +v -0.141421 0.400000 -0.000000 +v 0.000000 0.400000 -0.141421 +v 0.141421 0.400000 0.000000 +v -0.000000 0.400000 0.141421 +vt 0.375763 0.748473 +vt 0.624237 0.748473 +vt 0.624237 0.500000 +vt 0.375763 0.500000 +vt 0.872710 0.500000 +vt 0.872710 0.748473 +vt 0.624237 0.375763 +vt 0.375763 0.375763 +vt 0.375763 0.127290 +vt 0.624237 0.127290 +vt 0.624237 0.003053 +vt 0.375763 0.003053 +vt 0.375763 0.996946 +vt 0.624237 0.996946 +vt 0.375763 0.624237 +vt 0.624237 0.624237 +vt 0.375763 0.872710 +vt 0.624237 0.872710 +vt 0.127290 0.748473 +vt 0.127290 0.500000 +vn -0.707100 0.000000 -0.707100 +vn 0.707100 0.000000 0.707100 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707100 0.000000 -0.707100 +vn -0.707100 0.000000 0.707100 +g Cross_Cube.002_None +s off +f 2/1/1 4/2/1 3/3/1 1/4/1 +f 8/2/2 7/3/2 16/5/2 15/6/2 +f 8/2/2 6/1/2 5/4/2 7/3/2 +f 6/7/3 2/8/3 18/9/3 19/10/3 +f 1/4/1 3/3/1 9/11/1 10/12/1 +f 4/2/1 2/1/1 21/13/1 22/14/1 +f 10/8/4 9/15/4 11/16/4 12/7/4 +f 3/4/5 7/3/5 11/11/5 9/12/5 +f 5/3/6 1/4/6 10/12/6 12/11/6 +f 7/3/2 5/4/2 12/12/2 11/11/2 +f 13/1/5 15/2/5 16/3/5 14/4/5 +f 7/16/4 3/15/4 14/17/4 16/18/4 +f 4/15/3 8/16/3 15/18/3 13/17/3 +f 3/3/1 4/2/1 13/6/1 14/5/1 +f 19/2/6 18/1/6 17/4/6 20/3/6 +f 5/4/2 6/1/2 19/19/2 20/20/2 +f 2/1/1 1/4/1 17/20/1 18/19/1 +f 1/8/4 5/7/4 20/10/4 17/9/4 +f 24/7/3 23/16/3 22/15/3 21/8/3 +f 2/1/6 6/2/6 24/14/6 21/13/6 +f 8/2/5 4/1/5 22/13/5 23/14/5 +f 6/1/2 8/2/2 23/14/2 24/13/2 diff --git a/textures/mylandscaping_adaridge_tex_normal.png b/textures/mylandscaping_adaridge_tex_normal.png new file mode 100644 index 0000000..8333b21 Binary files /dev/null and b/textures/mylandscaping_adaridge_tex_normal.png differ diff --git a/textures/mylandscaping_ashlar_normal.png b/textures/mylandscaping_ashlar_normal.png deleted file mode 100644 index 1de1de9..0000000 Binary files a/textures/mylandscaping_ashlar_normal.png and /dev/null differ diff --git a/textures/mylandscaping_block_smooth_normal.png b/textures/mylandscaping_block_smooth_normal.png index 88ece4f..a6e741c 100644 Binary files a/textures/mylandscaping_block_smooth_normal.png and b/textures/mylandscaping_block_smooth_normal.png differ diff --git a/textures/mylandscaping_block_split_normal.png b/textures/mylandscaping_block_split_normal.png index 3e57ac7..55fec9b 100644 Binary files a/textures/mylandscaping_block_split_normal.png and b/textures/mylandscaping_block_split_normal.png differ diff --git a/textures/mylandscaping_cement_normal.png b/textures/mylandscaping_cement_normal.png index d9f75e6..643a897 100644 Binary files a/textures/mylandscaping_cement_normal.png and b/textures/mylandscaping_cement_normal.png differ diff --git a/toppers.lua b/toppers.lua index acf8795..3b54164 100644 --- a/toppers.lua +++ b/toppers.lua @@ -1,7 +1,8 @@ local block_type1 = { -- desc2, obj, texture {"Sphere", "sphere", 'concrete'}, {"Suzanne", "suzanne", 'concrete'}, -{'Dragon', 'dragon', 'dragon'} +{'Dragon', 'dragon', 'dragon'}, +{'Cross', 'cross', 'concrete'}, } for i in ipairs (block_type1) do local desc2 = block_type1[i][1]