diff --git a/mods/homedecor_modpack/building_blocks/textures/technic_granite.png b/mods/homedecor_modpack/building_blocks/textures/technic_granite.png index abb13850..88a7b329 100644 Binary files a/mods/homedecor_modpack/building_blocks/textures/technic_granite.png and b/mods/homedecor_modpack/building_blocks/textures/technic_granite.png differ diff --git a/mods/homedecor_modpack/chains/textures/chain_brass_inv.png b/mods/homedecor_modpack/chains/textures/chain_brass_inv.png index a7cfd70d..8c2d554d 100644 Binary files a/mods/homedecor_modpack/chains/textures/chain_brass_inv.png and b/mods/homedecor_modpack/chains/textures/chain_brass_inv.png differ diff --git a/mods/homedecor_modpack/chains/textures/chain_wrought_iron_inv.png b/mods/homedecor_modpack/chains/textures/chain_wrought_iron_inv.png index 829e73bf..c552f7b4 100644 Binary files a/mods/homedecor_modpack/chains/textures/chain_wrought_iron_inv.png and b/mods/homedecor_modpack/chains/textures/chain_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_brass.png b/mods/homedecor_modpack/chains/textures/chains_brass.png index 89a5c221..e2fb20db 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_brass.png and b/mods/homedecor_modpack/chains/textures/chains_brass.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_candle.png b/mods/homedecor_modpack/chains/textures/chains_candle.png index 0b4bee77..d709a8cf 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_candle.png and b/mods/homedecor_modpack/chains/textures/chains_candle.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_candle_flame.png b/mods/homedecor_modpack/chains/textures/chains_candle_flame.png index bb866dd6..a34b9a5e 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_candle_flame.png and b/mods/homedecor_modpack/chains/textures/chains_candle_flame.png differ diff --git a/mods/homedecor_modpack/chains/textures/chains_wrought_iron.png b/mods/homedecor_modpack/chains/textures/chains_wrought_iron.png index 882963f7..29af8dbd 100644 Binary files a/mods/homedecor_modpack/chains/textures/chains_wrought_iron.png and b/mods/homedecor_modpack/chains/textures/chains_wrought_iron.png differ diff --git a/mods/homedecor_modpack/chains/textures/top_chain_brass_inv.png b/mods/homedecor_modpack/chains/textures/top_chain_brass_inv.png index 65cc8048..dc8183c0 100644 Binary files a/mods/homedecor_modpack/chains/textures/top_chain_brass_inv.png and b/mods/homedecor_modpack/chains/textures/top_chain_brass_inv.png differ diff --git a/mods/homedecor_modpack/chains/textures/top_chain_wrought_iron_inv.png b/mods/homedecor_modpack/chains/textures/top_chain_wrought_iron_inv.png index 3683f2e2..cddf6c9a 100644 Binary files a/mods/homedecor_modpack/chains/textures/top_chain_wrought_iron_inv.png and b/mods/homedecor_modpack/chains/textures/top_chain_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/computer/computers.lua b/mods/homedecor_modpack/computer/computers.lua index 282e3659..cf7c6ac3 100755 --- a/mods/homedecor_modpack/computer/computers.lua +++ b/mods/homedecor_modpack/computer/computers.lua @@ -1,21 +1,21 @@ - -- Amiga 500 lookalike computer.register("computer:shefriendSOO", { - description = "SheFriendSOO"; - tiles_off = { front=true; }; + description = "SheFriendSOO", + tiles_off = { front=true }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L { 0, 0, 17, 32, 32, 12 }, -- Monitor Screen { 3, 3, 29, 26, 26, 3 }, -- Monitor Tube - { 0, 0, 0, 32, 4, 17 }, -- Keyboard - }); -}); + { 0, 0, 0, 32, 4, 17 } -- Keyboard + }) +}) -- Some generic laptop minetest.register_node("computer:vanio", { drawtype = "mesh", mesh = "computer_laptop.obj", description = "Pony Vanio", + inventory_image = "computer_laptop_inv.png", tiles = {"computer_laptop.png"}, paramtype = "light", paramtype2 = "facedir", @@ -26,7 +26,7 @@ minetest.register_node("computer:vanio", { type = "fixed", fixed = {-0.35, -0.5, -0.35, 0.35, 0.05, 0.35}, }, - on_rightclick = function (pos, node, clicker, itemstack) + on_rightclick = function(pos, node, clicker, itemstack) node.name = "computer:vanio_off" minetest.set_node(pos, node) end @@ -45,7 +45,7 @@ minetest.register_node("computer:vanio_off", { fixed = {-0.35, -0.5, -0.35, 0.35, -0.4, 0.25}, }, drop = "computer:vanio", - on_rightclick = function (pos, node, clicker, itemstack) + on_rightclick = function(pos, node, clicker, itemstack) node.name = "computer:vanio" minetest.set_node(pos, node) end @@ -53,8 +53,9 @@ minetest.register_node("computer:vanio_off", { -- Sony PlayStation lookalike computer.register("computer:slaystation", { - description = "Pony SlayStation"; - tiles_off = { top=true; }; + description = "Pony SlayStation", + inventory_image = "computer_ps1_inv.png", + tiles_off = { top=true }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L { 0, 0, 11, 32, 6, 21 }, -- Console @@ -63,14 +64,15 @@ computer.register("computer:slaystation", { { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 4, 5, 2, 5 }, -- Controller 2 Center - }); -}); + { 22, 0, 4, 5, 2, 5 } -- Controller 2 Center + }) +}) -- Sony PlayStation 2 lookalike computer.register("computer:slaystation2", { - description = "Pony SlayStation 2"; - tiles_off = { front=true; }; + description = "Pony SlayStation 2", + inventory_image = "computer_ps2_inv.png", + tiles_off = { front=true }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) @@ -80,31 +82,33 @@ computer.register("computer:slaystation2", { { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 1, 5, 2, 8 }, -- Controller 2 Center - }); -}); + { 22, 0, 1, 5, 2, 8 } -- Controller 2 Center + }) +}) -- Sinclair ZX Spectrum lookalike computer.register("computer:specter", { - description = "SX Specter"; - tiles_off = { }; + description = "SX Specter", + inventory_image = "computer_specter_inv.png", + tiles_off = { }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L { 3, 0, 0, 26, 4, 17 }, -- Keyboard - { 18, 0, 18, 12, 6, 14 }, -- Tape Player - }); -}); + { 18, 0, 18, 12, 6, 14 } -- Tape Player + }) +}) -- Nintendo Wii lookalike computer.register("computer:wee", { - description = "Nientiendo Wee"; - tiles_off = { front=true; }; + description = "Nientiendo Wee", + inventory_image = "computer_wii_inv.png", + tiles_off = { front=true }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L { 11, 0, 3, 10, 6, 26 }, -- Base - { 12, 6, 4, 8, 22, 24 }, -- Top - }); -}); + { 12, 6, 4, 8, 22, 24 } -- Top + }) +}) -- Apple iPad lookalike minetest.register_node("computer:piepad", { @@ -113,214 +117,92 @@ minetest.register_node("computer:piepad", { tiles = {"computer_piepad_inv.png"}, inventory_image = "computer_piepad_inv.png", wield_image = "computer_piepad_inv.png", - sunlight_propagates = false, paramtype = "light", paramtype2 = "wallmounted", - light_source = 10, + light_source = 8, walkable = false, - groups = { snappy=3, cracky=3, choppy=3, oddly_breakable_by_hand=3}, + groups = {oddly_breakable_by_hand=2}, selection_box = {type = "wallmounted"}, sounds = default.node_sound_wood_defaults() }) -- Commodore 64 lookalike computer.register("computer:admiral64", { - description = "Admiral64"; - tiles_off = { }; + description = "Admiral64", + inventory_image = "computer_ad64_inv.png", + tiles_off = { }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L - { 0, 0, 0, 32, 4, 18 }, -- Keyboard - }); -}); + { 0, 0, 0, 32, 4, 18 } -- Keyboard + }) +}) -- Commodore 128 lookalike computer.register("computer:admiral128", { - description = "Admiral128"; - tiles_off = { }; + description = "Admiral128", + inventory_image = "computer_ad128_inv.png", + tiles_off = { }, node_box = computer.pixelnodebox(32, { -- X Y Z W H L - { 0, 0, 0, 32, 4, 27 }, -- Keyboard - }); -}); - ---------------------------------------------------------------------------------- -----------------------------added by crazyginger72------------------------------- ---------------------------------------------------------------------------------- + { 0, 0, 0, 32, 4, 27 } -- Keyboard + }) +}) -- Generic Flat Screen LCD (16x9) with keyboard -minetest.register_node("computer:monitor_on", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png", - "computer_monitor_l.png","computer_monitor_r.png", - "computer_monitor_b.png","computer_monitor_f_desktop.png"}, --"computer_monitor_f_on.png"}, --till i get a boot abm inplace - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {snappy=3,not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor', - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:monitor"; - minetest.set_node(pos, node); - end -}) - -minetest.register_node("computer:monitor_bios", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", - "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_bios.png"}, - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {snappy=3,not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor', -}) - -minetest.register_node("computer:monitor_loading", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", - "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_loading.png"}, - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {snappy=3,not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor', -}) - -minetest.register_node("computer:monitor_login", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", - "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_login.png"}, - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {snappy=3,not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor', -}) - -minetest.register_node("computer:monitor_desktop", { - description = "Monitor and keyboard", - tiles = {"computer_monitor_t.png","computer_monitor_bt.png","computer_monitor_l.png", - "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_desktop.png"}, - paramtype = "light", - light_source = 4, - paramtype2 = "facedir", - walkable = false, - is_ground_content = true, - groups = {snappy=3,not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - drop = 'computer:monitor', -}) +local mo_sbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.43, 0.5, 0.2, 0.25 } +} minetest.register_node("computer:monitor", { description = "Monitor and keyboard", - tiles = {"computer_monitor_t_off.png","computer_monitor_bt.png","computer_monitor_l.png", - "computer_monitor_r.png","computer_monitor_b.png","computer_monitor_f_off.png"}, + inventory_image = "computer_monitor_inv.png", + drawtype = "mesh", + mesh = "computer_monitor.obj", + tiles = {"computer_black.png", "monitor_plastic.png", "computer_black.png", "monitor_plastic.png"}, paramtype = "light", - light_source = 4, paramtype2 = "facedir", walkable = false, - is_ground_content = true, groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.3125, 0.1875, 0.5, 0.375, 0.223116}, - {-0.25, -0.5, 0.125, 0.25, -0.466981, 0.5}, - {-0.125, -0.5, 0.3125, 0.125, 0.0283019, 0.346698}, - {-0.375, -0.3125, 0.208965, 0.375, 0.240566, 0.3125}, - {-0.4375, -0.5, -0.4375, 0.4375, -0.4375, -0.125}, - {-0.1875, -0.5, 0.25, 0.1875, -0.410377, 0.375}, - }, - }, - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:monitor_on"; - minetest.set_node(pos, node); + selection_box = mo_sbox, + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computer:monitor_on" + minetest.set_node(pos, node) end }) +minetest.register_node("computer:monitor_on", { + description = "Monitor and keyboard", + drawtype = "mesh", + mesh = "computer_monitor.obj", + tiles = {"monitor_display.png^[transformFX", "monitor_plastic.png", "computer_black.png", "monitor_plastic.png"}, + paramtype = "light", + paramtype2 = "facedir", + light_source = 9, + walkable = false, + groups = {snappy=3, not_in_creative_inventory=1}, + selection_box = mo_sbox, + drop = "computer:monitor", + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computer:monitor" + minetest.set_node(pos, node) + end +}) + +minetest.register_alias("computer:monitor_bios", "computer:monitor") +minetest.register_alias("computer:monitor_loading", "computer:monitor") +minetest.register_alias("computer:monitor_login", "computer:monitor") +minetest.register_alias("computer:monitor_desktop", "computer:monitor") + --WIFI Router (linksys look-a-like) minetest.register_node("computer:router", { description = "WIFI Router", + inventory_image = "computer_router_inv.png", tiles = {"computer_router_t.png","computer_router_bt.png","computer_router_l.png","computer_router_r.png","computer_router_b.png", {name="computer_router_f_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}},}, --"computer_router_f.png"}, paramtype = "light", paramtype2 = "facedir", walkable = false, - is_ground_content = true, groups = {snappy=3}, sound = default.node_sound_wood_defaults(), drawtype = "nodebox", @@ -330,84 +212,42 @@ minetest.register_node("computer:router", { {-0.25, -0.5, -0.0625, 0.25, -0.375, 0.3125}, {-0.1875, -0.4375, 0.3125, -0.125, -0.1875, 0.375}, {0.125, -0.4375, 0.3125, 0.1875, -0.1875, 0.375}, - {-0.0625, -0.4375, 0.3125, 0.0625, -0.25, 0.375}, - }, - }, + {-0.0625, -0.4375, 0.3125, 0.0625, -0.25, 0.375} + } + } }) +local pct_cbox = { + type = "fixed", + fixed = { -0.1875, -0.5, -0.36, 0.1875, 0.34, 0.46 } +} + --Modern PC Tower -minetest.register_node("computer:tower_on", { - description = "Computer Tower", - tiles = {"computer_tower_t.png","computer_tower_bt.png","computer_tower_l.png", - "computer_tower_r.png","computer_tower_b.png","computer_tower_f_on.png"}, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - is_ground_content = true, - groups = {snappy=3,not_in_creative_inventory=1}, - sound = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, - {-0.1875, -0.5, -0.353774, 0.1875, 0, -0.0625}, - {-0.1875, 0.247641, -0.353774, 0.1875, 0.3125, 0.1875}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, - }, - }, - drop = 'computer:tower', - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:tower"; - minetest.set_node(pos, node); - end -}) - minetest.register_node("computer:tower", { description = "Computer Tower", - tiles = {"computer_tower_t.png","computer_tower_bt.png","computer_tower_l.png","computer_tower_r.png", - "computer_tower_b.png","computer_tower_f_off.png"}, + inventory_image = "computer_tower_inv.png", + drawtype = "mesh", + mesh = "computer_tower.obj", + tiles = {"computer_tower.png"}, paramtype = "light", paramtype2 = "facedir", - walkable = true, - is_ground_content = true, groups = {snappy=3}, sound = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, - {-0.1875, -0.5, -0.353774, 0.1875, 0, -0.0625}, - {-0.1875, 0.247641, -0.353774, 0.1875, 0.3125, 0.1875}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.1875, -0.5, -0.3125, 0.1875, 0.3125, 0.4375}, - }, - }, - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:tower_on"; - minetest.set_node(pos, node); - end + selection_box = pct_cbox, + collision_box = pct_cbox }) +minetest.register_alias("computer:tower_on", "computer:tower") + -- Printer/scaner combo minetest.register_node("computer:printer", { description = "Printer Scaner Combo", + inventory_image = "computer_printer_inv.png", tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png", "computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"}, paramtype = "light", paramtype2 = "facedir", walkable = true, - is_ground_content = true, groups = {snappy=3}, sound = default.node_sound_wood_defaults(), drawtype = "nodebox", @@ -421,9 +261,9 @@ minetest.register_node("computer:printer", { {-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375}, {-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375}, {-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5}, - {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0}, - }, + {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0} }, + }, }) --Rack Server @@ -439,23 +279,21 @@ minetest.register_node("computer:server", { 'computer_server_f_off.png' }, inventory_image = "computer_server_inv.png", - sunlight_propagates = false, paramtype = "light", paramtype2 = "facedir", - walkable = true, groups = {snappy=3}, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, sounds = default.node_sound_wood_defaults(), - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:server_on"; - minetest.set_node(pos, node); + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computer:server_on" + minetest.set_node(pos, node) end, on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above @@ -479,23 +317,21 @@ minetest.register_node("computer:server_on", { 'computer_server_f_on.png', }, inventory_image = "computer_server_inv.png", - sunlight_propagates = false, paramtype = "light", paramtype2 = "facedir", - walkable = true, groups = {snappy=3,not_in_creative_inventory=1}, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}, - }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, sounds = default.node_sound_wood_defaults(), drop = 'computer:server', - on_rightclick = function ( pos, node, clicker, itemstack) - node.name = "computer:server"; - minetest.set_node(pos, node); + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computer:server" + minetest.set_node(pos, node) end }) diff --git a/mods/homedecor_modpack/computer/init.lua b/mods/homedecor_modpack/computer/init.lua index 58b2589c..f43cc8ad 100755 --- a/mods/homedecor_modpack/computer/init.lua +++ b/mods/homedecor_modpack/computer/init.lua @@ -1,100 +1,101 @@ -computer = { }; +computer = { } -computer.register = function ( name, def ) - local nodename = name; - if (name:sub(1, 1) == ":") then name = name:sub(2); end - local modname, basename = name:match("^([^:]+):(.*)"); - local TEXPFX = modname.."_"..basename.."_"; - local ONSTATE = modname..":"..basename; - local OFFSTATE = modname..":"..basename.."_off"; - local def = def; +computer.register = function (name, def) + local nodename = name + if (name:sub(1, 1) == ":") then name = name:sub(2) end + local modname, basename = name:match("^([^:]+):(.*)") + local TEXPFX = modname.."_"..basename.."_" + local ONSTATE = modname..":"..basename + local OFFSTATE = modname..":"..basename.."_off" + local def = def minetest.register_node(ONSTATE, { - drawtype = "nodebox"; - paramtype = "light"; - paramtype2 = "facedir"; - description = def.description; - groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2 }; + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + description = def.description, + inventory_image = def.inventory_image, + groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2}, tiles = { TEXPFX.."tp.png", TEXPFX.."bt.png", TEXPFX.."rt.png", TEXPFX.."lt.png", TEXPFX.."bk.png", - TEXPFX.."ft.png", - }; - node_box = def.node_box; - selection_box = def.node_box; - on_rightclick = function ( pos, node, clicker, itemstack) + TEXPFX.."ft.png" + }, + node_box = def.node_box, + selection_box = def.node_box, + on_rightclick = function (pos, node, clicker, itemstack) if (def.on_turn_off) then - if (def.on_turn_off(pos, node, clicker, itemstack)) then return; end + if (def.on_turn_off(pos, node, clicker, itemstack)) then return end end - node.name = OFFSTATE; - minetest.set_node(pos, node); - end; - }); + node.name = OFFSTATE + minetest.set_node(pos, node) + end + }) minetest.register_node(OFFSTATE, { - drawtype = "nodebox"; - paramtype = "light"; - paramtype2 = "facedir"; - groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, - not_in_creative_inventory=1 }; + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, tiles = { (TEXPFX.."tp"..(def.tiles_off.top and "_off" or "")..".png"), (TEXPFX.."bt"..(def.tiles_off.bottom and "_off" or "")..".png"), (TEXPFX.."rt"..(def.tiles_off.right and "_off" or "")..".png"), (TEXPFX.."lt"..(def.tiles_off.left and "_off" or "")..".png"), (TEXPFX.."bk"..(def.tiles_off.back and "_off" or "")..".png"), - (TEXPFX.."ft"..(def.tiles_off.front and "_off" or "")..".png"), - }; - node_box = def.node_box_off or def.node_box; - selection_box = def.node_box_off or def.node_box; - on_rightclick = function ( pos, node, clicker, itemstack) + (TEXPFX.."ft"..(def.tiles_off.front and "_off" or "")..".png") + }, + node_box = def.node_box_off or def.node_box, + selection_box = def.node_box_off or def.node_box, + on_rightclick = function (pos, node, clicker, itemstack) if (def.on_turn_on) then - if (def.on_turn_on(pos, node, clicker, itemstack)) then return; end + if (def.on_turn_on(pos, node, clicker, itemstack)) then return end end - node.name = ONSTATE; - minetest.set_node(pos, node); - end; - drop = ONSTATE; - }); + node.name = ONSTATE + minetest.set_node(pos, node) + end, + drop = ONSTATE + }) end -computer.register_handheld = function ( name, def ) - local nodename = name; - if (name:sub(1, 1) == ":") then name = name:sub(2); end - local modname, basename = name:match("^([^:]+):(.*)"); - local TEXPFX = modname.."_"..basename.."_inv"; - local ONSTATE = modname..":"..basename; - local OFFSTATE = modname..":"..basename.."_off"; - local on_use = def.on_use; +computer.register_handheld = function (name, def) + local nodename = name + if (name:sub(1, 1) == ":") then name = name:sub(2) end + local modname, basename = name:match("^([^:]+):(.*)") + local TEXPFX = modname.."_"..basename.."_inv" + local ONSTATE = modname..":"..basename + local OFFSTATE = modname..":"..basename.."_off" + local on_use = def.on_use minetest.register_craftitem(ONSTATE, { - description = def.description; - inventory_image = TEXPFX..".png"; - wield_image = TEXPFX..".png"; - }); + description = def.description, + inventory_image = TEXPFX..".png", + wield_image = TEXPFX..".png" + }) end -computer.pixelnodebox = function ( size, boxes ) - local fixed = { }; - local i, box; +computer.pixelnodebox = function (size, boxes) + local fixed = { } + local i, box for i, box in ipairs(boxes) do - local x, y, z, w, h, l = unpack(box); + local x, y, z, w, h, l = unpack(box) fixed[#fixed + 1] = { (x / size) - 0.5, (y / size) - 0.5, (z / size) - 0.5, ((x + w) / size) - 0.5, ((y + h) / size) - 0.5, - ((z + l) / size) - 0.5, - }; + ((z + l) / size) - 0.5 + } end return { - type = "fixed"; - fixed = fixed; - }; + type = "fixed", + fixed = fixed + } end -local MODPATH = minetest.get_modpath("computer"); -dofile(MODPATH.."/computers.lua"); -dofile(MODPATH.."/miscitems.lua"); -dofile(MODPATH.."/recipes.lua"); +local MODPATH = minetest.get_modpath("computer") +dofile(MODPATH.."/computers.lua") +dofile(MODPATH.."/miscitems.lua") +dofile(MODPATH.."/recipes.lua") +dofile(MODPATH.."/tetris.lua") diff --git a/mods/homedecor_modpack/computer/models/computer_monitor.obj b/mods/homedecor_modpack/computer/models/computer_monitor.obj new file mode 100644 index 00000000..55a7763e --- /dev/null +++ b/mods/homedecor_modpack/computer/models/computer_monitor.obj @@ -0,0 +1,1618 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib computer_monitor.mtl +o display +v 0.428237 0.168254 0.091392 +v -0.393909 0.168254 0.091392 +v 0.428237 -0.358283 0.045326 +v -0.393909 -0.358283 0.045326 +vt 0.999920 0.999996 +vt 0.000080 0.999996 +vt 0.000080 0.000080 +vt 0.999920 0.000080 +g display_display_None +usemtl None +s off +f 1/1 2/2 4/3 3/4 +o screen +v 0.084081 -0.280866 0.084563 +v -0.047689 -0.280866 0.084563 +v -0.047689 -0.470723 0.111650 +v 0.084081 -0.470723 0.111650 +v -0.047689 -0.363032 0.046992 +v -0.047689 -0.470723 0.046992 +v 0.084081 -0.363032 0.046992 +v 0.084081 -0.470723 0.046992 +v 0.455244 0.186934 0.077083 +v 0.455244 0.183841 0.112433 +v -0.420916 0.183841 0.112433 +v -0.420916 0.186934 0.077083 +v 0.455244 -0.374195 0.027990 +v 0.455244 -0.377287 0.063341 +v -0.420916 -0.377287 0.063341 +v -0.420916 -0.374195 0.027990 +v 0.173247 -0.489973 -0.038210 +v 0.173247 -0.489973 0.196851 +v 0.173247 -0.499995 0.196851 +v 0.173247 -0.499995 -0.038210 +v -0.136855 -0.489973 -0.038210 +v -0.136855 -0.499995 -0.038210 +v -0.136855 -0.489973 0.196851 +v -0.136855 -0.499995 0.196851 +v 0.398369 0.145375 0.132580 +v -0.364041 0.145375 0.132580 +v 0.398369 -0.342904 0.089861 +v -0.364041 -0.342904 0.089861 +v 0.428237 0.169638 0.075570 +v -0.393909 0.169638 0.075570 +v 0.428237 -0.356899 0.029504 +v -0.393909 -0.356899 0.029504 +v 0.428237 0.168254 0.091392 +v -0.393909 0.168254 0.091392 +v 0.428237 -0.358283 0.045326 +v -0.393909 -0.358283 0.045326 +vt 0.252552 0.007665 +vt 0.499880 0.007665 +vt 0.499880 0.254993 +vt 0.252552 0.254993 +vt 0.747208 0.007665 +vt 0.747208 0.254993 +vt 0.994536 0.007665 +vt 0.994536 0.254993 +vt 0.005224 0.007665 +vt 0.005224 0.254993 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.005224 0.502321 +vt 0.252552 0.502321 +vt 0.252552 0.749649 +vt 0.005224 0.749649 +vt 0.747208 0.502321 +vt 0.994536 0.502321 +vt 0.994536 0.749649 +vt 0.747208 0.749649 +vt 0.499880 0.502321 +vt 0.499880 0.749649 +vt 0.499880 0.996977 +vt 0.252552 0.996977 +g screen_screen_None +usemtl None +s off +f 5/5 6/6 7/7 8/8 +f 6/6 9/9 10/10 7/7 +f 9/9 11/11 12/12 10/10 +f 11/13 5/5 8/8 12/14 +f 15/15 14/16 29/17 30/18 +f 16/15 15/16 19/17 20/18 +f 13/15 14/16 15/17 16/18 +f 17/15 13/16 33/17 35/18 +f 20/15 19/16 18/17 17/18 +f 14/15 13/16 17/17 18/18 +f 21/19 22/20 23/21 24/22 +f 25/23 21/24 24/25 26/26 +f 27/27 25/23 26/26 28/28 +f 22/20 27/27 28/28 23/21 +f 12/14 8/8 22/20 21/19 +f 10/10 12/12 21/24 25/23 +f 7/7 10/10 25/23 27/27 +f 8/8 7/7 27/27 22/20 +f 28/28 26/29 24/30 23/21 +f 30/15 29/16 31/17 32/18 +f 18/15 19/16 32/17 31/18 +f 14/15 18/16 31/17 29/18 +f 19/15 15/16 30/17 32/18 +f 35/15 33/16 37/17 39/18 +f 16/15 20/16 36/17 34/18 +f 20/15 17/16 35/17 36/18 +f 13/15 16/16 34/17 33/18 +f 34/15 36/16 40/17 38/18 +f 36/15 35/16 39/17 40/18 +f 33/15 34/16 38/17 37/18 +o keys +v -0.390747 -0.479858 -0.268432 +v -0.414573 -0.479858 -0.270517 +v -0.414573 -0.484356 -0.270517 +v -0.390747 -0.484356 -0.268432 +v -0.410352 -0.479858 -0.318762 +v -0.410352 -0.484356 -0.318762 +v -0.386526 -0.479858 -0.316677 +v -0.386526 -0.484356 -0.316677 +v -0.363510 -0.479858 -0.266049 +v -0.387336 -0.479858 -0.268134 +v -0.387336 -0.484356 -0.268134 +v -0.363510 -0.484356 -0.266049 +v -0.383115 -0.479858 -0.316379 +v -0.383115 -0.484356 -0.316379 +v -0.359289 -0.479858 -0.314294 +v -0.359289 -0.484356 -0.314294 +v -0.262382 -0.472028 -0.345724 +v -0.286300 -0.472028 -0.345724 +v -0.286300 -0.495945 -0.345724 +v -0.262382 -0.495945 -0.345724 +v -0.286300 -0.472028 -0.399370 +v -0.286300 -0.495945 -0.399370 +v -0.262382 -0.472028 -0.399370 +v -0.262382 -0.495945 -0.399370 +v -0.262382 -0.472028 -0.289166 +v -0.286300 -0.472028 -0.289166 +v -0.286300 -0.495945 -0.289166 +v -0.262382 -0.495945 -0.289166 +v -0.286300 -0.472028 -0.342813 +v -0.286300 -0.495945 -0.342813 +v -0.262382 -0.472028 -0.342813 +v -0.262382 -0.495945 -0.342813 +v -0.262382 -0.472028 -0.261470 +v -0.286300 -0.472028 -0.261470 +v -0.286300 -0.495945 -0.261470 +v -0.262382 -0.495945 -0.261470 +v -0.286300 -0.472028 -0.285387 +v -0.286300 -0.495945 -0.285387 +v -0.262382 -0.472028 -0.285387 +v -0.262382 -0.495945 -0.285387 +v -0.233840 -0.472028 -0.375175 +v -0.257757 -0.472028 -0.375175 +v -0.257757 -0.495945 -0.375175 +v -0.233840 -0.495945 -0.375175 +v -0.257757 -0.472028 -0.399092 +v -0.257757 -0.495945 -0.399092 +v -0.233840 -0.472028 -0.399092 +v -0.233840 -0.495945 -0.399092 +v -0.176566 -0.472028 -0.375175 +v -0.229456 -0.472028 -0.375175 +v -0.229456 -0.495945 -0.375175 +v -0.176566 -0.495945 -0.375175 +v -0.229456 -0.472028 -0.399092 +v -0.229456 -0.495945 -0.399092 +v -0.176566 -0.472028 -0.399092 +v -0.176566 -0.495945 -0.399092 +v -0.175988 -0.472028 -0.345994 +v -0.199906 -0.472028 -0.345994 +v -0.199906 -0.495945 -0.345994 +v -0.175988 -0.495945 -0.345994 +v -0.199906 -0.472028 -0.369911 +v -0.199906 -0.495945 -0.369911 +v -0.175988 -0.472028 -0.369911 +v -0.175988 -0.495945 -0.369911 +v -0.205539 -0.472028 -0.345994 +v -0.229456 -0.472028 -0.345994 +v -0.229456 -0.495945 -0.345994 +v -0.205539 -0.495945 -0.345994 +v -0.229456 -0.472028 -0.369911 +v -0.229456 -0.495945 -0.369911 +v -0.205539 -0.472028 -0.369911 +v -0.205539 -0.495945 -0.369911 +v -0.233840 -0.472028 -0.345994 +v -0.257757 -0.472028 -0.345994 +v -0.257757 -0.495945 -0.345994 +v -0.233840 -0.495945 -0.345994 +v -0.257757 -0.472028 -0.369911 +v -0.257757 -0.495945 -0.369911 +v -0.233840 -0.472028 -0.369911 +v -0.233840 -0.495945 -0.369911 +v -0.233840 -0.472028 -0.318631 +v -0.257757 -0.472028 -0.318631 +v -0.257757 -0.495945 -0.318631 +v -0.233840 -0.495945 -0.318631 +v -0.257757 -0.472028 -0.342548 +v -0.257757 -0.495945 -0.342548 +v -0.233840 -0.472028 -0.342548 +v -0.233840 -0.495945 -0.342548 +v -0.205539 -0.472028 -0.318631 +v -0.229456 -0.472028 -0.318631 +v -0.229456 -0.495945 -0.318631 +v -0.205539 -0.495945 -0.318631 +v -0.229456 -0.472028 -0.342548 +v -0.229456 -0.495945 -0.342548 +v -0.205539 -0.472028 -0.342548 +v -0.205539 -0.495945 -0.342548 +v -0.175988 -0.472028 -0.318631 +v -0.199906 -0.472028 -0.318631 +v -0.199906 -0.495945 -0.318631 +v -0.175988 -0.495945 -0.318631 +v -0.199906 -0.472028 -0.342548 +v -0.199906 -0.495945 -0.342548 +v -0.175988 -0.472028 -0.342548 +v -0.175988 -0.495945 -0.342548 +v -0.175988 -0.472028 -0.261470 +v -0.199906 -0.472028 -0.261470 +v -0.199906 -0.495945 -0.261470 +v -0.175988 -0.495945 -0.261470 +v -0.199906 -0.472028 -0.285387 +v -0.199906 -0.495945 -0.285387 +v -0.175988 -0.472028 -0.285387 +v -0.175988 -0.495945 -0.285387 +v -0.205539 -0.472028 -0.261470 +v -0.229456 -0.472028 -0.261470 +v -0.229456 -0.495945 -0.261470 +v -0.205539 -0.495945 -0.261470 +v -0.229456 -0.472028 -0.285387 +v -0.229456 -0.495945 -0.285387 +v -0.205539 -0.472028 -0.285387 +v -0.205539 -0.495945 -0.285387 +v -0.233840 -0.472028 -0.261470 +v -0.257757 -0.472028 -0.261470 +v -0.257757 -0.495945 -0.261470 +v -0.233840 -0.495945 -0.261470 +v -0.257757 -0.472028 -0.285387 +v -0.257757 -0.495945 -0.285387 +v -0.233840 -0.472028 -0.285387 +v -0.233840 -0.495945 -0.285387 +v -0.233840 -0.472028 -0.288834 +v -0.257757 -0.472028 -0.288834 +v -0.257757 -0.495945 -0.288834 +v -0.233840 -0.495945 -0.288834 +v -0.257757 -0.472028 -0.312751 +v -0.257757 -0.495945 -0.312751 +v -0.233840 -0.472028 -0.312751 +v -0.233840 -0.495945 -0.312751 +v -0.205539 -0.472028 -0.288834 +v -0.229456 -0.472028 -0.288834 +v -0.229456 -0.495945 -0.288834 +v -0.205539 -0.495945 -0.288834 +v -0.229456 -0.472028 -0.312751 +v -0.229456 -0.495945 -0.312751 +v -0.205539 -0.472028 -0.312751 +v -0.205539 -0.495945 -0.312751 +v -0.175988 -0.472028 -0.288834 +v -0.199906 -0.472028 -0.288834 +v -0.199906 -0.495945 -0.288834 +v -0.175988 -0.495945 -0.288834 +v -0.199906 -0.472028 -0.312751 +v -0.199906 -0.495945 -0.312751 +v -0.175988 -0.472028 -0.312751 +v -0.175988 -0.495945 -0.312751 +v -0.099654 -0.472028 -0.347769 +v -0.123570 -0.472028 -0.347769 +v -0.123570 -0.495945 -0.347769 +v -0.099654 -0.495945 -0.347769 +v -0.123570 -0.472028 -0.371686 +v -0.123570 -0.495945 -0.371686 +v -0.099654 -0.472028 -0.371686 +v -0.099654 -0.495945 -0.371686 +v -0.127954 -0.472028 -0.375133 +v -0.151871 -0.472028 -0.375133 +v -0.151871 -0.495945 -0.375133 +v -0.127954 -0.495945 -0.375133 +v -0.151871 -0.472028 -0.399050 +v -0.151871 -0.495945 -0.399050 +v -0.127954 -0.472028 -0.399050 +v -0.127954 -0.495945 -0.399050 +v -0.099654 -0.472028 -0.375133 +v -0.123570 -0.472028 -0.375133 +v -0.123570 -0.495945 -0.375133 +v -0.099654 -0.495945 -0.375133 +v -0.123570 -0.472028 -0.399050 +v -0.123570 -0.495945 -0.399050 +v -0.099654 -0.472028 -0.399050 +v -0.099654 -0.495945 -0.399050 +v -0.070103 -0.472028 -0.375133 +v -0.094019 -0.472028 -0.375133 +v -0.094019 -0.495945 -0.375133 +v -0.070103 -0.495945 -0.375133 +v -0.094019 -0.472028 -0.399050 +v -0.094019 -0.495945 -0.399050 +v -0.070103 -0.472028 -0.399050 +v -0.070103 -0.495945 -0.399050 +v -0.070103 -0.472028 -0.288834 +v -0.094019 -0.472028 -0.288834 +v -0.094019 -0.495945 -0.288834 +v -0.070103 -0.495945 -0.288834 +v -0.094019 -0.472028 -0.312751 +v -0.094019 -0.495945 -0.312751 +v -0.070103 -0.472028 -0.312751 +v -0.070103 -0.495945 -0.312751 +v -0.099654 -0.472028 -0.288834 +v -0.123570 -0.472028 -0.288834 +v -0.123570 -0.495945 -0.288834 +v -0.099654 -0.495945 -0.288834 +v -0.123570 -0.472028 -0.312751 +v -0.123570 -0.495945 -0.312751 +v -0.099654 -0.472028 -0.312751 +v -0.099654 -0.495945 -0.312751 +v -0.127954 -0.472028 -0.288834 +v -0.151871 -0.472028 -0.288834 +v -0.151871 -0.495945 -0.288834 +v -0.127954 -0.495945 -0.288834 +v -0.151871 -0.472028 -0.312751 +v -0.151871 -0.495945 -0.312751 +v -0.127954 -0.472028 -0.312751 +v -0.127954 -0.495945 -0.312751 +v -0.127954 -0.472028 -0.261470 +v -0.151871 -0.472028 -0.261470 +v -0.151871 -0.495945 -0.261470 +v -0.127954 -0.495945 -0.261470 +v -0.151871 -0.472028 -0.285387 +v -0.151871 -0.495945 -0.285387 +v -0.127954 -0.472028 -0.285387 +v -0.127954 -0.495945 -0.285387 +v -0.099654 -0.472028 -0.261470 +v -0.123570 -0.472028 -0.261470 +v -0.123570 -0.495945 -0.261470 +v -0.099654 -0.495945 -0.261470 +v -0.123570 -0.472028 -0.285387 +v -0.123570 -0.495945 -0.285387 +v -0.099654 -0.472028 -0.285387 +v -0.099654 -0.495945 -0.285387 +v -0.070103 -0.472028 -0.261470 +v -0.094019 -0.472028 -0.261470 +v -0.094019 -0.495945 -0.261470 +v -0.070103 -0.495945 -0.261470 +v -0.094019 -0.472028 -0.285387 +v -0.094019 -0.495945 -0.285387 +v -0.070103 -0.472028 -0.285387 +v -0.070103 -0.495945 -0.285387 +v -0.070103 -0.472028 -0.222573 +v -0.094019 -0.472028 -0.222573 +v -0.094019 -0.495945 -0.222573 +v -0.070103 -0.495945 -0.222573 +v -0.094019 -0.472028 -0.246491 +v -0.094019 -0.495945 -0.246491 +v -0.070103 -0.472028 -0.246491 +v -0.070103 -0.495945 -0.246491 +v -0.099654 -0.472028 -0.222573 +v -0.123570 -0.472028 -0.222573 +v -0.123570 -0.495945 -0.222573 +v -0.099654 -0.495945 -0.222573 +v -0.123570 -0.472028 -0.246491 +v -0.123570 -0.495945 -0.246491 +v -0.099654 -0.472028 -0.246491 +v -0.099654 -0.495945 -0.246491 +v -0.127954 -0.472028 -0.222573 +v -0.151871 -0.472028 -0.222573 +v -0.151871 -0.495945 -0.222573 +v -0.127954 -0.495945 -0.222573 +v -0.151871 -0.472028 -0.246491 +v -0.151871 -0.495945 -0.246491 +v -0.127954 -0.472028 -0.246491 +v -0.127954 -0.495945 -0.246491 +v 0.064702 -0.471565 -0.222862 +v 0.040785 -0.471565 -0.222862 +v 0.040785 -0.495482 -0.222862 +v 0.064702 -0.495482 -0.222862 +v 0.040785 -0.471565 -0.246779 +v 0.040785 -0.495482 -0.246779 +v 0.064702 -0.471565 -0.246779 +v 0.064702 -0.495482 -0.246779 +v -0.021316 -0.472028 -0.222573 +v -0.045233 -0.472028 -0.222573 +v -0.045233 -0.495945 -0.222573 +v -0.021316 -0.495945 -0.222573 +v -0.045233 -0.472028 -0.246491 +v -0.045233 -0.495945 -0.246491 +v -0.021316 -0.472028 -0.246491 +v -0.021316 -0.495945 -0.246491 +v 0.006985 -0.472028 -0.222573 +v -0.016932 -0.472028 -0.222573 +v -0.016932 -0.495945 -0.222573 +v 0.006985 -0.495945 -0.222573 +v -0.016932 -0.472028 -0.246491 +v -0.016932 -0.495945 -0.246491 +v 0.006985 -0.472028 -0.246491 +v 0.006985 -0.495945 -0.246491 +v 0.036536 -0.472028 -0.222573 +v 0.012619 -0.472028 -0.222573 +v 0.012619 -0.495945 -0.222573 +v 0.036536 -0.495945 -0.222573 +v 0.012619 -0.472028 -0.246491 +v 0.012619 -0.495945 -0.246491 +v 0.036536 -0.472028 -0.246491 +v 0.036536 -0.495945 -0.246491 +v 0.171678 -0.472028 -0.222573 +v 0.147761 -0.472028 -0.222573 +v 0.147761 -0.495945 -0.222573 +v 0.171678 -0.495945 -0.222573 +v 0.147761 -0.472028 -0.246491 +v 0.147761 -0.495945 -0.246491 +v 0.171678 -0.472028 -0.246491 +v 0.171678 -0.495945 -0.246491 +v 0.142127 -0.472028 -0.222573 +v 0.118210 -0.472028 -0.222573 +v 0.118210 -0.495945 -0.222573 +v 0.142127 -0.495945 -0.222573 +v 0.118210 -0.472028 -0.246491 +v 0.118210 -0.495945 -0.246491 +v 0.142127 -0.472028 -0.246491 +v 0.142127 -0.495945 -0.246491 +v 0.113827 -0.472028 -0.222573 +v 0.089910 -0.472028 -0.222573 +v 0.089910 -0.495945 -0.222573 +v 0.113827 -0.495945 -0.222573 +v 0.089910 -0.472028 -0.246491 +v 0.089910 -0.495945 -0.246491 +v 0.113827 -0.472028 -0.246491 +v 0.113827 -0.495945 -0.246491 +v 0.199845 -0.471565 -0.222862 +v 0.175927 -0.471565 -0.222862 +v 0.175927 -0.495482 -0.222862 +v 0.199845 -0.495482 -0.222862 +v 0.175927 -0.471565 -0.246779 +v 0.175927 -0.495482 -0.246779 +v 0.199845 -0.471565 -0.246779 +v 0.199845 -0.495482 -0.246779 +v 0.331555 -0.471565 -0.222862 +v 0.307637 -0.471565 -0.222862 +v 0.307637 -0.495482 -0.222862 +v 0.331555 -0.495482 -0.222862 +v 0.307637 -0.471565 -0.246779 +v 0.307637 -0.495482 -0.246779 +v 0.331555 -0.471565 -0.246779 +v 0.331555 -0.495482 -0.246779 +v 0.245536 -0.472028 -0.222573 +v 0.221620 -0.472028 -0.222573 +v 0.221620 -0.495945 -0.222573 +v 0.245536 -0.495945 -0.222573 +v 0.221620 -0.472028 -0.246491 +v 0.221620 -0.495945 -0.246491 +v 0.245536 -0.472028 -0.246491 +v 0.245536 -0.495945 -0.246491 +v 0.273837 -0.472028 -0.222573 +v 0.249920 -0.472028 -0.222573 +v 0.249920 -0.495945 -0.222573 +v 0.273837 -0.495945 -0.222573 +v 0.249920 -0.472028 -0.246491 +v 0.249920 -0.495945 -0.246491 +v 0.273837 -0.472028 -0.246491 +v 0.273837 -0.495945 -0.246491 +v 0.303388 -0.472028 -0.222573 +v 0.279471 -0.472028 -0.222573 +v 0.279471 -0.495945 -0.222573 +v 0.303388 -0.495945 -0.222573 +v 0.279471 -0.472028 -0.246491 +v 0.279471 -0.495945 -0.246491 +v 0.303388 -0.472028 -0.246491 +v 0.303388 -0.495945 -0.246491 +v 0.399277 -0.471565 -0.222499 +v 0.375359 -0.471565 -0.222499 +v 0.375359 -0.495482 -0.222499 +v 0.399277 -0.495482 -0.222499 +v 0.375359 -0.471565 -0.246417 +v 0.375359 -0.495482 -0.246417 +v 0.399277 -0.471565 -0.246417 +v 0.399277 -0.495482 -0.246417 +v -0.007081 -0.471059 -0.374434 +v -0.045281 -0.471059 -0.374434 +v -0.045281 -0.495161 -0.374434 +v -0.007081 -0.495161 -0.374434 +v -0.045281 -0.471059 -0.398536 +v -0.045281 -0.495161 -0.398536 +v -0.007081 -0.471059 -0.398536 +v -0.007081 -0.495161 -0.398536 +v 0.031444 -0.471059 -0.374434 +v -0.000208 -0.471059 -0.374434 +v -0.000208 -0.495161 -0.374434 +v 0.031444 -0.495161 -0.374434 +v -0.000208 -0.471059 -0.398536 +v -0.000208 -0.495161 -0.398536 +v 0.031444 -0.471059 -0.398536 +v 0.031444 -0.495161 -0.398536 +v 0.068025 -0.471059 -0.374434 +v 0.036373 -0.471059 -0.374434 +v 0.036373 -0.495161 -0.374434 +v 0.068025 -0.495161 -0.374434 +v 0.036373 -0.471059 -0.398536 +v 0.036373 -0.495161 -0.398536 +v 0.068025 -0.471059 -0.398536 +v 0.068025 -0.495161 -0.398536 +v 0.104539 -0.471059 -0.374434 +v 0.072887 -0.471059 -0.374434 +v 0.072887 -0.495161 -0.374434 +v 0.104539 -0.495161 -0.374434 +v 0.072887 -0.471059 -0.398536 +v 0.072887 -0.495161 -0.398536 +v 0.104539 -0.471059 -0.398536 +v 0.104539 -0.495161 -0.398536 +v 0.293333 -0.471059 -0.374434 +v 0.110331 -0.471059 -0.374434 +v 0.110331 -0.495161 -0.374434 +v 0.293333 -0.495161 -0.374434 +v 0.110331 -0.471059 -0.398536 +v 0.110331 -0.495161 -0.398536 +v 0.293333 -0.471059 -0.398536 +v 0.293333 -0.495161 -0.398536 +v 0.326581 -0.471059 -0.374434 +v 0.297744 -0.471059 -0.374434 +v 0.297744 -0.495161 -0.374434 +v 0.326581 -0.495161 -0.374434 +v 0.297744 -0.471059 -0.398536 +v 0.297744 -0.495161 -0.398536 +v 0.326581 -0.471059 -0.398536 +v 0.326581 -0.495161 -0.398536 +v 0.311892 -0.472028 -0.261036 +v 0.287975 -0.472028 -0.261036 +v 0.287975 -0.495945 -0.261036 +v 0.311892 -0.495945 -0.261036 +v 0.287975 -0.472028 -0.284953 +v 0.287975 -0.495945 -0.284953 +v 0.311892 -0.472028 -0.284953 +v 0.311892 -0.495945 -0.284953 +v 0.282341 -0.472028 -0.261036 +v 0.258424 -0.472028 -0.261036 +v 0.258424 -0.495945 -0.261036 +v 0.282341 -0.495945 -0.261036 +v 0.258424 -0.472028 -0.284953 +v 0.258424 -0.495945 -0.284953 +v 0.282341 -0.472028 -0.284953 +v 0.282341 -0.495945 -0.284953 +v 0.254040 -0.472028 -0.261036 +v 0.230123 -0.472028 -0.261036 +v 0.230123 -0.495945 -0.261036 +v 0.254040 -0.495945 -0.261036 +v 0.230123 -0.472028 -0.284953 +v 0.230123 -0.495945 -0.284953 +v 0.254040 -0.472028 -0.284953 +v 0.254040 -0.495945 -0.284953 +v 0.222860 -0.472028 -0.261036 +v 0.198944 -0.472028 -0.261036 +v 0.198944 -0.495945 -0.261036 +v 0.222860 -0.495945 -0.261036 +v 0.198944 -0.472028 -0.284953 +v 0.198944 -0.495945 -0.284953 +v 0.222860 -0.472028 -0.284953 +v 0.222860 -0.495945 -0.284953 +v 0.194771 -0.472028 -0.261036 +v 0.170853 -0.472028 -0.261036 +v 0.170853 -0.495945 -0.261036 +v 0.194771 -0.495945 -0.261036 +v 0.170853 -0.472028 -0.284953 +v 0.170853 -0.495945 -0.284953 +v 0.194771 -0.472028 -0.284953 +v 0.194771 -0.495945 -0.284953 +v 0.165247 -0.472028 -0.261036 +v 0.141330 -0.472028 -0.261036 +v 0.141330 -0.495945 -0.261036 +v 0.165247 -0.495945 -0.261036 +v 0.141330 -0.472028 -0.284953 +v 0.141330 -0.495945 -0.284953 +v 0.165247 -0.472028 -0.284953 +v 0.165247 -0.495945 -0.284953 +v 0.135655 -0.472028 -0.261036 +v 0.111737 -0.472028 -0.261036 +v 0.111737 -0.495945 -0.261036 +v 0.135655 -0.495945 -0.261036 +v 0.111737 -0.472028 -0.284953 +v 0.111737 -0.495945 -0.284953 +v 0.135655 -0.472028 -0.284953 +v 0.135655 -0.495945 -0.284953 +v 0.103818 -0.472028 -0.261036 +v 0.079901 -0.472028 -0.261036 +v 0.079901 -0.495945 -0.261036 +v 0.103818 -0.495945 -0.261036 +v 0.079901 -0.472028 -0.284953 +v 0.079901 -0.495945 -0.284953 +v 0.103818 -0.472028 -0.284953 +v 0.103818 -0.495945 -0.284953 +v 0.074652 -0.472028 -0.261036 +v 0.050736 -0.472028 -0.261036 +v 0.050736 -0.495945 -0.261036 +v 0.074652 -0.495945 -0.261036 +v 0.050736 -0.472028 -0.284953 +v 0.050736 -0.495945 -0.284953 +v 0.074652 -0.472028 -0.284953 +v 0.074652 -0.495945 -0.284953 +v 0.044727 -0.472028 -0.261036 +v 0.020810 -0.472028 -0.261036 +v 0.020810 -0.495945 -0.261036 +v 0.044727 -0.495945 -0.261036 +v 0.020810 -0.472028 -0.284953 +v 0.020810 -0.495945 -0.284953 +v 0.044727 -0.472028 -0.284953 +v 0.044727 -0.495945 -0.284953 +v 0.014076 -0.472028 -0.260816 +v -0.046476 -0.472028 -0.260816 +v -0.046476 -0.495945 -0.260816 +v 0.014076 -0.495945 -0.260816 +v -0.046476 -0.472028 -0.284733 +v -0.046476 -0.495945 -0.284733 +v 0.014076 -0.472028 -0.284733 +v 0.014076 -0.495945 -0.284733 +v -0.018777 -0.472028 -0.289712 +v -0.046317 -0.472028 -0.289712 +v -0.046317 -0.495945 -0.289712 +v -0.018777 -0.495945 -0.289712 +v -0.046317 -0.472028 -0.312654 +v -0.046317 -0.472028 -0.342087 +v -0.046317 -0.495945 -0.342087 +v -0.046317 -0.495945 -0.312654 +v -0.018777 -0.472028 -0.342087 +v -0.018777 -0.495945 -0.342087 +v -0.018777 -0.495945 -0.312654 +v -0.018777 -0.472028 -0.312654 +v -0.012723 -0.472028 -0.312654 +v -0.012723 -0.495945 -0.312654 +v -0.012723 -0.495945 -0.289712 +v -0.012723 -0.472028 -0.289712 +v 0.020153 -0.472028 -0.346050 +v -0.046476 -0.472028 -0.346050 +v -0.046476 -0.495945 -0.346050 +v 0.020153 -0.495945 -0.346050 +v -0.046476 -0.472028 -0.369967 +v -0.046476 -0.495945 -0.369967 +v 0.020153 -0.472028 -0.369967 +v 0.020153 -0.495945 -0.369967 +v 0.008757 -0.472028 -0.318170 +v -0.015161 -0.472028 -0.318170 +v -0.015161 -0.495945 -0.318170 +v 0.008757 -0.495945 -0.318170 +v -0.015161 -0.472028 -0.342087 +v -0.015161 -0.495945 -0.342087 +v 0.008757 -0.472028 -0.342087 +v 0.008757 -0.495945 -0.342087 +v 0.013686 -0.472028 -0.289285 +v -0.010232 -0.472028 -0.289285 +v -0.010232 -0.495945 -0.289285 +v 0.013686 -0.495945 -0.289285 +v -0.010232 -0.472028 -0.313203 +v -0.010232 -0.495945 -0.313203 +v 0.013686 -0.472028 -0.313203 +v 0.013686 -0.495945 -0.313203 +v 0.041797 -0.472028 -0.289285 +v 0.017880 -0.472028 -0.289285 +v 0.017880 -0.495945 -0.289285 +v 0.041797 -0.495945 -0.289285 +v 0.017880 -0.472028 -0.313203 +v 0.017880 -0.495945 -0.313203 +v 0.041797 -0.472028 -0.313203 +v 0.041797 -0.495945 -0.313203 +v 0.036867 -0.472028 -0.318170 +v 0.012950 -0.472028 -0.318170 +v 0.012950 -0.495945 -0.318170 +v 0.036867 -0.495945 -0.318170 +v 0.012950 -0.472028 -0.342087 +v 0.012950 -0.495945 -0.342087 +v 0.036867 -0.472028 -0.342087 +v 0.036867 -0.495945 -0.342087 +v 0.048974 -0.472028 -0.346050 +v 0.025058 -0.472028 -0.346050 +v 0.025058 -0.495945 -0.346050 +v 0.048974 -0.495945 -0.346050 +v 0.025058 -0.472028 -0.369967 +v 0.025058 -0.495945 -0.369967 +v 0.048974 -0.472028 -0.369967 +v 0.048974 -0.495945 -0.369967 +v 0.077016 -0.472028 -0.346050 +v 0.053098 -0.472028 -0.346050 +v 0.053098 -0.495945 -0.346050 +v 0.077016 -0.495945 -0.346050 +v 0.053098 -0.472028 -0.369967 +v 0.053098 -0.495945 -0.369967 +v 0.077016 -0.472028 -0.369967 +v 0.077016 -0.495945 -0.369967 +v 0.064909 -0.472028 -0.318170 +v 0.040991 -0.472028 -0.318170 +v 0.040991 -0.495945 -0.318170 +v 0.064909 -0.495945 -0.318170 +v 0.040991 -0.472028 -0.342087 +v 0.040991 -0.495945 -0.342087 +v 0.064909 -0.472028 -0.342087 +v 0.064909 -0.495945 -0.342087 +v 0.069838 -0.472028 -0.289285 +v 0.045920 -0.472028 -0.289285 +v 0.045920 -0.495945 -0.289285 +v 0.069838 -0.495945 -0.289285 +v 0.045920 -0.472028 -0.313203 +v 0.045920 -0.495945 -0.313203 +v 0.069838 -0.472028 -0.313203 +v 0.069838 -0.495945 -0.313203 +v 0.098238 -0.472028 -0.289285 +v 0.074321 -0.472028 -0.289285 +v 0.074321 -0.495945 -0.289285 +v 0.098238 -0.495945 -0.289285 +v 0.074321 -0.472028 -0.313203 +v 0.074321 -0.495945 -0.313203 +v 0.098238 -0.472028 -0.313203 +v 0.098238 -0.495945 -0.313203 +v 0.093308 -0.472028 -0.318170 +v 0.069391 -0.472028 -0.318170 +v 0.069391 -0.495945 -0.318170 +v 0.093308 -0.495945 -0.318170 +v 0.069391 -0.472028 -0.342087 +v 0.069391 -0.495945 -0.342087 +v 0.093308 -0.472028 -0.342087 +v 0.093308 -0.495945 -0.342087 +v 0.105417 -0.472028 -0.346050 +v 0.081499 -0.472028 -0.346050 +v 0.081499 -0.495945 -0.346050 +v 0.105417 -0.495945 -0.346050 +v 0.081499 -0.472028 -0.369967 +v 0.081499 -0.495945 -0.369967 +v 0.105417 -0.472028 -0.369967 +v 0.105417 -0.495945 -0.369967 +v 0.133480 -0.472028 -0.346050 +v 0.109564 -0.472028 -0.346050 +v 0.109564 -0.495945 -0.346050 +v 0.133480 -0.495945 -0.346050 +v 0.109564 -0.472028 -0.369967 +v 0.109564 -0.495945 -0.369967 +v 0.133480 -0.472028 -0.369967 +v 0.133480 -0.495945 -0.369967 +v 0.121373 -0.472028 -0.318170 +v 0.097456 -0.472028 -0.318170 +v 0.097456 -0.495945 -0.318170 +v 0.121373 -0.495945 -0.318170 +v 0.097456 -0.472028 -0.342087 +v 0.097456 -0.495945 -0.342087 +v 0.121373 -0.472028 -0.342087 +v 0.121373 -0.495945 -0.342087 +v 0.126303 -0.472028 -0.289285 +v 0.102386 -0.472028 -0.289285 +v 0.102386 -0.495945 -0.289285 +v 0.126303 -0.495945 -0.289285 +v 0.102386 -0.472028 -0.313203 +v 0.102386 -0.495945 -0.313203 +v 0.126303 -0.472028 -0.313203 +v 0.126303 -0.495945 -0.313203 +v 0.155499 -0.472028 -0.289285 +v 0.131581 -0.472028 -0.289285 +v 0.131581 -0.495945 -0.289285 +v 0.155499 -0.495945 -0.289285 +v 0.131581 -0.472028 -0.313203 +v 0.131581 -0.495945 -0.313203 +v 0.155499 -0.472028 -0.313203 +v 0.155499 -0.495945 -0.313203 +v 0.150569 -0.472028 -0.318170 +v 0.126651 -0.472028 -0.318170 +v 0.126651 -0.495945 -0.318170 +v 0.150569 -0.495945 -0.318170 +v 0.126651 -0.472028 -0.342087 +v 0.126651 -0.495945 -0.342087 +v 0.150569 -0.472028 -0.342087 +v 0.150569 -0.495945 -0.342087 +v 0.162676 -0.472028 -0.346050 +v 0.138758 -0.472028 -0.346050 +v 0.138758 -0.495945 -0.346050 +v 0.162676 -0.495945 -0.346050 +v 0.138758 -0.472028 -0.369967 +v 0.138758 -0.495945 -0.369967 +v 0.162676 -0.472028 -0.369967 +v 0.162676 -0.495945 -0.369967 +v 0.191727 -0.472028 -0.346050 +v 0.167811 -0.472028 -0.346050 +v 0.167811 -0.495945 -0.346050 +v 0.191727 -0.495945 -0.346050 +v 0.167811 -0.472028 -0.369967 +v 0.167811 -0.495945 -0.369967 +v 0.191727 -0.472028 -0.369967 +v 0.191727 -0.495945 -0.369967 +v 0.179620 -0.472028 -0.318170 +v 0.155702 -0.472028 -0.318170 +v 0.155702 -0.495945 -0.318170 +v 0.179620 -0.495945 -0.318170 +v 0.155702 -0.472028 -0.342087 +v 0.155702 -0.495945 -0.342087 +v 0.179620 -0.472028 -0.342087 +v 0.179620 -0.495945 -0.342087 +v 0.184550 -0.472028 -0.289285 +v 0.160632 -0.472028 -0.289285 +v 0.160632 -0.495945 -0.289285 +v 0.184550 -0.495945 -0.289285 +v 0.160632 -0.472028 -0.313203 +v 0.160632 -0.495945 -0.313203 +v 0.184550 -0.472028 -0.313203 +v 0.184550 -0.495945 -0.313203 +v 0.213560 -0.472028 -0.289285 +v 0.189643 -0.472028 -0.289285 +v 0.189643 -0.495945 -0.289285 +v 0.213560 -0.495945 -0.289285 +v 0.189643 -0.472028 -0.313203 +v 0.189643 -0.495945 -0.313203 +v 0.213560 -0.472028 -0.313203 +v 0.213560 -0.495945 -0.313203 +v 0.208631 -0.472028 -0.318170 +v 0.184714 -0.472028 -0.318170 +v 0.184714 -0.495945 -0.318170 +v 0.208631 -0.495945 -0.318170 +v 0.184714 -0.472028 -0.342087 +v 0.184714 -0.495945 -0.342087 +v 0.208631 -0.472028 -0.342087 +v 0.208631 -0.495945 -0.342087 +v 0.220739 -0.472028 -0.346050 +v 0.196821 -0.472028 -0.346050 +v 0.196821 -0.495945 -0.346050 +v 0.220739 -0.495945 -0.346050 +v 0.196821 -0.472028 -0.369967 +v 0.196821 -0.495945 -0.369967 +v 0.220739 -0.472028 -0.369967 +v 0.220739 -0.495945 -0.369967 +v 0.252314 -0.472028 -0.346050 +v 0.228398 -0.472028 -0.346050 +v 0.228398 -0.495945 -0.346050 +v 0.252314 -0.495945 -0.346050 +v 0.228398 -0.472028 -0.369967 +v 0.228398 -0.495945 -0.369967 +v 0.252314 -0.472028 -0.369967 +v 0.252314 -0.495945 -0.369967 +v 0.240207 -0.472028 -0.318170 +v 0.216290 -0.472028 -0.318170 +v 0.216290 -0.495945 -0.318170 +v 0.240207 -0.495945 -0.318170 +v 0.216290 -0.472028 -0.342087 +v 0.216290 -0.495945 -0.342087 +v 0.240207 -0.472028 -0.342087 +v 0.240207 -0.495945 -0.342087 +v 0.245137 -0.472028 -0.289285 +v 0.221220 -0.472028 -0.289285 +v 0.221220 -0.495945 -0.289285 +v 0.245137 -0.495945 -0.289285 +v 0.221220 -0.472028 -0.313203 +v 0.221220 -0.495945 -0.313203 +v 0.245137 -0.472028 -0.313203 +v 0.245137 -0.495945 -0.313203 +v 0.273972 -0.472028 -0.289285 +v 0.250054 -0.472028 -0.289285 +v 0.250054 -0.495945 -0.289285 +v 0.273972 -0.495945 -0.289285 +v 0.250054 -0.472028 -0.313203 +v 0.250054 -0.495945 -0.313203 +v 0.273972 -0.472028 -0.313203 +v 0.273972 -0.495945 -0.313203 +v 0.269043 -0.472028 -0.318170 +v 0.245125 -0.472028 -0.318170 +v 0.245125 -0.495945 -0.318170 +v 0.269043 -0.495945 -0.318170 +v 0.245125 -0.472028 -0.342087 +v 0.245125 -0.495945 -0.342087 +v 0.269043 -0.472028 -0.342087 +v 0.269043 -0.495945 -0.342087 +v 0.281150 -0.472028 -0.346050 +v 0.257232 -0.472028 -0.346050 +v 0.257232 -0.495945 -0.346050 +v 0.281150 -0.495945 -0.346050 +v 0.257232 -0.472028 -0.369967 +v 0.257232 -0.495945 -0.369967 +v 0.281150 -0.472028 -0.369967 +v 0.281150 -0.495945 -0.369967 +v 0.310666 -0.472028 -0.346050 +v 0.286749 -0.472028 -0.346050 +v 0.286749 -0.495945 -0.346050 +v 0.310666 -0.495945 -0.346050 +v 0.286749 -0.472028 -0.369967 +v 0.286749 -0.495945 -0.369967 +v 0.310666 -0.472028 -0.369967 +v 0.310666 -0.495945 -0.369967 +v 0.298559 -0.472028 -0.318170 +v 0.274642 -0.472028 -0.318170 +v 0.274642 -0.495945 -0.318170 +v 0.298559 -0.495945 -0.318170 +v 0.274642 -0.472028 -0.342087 +v 0.274642 -0.495945 -0.342087 +v 0.298559 -0.472028 -0.342087 +v 0.298559 -0.495945 -0.342087 +v 0.303488 -0.472028 -0.289285 +v 0.279570 -0.472028 -0.289285 +v 0.279570 -0.495945 -0.289285 +v 0.303488 -0.495945 -0.289285 +v 0.279570 -0.472028 -0.313203 +v 0.279570 -0.495945 -0.313203 +v 0.303488 -0.472028 -0.313203 +v 0.303488 -0.495945 -0.313203 +v 0.332126 -0.472028 -0.289285 +v 0.308209 -0.472028 -0.289285 +v 0.308209 -0.495945 -0.289285 +v 0.332126 -0.495945 -0.289285 +v 0.308209 -0.472028 -0.313203 +v 0.308209 -0.495945 -0.313203 +v 0.332126 -0.472028 -0.313203 +v 0.332126 -0.495945 -0.313203 +v 0.327196 -0.472028 -0.318170 +v 0.303279 -0.472028 -0.318170 +v 0.303279 -0.495945 -0.318170 +v 0.327196 -0.495945 -0.318170 +v 0.303279 -0.472028 -0.342087 +v 0.303279 -0.495945 -0.342087 +v 0.327196 -0.472028 -0.342087 +v 0.327196 -0.495945 -0.342087 +v 0.339303 -0.472028 -0.346050 +v 0.315386 -0.472028 -0.346050 +v 0.315386 -0.495945 -0.346050 +v 0.339303 -0.495945 -0.346050 +v 0.315386 -0.472028 -0.369967 +v 0.315386 -0.495945 -0.369967 +v 0.339303 -0.472028 -0.369967 +v 0.339303 -0.495945 -0.369967 +v 0.367000 -0.472028 -0.346050 +v 0.343083 -0.472028 -0.346050 +v 0.343083 -0.495945 -0.346050 +v 0.367000 -0.495945 -0.346050 +v 0.343083 -0.472028 -0.369967 +v 0.343083 -0.495945 -0.369967 +v 0.367000 -0.472028 -0.369967 +v 0.367000 -0.495945 -0.369967 +v 0.354893 -0.472028 -0.318170 +v 0.330976 -0.472028 -0.318170 +v 0.330976 -0.495945 -0.318170 +v 0.354893 -0.495945 -0.318170 +v 0.330976 -0.472028 -0.342087 +v 0.330976 -0.495945 -0.342087 +v 0.354893 -0.472028 -0.342087 +v 0.354893 -0.495945 -0.342087 +v 0.359823 -0.472028 -0.289285 +v 0.335906 -0.472028 -0.289285 +v 0.335906 -0.495945 -0.289285 +v 0.359823 -0.495945 -0.289285 +v 0.335906 -0.472028 -0.313203 +v 0.335906 -0.495945 -0.313203 +v 0.359823 -0.472028 -0.313203 +v 0.359823 -0.495945 -0.313203 +v 0.340059 -0.471565 -0.261324 +v 0.316141 -0.471565 -0.261324 +v 0.316141 -0.495482 -0.261324 +v 0.340059 -0.495482 -0.261324 +v 0.316141 -0.471565 -0.285241 +v 0.316141 -0.495482 -0.285241 +v 0.340059 -0.471565 -0.285241 +v 0.340059 -0.495482 -0.285241 +v 0.370925 -0.471565 -0.261324 +v 0.347008 -0.471565 -0.261324 +v 0.347008 -0.495482 -0.261324 +v 0.370925 -0.495482 -0.261324 +v 0.347008 -0.471565 -0.285241 +v 0.347008 -0.495482 -0.285241 +v 0.370925 -0.471565 -0.285241 +v 0.370925 -0.495482 -0.285241 +v 0.359556 -0.471059 -0.374434 +v 0.330719 -0.471059 -0.374434 +v 0.330719 -0.495161 -0.374434 +v 0.359556 -0.495161 -0.374434 +v 0.330719 -0.471059 -0.398536 +v 0.330719 -0.495161 -0.398536 +v 0.359556 -0.471059 -0.398536 +v 0.359556 -0.495161 -0.398536 +v 0.399277 -0.471565 -0.261324 +v 0.375359 -0.471565 -0.261324 +v 0.375359 -0.495482 -0.261324 +v 0.399277 -0.495482 -0.261324 +v 0.375359 -0.471565 -0.285241 +v 0.375359 -0.495482 -0.285241 +v 0.399277 -0.471565 -0.285241 +v 0.399277 -0.495482 -0.285241 +v 0.399509 -0.471059 -0.289180 +v 0.363369 -0.471059 -0.289180 +v 0.363369 -0.495161 -0.289180 +v 0.399509 -0.495161 -0.289180 +v 0.363369 -0.471059 -0.313283 +v 0.363369 -0.495161 -0.313283 +v 0.399509 -0.471059 -0.313283 +v 0.399509 -0.495161 -0.313283 +v 0.399509 -0.471059 -0.317715 +v 0.358301 -0.471059 -0.317715 +v 0.358301 -0.495161 -0.317715 +v 0.399509 -0.495161 -0.317715 +v 0.358301 -0.471059 -0.341818 +v 0.358301 -0.495161 -0.341818 +v 0.399509 -0.471059 -0.341818 +v 0.399509 -0.495161 -0.341818 +v 0.399509 -0.471059 -0.346050 +v 0.370671 -0.471059 -0.346050 +v 0.370671 -0.495161 -0.346050 +v 0.399509 -0.495161 -0.346050 +v 0.370671 -0.471059 -0.370152 +v 0.370671 -0.495161 -0.370152 +v 0.399509 -0.471059 -0.370152 +v 0.399509 -0.495161 -0.370152 +v 0.399509 -0.471059 -0.374132 +v 0.363369 -0.471059 -0.374132 +v 0.363369 -0.495161 -0.374132 +v 0.399509 -0.495161 -0.374132 +v 0.363369 -0.471059 -0.398234 +v 0.363369 -0.495161 -0.398234 +v 0.399509 -0.471059 -0.398234 +v 0.399509 -0.495161 -0.398234 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +g keys_keys_None +usemtl None +s off +f 41/31 42/32 43/33 44/34 +f 42/31 45/32 46/33 43/34 +f 45/31 47/32 48/33 46/34 +f 47/31 41/32 44/33 48/34 +f 42/33 41/34 47/31 45/32 +f 49/31 50/32 51/33 52/34 +f 50/31 53/32 54/33 51/34 +f 53/31 55/32 56/33 54/34 +f 55/31 49/32 52/33 56/34 +f 55/31 53/32 50/33 49/34 +f 57/31 58/32 59/33 60/34 +f 58/31 61/32 62/33 59/34 +f 61/31 63/32 64/33 62/34 +f 63/31 57/32 60/33 64/34 +f 63/31 61/32 58/33 57/34 +f 65/31 66/32 67/33 68/34 +f 66/31 69/32 70/33 67/34 +f 69/31 71/32 72/33 70/34 +f 71/31 65/32 68/33 72/34 +f 71/31 69/32 66/33 65/34 +f 73/31 74/32 75/33 76/34 +f 74/31 77/32 78/33 75/34 +f 77/31 79/32 80/33 78/34 +f 79/31 73/32 76/33 80/34 +f 79/31 77/32 74/33 73/34 +f 81/31 82/32 83/33 84/34 +f 82/31 85/32 86/33 83/34 +f 85/31 87/32 88/33 86/34 +f 87/31 81/32 84/33 88/34 +f 87/31 85/32 82/33 81/34 +f 89/31 90/32 91/33 92/34 +f 90/31 93/32 94/33 91/34 +f 93/31 95/32 96/33 94/34 +f 95/31 89/32 92/33 96/34 +f 95/31 93/32 90/33 89/34 +f 97/31 98/32 99/33 100/34 +f 98/31 101/32 102/33 99/34 +f 101/31 103/32 104/33 102/34 +f 103/31 97/32 100/33 104/34 +f 103/31 101/32 98/33 97/34 +f 105/31 106/32 107/33 108/34 +f 106/31 109/32 110/33 107/34 +f 109/31 111/32 112/33 110/34 +f 111/31 105/32 108/33 112/34 +f 111/31 109/32 106/33 105/34 +f 113/31 114/32 115/33 116/34 +f 114/31 117/32 118/33 115/34 +f 117/31 119/32 120/33 118/34 +f 119/31 113/32 116/33 120/34 +f 119/31 117/32 114/33 113/34 +f 121/31 122/32 123/33 124/34 +f 122/31 125/32 126/33 123/34 +f 125/31 127/32 128/33 126/34 +f 127/31 121/32 124/33 128/34 +f 127/31 125/32 122/33 121/34 +f 129/31 130/32 131/33 132/34 +f 130/31 133/32 134/33 131/34 +f 133/31 135/32 136/33 134/34 +f 135/31 129/32 132/33 136/34 +f 135/31 133/32 130/33 129/34 +f 137/31 138/32 139/33 140/34 +f 138/31 141/32 142/33 139/34 +f 141/31 143/32 144/33 142/34 +f 143/31 137/32 140/33 144/34 +f 143/31 141/32 138/33 137/34 +f 145/31 146/32 147/33 148/34 +f 146/31 149/32 150/33 147/34 +f 149/31 151/32 152/33 150/34 +f 151/31 145/32 148/33 152/34 +f 151/31 149/32 146/33 145/34 +f 153/31 154/32 155/33 156/34 +f 154/31 157/32 158/33 155/34 +f 157/31 159/32 160/33 158/34 +f 159/31 153/32 156/33 160/34 +f 159/31 157/32 154/33 153/34 +f 161/31 162/32 163/33 164/34 +f 162/31 165/32 166/33 163/34 +f 165/31 167/32 168/33 166/34 +f 167/31 161/32 164/33 168/34 +f 167/31 165/32 162/33 161/34 +f 169/31 170/32 171/33 172/34 +f 170/31 173/32 174/33 171/34 +f 173/31 175/32 176/33 174/34 +f 175/31 169/32 172/33 176/34 +f 175/31 173/32 170/33 169/34 +f 177/31 178/32 179/33 180/34 +f 178/31 181/32 182/33 179/34 +f 181/31 183/32 184/33 182/34 +f 183/31 177/32 180/33 184/34 +f 183/31 181/32 178/33 177/34 +f 185/31 186/32 187/33 188/34 +f 186/31 189/32 190/33 187/34 +f 189/31 191/32 192/33 190/34 +f 191/31 185/32 188/33 192/34 +f 191/31 189/32 186/33 185/34 +f 193/31 194/32 195/33 196/34 +f 194/31 197/32 198/33 195/34 +f 197/31 199/32 200/33 198/34 +f 199/31 193/32 196/33 200/34 +f 199/31 197/32 194/33 193/34 +f 201/31 202/32 203/33 204/34 +f 202/31 205/32 206/33 203/34 +f 205/31 207/32 208/33 206/34 +f 207/31 201/32 204/33 208/34 +f 207/31 205/32 202/33 201/34 +f 209/31 210/32 211/33 212/34 +f 210/31 213/32 214/33 211/34 +f 213/31 215/32 216/33 214/34 +f 215/31 209/32 212/33 216/34 +f 215/31 213/32 210/33 209/34 +f 217/31 218/32 219/33 220/34 +f 218/31 221/32 222/33 219/34 +f 221/31 223/32 224/33 222/34 +f 223/31 217/32 220/33 224/34 +f 223/31 221/32 218/33 217/34 +f 225/31 226/32 227/33 228/34 +f 226/31 229/32 230/33 227/34 +f 229/31 231/32 232/33 230/34 +f 231/31 225/32 228/33 232/34 +f 231/31 229/32 226/33 225/34 +f 233/31 234/32 235/33 236/34 +f 234/31 237/32 238/33 235/34 +f 237/31 239/32 240/33 238/34 +f 239/31 233/32 236/33 240/34 +f 239/31 237/32 234/33 233/34 +f 241/31 242/32 243/33 244/34 +f 242/31 245/32 246/33 243/34 +f 245/31 247/32 248/33 246/34 +f 247/31 241/32 244/33 248/34 +f 247/31 245/32 242/33 241/34 +f 249/31 250/32 251/33 252/34 +f 250/31 253/32 254/33 251/34 +f 253/31 255/32 256/33 254/34 +f 255/31 249/32 252/33 256/34 +f 255/31 253/32 250/33 249/34 +f 257/31 258/32 259/33 260/34 +f 258/31 261/32 262/33 259/34 +f 261/31 263/32 264/33 262/34 +f 263/31 257/32 260/33 264/34 +f 263/31 261/32 258/33 257/34 +f 265/31 266/32 267/33 268/34 +f 266/31 269/32 270/33 267/34 +f 269/31 271/32 272/33 270/34 +f 271/31 265/32 268/33 272/34 +f 271/31 269/32 266/33 265/34 +f 273/31 274/32 275/33 276/34 +f 274/31 277/32 278/33 275/34 +f 277/31 279/32 280/33 278/34 +f 279/31 273/32 276/33 280/34 +f 279/31 277/32 274/33 273/34 +f 281/31 282/32 283/33 284/34 +f 282/31 285/32 286/33 283/34 +f 285/31 287/32 288/33 286/34 +f 287/31 281/32 284/33 288/34 +f 287/31 285/32 282/33 281/34 +f 289/31 290/32 291/33 292/34 +f 290/31 293/32 294/33 291/34 +f 293/31 295/32 296/33 294/34 +f 295/31 289/32 292/33 296/34 +f 295/31 293/32 290/33 289/34 +f 297/31 298/32 299/33 300/34 +f 298/31 301/32 302/33 299/34 +f 301/31 303/32 304/33 302/34 +f 303/31 297/32 300/33 304/34 +f 303/31 301/32 298/33 297/34 +f 305/31 306/32 307/33 308/34 +f 306/31 309/32 310/33 307/34 +f 309/31 311/32 312/33 310/34 +f 311/31 305/32 308/33 312/34 +f 311/31 309/32 306/33 305/34 +f 313/31 314/32 315/33 316/34 +f 314/31 317/32 318/33 315/34 +f 317/31 319/32 320/33 318/34 +f 319/31 313/32 316/33 320/34 +f 319/31 317/32 314/33 313/34 +f 321/31 322/32 323/33 324/34 +f 322/31 325/32 326/33 323/34 +f 325/31 327/32 328/33 326/34 +f 327/31 321/32 324/33 328/34 +f 327/31 325/32 322/33 321/34 +f 329/31 330/32 331/33 332/34 +f 330/31 333/32 334/33 331/34 +f 333/31 335/32 336/33 334/34 +f 335/31 329/32 332/33 336/34 +f 335/31 333/32 330/33 329/34 +f 337/31 338/32 339/33 340/34 +f 338/31 341/32 342/33 339/34 +f 341/31 343/32 344/33 342/34 +f 343/31 337/32 340/33 344/34 +f 343/31 341/32 338/33 337/34 +f 345/31 346/32 347/33 348/34 +f 346/31 349/32 350/33 347/34 +f 349/31 351/32 352/33 350/34 +f 351/31 345/32 348/33 352/34 +f 351/31 349/32 346/33 345/34 +f 353/31 354/32 355/33 356/34 +f 354/31 357/32 358/33 355/34 +f 357/31 359/32 360/33 358/34 +f 359/31 353/32 356/33 360/34 +f 359/31 357/32 354/33 353/34 +f 361/31 362/32 363/33 364/34 +f 362/31 365/32 366/33 363/34 +f 365/31 367/32 368/33 366/34 +f 367/31 361/32 364/33 368/34 +f 367/31 365/32 362/33 361/34 +f 369/31 370/32 371/33 372/34 +f 370/31 373/32 374/33 371/34 +f 373/31 375/32 376/33 374/34 +f 375/31 369/32 372/33 376/34 +f 375/31 373/32 370/33 369/34 +f 377/31 378/32 379/33 380/34 +f 378/31 381/32 382/33 379/34 +f 381/31 383/32 384/33 382/34 +f 383/31 377/32 380/33 384/34 +f 383/31 381/32 378/33 377/34 +f 385/31 386/32 387/33 388/34 +f 386/31 389/32 390/33 387/34 +f 389/31 391/32 392/33 390/34 +f 391/31 385/32 388/33 392/34 +f 391/31 389/32 386/33 385/34 +f 393/31 394/32 395/33 396/34 +f 394/31 397/32 398/33 395/34 +f 397/31 399/32 400/33 398/34 +f 399/31 393/32 396/33 400/34 +f 399/31 397/32 394/33 393/34 +f 401/31 402/32 403/33 404/34 +f 402/31 405/32 406/33 403/34 +f 405/31 407/32 408/33 406/34 +f 407/31 401/32 404/33 408/34 +f 407/31 405/32 402/33 401/34 +f 409/31 410/32 411/33 412/34 +f 410/31 413/32 414/33 411/34 +f 413/31 415/32 416/33 414/34 +f 415/31 409/32 412/33 416/34 +f 415/31 413/32 410/33 409/34 +f 417/31 418/32 419/33 420/34 +f 418/31 421/32 422/33 419/34 +f 421/31 423/32 424/33 422/34 +f 423/31 417/32 420/33 424/34 +f 423/31 421/32 418/33 417/34 +f 425/31 426/32 427/33 428/34 +f 426/31 429/32 430/33 427/34 +f 429/31 431/32 432/33 430/34 +f 431/31 425/32 428/33 432/34 +f 431/31 429/32 426/33 425/34 +f 433/31 434/32 435/33 436/34 +f 434/31 437/32 438/33 435/34 +f 437/31 439/32 440/33 438/34 +f 439/31 433/32 436/33 440/34 +f 439/31 437/32 434/33 433/34 +f 441/31 442/32 443/33 444/34 +f 442/31 445/32 446/33 443/34 +f 445/31 447/32 448/33 446/34 +f 447/31 441/32 444/33 448/34 +f 447/31 445/32 442/33 441/34 +f 449/31 450/32 451/33 452/34 +f 450/31 453/32 454/33 451/34 +f 453/31 455/32 456/33 454/34 +f 455/31 449/32 452/33 456/34 +f 455/31 453/32 450/33 449/34 +f 457/31 458/32 459/33 460/34 +f 458/31 461/32 462/33 459/34 +f 461/31 463/32 464/33 462/34 +f 463/31 457/32 460/33 464/34 +f 463/31 461/32 458/33 457/34 +f 465/31 466/32 467/33 468/34 +f 466/31 469/32 470/33 467/34 +f 469/31 471/32 472/33 470/34 +f 471/31 465/32 468/33 472/34 +f 471/31 469/32 466/33 465/34 +f 473/31 474/32 475/33 476/34 +f 474/31 477/32 478/33 475/34 +f 477/31 479/32 480/33 478/34 +f 479/31 473/32 476/33 480/34 +f 479/31 477/32 474/33 473/34 +f 481/31 482/32 483/33 484/34 +f 482/31 485/32 486/33 483/34 +f 485/31 487/32 488/33 486/34 +f 487/31 481/32 484/33 488/34 +f 487/31 485/32 482/33 481/34 +f 489/31 490/32 491/33 492/34 +f 490/31 493/32 494/33 491/34 +f 493/31 495/32 496/33 494/34 +f 495/31 489/32 492/33 496/34 +f 495/31 493/32 490/33 489/34 +f 497/31 498/32 499/33 500/34 +f 498/31 501/32 502/33 499/34 +f 501/31 503/32 504/33 502/34 +f 503/31 497/32 500/33 504/34 +f 503/31 501/32 498/33 497/34 +f 505/31 506/32 507/33 508/34 +f 506/31 509/32 510/33 507/34 +f 509/31 511/32 512/33 510/34 +f 511/31 505/32 508/33 512/34 +f 511/31 509/32 506/33 505/34 +f 513/31 514/32 515/33 516/34 +f 514/31 517/32 518/33 515/34 +f 517/31 519/32 520/33 518/34 +f 519/31 513/32 516/33 520/34 +f 519/31 517/32 514/33 513/34 +f 521/31 522/32 523/33 524/34 +f 522/31 525/32 526/33 523/34 +f 525/31 527/32 528/33 526/34 +f 527/31 521/32 524/33 528/34 +f 527/31 525/32 522/33 521/34 +f 529/31 530/32 531/33 532/34 +f 530/31 533/32 534/33 531/34 +f 533/31 535/32 536/33 534/34 +f 535/31 529/32 532/33 536/34 +f 535/31 533/32 530/33 529/34 +f 537/31 538/32 539/33 540/34 +f 541/31 542/32 543/33 544/34 +f 542/31 545/32 546/33 543/34 +f 547/31 548/32 549/33 550/34 +f 548/31 541/32 538/33 537/34 +f 538/31 541/32 544/33 539/34 +f 545/31 548/32 547/33 546/34 +f 545/31 542/32 541/33 548/34 +f 540/31 547/32 550/33 551/34 +f 548/31 537/32 552/33 549/34 +f 549/31 552/32 551/33 550/34 +f 537/31 540/32 551/33 552/34 +f 553/31 554/32 555/33 556/34 +f 554/31 557/32 558/33 555/34 +f 557/31 559/32 560/33 558/34 +f 559/31 553/32 556/33 560/34 +f 559/31 557/32 554/33 553/34 +f 561/31 562/32 563/33 564/34 +f 562/31 565/32 566/33 563/34 +f 565/31 567/32 568/33 566/34 +f 567/31 561/32 564/33 568/34 +f 567/31 565/32 562/33 561/34 +f 569/31 570/32 571/33 572/34 +f 570/31 573/32 574/33 571/34 +f 573/31 575/32 576/33 574/34 +f 575/31 569/32 572/33 576/34 +f 575/31 573/32 570/33 569/34 +f 577/31 578/32 579/33 580/34 +f 578/31 581/32 582/33 579/34 +f 581/31 583/32 584/33 582/34 +f 583/31 577/32 580/33 584/34 +f 583/31 581/32 578/33 577/34 +f 585/31 586/32 587/33 588/34 +f 586/31 589/32 590/33 587/34 +f 589/31 591/32 592/33 590/34 +f 591/31 585/32 588/33 592/34 +f 591/31 589/32 586/33 585/34 +f 593/31 594/32 595/33 596/34 +f 594/31 597/32 598/33 595/34 +f 597/31 599/32 600/33 598/34 +f 599/31 593/32 596/33 600/34 +f 599/31 597/32 594/33 593/34 +f 601/31 602/32 603/33 604/34 +f 602/31 605/32 606/33 603/34 +f 605/31 607/32 608/33 606/34 +f 607/31 601/32 604/33 608/34 +f 607/31 605/32 602/33 601/34 +f 609/31 610/32 611/33 612/34 +f 610/31 613/32 614/33 611/34 +f 613/31 615/32 616/33 614/34 +f 615/31 609/32 612/33 616/34 +f 615/31 613/32 610/33 609/34 +f 617/31 618/32 619/33 620/34 +f 618/31 621/32 622/33 619/34 +f 621/31 623/32 624/33 622/34 +f 623/31 617/32 620/33 624/34 +f 623/31 621/32 618/33 617/34 +f 625/31 626/32 627/33 628/34 +f 626/31 629/32 630/33 627/34 +f 629/31 631/32 632/33 630/34 +f 631/31 625/32 628/33 632/34 +f 631/31 629/32 626/33 625/34 +f 633/31 634/32 635/33 636/34 +f 634/31 637/32 638/33 635/34 +f 637/31 639/32 640/33 638/34 +f 639/31 633/32 636/33 640/34 +f 639/31 637/32 634/33 633/34 +f 641/31 642/32 643/33 644/34 +f 642/31 645/32 646/33 643/34 +f 645/31 647/32 648/33 646/34 +f 647/31 641/32 644/33 648/34 +f 647/31 645/32 642/33 641/34 +f 649/31 650/32 651/33 652/34 +f 650/31 653/32 654/33 651/34 +f 653/31 655/32 656/33 654/34 +f 655/31 649/32 652/33 656/34 +f 655/31 653/32 650/33 649/34 +f 657/31 658/32 659/33 660/34 +f 658/31 661/32 662/33 659/34 +f 661/31 663/32 664/33 662/34 +f 663/31 657/32 660/33 664/34 +f 663/31 661/32 658/33 657/34 +f 665/31 666/32 667/33 668/34 +f 666/31 669/32 670/33 667/34 +f 669/31 671/32 672/33 670/34 +f 671/31 665/32 668/33 672/34 +f 671/31 669/32 666/33 665/34 +f 673/31 674/32 675/33 676/34 +f 674/31 677/32 678/33 675/34 +f 677/31 679/32 680/33 678/34 +f 679/31 673/32 676/33 680/34 +f 679/31 677/32 674/33 673/34 +f 681/31 682/32 683/33 684/34 +f 682/31 685/32 686/33 683/34 +f 685/31 687/32 688/33 686/34 +f 687/31 681/32 684/33 688/34 +f 687/31 685/32 682/33 681/34 +f 689/31 690/32 691/33 692/34 +f 690/31 693/32 694/33 691/34 +f 693/31 695/32 696/33 694/34 +f 695/31 689/32 692/33 696/34 +f 695/31 693/32 690/33 689/34 +f 697/31 698/32 699/33 700/34 +f 698/31 701/32 702/33 699/34 +f 701/31 703/32 704/33 702/34 +f 703/31 697/32 700/33 704/34 +f 703/31 701/32 698/33 697/34 +f 705/31 706/32 707/33 708/34 +f 706/31 709/32 710/33 707/34 +f 709/31 711/32 712/33 710/34 +f 711/31 705/32 708/33 712/34 +f 711/31 709/32 706/33 705/34 +f 713/31 714/32 715/33 716/34 +f 714/31 717/32 718/33 715/34 +f 717/31 719/32 720/33 718/34 +f 719/31 713/32 716/33 720/34 +f 719/31 717/32 714/33 713/34 +f 721/31 722/32 723/33 724/34 +f 722/31 725/32 726/33 723/34 +f 725/31 727/32 728/33 726/34 +f 727/31 721/32 724/33 728/34 +f 727/31 725/32 722/33 721/34 +f 729/31 730/32 731/33 732/34 +f 730/31 733/32 734/33 731/34 +f 733/31 735/32 736/33 734/34 +f 735/31 729/32 732/33 736/34 +f 735/31 733/32 730/33 729/34 +f 737/31 738/32 739/33 740/34 +f 738/31 741/32 742/33 739/34 +f 741/31 743/32 744/33 742/34 +f 743/31 737/32 740/33 744/34 +f 743/31 741/32 738/33 737/34 +f 745/31 746/32 747/33 748/34 +f 746/31 749/32 750/33 747/34 +f 749/31 751/32 752/33 750/34 +f 751/31 745/32 748/33 752/34 +f 751/31 749/32 746/33 745/34 +f 753/31 754/32 755/33 756/34 +f 754/31 757/32 758/33 755/34 +f 757/31 759/32 760/33 758/34 +f 759/31 753/32 756/33 760/34 +f 759/31 757/32 754/33 753/34 +f 761/31 762/32 763/33 764/34 +f 762/31 765/32 766/33 763/34 +f 765/31 767/32 768/33 766/34 +f 767/31 761/32 764/33 768/34 +f 767/31 765/32 762/33 761/34 +f 769/31 770/32 771/33 772/34 +f 770/31 773/32 774/33 771/34 +f 773/31 775/32 776/33 774/34 +f 775/31 769/32 772/33 776/34 +f 775/31 773/32 770/33 769/34 +f 777/31 778/32 779/33 780/34 +f 778/31 781/32 782/33 779/34 +f 781/31 783/32 784/33 782/34 +f 783/31 777/32 780/33 784/34 +f 783/31 781/32 778/33 777/34 +f 785/31 786/32 787/33 788/34 +f 786/31 789/32 790/33 787/34 +f 789/31 791/32 792/33 790/34 +f 791/31 785/32 788/33 792/34 +f 791/31 789/32 786/33 785/34 +f 793/31 794/32 795/33 796/34 +f 794/31 797/32 798/33 795/34 +f 797/31 799/32 800/33 798/34 +f 799/31 793/32 796/33 800/34 +f 799/31 797/32 794/33 793/34 +f 801/31 802/32 803/33 804/34 +f 802/31 805/32 806/33 803/34 +f 805/31 807/32 808/33 806/34 +f 807/31 801/32 804/33 808/34 +f 807/31 805/32 802/33 801/34 +f 809/31 810/32 811/33 812/34 +f 810/31 813/32 814/33 811/34 +f 813/31 815/32 816/33 814/34 +f 815/31 809/32 812/33 816/34 +f 815/31 813/32 810/33 809/34 +f 817/31 818/32 819/33 820/34 +f 818/31 821/32 822/33 819/34 +f 821/31 823/32 824/33 822/34 +f 823/31 817/32 820/33 824/34 +f 823/31 821/32 818/33 817/34 +f 825/31 826/32 827/33 828/34 +f 826/31 829/32 830/33 827/34 +f 829/31 831/32 832/33 830/34 +f 831/31 825/32 828/33 832/34 +f 831/31 829/32 826/33 825/34 +f 833/31 834/32 835/33 836/34 +f 834/31 837/32 838/33 835/34 +f 837/31 839/32 840/33 838/34 +f 839/31 833/32 836/33 840/34 +f 839/31 837/32 834/33 833/34 +f 841/31 842/32 843/33 844/34 +f 842/31 845/32 846/33 843/34 +f 845/31 847/32 848/33 846/34 +f 847/31 841/32 844/33 848/34 +f 847/31 845/32 842/33 841/34 +f 849/31 850/32 851/33 852/34 +f 850/31 853/32 854/33 851/34 +f 853/31 855/32 856/33 854/34 +f 855/31 849/32 852/33 856/34 +f 855/31 853/32 850/33 849/34 +f 857/31 858/32 859/33 860/34 +f 858/31 861/32 862/33 859/34 +f 861/31 863/32 864/33 862/34 +f 863/31 857/32 860/33 864/34 +f 863/31 861/32 858/33 857/34 +f 865/31 866/32 867/33 868/34 +f 866/31 869/32 870/33 867/34 +f 869/31 871/32 872/33 870/34 +f 871/31 865/32 868/33 872/34 +f 871/31 869/32 866/33 865/34 +f 873/31 874/32 875/33 876/34 +f 874/31 877/32 878/33 875/34 +f 877/31 879/32 880/33 878/34 +f 879/31 873/32 876/33 880/34 +f 879/31 877/32 874/33 873/34 +f 881/31 882/32 883/33 884/34 +f 882/31 885/32 886/33 883/34 +f 885/31 887/32 888/33 886/34 +f 887/31 881/32 884/33 888/34 +f 887/31 885/32 882/33 881/34 +f 889/31 890/32 891/33 892/34 +f 890/31 893/32 894/33 891/34 +f 893/31 895/32 896/33 894/34 +f 895/31 889/32 892/33 896/34 +f 895/31 893/32 890/33 889/34 +f 897/31 898/32 899/33 900/34 +f 898/31 901/32 902/33 899/34 +f 901/31 903/32 904/33 902/34 +f 903/31 897/32 900/33 904/34 +f 903/31 901/32 898/33 897/34 +f 905/31 906/32 907/33 908/34 +f 906/31 909/32 910/33 907/34 +f 909/31 911/32 912/33 910/34 +f 911/31 905/32 908/33 912/34 +f 911/31 909/32 906/33 905/34 +f 913/31 914/32 915/33 916/34 +f 914/31 917/32 918/33 915/34 +f 917/31 919/32 920/33 918/34 +f 919/31 913/32 916/33 920/34 +f 919/31 917/32 914/33 913/34 +f 921/31 922/32 923/33 924/34 +f 922/31 925/32 926/33 923/34 +f 925/31 927/32 928/33 926/34 +f 927/31 921/32 924/33 928/34 +f 927/31 925/32 922/33 921/34 +l 544 547 +o keyboard +v -0.411510 -0.499998 -0.385414 +v -0.347259 -0.499998 -0.379792 +v -0.360885 -0.499998 -0.260399 +v -0.418823 -0.499998 -0.265468 +v -0.411638 -0.479821 -0.383948 +v -0.418823 -0.481779 -0.265468 +v -0.360885 -0.481779 -0.260399 +v -0.347387 -0.479821 -0.378327 +v -0.413073 -0.485086 -0.387747 +v -0.345315 -0.485086 -0.381819 +v -0.359464 -0.485086 -0.258429 +v -0.420565 -0.485086 -0.263775 +v -0.412532 -0.492542 -0.386975 +v -0.419957 -0.492542 -0.264466 +v -0.345980 -0.492542 -0.381152 +v -0.359943 -0.492542 -0.259215 +v -0.307392 -0.474888 -0.210007 +v -0.307392 -0.478903 -0.416481 +v -0.307392 -0.499996 -0.416481 +v -0.307392 -0.499996 -0.210007 +v 0.419545 -0.499996 -0.210007 +v 0.419545 -0.499996 -0.416481 +v 0.419545 -0.478903 -0.416481 +v 0.419545 -0.474888 -0.210007 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +g keyboard_keyboard_None +usemtl None +s off +f 929/35 930/36 931/37 932/38 +f 933/35 934/36 935/37 936/38 +f 937/35 933/36 936/37 938/38 +f 938/35 936/36 935/37 939/38 +f 939/35 935/36 934/37 940/38 +f 941/35 929/36 932/37 942/38 +f 929/35 941/36 943/37 930/38 +f 941/35 937/36 938/37 943/38 +f 930/35 943/36 944/37 931/38 +f 943/35 938/36 939/37 944/38 +f 931/35 944/36 942/37 932/38 +f 944/35 939/36 940/37 942/38 +f 933/35 937/36 940/37 934/38 +f 937/35 941/36 942/37 940/38 +f 945/35 946/36 947/37 948/38 +f 949/35 948/36 947/37 950/38 +f 951/35 946/36 945/37 952/38 +f 946/35 951/36 950/37 947/38 +f 952/35 945/36 948/37 949/38 +f 951/35 952/36 949/37 950/38 diff --git a/mods/homedecor_modpack/computer/models/computer_tower.obj b/mods/homedecor_modpack/computer/models/computer_tower.obj new file mode 100644 index 00000000..90666eaf --- /dev/null +++ b/mods/homedecor_modpack/computer/models/computer_tower.obj @@ -0,0 +1,33 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib computer_tower.mtl +o Cube.001 +v -0.182508 -0.499998 0.450000 +v -0.182508 -0.499998 -0.349946 +v 0.182508 -0.499998 -0.349946 +v 0.182508 -0.499998 0.450000 +v -0.182508 0.335734 0.450000 +v 0.182508 0.335734 0.450000 +v 0.182508 0.335734 -0.349946 +v -0.182508 0.335734 -0.349947 +vt 0.999994 0.750017 +vt 0.500006 0.749983 +vt 0.500002 0.499996 +vt 0.999997 0.500009 +vt 0.499989 0.999941 +vt 0.999986 0.999931 +vt 0.500005 0.000003 +vt 0.000007 0.500002 +vt -0.000003 0.000003 +vt 0.250005 0.999991 +vt 0.250005 0.499995 +vt 0.999993 0.000002 +vt 0.000017 0.999997 +usemtl Material.001 +s off +f 1/1 2/2 3/3 4/4 +f 5/5 6/2 7/1 8/6 +f 1/7 5/3 8/8 2/9 +f 2/3 8/5 7/10 3/11 +f 3/12 7/4 6/3 4/7 +f 5/13 1/8 4/11 6/10 diff --git a/mods/homedecor_modpack/computer/models/tetris_arcade.obj b/mods/homedecor_modpack/computer/models/tetris_arcade.obj new file mode 100644 index 00000000..66d651f6 --- /dev/null +++ b/mods/homedecor_modpack/computer/models/tetris_arcade.obj @@ -0,0 +1,34 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib vending_machine.mtl +o Cube +v 0.499998 -0.499998 -0.499998 +v 0.499998 -0.499998 0.499998 +v -0.499998 -0.499998 0.499998 +v -0.499998 -0.499998 -0.499998 +v 0.499998 1.499994 -0.499998 +v 0.499998 1.499994 0.499998 +v -0.499998 1.499994 0.499998 +v -0.499998 1.499994 -0.499998 +vt 0.250050 0.250050 +vt 0.000100 0.250050 +vt 0.000100 0.000100 +vt 0.250050 0.000100 +vt 0.250050 0.749950 +vt 0.250050 0.999900 +vt 0.000100 0.999900 +vt 0.000100 0.749950 +vt 0.999900 0.250049 +vt 0.999900 0.749949 +vt 0.749950 0.749950 +vt 0.749950 0.250050 +vt 0.500000 0.749950 +vt 0.500000 0.250050 +usemtl Material +s off +f 1/1 2/2 3/3 4/4 +f 5/5 8/6 7/7 6/8 +f 1/1 5/5 6/8 2/2 +f 2/9 6/10 7/11 3/12 +f 3/12 7/11 8/13 4/14 +f 5/5 1/1 4/14 8/13 diff --git a/mods/homedecor_modpack/computer/recipes.lua b/mods/homedecor_modpack/computer/recipes.lua index e4335a1c..243292af 100755 --- a/mods/homedecor_modpack/computer/recipes.lua +++ b/mods/homedecor_modpack/computer/recipes.lua @@ -3,132 +3,141 @@ -- License is WTFPL (see README.txt). minetest.register_craft({ - output = "computer:shefriendSOO"; + output = "computer:shefriendSOO", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:slaystation"; + output = "computer:slaystation", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:wood", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:vanio"; + output = "computer:vanio", recipe = { - { "homedecor:plastic_sheeting", "", "", }, + { "homedecor:plastic_sheeting", "", "" }, { "default:glass", "", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:specter"; + output = "computer:specter", recipe = { - { "", "", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - }; -}); + { "", "", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:slaystation2"; + output = "computer:slaystation2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:admiral64"; + output = "computer:admiral64", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "default:wood", "default:wood", "default:wood", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "default:wood", "default:wood", "default:wood" } + } +}) minetest.register_craft({ - output = "computer:admiral128"; + output = "computer:admiral128", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } + } +}) minetest.register_craft({ - output = "computer:wee"; + output = "computer:wee", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:piepad"; + output = "computer:piepad", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" } + } +}) --new stuff minetest.register_craft({ - output = "computer:monitor"; + output = "computer:monitor", recipe = { - { "homedecor:plastic_sheeting", "default:glass","", }, - { "homedecor:plastic_sheeting", "default:glass","", }, - { "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "default:glass","" }, + { "homedecor:plastic_sheeting", "default:glass","" }, + { "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:router"; + output = "computer:router", recipe = { - { "default:steel_ingot","","", }, - { "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - { "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting", }, - }; -}); + { "default:steel_ingot","","" }, + { "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:tower"; + output = "computer:tower", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:printer"; + output = "computer:printer", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","", }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "default:steel_ingot","" }, + { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting" } + } +}) minetest.register_craft({ - output = "computer:printer"; + output = "computer:printer", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","", }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting", }, - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", }, - }; -}); + { "homedecor:plastic_sheeting", "default:steel_ingot","" }, + { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, + { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", } + } +}) minetest.register_craft({ - output = "computer:server"; + output = "computer:server", recipe = { { "computer:tower", "computer:tower", "computer:tower", }, - { "computer:tower", "computer:tower", "computer:tower", }, - { "computer:tower", "computer:tower", "computer:tower", }, - }; -}); + { "computer:tower", "computer:tower", "computer:tower" }, + { "computer:tower", "computer:tower", "computer:tower" } + } +}) + +minetest.register_craft({ + output = "computer:tetris_arcade", + recipe = { + { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting", }, + { "dye:black", "default:glass", "dye:black" }, + { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" } + } +}) diff --git a/mods/homedecor_modpack/computer/tetris.lua b/mods/homedecor_modpack/computer/tetris.lua new file mode 100644 index 00000000..e985e0e6 --- /dev/null +++ b/mods/homedecor_modpack/computer/tetris.lua @@ -0,0 +1,282 @@ +local shapes = { + { { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } }, + + { { x = {1, 1, 1, 1}, y = {0, 1, 2, 3} }, + { x = {0, 1, 2, 3}, y = {1, 1, 1, 1} } }, + + { { x = {0, 0, 1, 1}, y = {0, 1, 1, 2} }, + { x = {1, 2, 0, 1}, y = {0, 0, 1, 1} } }, + + { { x = {1, 0, 1, 0}, y = {0, 1, 1, 2} }, + { x = {0, 1, 1, 2}, y = {0, 0, 1, 1} } }, + + { { x = {1, 2, 1, 1}, y = {0, 0, 1, 2} }, + { x = {0, 1, 2, 2}, y = {1, 1, 1, 2} }, + { x = {1, 1, 0, 1}, y = {0, 1, 2, 2} }, + { x = {0, 0, 1, 2}, y = {0, 1, 1, 1} } }, + + { { x = {1, 1, 1, 2}, y = {0, 1, 2, 2} }, + { x = {0, 1, 2, 0}, y = {1, 1, 1, 2} }, + { x = {0, 1, 1, 1}, y = {0, 0, 1, 2} }, + { x = {0, 1, 2, 2}, y = {1, 1, 1, 0} } }, + + { { x = {1, 0, 1, 2}, y = {0, 1, 1, 1} }, + { x = {1, 1, 1, 2}, y = {0, 1, 2, 1} }, + { x = {0, 1, 2, 1}, y = {1, 1, 1, 2} }, + { x = {0, 1, 1, 1}, y = {1, 0, 1, 2} } } } + +local colors = { "computer_cyan.png", "computer_magenta.png", "computer_red.png", + "computer_blue.png", "computer_green.png", "computer_orange.png", "computer_yellow.png" } + +local background = "image[0,0;3.55,6.66;computer_black.png]" +local buttons = "button[3,4.5;0.6,0.6;left;<]" + .."button[3.6,4.5;0.6,0.6;rotateleft;L]" + .."button[4.2,4.5;0.6,0.6;down;v]" + .."button[4.2,5.3;0.6,0.6;drop;V]" + .."button[4.8,4.5;0.6,0.6;rotateright;R]" + .."button[5.4,4.5;0.6,0.6;right;>]" + .."button[3.5,3;2,2;new;New Game]" + +local formsize = "size[5.9,5.7]" +local boardx, boardy = 0, 0 +local sizex, sizey, size = 0.29, 0.29, 0.31 + +local comma = "," +local semi = ";" +local close = "]" + +local concat = table.concat +local insert = table.insert + +local draw_shape = function(id, x, y, rot, posx, posy) + local d = shapes[id][rot] + local scr = {} + local ins = #scr + + for i=1,4 do + local tmp = { "image[", + (d.x[i]+x)*sizex+posx, comma, + (d.y[i]+y)*sizey+posy, semi, + size, comma, size, semi, + colors[id], close } + + ins = ins + 1 + scr[ins] = concat(tmp) + end + + return concat(scr) +end + +local function step(pos, fields) + local meta = minetest.get_meta(pos) + local t = minetest.deserialize(meta:get_string("tetris")) + + local function new_game(pos) + local nex = math.random(7) + + t = { + board = {}, + boardstring = "", + previewstring = draw_shape(nex, 0, 0, 1, 4, 1), + score = 0, + cur = math.random(7), + nex = nex, + x=4, y=0, rot=1 + } + + local timer = minetest.get_node_timer(pos) + timer:set(0.3, 0) + end + + local function update_boardstring() + local scr = {} + local ins = #scr + + for i, line in pairs(t.board) do + for _, tile in pairs(line) do + local tmp = { "image[", + tile[1]*sizex+boardx, comma, + i*sizey+boardy, semi, + size, comma, size, semi, + colors[tile[2]], close } + + ins = ins + 1 + scr[ins] = concat(tmp) + end + end + + t.boardstring = concat(scr) + end + + local function add() + local d = shapes[t.cur][t.rot] + + for i=1,4 do + local l = d.y[i] + t.y + if not t.board[l] then t.board[l] = {} end + insert(t.board[l], {d.x[i] + t.x, t.cur}) + end + end + + local function scroll(l) + for i=l, 1, -1 do + t.board[i] = t.board[i-1] or {} + end + end + + local function check_lines() + for i, line in pairs(t.board) do + if #line >= 10 then + scroll(i) + t.score = t.score + 20 + end + end + end + + local function check_position(x, y, rot) + local d = shapes[t.cur][rot] + + for i=1,4 do + local cx, cy = d.x[i]+x, d.y[i]+y + + if cx < 0 or cx > 9 or cy < 0 or cy > 19 then + return false + end + + for _, tile in pairs(t.board[ cy ] or {}) do + if tile[1] == cx then return false end + end + end + + return true + end + + local function stuck() + if check_position(t.x, t.y+1, t.rot) then return false end + return true + end + + local function tick() + if stuck() then + if t.y <= 0 then + return false end + add() + check_lines() + update_boardstring() + t.cur, t.nex = t.nex, math.random(7) + t.x, t.y, t.rot = 4, 0, 1 + t.previewstring = draw_shape(t.nex, 0, 0, 1, 4.1, 0.6) + else + t.y = t.y + 1 + end + return true + end + + local function move(dx, dy) + local newx, newy = t.x+dx, t.y+dy + if not check_position(newx, newy, t.rot) then return end + t.x, t.y = newx, newy + end + + local function rotate(dr) + local no = #(shapes[t.cur]) + local newrot = (t.rot+dr) % no + + if newrot<1 then newrot = newrot+no end + if not check_position(t.x, t.y, newrot) then return end + t.rot = newrot + end + + local function key() + if fields.left then + move(-1, 0) + end + if fields.rotateleft then + rotate(-1) + end + if fields.down then + t.score = t.score + 1 + move(0, 1) + end + if fields.drop then + while not stuck() do + t.score = t.score + 2 + move(0, 1) + end + end + if fields.rotateright then + rotate(1) + end + if fields.right then + move(1, 0) + end + end + + local run = true + + if fields then + if fields.new then + new_game(pos) + else + key(fields) + end + else + run = tick() + end + + if t ~= nil then + local scr = { formsize, background, + t.boardstring, t.previewstring, + draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy), + "label[3.8,0.1;Next...]label[3.8,2.7;Score: ", + t.score, close, buttons } + + + meta:set_string("formspec", concat(scr) + ..default.gui_bg..default.gui_bg_img..default.gui_slots) + meta:set_string("tetris", minetest.serialize(t)) + end + + return run +end + +minetest.register_node("computer:tetris_arcade", { + description="Tetris Arcade", + drawtype = "mesh", + mesh = "tetris_arcade.obj", + tiles = {"tetris_arcade.png"}, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + on_rotate = screwdriver.rotate_simple, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5} + }, + collision_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5} + }, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", formsize.."button[2,2.5;2,2;new;New Game]" + ..default.gui_bg..default.gui_bg_img..default.gui_slots) + end, + on_timer = function(pos) + return step(pos, nil) + end, + on_receive_fields = function(pos, formanme, fields, sender) + step(pos, fields) + end, + on_place = function(itemstack, placer, pointed_thing) + local pos = pointed_thing.above + if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then + minetest.chat_send_player(placer:get_player_name(), "No room for place the Arcade!") + return end + local dir = placer:get_look_dir() + local node = {name="computer:tetris_arcade", param1=0, param2 = minetest.dir_to_facedir(dir)} + minetest.set_node(pos, node) + itemstack:take_item() + return itemstack + end +}) diff --git a/mods/homedecor_modpack/computer/textures/computer_ad128_inv.png b/mods/homedecor_modpack/computer/textures/computer_ad128_inv.png new file mode 100644 index 00000000..846497ad Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_ad128_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_ad64_inv.png b/mods/homedecor_modpack/computer/textures/computer_ad64_inv.png new file mode 100644 index 00000000..79703413 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_ad64_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_back.png b/mods/homedecor_modpack/computer/textures/computer_babytower_back.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png b/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_front.png b/mods/homedecor_modpack/computer/textures/computer_babytower_front.png deleted file mode 100644 index f6fc9711..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_left.png b/mods/homedecor_modpack/computer/textures/computer_babytower_left.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_right.png b/mods/homedecor_modpack/computer/textures/computer_babytower_right.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_babytower_top.png b/mods/homedecor_modpack/computer/textures/computer_babytower_top.png deleted file mode 100644 index 624d131c..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_babytower_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_black.png b/mods/homedecor_modpack/computer/textures/computer_black.png new file mode 100644 index 00000000..e4e017f4 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_black.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_blue.png b/mods/homedecor_modpack/computer/textures/computer_blue.png new file mode 100644 index 00000000..a5a59772 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_blue.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_cyan.png b/mods/homedecor_modpack/computer/textures/computer_cyan.png new file mode 100644 index 00000000..b2c037ea Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_cyan.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_green.png b/mods/homedecor_modpack/computer/textures/computer_green.png new file mode 100644 index 00000000..444cce54 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_green.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_laptop_inv.png b/mods/homedecor_modpack/computer/textures/computer_laptop_inv.png new file mode 100644 index 00000000..7d02a2bb Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_laptop_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_magenta.png b/mods/homedecor_modpack/computer/textures/computer_magenta.png new file mode 100644 index 00000000..e5b9d044 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_magenta.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_b.png b/mods/homedecor_modpack/computer/textures/computer_monitor_b.png deleted file mode 100644 index ee1a604e..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_b.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png b/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png deleted file mode 100644 index 7cc0c059..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_bt.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png b/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png deleted file mode 100644 index 652d24ca..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png deleted file mode 100644 index 506cd07e..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png deleted file mode 100644 index 449f1b32..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_dl.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_dl.png deleted file mode 100644 index 5ed17eb6..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_dl.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png deleted file mode 100644 index 0d699aa5..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png deleted file mode 100644 index d65b5483..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png deleted file mode 100644 index 2c4157a3..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png b/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png deleted file mode 100644 index fadabef2..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_inv.png b/mods/homedecor_modpack/computer/textures/computer_monitor_inv.png new file mode 100644 index 00000000..314197bd Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_monitor_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_l.png b/mods/homedecor_modpack/computer/textures/computer_monitor_l.png deleted file mode 100644 index b6b35171..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_l.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_r.png b/mods/homedecor_modpack/computer/textures/computer_monitor_r.png deleted file mode 100644 index b6b35171..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_r.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_t.png b/mods/homedecor_modpack/computer/textures/computer_monitor_t.png deleted file mode 100644 index a9ef1e1a..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_t.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png b/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png deleted file mode 100644 index b4d34dab..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png b/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png deleted file mode 100644 index 74cbd8b4..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_orange.png b/mods/homedecor_modpack/computer/textures/computer_orange.png new file mode 100644 index 00000000..27792f7c Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_orange.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_inv.png b/mods/homedecor_modpack/computer/textures/computer_printer_inv.png new file mode 100644 index 00000000..064d996e Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_printer_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_ps1_inv.png b/mods/homedecor_modpack/computer/textures/computer_ps1_inv.png new file mode 100644 index 00000000..af7bd66d Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_ps1_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_ps2_inv.png b/mods/homedecor_modpack/computer/textures/computer_ps2_inv.png new file mode 100644 index 00000000..8f46fb47 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_ps2_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_red.png b/mods/homedecor_modpack/computer/textures/computer_red.png new file mode 100644 index 00000000..adcd6272 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_red.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_router_inv.png b/mods/homedecor_modpack/computer/textures/computer_router_inv.png new file mode 100644 index 00000000..3f935eee Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_router_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_inv.png b/mods/homedecor_modpack/computer/textures/computer_specter_inv.png new file mode 100644 index 00000000..d4ac3b00 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_specter_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower.png b/mods/homedecor_modpack/computer/textures/computer_tower.png new file mode 100644 index 00000000..6eaf4c49 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_tower.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_b.png b/mods/homedecor_modpack/computer/textures/computer_tower_b.png deleted file mode 100644 index 2aa583eb..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_b.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_bt.png b/mods/homedecor_modpack/computer/textures/computer_tower_bt.png deleted file mode 100644 index b6b35171..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_bt.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_f_off.png b/mods/homedecor_modpack/computer/textures/computer_tower_f_off.png deleted file mode 100644 index 47770172..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_f_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_f_on.png b/mods/homedecor_modpack/computer/textures/computer_tower_f_on.png deleted file mode 100644 index e2eff77b..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_f_on.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_inv.png b/mods/homedecor_modpack/computer/textures/computer_tower_inv.png new file mode 100644 index 00000000..ab200f21 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_tower_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_l.png b/mods/homedecor_modpack/computer/textures/computer_tower_l.png deleted file mode 100644 index e605b92a..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_l.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_r.png b/mods/homedecor_modpack/computer/textures/computer_tower_r.png deleted file mode 100644 index 64e0e82f..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_r.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_t.png b/mods/homedecor_modpack/computer/textures/computer_tower_t.png deleted file mode 100644 index b6b35171..00000000 Binary files a/mods/homedecor_modpack/computer/textures/computer_tower_t.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/computer_wii_inv.png b/mods/homedecor_modpack/computer/textures/computer_wii_inv.png new file mode 100644 index 00000000..da7f91bb Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_wii_inv.png differ diff --git a/mods/homedecor_modpack/computer/textures/computer_yellow.png b/mods/homedecor_modpack/computer/textures/computer_yellow.png new file mode 100644 index 00000000..29537acc Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/computer_yellow.png differ diff --git a/mods/homedecor_modpack/computer/textures/monitor_display.png b/mods/homedecor_modpack/computer/textures/monitor_display.png new file mode 100644 index 00000000..3d1fb399 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/monitor_display.png differ diff --git a/mods/homedecor_modpack/computer/textures/monitor_plastic.png b/mods/homedecor_modpack/computer/textures/monitor_plastic.png new file mode 100644 index 00000000..9e2d9240 Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/monitor_plastic.png differ diff --git a/mods/homedecor_modpack/computer/textures/tetris_arcade.png b/mods/homedecor_modpack/computer/textures/tetris_arcade.png new file mode 100644 index 00000000..dfd176df Binary files /dev/null and b/mods/homedecor_modpack/computer/textures/tetris_arcade.png differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png deleted file mode 100644 index f6fc9711..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png deleted file mode 100644 index 48a40cd7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png b/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png deleted file mode 100644 index 624d131c..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_babytower_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_computer_front_old.png b/mods/homedecor_modpack/computer/textures/unused/computer_computer_front_old.png deleted file mode 100644 index 5f591a64..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_computer_front_old.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_computer_top_old.png b/mods/homedecor_modpack/computer/textures/unused/computer_computer_top_old.png deleted file mode 100644 index 625479c8..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_computer_top_old.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_shefriendSOO_ (copia).png b/mods/homedecor_modpack/computer/textures/unused/computer_shefriendSOO_ (copia).png deleted file mode 100644 index b94088d0..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_shefriendSOO_ (copia).png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_back.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_back.png deleted file mode 100644 index d5abffc9..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_bottom.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_bottom.png deleted file mode 100644 index 701a191e..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_front.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_front.png deleted file mode 100644 index 6ad7f280..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_left.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_left.png deleted file mode 100644 index b7d0ac34..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_right.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_right.png deleted file mode 100644 index 19f98157..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png b/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png deleted file mode 100644 index 4716ad2f..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_spectre_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bk.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bk.png deleted file mode 100644 index 15f7d1bd..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bk.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bk_off.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bk_off.png deleted file mode 100644 index 6748cea7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bk_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bt.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bt.png deleted file mode 100644 index 33b630ae..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_bt.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_ft.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_ft.png deleted file mode 100644 index 69d4e9f4..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_ft.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_ft_off.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_ft_off.png deleted file mode 100644 index 6748cea7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_ft_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_lt.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_lt.png deleted file mode 100644 index 0bc3d68c..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_lt.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_lt_off.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_lt_off.png deleted file mode 100644 index 6748cea7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_lt_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_rt.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_rt.png deleted file mode 100644 index fc163b58..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_rt.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_rt_off.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_rt_off.png deleted file mode 100644 index 6748cea7..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_rt_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_tp.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_tp.png deleted file mode 100644 index 61144dca..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_tp.png and /dev/null differ diff --git a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_tp_off.png b/mods/homedecor_modpack/computer/textures/unused/computer_vanio_tp_off.png deleted file mode 100644 index dfd1f6fe..00000000 Binary files a/mods/homedecor_modpack/computer/textures/unused/computer_vanio_tp_off.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/LICENSE.txt b/mods/homedecor_modpack/fake_fire/LICENSE.txt index 7015bc8c..d6a4b6cd 100755 --- a/mods/homedecor_modpack/fake_fire/LICENSE.txt +++ b/mods/homedecor_modpack/fake_fire/LICENSE.txt @@ -1,21 +1,7 @@ -JP's Fork of LazyJ's Minetest Mod, "Fake Fire" -by : JP. - -Replaced LazyJ's smoke nodes pictures by smoke particles. Lighter, prettier, configurable smoke. - -====================================================================== - - -LazyJ's Fork of Semmett9's Minetest Mod, "Fake Fire" -by: -LazyJ - -This is my fork of Semmett9's "Fake Fire" mod. Some code clean-up, a -bunch of changes and a few new things have been added. - - - -====================================================================== +Semmett9's "Fake Fire" mod. kilbith's fork. +Some textures by LazyJ. +Fancy mesh fire model/texture by NathanS (CC-0). +============================================================== GNU GENERAL PUBLIC LICENSE diff --git a/mods/homedecor_modpack/fake_fire/README.txt b/mods/homedecor_modpack/fake_fire/README.txt deleted file mode 100755 index 01fd377c..00000000 --- a/mods/homedecor_modpack/fake_fire/README.txt +++ /dev/null @@ -1,62 +0,0 @@ -##### JP's Fork of LazyJ's Minetest Mod, "Fake Fire" - -Replaced LazyJ's smoke nodes pictures by smoke particles. Lighter, prettier, configurable smoke. - - - -##### LazyJ's Fork of Semmett9's "Fake Fire" Mod - -This fork of 'Fake Fire' is based off of Semmett9's 2014_03_14 release of the -mod. - -At LinuxGaming.us, we have a creative-leaning Minetest server. Destruction by -arson is not something we like. When the Fake Fire mod was installed we finally -could make warm hearths and campfires without fear of burning down our builds. -We could also use Fake Fire to simulate things burning without worrying our -neighbors about the fires spreading and destroying their stuff. - -As a creative bunch of Minetesters, we often come up with new ideas for things. -This fork of "Fake Fire" incorporates some of those ideas. - - -Semmett9's original version of this mod can be found here: - -* Minetest.net -http://forum.minetest.net/viewtopic.php?id=6145 - -* Ad.Fly -http://adf.ly/RbzwV - -Yes, it has advertisements. That's what helps to pay for hosting Semmett9's -website and server costs. Everything has a cost. Someone pays. Even when it -comes to so-called free, open-source software. Someone pays. Everything has a -cost. Try running your own business and you will understand. There are no -free lunches in life. - -Ok, done ranting. ;)- - - -~ LazyJ, 2014_06_19 - - - -Minetest version: 0.4.9 -Depends: default -Recommended Additional Mods: none -License: GPL v2 -Source Code: http://github.com/LazyJ/fake_fire -Download (.zip): http://github.com/LazyJ/fake_fire/archive/master.zip - -Install: - * After downloading, unzip the file. - * Rename the directory "fake_fire_fork-master" to "fake_fire" - * Copy the "fake_fire" directory into either - ../minetest/worlds/yourworld'sname/worldmods/ - or - ../minetest/mods/ - * If you put "fake_fire" in the ../minetest/mods/ directory, either - enable the mod from within Minetest's "Configure" button - (main menu, bottom right) or by adding this line to the - world's "world.mt" file: - load_mod_fake_fire = true - diff --git a/mods/homedecor_modpack/fake_fire/changelog.txt b/mods/homedecor_modpack/fake_fire/changelog.txt deleted file mode 100755 index 9afe9f3b..00000000 --- a/mods/homedecor_modpack/fake_fire/changelog.txt +++ /dev/null @@ -1,86 +0,0 @@ -CHANGELOG -~~~~~~~~~~~~~~~~~ - -2014_07_27: - -* Replaced LazyJ's smoke nodes pictures by smoke particles. Lighter, prettier, configurable smoke. -* Code clean-up. - - -2014_06_21: - - * Added changelog.txt, 2014_06_19. Some changes are much older than this. - I've been making little tweaks to it for several months and finally decided - to give it an overhaul. - * Code clean-up. - * Split the init.lua file stuff into separate files and moved them into the - "modfiles" folder. - * I had added a lump of coal to be dropped when the flame was dug but, as - one of our moderators pointed out, once word got out, new players would - snuff-out every fake_fire they found just to get easy coal. The coal drop - was removed. - * Changed the flint crafting recipe to require 2 gravel instead of one. - This resolves a crafting conflict with another mod. The recipe is also - shapless now. - * Added crafting recipes for 1 cobble to 1 gravel, then 1 gravel to 1 sand. - For Wazuland2 these recipes are commented out because another mod takes - care of them (the reason for changing the flint recipe). - * Health-damage disabled. This fork is strictly for decoration. - * Waving added to flames and smoke. - * Rising, disappearing smoke-puffs added. Smoke columns will rise to 14 - spaces above the flame or chimney top. - * Smoke can be punched to remove. - * Never-ending flint and steel disabled. May add it as a priv later. - * Extinguishing with water and lava(??) disabled. Again, this fork is - strictly for decoration so dousing the flames with water or lava would just - make a big, needless mess. Much easier and cleaner to just punch the flame. - * Flame images are hidden from creative inventory but are still provided - for in the code and image files if you want them to be visible. Just remove - the "not_in_creative_inventory" part from the groups of the flame types and - they will be visible again. Having the images in inventory is useful when - playing in creative mode or if you want to torture griefers who put in the - time and effort to get the materials to make the fire hoping to be able to - burn things only to discover that it is *fake* and *harmless*. Bwa-hahaha! - * Added ice-fire, a blue-colored flame that only ignites on snow and ice - stuff. - * Added added ability to switch between smoking and non-smoking flames by - punching them. Default is non-smoking. - * Added stone and sandstone chimney caps that can produce smoke when punched - (smoking and non-smoking versions). Useful for small builds where a 3x3 - chimney would be too oversized in proportion to the reset of the build. - * Added animated, glowing embers. This hearth-warming block emits a - mid-level light and simulates the hot coals under a flame. Flames are not - required and the embers blocks are smokeless. - - - -2014_06_23: - - * Flames - "sunlight_propagates = true," - -- Adding sunlight_propagtes and leaving comments as a future reference. - -- If true, sunlight will go infinitely through this (no shadow is cast). - -- Because fire produces light it should be "true" so fire *doesn't* have - -- a shadow. - - * Embers - "sunlight_propagates = true," - -- Adding sunlight_propagtes and leaving comments as a future reference. - -- If true, sunlight will go infinitely through this (no shadow is cast). - -- Because embers produce some light it should be somewhat "true" but this - -- is an area where Minetest lacks in subtlety so I'm opting for 100% that - -- embers *don't* have a shadow. - - * Bug Fix - Server Crash when Flint-Steel Clicked on Nothing (sky). - -- Players can see farther than they can reach. Even though the player - -- was aiming for a node several spaces ahead of them, Minetest's targeting - -- range doesn't extend that far. The player saw the node they were aiming - -- at, Minetest's target range ended and Minetest saw "nothing" - -- (a nil value). The bug was a conflict in the code so when that - -- particular nil value popped up, Minetest was confused by the bug, threw - -- up it's hands in frustration and said "I quit!" by crashing. - - * Original init.lua Added - -- What I thought was the original init.lua file turned out to be one I had - -- tinkered with months ago. So I extracted the actual original init.lua - -- file from a zip file of the original mod. Why bother including it in my - -- fork? Because it's a reference to compare to and learn from. - \ No newline at end of file diff --git a/mods/homedecor_modpack/fake_fire/init.lua b/mods/homedecor_modpack/fake_fire/init.lua index 98f575b8..b72db191 100755 --- a/mods/homedecor_modpack/fake_fire/init.lua +++ b/mods/homedecor_modpack/fake_fire/init.lua @@ -1,3 +1,233 @@ -dofile(minetest.get_modpath("fake_fire").."/modfiles/nodes.lua") -dofile(minetest.get_modpath("fake_fire").."/modfiles/crafts.lua") -dofile(minetest.get_modpath("fake_fire").."/modfiles/abms.lua") +local function start_smoke(pos, node, clicker, chimney) + local this_spawner_meta = minetest.get_meta(pos) + local id = this_spawner_meta:get_int("smoky") + local s_handle = this_spawner_meta:get_int("sound") + local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name + + if id ~= 0 then + if s_handle then + minetest.after(0, function(s_handle) + minetest.sound_stop(s_handle) + end, s_handle) + end + minetest.delete_particlespawner(id) + this_spawner_meta:set_int("smoky", nil) + this_spawner_meta:set_int("sound", nil) + return + end + + if above == "air" and (not id or id == 0) then + id = minetest.add_particlespawner({ + amount = 4, time = 0, collisiondetection = false, + minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25}, + maxpos = {x=pos.x+0.25, y=pos.y+5, z=pos.z+0.25}, + minvel = {x=-0.2, y=0.3, z=-0.2}, maxvel = {x=0.2, y=1, z=0.2}, + minacc = {x=0,y=0,z=0}, maxacc = {x=0,y=0.5,z=0}, + minexptime = 1, maxexptime = 3, + minsize = 4, maxsize = 8, + texture = "smoke_particle.png", + }) + if chimney == 1 then + s_handle = nil + this_spawner_meta:set_int("smoky", id) + this_spawner_meta:set_int("sound", nil) + else + s_handle = minetest.sound_play("fire_small", { + pos = pos, + max_hear_distance = 5, + loop = true + }) + this_spawner_meta:set_int("smoky", id) + this_spawner_meta:set_int("sound", s_handle) + end + return end +end + +local function stop_smoke(pos) + local this_spawner_meta = minetest.get_meta(pos) + local id = this_spawner_meta:get_int("smoky") + local s_handle = this_spawner_meta:get_int("sound") + + if id ~= 0 then + minetest.delete_particlespawner(id) + end + + if s_handle then + minetest.after(0, function(s_handle) + minetest.sound_stop(s_handle) + end, s_handle) + end + + this_spawner_meta:set_int("smoky", nil) + this_spawner_meta:set_int("sound", nil) +end + +-- FLAME TYPES +local flame_types = {"fake", "ice"} + +for _, f in ipairs(flame_types) do + minetest.register_node("fake_fire:"..f.."_fire", { + inventory_image = f.."_fire_inv.png", + description = f.." fire", + drawtype = "plantlike", + paramtype = "light", + paramtype2 = "facedir", + groups = {dig_immediate=3, not_in_creative_inventory=1}, + sunlight_propagates = true, + buildable_to = true, + walkable = false, + light_source = 14, + waving = 1, + tiles = { + {name=f.."_fire_animated.png", animation={type="vertical_frames", + aspect_w=16, aspect_h=16, length=1.5}}, + }, + on_rightclick = function (pos, node, clicker) + start_smoke(pos, node, clicker) + end, + on_destruct = function (pos) + stop_smoke(pos) + minetest.sound_play("fire_extinguish", { + pos = pos, max_hear_distance = 5 + }) + end, + drop = "" + }) +end + +minetest.register_node("fake_fire:fancy_fire", { + inventory_image = "fancy_fire_inv.png", + description = "Fancy Fire", + drawtype = "mesh", + mesh = "fancy_fire.obj", + paramtype = "light", + paramtype2 = "facedir", + groups = {dig_immediate=3}, + sunlight_propagates = true, + light_source = 14, + walkable = false, + damage_per_second = 4, + on_rotate = screwdriver.rotate_simple, + tiles = { + {name="fake_fire_animated.png", + animation={type='vertical_frames', aspect_w=16, aspect_h=16, length=1}}, {name='fake_fire_logs.png'}}, + on_rightclick = function (pos, node, clicker) + start_smoke(pos, node, clicker) + end, + on_destruct = function (pos) + stop_smoke(pos) + minetest.sound_play("fire_extinguish", { + pos = pos, max_hear_distance = 5 + }) + end, + drop = { + max_items = 3, + items = { + { + items = { "default:torch", "default:torch", "building_blocks:sticks" }, + rarity = 1, + } + } + } + }) + +-- EMBERS +minetest.register_node("fake_fire:embers", { + description = "Glowing Embers", + tiles = { + {name="embers_animated.png", animation={type="vertical_frames", + aspect_w=16, aspect_h=16, length=2}}, + }, + light_source = 9, + groups = {crumbly=3}, + paramtype = "light", + sounds = default.node_sound_dirt_defaults(), +}) + +-- CHIMNEYS +local materials = {"stone", "sandstone"} + +for _, m in ipairs(materials) do + minetest.register_node("fake_fire:chimney_top_"..m, { + description = "Chimney Top - "..m, + tiles = {"default_"..m..".png^chimney_top.png", "default_"..m..".png"}, + groups = {snappy=3}, + paramtype = "light", + sounds = default.node_sound_stone_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + }, + on_rightclick = function (pos, node, clicker) + local chimney = 1 + start_smoke(pos, node, clicker, chimney) + end, + on_destruct = function (pos) + stop_smoke(pos) + end + }) + + minetest.register_craft({ + type = "shapeless", + output = 'fake_fire:chimney_top_'..m, + recipe = {"default:torch", "stairs:slab_"..m} + }) +end + +-- FLINT and STEEL +minetest.register_tool("fake_fire:flint_and_steel", { + description = "Flint and steel", + inventory_image = "flint_and_steel.png", + liquids_pointable = false, + stack_max = 1, + tool_capabilities = { + full_punch_interval = 1.0, + max_drop_level=0, + groupcaps={flamable = {uses=65, maxlevel=1}} + }, + on_use = function(itemstack, user, pointed_thing) + if pointed_thing.type == "node" and minetest.get_node(pointed_thing.above).name == "air" then + if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then + if string.find(minetest.get_node(pointed_thing.under).name, "ice") then + minetest.set_node(pointed_thing.above, {name="fake_fire:ice_fire"}) + else + minetest.set_node(pointed_thing.above, {name="fake_fire:fake_fire"}) + end + else + minetest.chat_send_player(user:get_player_name(), "This area is protected!") + end + else + return + end + + itemstack:add_wear(65535/65) + return itemstack + end +}) + +-- CRAFTS +minetest.register_craft({ + type = "shapeless", + output = 'fake_fire:flint_and_steel', + recipe = {"default:obsidian_shard", "default:steel_ingot"} +}) + +minetest.register_craft({ + type = "shapeless", + output = 'fake_fire:embers', + recipe = {"default:torch", "group:wood", "default:torch"} +}) + +minetest.register_craft({ + type = "shapeless", + output = 'fake_fire:fancy_fire', + recipe = {"default:torch", "building_blocks:sticks", "default:torch" } +}) + +-- ALIASES +minetest.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire") +minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire") +minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone") +minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone") +minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel") diff --git a/mods/homedecor_modpack/fake_fire/models/fancy_fire.obj b/mods/homedecor_modpack/fake_fire/models/fancy_fire.obj new file mode 100644 index 00000000..ad81f6e6 --- /dev/null +++ b/mods/homedecor_modpack/fake_fire/models/fancy_fire.obj @@ -0,0 +1,133 @@ +# Blender v2.72 (sub 2) OBJ File: 'campfire.blend' +# www.blender.org +v 0.353153 -0.337287 0.000000 +v -0.366847 -0.337287 0.000000 +v -0.366847 0.382713 -0.000000 +v -0.186847 -0.337287 0.311769 +v 0.173153 -0.337287 -0.311769 +v -0.186846 0.382713 0.311769 +v 0.173154 0.382713 -0.311769 +v -0.186846 -0.337287 -0.311769 +v 0.173154 -0.337287 0.311769 +v -0.186846 0.382713 -0.311769 +v 0.173153 0.382713 0.311769 +v 0.353153 0.382713 0.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +g Flames.001_Cube.004_Fire +s off +f 4/1 5/2 7/3 6/4 +f 8/1 9/2 11/3 10/4 +f 1/1 2/2 3/3 12/4 +v 0.151217 -0.347540 0.439253 +v 0.151217 -0.207593 0.411057 +v 0.008458 -0.207593 0.411057 +v 0.008458 -0.347540 0.439253 +v 0.151217 -0.526542 -0.449208 +v 0.151217 -0.386595 -0.477403 +v 0.008458 -0.386595 -0.477403 +v 0.008458 -0.526542 -0.449208 +v -0.419949 -0.512482 0.485423 +v -0.419949 -0.369723 0.485423 +v -0.444739 -0.369723 0.344833 +v -0.444739 -0.512482 0.344833 +v 0.472595 -0.512482 0.328044 +v 0.472595 -0.369723 0.328044 +v 0.447805 -0.369723 0.187453 +v 0.447805 -0.512482 0.187453 +v 0.033402 -0.347540 0.433815 +v 0.025205 -0.207593 0.406838 +v -0.111388 -0.207593 0.448342 +v -0.103191 -0.347540 0.475320 +v -0.224900 -0.526542 -0.416268 +v -0.233097 -0.386595 -0.443246 +v -0.369690 -0.386595 -0.401741 +v -0.361493 -0.526542 -0.374763 +v 0.254175 -0.345963 0.293196 +v 0.254175 -0.277187 0.265611 +v 0.181422 -0.282425 0.252550 +v 0.181422 -0.351201 0.280135 +v 0.343511 -0.517901 -0.135488 +v 0.343511 -0.449125 -0.163073 +v 0.270757 -0.454364 -0.176133 +v 0.270757 -0.523140 -0.148548 +v -0.418506 -0.513914 0.100698 +v -0.418472 -0.439812 0.100704 +v -0.392481 -0.439819 0.031309 +v -0.392514 -0.513921 0.031304 +v 0.022046 -0.514125 0.265705 +v 0.022080 -0.440022 0.265710 +v 0.048071 -0.440029 0.196316 +v 0.048038 -0.514131 0.196310 +v -0.249910 -0.307656 -0.062181 +v -0.249882 -0.234638 -0.074807 +v -0.278776 -0.246254 -0.142048 +v -0.278804 -0.319272 -0.129422 +v 0.183295 -0.339072 -0.242901 +v 0.183323 -0.266053 -0.255527 +v 0.154429 -0.277669 -0.322768 +v 0.154401 -0.350687 -0.310143 +vt 0.418293 0.016195 +vt 0.418293 0.216092 +vt 0.218396 0.216092 +vt 0.218396 0.016195 +vt 0.002609 0.212891 +vt 0.002609 0.012994 +vt 0.989254 0.012994 +vt 0.989254 0.212891 +vt 0.010050 0.219323 +vt 0.010050 0.019426 +vt 0.996695 0.019426 +vt 0.996695 0.219323 +vt 0.618448 0.016195 +vt 0.618448 0.216092 +vt 0.418551 0.216092 +vt 0.418551 0.016195 +vt 0.010050 0.228781 +vt 0.010050 0.028884 +vt 0.996695 0.028884 +vt 0.996695 0.228781 +vt 0.005089 0.207467 +vt 0.005089 0.007570 +vt 0.991734 0.007570 +vt 0.991734 0.207467 +g Campfire_Cube.003_Logs-Stone +s off +f 20/5 19/6 18/7 17/8 +f 14/9 13/10 17/11 18/12 +f 15/13 14/14 18/15 19/16 +f 13/17 14/18 15/19 16/20 +f 13/21 16/22 20/23 17/24 +f 16/25 15/26 19/27 20/28 +f 28/5 27/6 26/7 25/8 +f 22/9 21/10 25/11 26/12 +f 23/13 22/14 26/15 27/16 +f 21/17 22/18 23/19 24/20 +f 21/21 24/22 28/23 25/24 +f 24/25 23/26 27/27 28/28 +f 36/5 35/6 34/7 33/8 +f 30/9 29/10 33/11 34/12 +f 31/13 30/14 34/15 35/16 +f 29/17 30/18 31/19 32/20 +f 29/21 32/22 36/23 33/24 +f 32/25 31/26 35/27 36/28 +f 44/5 43/6 42/7 41/8 +f 38/9 37/10 41/11 42/12 +f 39/13 38/14 42/15 43/16 +f 37/17 38/18 39/19 40/20 +f 37/21 40/22 44/23 41/24 +f 40/25 39/26 43/27 44/28 +f 52/5 51/6 50/7 49/8 +f 46/9 45/10 49/11 50/12 +f 47/13 46/14 50/15 51/16 +f 45/17 46/18 47/19 48/20 +f 45/21 48/22 52/23 49/24 +f 48/25 47/26 51/27 52/28 +f 60/5 59/6 58/7 57/8 +f 54/9 53/10 57/11 58/12 +f 55/13 54/14 58/15 59/16 +f 53/17 54/18 55/19 56/20 +f 53/21 56/22 60/23 57/24 +f 56/25 55/26 59/27 60/28 diff --git a/mods/homedecor_modpack/fake_fire/modfiles/abms.lua b/mods/homedecor_modpack/fake_fire/modfiles/abms.lua deleted file mode 100755 index 6067e7e3..00000000 --- a/mods/homedecor_modpack/fake_fire/modfiles/abms.lua +++ /dev/null @@ -1,26 +0,0 @@ -minetest.register_abm({ - nodenames = { - "fake_fire:fake_fire", - "fake_fire:ice_fire", - "fake_fire:chimney_top_stone", - "fake_fire:chimney_top_sandstone" - }, - interval = 1, - chance = 2, - action = function(pos, node) - if minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}).name == "air" - and minetest.get_node({x=pos.x, y=pos.y+2.0, z=pos.z}).name == "air" then - local image_number = math.random(4) - minetest.add_particlespawner({ - amount = 6, time = 1, collisiondetection = false, - minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25}, - maxpos = {x=pos.x+0.25, y=pos.y+8, z=pos.z+0.25}, - minvel = {x=-0.2, y=0.3, z=-0.2}, maxvel = {x=0.2, y=1, z=0.2}, - minacc = {x=0,y=0,z=0}, maxacc = {x=0,y=0,z=0}, - minexptime = 0.5, maxexptime = 3, - minsize = 2, maxsize = 10, - texture = "smoke_particle_"..image_number..".png", - }) - end - end -}) diff --git a/mods/homedecor_modpack/fake_fire/modfiles/crafts.lua b/mods/homedecor_modpack/fake_fire/modfiles/crafts.lua deleted file mode 100755 index cc90998a..00000000 --- a/mods/homedecor_modpack/fake_fire/modfiles/crafts.lua +++ /dev/null @@ -1,89 +0,0 @@ --- RECIPE ITEM - FLINT -minetest.register_craftitem("fake_fire:flint", { - description = "flint", - inventory_image = "flint.png", - stack_max = 99, - liquids_pointable = false, -}) - --- FLINT -minetest.register_craft({ - type = "shapeless", - output = 'fake_fire:flint', - recipe = { - "default:gravel", - "default:gravel", - } -}) - --- FLINT & STEEL -minetest.register_craft({ - type = "shapeless", - output = 'fake_fire:flint_and_steel', - recipe = { - "fake_fire:flint", - "default:steel_ingot", - } -}) - --- EMBERS -minetest.register_craft({ - type = "shapeless", - output = 'fake_fire:embers', - recipe = { - "default:torch", - "group:wood", - } -}) - --- STONE CHIMNEY TOP -minetest.register_craft({ - type = "shapeless", - output = 'fake_fire:smokeless_chimney_top_stone', - recipe = { - "default:torch", - "stairs:slab_stone", - } -}) - --- SANDSTONE CHIMNEY TOP -minetest.register_craft({ - type = "shapeless", - output = 'fake_fire:smokeless_chimney_top_sandstone', - recipe = { - "default:torch", - "stairs:slab_sandstone", - } -}) - --- Cobble to Gravel -minetest.register_craft({ - output = 'default:gravel', - recipe = { - {'default:cobble'}, - } -}) - --- Gravel to Sand -minetest.register_craft({ - output = 'default:sand', - recipe = { - {'default:gravel'}, - } -}) - --- Desert Sand to Sand -minetest.register_craft({ - output = 'default:sand', - recipe = { - {'default:desert_sand'}, - } -}) - --- Sand to Desert Sand -minetest.register_craft({ - output = 'default:desert_sand', - recipe = { - {'default:sand'}, - } -}) diff --git a/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua b/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua deleted file mode 100755 index e9697f15..00000000 --- a/mods/homedecor_modpack/fake_fire/modfiles/nodes.lua +++ /dev/null @@ -1,213 +0,0 @@ -local cp = nil - -local function register_fake_fire(name, def) - assert(name, "local registration called without name") - assert(def, "local registration called without node definition") - - def.is_ground_content = true - def.inventory_image = def.inventory_image or name..".png" - def.drawtype = "plantlike" - def.waving = 1 - def.light_source = def.lightsource or 14 - def.sunlight_propagates = true - def.groups = def.groups or { - oddly_breakable_by_hand=3, dig_immediate=2, - attached_node=1, not_in_creative_inventory=1 - } - def.paramtype = "light" - def.walkable = false - def.drop = "" - def.sounds = def.sounds or minetest.sound_play("fire_small", {pos=cp, loop=true}) - def.buildable_to = true - - local swap_on_punch = def.swap_on_punch - def.on_punch = def.on_punch or function (pos, node, puncher) - minetest.sound_play("fire_extinguish", {pos = pos, gain = 1.0, max_hear_distance = 5,}) - if swap_on_punch then - minetest.set_node(pos, {name = swap_on_punch}) - end - end - - def.swap_on_punch = nil - def.smoking = nil - minetest.register_node("fake_fire:"..name, def) -end - - --- FLAME TYPES -register_fake_fire("fake_fire", { - description = "Smokey, Fake Fire", - tiles = { - {name="fake_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - swap_on_punch = "fake_fire:smokeless_fire", -}) - -register_fake_fire("smokeless_fire", { - description = "Smokeless, Fake Fire", - tiles = { - {name="fake_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - inventory_image = 'fake_fire.png', - swap_on_punch = "fake_fire:fake_fire", -}) - -register_fake_fire("ice_fire", { - description = "Smoky, Fake, Ice Fire", - tiles = { - {name="ice_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - swap_on_punch = "fake_fire:smokeless_ice_fire", -}) - -register_fake_fire("smokeless_ice_fire", { - description = "Smokeless, Fake, Ice Fire", - tiles = { - {name="ice_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, - }, - inventory_image = 'ice_fire.png', - swap_on_punch = "fake_fire:ice_fire", -}) - - --- FLINT and STEEL -minetest.register_tool("fake_fire:flint_and_steel", { - description = "Flint and steel", - inventory_image = "flint_and_steel.png", - liquids_pointable = false, - stack_max = 1, - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=0, - groupcaps={flamable = {uses=65, maxlevel=1}, - } - }, - on_use = function(itemstack, user, pointed_thing) - local snow_ice_list = {"snow", "ice",} - - for _, which_one_is_it in pairs(snow_ice_list) do - local snow_ice = which_one_is_it - - if pointed_thing.type == "node" - and not string.find(minetest.get_node(pointed_thing.under).name, "snow") - and not string.find(minetest.get_node(pointed_thing.under).name, "ice") - and minetest.get_node(pointed_thing.above).name == "air" - then - if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then - minetest.set_node(pointed_thing.above, {name="fake_fire:smokeless_fire"}) - else - minetest.chat_send_player(user:get_player_name(), "You can't set a fire in someone else's area!") - end - elseif pointed_thing.type == "node" - and string.find(minetest.get_node(pointed_thing.under).name,snow_ice) - and minetest.get_node(pointed_thing.above).name == "air" then - if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then - minetest.set_node(pointed_thing.above, {name="fake_fire:smokeless_ice_fire"}) - else - minetest.chat_send_player(user:get_player_name(), "You can't set a fire in someone else's area!") - end - end - end - - minetest.sound_play("", {gain = 1.0, max_hear_distance = 2,}) - itemstack:add_wear(65535/65) - return itemstack - end -}) - - --- EMBERS -minetest.register_node("fake_fire:embers", { - description = "Glowing Embers", - tiles = { - {name="embers_animated.png", animation={type="vertical_frames", - aspect_w=16, aspect_h=16, length=2}}, - }, - inventory_image = minetest.inventorycube('fake_fire_embers.png'), - is_ground_content = true, - light_source = 9, - sunlight_propagates = true, - groups = {choppy=3, crumbly=3, oddly_breakable_by_hand=3}, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - sounds = minetest.sound_play("fire_small", {pos=cp, loop=true}), -}) - - --- CHIMNEY TOP - STONE -minetest.register_node("fake_fire:chimney_top_stone", { - description = "Chimney Top - Stone", - tiles = {"chimney_top_stone.png", "default_stone.png"}, - is_ground_content = true, - groups = {cracky=3, oddly_breakable_by_hand=1, not_in_creative_inventory=1}, - paramtype = "light", - sounds = default.node_sound_stone_defaults(), - drop = "fake_fire:smokeless_chimney_top_stone", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - on_punch = function (pos,node,puncher) - minetest.set_node(pos, {name = "fake_fire:smokeless_chimney_top_stone"}) - end -}) - - --- CHIMNEY TOP - SANDSTONE -minetest.register_node("fake_fire:chimney_top_sandstone", { - description = "Chimney Top - Sandstone", - tiles = {"chimney_top_sandstone.png", "default_sandstone.png"}, - is_ground_content = true, - groups = {cracky=3, oddly_breakable_by_hand=1, not_in_creative_inventory=1}, - paramtype = "light", - sounds = default.node_sound_stone_defaults(), - drop = "fake_fire:smokeless_chimney_top_sandstone", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - on_punch = function (pos,node,puncher) - minetest.set_node(pos, {name = "fake_fire:smokeless_chimney_top_sandstone"}) - end -}) - - --- SMOKELESS CHIMNEY TOP - STONE -minetest.register_node("fake_fire:smokeless_chimney_top_stone", { - description = "Chimney Top - Stone", - tiles = {"chimney_top_stone.png", "default_stone.png"}, - is_ground_content = true, - groups = {cracky=3, oddly_breakable_by_hand=1}, - paramtype = "light", - sounds = default.node_sound_stone_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - on_punch = function (pos,node,puncher) - minetest.set_node(pos, {name = "fake_fire:chimney_top_stone"}) - end -}) - - --- SMOKELESS CHIMNEY TOP - SANDSTONE -minetest.register_node("fake_fire:smokeless_chimney_top_sandstone", { - description = "Chimney Top - Sandstone", - tiles = {"chimney_top_sandstone.png", "default_sandstone.png"}, - is_ground_content = true, - groups = {cracky=3, oddly_breakable_by_hand=1}, - paramtype = "light", - sounds = default.node_sound_stone_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - on_punch = function (pos,node,puncher) - minetest.set_node(pos, {name = "fake_fire:chimney_top_sandstone"}) - end -}) diff --git a/mods/homedecor_modpack/fake_fire/sounds/fire_extinguish.ogg b/mods/homedecor_modpack/fake_fire/sounds/fire_extinguish.ogg old mode 100755 new mode 100644 index 38c56d6a..a53525d0 Binary files a/mods/homedecor_modpack/fake_fire/sounds/fire_extinguish.ogg and b/mods/homedecor_modpack/fake_fire/sounds/fire_extinguish.ogg differ diff --git a/mods/homedecor_modpack/fake_fire/sounds/fire_ignite.ogg b/mods/homedecor_modpack/fake_fire/sounds/fire_ignite.ogg deleted file mode 100755 index 9063eeb8..00000000 Binary files a/mods/homedecor_modpack/fake_fire/sounds/fire_ignite.ogg and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/sounds/fire_small.ogg b/mods/homedecor_modpack/fake_fire/sounds/fire_small.ogg old mode 100755 new mode 100644 index 5aac595b..bf51b179 Binary files a/mods/homedecor_modpack/fake_fire/sounds/fire_small.ogg and b/mods/homedecor_modpack/fake_fire/sounds/fire_small.ogg differ diff --git a/mods/homedecor_modpack/fake_fire/textures/chimney_top.png b/mods/homedecor_modpack/fake_fire/textures/chimney_top.png new file mode 100644 index 00000000..a2e16cba Binary files /dev/null and b/mods/homedecor_modpack/fake_fire/textures/chimney_top.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/chimney_top_sandstone.png b/mods/homedecor_modpack/fake_fire/textures/chimney_top_sandstone.png deleted file mode 100644 index be937dbb..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/chimney_top_sandstone.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png b/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png deleted file mode 100644 index be59a802..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/chimney_top_stone.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/embers_animated.png b/mods/homedecor_modpack/fake_fire/textures/embers_animated.png index 2e7dda5a..3b78b72c 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/embers_animated.png and b/mods/homedecor_modpack/fake_fire/textures/embers_animated.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire.png deleted file mode 100644 index 7e3deae4..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/fake_fire.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png index 67f50f86..3b5dea0c 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png and b/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_inv.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_inv.png new file mode 100644 index 00000000..989963c9 Binary files /dev/null and b/mods/homedecor_modpack/fake_fire/textures/fake_fire_inv.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_logs.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_logs.png new file mode 100644 index 00000000..e7a16bad Binary files /dev/null and b/mods/homedecor_modpack/fake_fire/textures/fake_fire_logs.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/fancy_fire_inv.png b/mods/homedecor_modpack/fake_fire/textures/fancy_fire_inv.png new file mode 100644 index 00000000..8747d535 Binary files /dev/null and b/mods/homedecor_modpack/fake_fire/textures/fancy_fire_inv.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/flint.png b/mods/homedecor_modpack/fake_fire/textures/flint.png deleted file mode 100644 index 5c699917..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/flint.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png b/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png index aa4b885b..44c692ee 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png and b/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/ice_fire.png b/mods/homedecor_modpack/fake_fire/textures/ice_fire.png deleted file mode 100644 index 57df9056..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/ice_fire.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/ice_fire_animated.png b/mods/homedecor_modpack/fake_fire/textures/ice_fire_animated.png index 04c5a100..538700a3 100644 Binary files a/mods/homedecor_modpack/fake_fire/textures/ice_fire_animated.png and b/mods/homedecor_modpack/fake_fire/textures/ice_fire_animated.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/ice_fire_inv.png b/mods/homedecor_modpack/fake_fire/textures/ice_fire_inv.png new file mode 100644 index 00000000..878936e0 Binary files /dev/null and b/mods/homedecor_modpack/fake_fire/textures/ice_fire_inv.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/smoke_particle.png b/mods/homedecor_modpack/fake_fire/textures/smoke_particle.png new file mode 100644 index 00000000..115d12b6 Binary files /dev/null and b/mods/homedecor_modpack/fake_fire/textures/smoke_particle.png differ diff --git a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_1.png b/mods/homedecor_modpack/fake_fire/textures/smoke_particle_1.png deleted file mode 100644 index 23043030..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_1.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_2.png b/mods/homedecor_modpack/fake_fire/textures/smoke_particle_2.png deleted file mode 100644 index 0b3d7154..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_2.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_3.png b/mods/homedecor_modpack/fake_fire/textures/smoke_particle_3.png deleted file mode 100644 index acac1578..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_3.png and /dev/null differ diff --git a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_4.png b/mods/homedecor_modpack/fake_fire/textures/smoke_particle_4.png deleted file mode 100644 index b546ddae..00000000 Binary files a/mods/homedecor_modpack/fake_fire/textures/smoke_particle_4.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/bathroom_furniture.lua b/mods/homedecor_modpack/homedecor/bathroom_furniture.lua index 4676685b..64ae2143 100755 --- a/mods/homedecor_modpack/homedecor/bathroom_furniture.lua +++ b/mods/homedecor_modpack/homedecor/bathroom_furniture.lua @@ -1,29 +1,38 @@ local S = homedecor.gettext local bathroom_tile_colors = { - { "1", "white/grey" }, - { "2", "white/dark grey" }, - { "3", "white/black" }, - { "4", "black/dark grey" }, - { "red", "white/red" }, - { "green", "white/green" }, - { "blue", "white/blue" }, - { "yellow", "white/yellow" }, - { "tan", "white/tan" }, + { "1", "white/grey", "#c0c0c0:200" }, + { "2", "white/dark grey", "#404040:150" }, + { "3", "white/black", "#000000:200" }, + { "4", "black/dark grey", "" }, + { "red", "white/red", "#d00000:150" }, + { "green", "white/green", "#00d000:150" }, + { "blue", "white/blue", "#0000d0:150" }, + { "yellow", "white/yellow", "#ffff00:150" }, + { "tan", "white/tan", "#ceaf42:150" } } for i in ipairs(bathroom_tile_colors) do local color = bathroom_tile_colors[i][1] local shade = bathroom_tile_colors[i][2] + local hue = bathroom_tile_colors[i][3] + + local coloredtile = "homedecor_bathroom_tiles_bg.png^(homedecor_bathroom_tiles_fg.png^[colorize:"..hue..")" + + if color == "4" then + coloredtile = "(homedecor_bathroom_tiles_bg.png^[colorize:#000000:75)".. + "^(homedecor_bathroom_tiles_fg.png^[colorize:#000000:200)" + end + minetest.register_node("homedecor:tiles_"..color, { description = "Bathroom/kitchen tiles ("..shade..")", tiles = { - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png^[transformR90", - "homedecor_bathroom_tiles_"..color..".png^[transformR90" + coloredtile, + coloredtile, + coloredtile, + coloredtile, + "("..coloredtile..")^[transformR90", + "("..coloredtile..")^[transformR90" }, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), @@ -51,23 +60,17 @@ homedecor.register("towel_rod", { homedecor.register("medicine_cabinet", { description = S("Medicine Cabinet"), + mesh = "homedecor_medicine_cabinet.obj", tiles = { - 'homedecor_medicine_cabinet_tb.png', - 'homedecor_medicine_cabinet_tb.png', - 'homedecor_medicine_cabinet_sides.png', - 'homedecor_medicine_cabinet_sides.png', - 'homedecor_medicine_cabinet_back.png', - 'homedecor_medicine_cabinet_front.png' + 'default_wood.png', + 'homedecor_medicine_cabinet_mirror.png' }, inventory_image = "homedecor_medicine_cabinet_inv.png", selection_box = { type = "fixed", fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} }, - node_box = { - type = "fixed", - fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} - }, + walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher, pointed_thing) @@ -81,22 +84,18 @@ homedecor.register("medicine_cabinet", { }) homedecor.register("medicine_cabinet_open", { + mesh = "homedecor_medicine_cabinet_open.obj", tiles = { - 'homedecor_medicine_cabinet_tb.png', - 'homedecor_medicine_cabinet_tb.png', - "homedecor_medicine_cabinet_open_right.png", - 'homedecor_medicine_cabinet_sides.png', - 'homedecor_medicine_cabinet_back.png', - "homedecor_medicine_cabinet_open_front.png" + 'default_wood.png', + 'homedecor_medicine_cabinet_mirror.png', + 'homedecor_medicine_cabinet_inside.png' }, - groups = { snappy = 3, not_in_creative_inventory=1 }, - node_box = { + selection_box = { type = "fixed", - fixed = { - {-0.3125, -0.1875, 0.375, 0.3125, 0.5, 0.5}, -- NodeBox1 - {0.28, -0.1875, -0.1875, 0.3125, 0.5, 0.375}, -- NodeBox2 - } + fixed = {-0.3125, -0.1875, -0.25, 0.3125, 0.5, 0.5} }, + walkable = false, + groups = { snappy = 3, not_in_creative_inventory=1 }, drop = "homedecor:medicine_cabinet", on_punch = function(pos, node, puncher, pointed_thing) node.name = "homedecor:medicine_cabinet" diff --git a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua index 03a50670..9628721d 100755 --- a/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua +++ b/mods/homedecor_modpack/homedecor/bathroom_sanitation.lua @@ -17,10 +17,10 @@ homedecor.register("toilet", { description = S("Toilet"), mesh = "homedecor_toilet_closed.obj", tiles = { - "homedecor_marble_light.png", - "homedecor_marble_light.png", - "homedecor_marble_light.png", - "homedecor_generic_metal_neutral.png" + "homedecor_marble.png^[colorize:#ffffff:175", + "homedecor_marble.png^[colorize:#ffffff:175", + "homedecor_marble.png^[colorize:#ffffff:175", + "homedecor_generic_metal_black.png^[brighten" }, selection_box = toilet_sbox, node_box = toilet_cbox, @@ -35,11 +35,11 @@ homedecor.register("toilet", { homedecor.register("toilet_open", { mesh = "homedecor_toilet_open.obj", tiles = { - "homedecor_marble_light.png", - "homedecor_marble_light.png", - "homedecor_marble_light.png", + "homedecor_marble.png^[colorize:#ffffff:175", + "homedecor_marble.png^[colorize:#ffffff:175", + "homedecor_marble.png^[colorize:#ffffff:175", "default_water.png", - "homedecor_generic_metal_neutral.png" + "homedecor_generic_metal_black.png^[brighten" }, selection_box = toilet_sbox, collision_box = toilet_cbox, @@ -89,26 +89,55 @@ homedecor.register("sink", { description = S("Bathroom Sink"), mesh = "homedecor_bathroom_sink.obj", tiles = { - "homedecor_marble_light.png", - "forniture_marble.png", + "homedecor_marble.png^[colorize:#ffffff:175", + "homedecor_marble.png", "default_water.png" }, inventory_image="homedecor_bathroom_sink_inv.png", selection_box = sink_cbox, - collision_box = sink_cbox, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), + node_box = { + type = "fixed", + fixed = { + { -5/16, 5/16, 1/16, -4/16, 8/16, 8/16 }, + { 5/16, 5/16, 1/16, 4/16, 8/16, 8/16 }, + { -5/16, 5/16, 1/16, 5/16, 8/16, 2/16 }, + { -5/16, 5/16, 6/16, 5/16, 8/16, 8/16 }, + { -4/16, -8/16, 1/16, 4/16, 5/16, 6/16 } + } + }, + on_destruct = function(pos) + homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z}) + end }) --Taps +local function taps_on_rightclick(pos, node, clicker) + local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) + if below and + below.name == "homedecor:shower_tray" or + below.name == "homedecor:sink" or + below.name == "homedecor:kitchen_cabinet_with_sink" then + local particledef = { + outlet = { x = 0, y = -0.44, z = 0.28 }, + velocity_x = { min = -0.1, max = 0.1 }, + velocity_y = -0.3, + velocity_z = { min = -0.1, max = 0 }, + spread = 0 + } + homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet") + end +end + homedecor.register("taps", { description = S("Bathroom taps/faucet"), mesh = "homedecor_bathroom_faucet.obj", tiles = { - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "homedecor_generic_metal_bright.png", - "homedecor_generic_metal_white.png", + "homedecor_generic_metal_black.png^[colorize:#ffffff:200", "homedecor_generic_metal_bright.png" }, inventory_image = "3dforniture_taps_inv.png", @@ -120,6 +149,9 @@ homedecor.register("taps", { walkable = false, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), + on_rightclick = taps_on_rightclick, + on_destruct = homedecor.stop_particle_spawner, + on_rotate = screwdriver.disallow }) homedecor.register("taps_brass", { @@ -128,7 +160,7 @@ homedecor.register("taps_brass", { tiles = { "homedecor_generic_metal_brass.png", "homedecor_generic_metal_brass.png", - "homedecor_generic_metal_white.png", + "homedecor_generic_metal_black.png^[colorize:#ffffff:200", "homedecor_generic_metal_brass.png" }, inventory_image = "3dforniture_taps_brass_inv.png", @@ -140,6 +172,9 @@ homedecor.register("taps_brass", { walkable = false, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), + on_rightclick = taps_on_rightclick, + on_destruct = homedecor.stop_particle_spawner, + on_rotate = screwdriver.disallow }) --Shower Tray @@ -148,7 +183,7 @@ homedecor.register("shower_tray", { description = S("Shower Tray"), tiles = { "forniture_marble_base_ducha_top.png", - "forniture_marble.png" + "homedecor_marble.png" }, node_box = { type = "fixed", @@ -167,34 +202,13 @@ homedecor.register("shower_tray", { groups = {cracky=2}, sounds = default.node_sound_stone_defaults(), on_destruct = function(pos) - headpos = {x=pos.x, y=pos.y+2, z=pos.z} - local above_spawner_meta = minetest.get_meta(headpos) - - local id = above_spawner_meta:get_int("active") - local s_handle = above_spawner_meta:get_int("sound") - - if id ~= 0 then - minetest.delete_particlespawner(id) - end - - if s_handle then - minetest.after(0, function(s_handle) - minetest.sound_stop(s_handle) - end, s_handle) - end - - above_spawner_meta:set_int("active", nil) - above_spawner_meta:set_int("sound", nil) + homedecor.stop_particle_spawner({x=pos.x, y=pos.y+2, z=pos.z}) -- the showerhead + homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z}) -- the taps, if any end }) --Shower Head -local fdir_to_flowpos = { - minx = { 0.15, 0.05, -0.15, -0.05 }, maxx = { -0.15, -0.3, 0.15, 0.3 }, - minz = { 0.05, 0.15, -0.05, -0.15 }, maxz = { -0.3, -0.15, 0.3, 0.15 }, - velx = { 0, -0.2, 0, 0.2 }, velz = { -0.2, 0, 0.2, 0 } -} local sh_cbox = { type = "fixed", @@ -205,7 +219,7 @@ homedecor.register("shower_head", { drawtype = "mesh", mesh = "homedecor_shower_head.obj", tiles = { - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "homedecor_shower_head.png" }, inventory_image = "homedecor_shower_head_inv.png", @@ -213,70 +227,22 @@ homedecor.register("shower_head", { groups = {snappy=3}, selection_box = sh_cbox, walkable = false, + on_rotate = screwdriver.disallow, on_rightclick = function (pos, node, clicker) - local below = minetest.get_node({x=pos.x, y=pos.y-2.0, z=pos.z}) - local is_tray = string.find(below.name, "homedecor:shower_tray") - local fdir = node.param2 - local minx = fdir_to_flowpos.minx[fdir + 1] - local maxx = fdir_to_flowpos.maxx[fdir + 1] - local minz = fdir_to_flowpos.minz[fdir + 1] - local maxz = fdir_to_flowpos.maxz[fdir + 1] - local velx = fdir_to_flowpos.velx[fdir + 1] - local velz = fdir_to_flowpos.velz[fdir + 1] - - local this_spawner_meta = minetest.get_meta(pos) - local id = this_spawner_meta:get_int("active") - local s_handle = this_spawner_meta:get_int("sound") - - if id ~= 0 then - if s_handle then - minetest.after(0, function(s_handle) - minetest.sound_stop(s_handle) - end, s_handle) - end - minetest.delete_particlespawner(id) - this_spawner_meta:set_int("active", nil) - this_spawner_meta:set_int("sound", nil) - return - end - - if fdir and fdir < 4 and is_tray and (not id or id == 0) then - id = minetest.add_particlespawner({ - amount = 60, time = 0, collisiondetection = true, - minpos = {x=pos.x - minx, y=pos.y-0.45, z=pos.z - minz}, - maxpos = {x=pos.x - maxx, y=pos.y-0.45, z=pos.z - maxz}, - minvel = {x=velx, y=-2, z=velz}, maxvel = {x=velx, y=-2, z=velz}, - minacc = {x=0, y=0, z=0}, maxacc = {x=0, y=-0.05, z=0}, - minexptime = 2, maxexptime = 4, minsize = 0.5, maxsize = 1, - texture = "homedecor_water_particle.png", - }) - s_handle = minetest.sound_play("homedecor_shower", { - pos = pos, - max_hear_distance = 5, - loop = true - }) - this_spawner_meta:set_int("active", id) - this_spawner_meta:set_int("sound", s_handle) - return + local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-2.0, z=pos.z}) + if below and below.name == "homedecor:shower_tray" then + local particledef = { + outlet = { x = 0, y = -0.42, z = 0.1 }, + velocity_x = { min = -0.15, max = 0.15 }, + velocity_y = -2, + velocity_z = { min = -0.3, max = 0.1 }, + spread = 0.12 + } + homedecor.start_particle_spawner(pos, node, particledef, "homedecor_shower") end end, on_destruct = function(pos) - local this_spawner_meta = minetest.get_meta(pos) - local id = this_spawner_meta:get_int("active") - local s_handle = this_spawner_meta:get_int("sound") - - if id ~= 0 then - minetest.delete_particlespawner(id) - end - - if s_handle then - minetest.after(0, function(s_handle) - minetest.sound_stop(s_handle) - end, s_handle) - end - - this_spawner_meta:set_int("active", nil) - this_spawner_meta:set_int("sound", nil) + homedecor.stop_particle_spawner(pos) end }) diff --git a/mods/homedecor_modpack/homedecor/beds.lua b/mods/homedecor_modpack/homedecor/beds.lua index 2f1ca9de..282ea27d 100644 --- a/mods/homedecor_modpack/homedecor/beds.lua +++ b/mods/homedecor_modpack/homedecor/beds.lua @@ -1,15 +1,15 @@ local S = homedecor.gettext local bedcolors = { - "red", - "green", - "blue", - "violet", - "brown", - "darkgrey", - "orange", - "yellow", - "pink", + { "red", "#d00000:150" }, + { "green", "#00d000:150" }, + { "blue", "#0000d0:150" }, + { "violet", "#7000e0:150" }, + { "brown", "#603010:175" }, + { "darkgrey", "#101010:150" }, + { "orange", "#ff3000:150" }, + { "yellow", "#ffe000:150" }, + { "pink", "#ff80b0:150" } } local bed_sbox = { @@ -40,8 +40,11 @@ local kbed_cbox = { } } -for _, color in ipairs(bedcolors) do +for i in ipairs(bedcolors) do + local color = bedcolors[i][1] local color2=color + local hue = bedcolors[i][2] + if color == "darkgrey" then color2 = "dark_grey" end @@ -55,12 +58,13 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom.png", "wool_"..color2..".png^[brighten", -- pillow }, - inventory_image = "homedecor_bed_"..color.."_inv.png", + inventory_image = "homedecor_bed_inv.png^(homedecor_bed_overlay_inv.png^[colorize:"..hue..")", description = S("Bed (%s)"):format(color), groups = {snappy=3}, selection_box = bed_sbox, collision_box = bed_cbox, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack, pointed_thing) if not placer:get_player_control().sneak then return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color) @@ -86,11 +90,11 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom.png", "wool_"..color2..".png^[brighten", }, - groups = {snappy=3, not_in_creative_inventory=1}, selection_box = bed_sbox, collision_box = bed_cbox, sounds = default.node_sound_wood_defaults(), expand = { forward = "air" }, + on_rotate = screwdriver.disallow, after_dig_node = function(pos) homedecor.unextend_bed(pos, color) end, @@ -112,12 +116,14 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom.png", "wool_"..color2..".png^[brighten", }, - inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png", + inventory_image = "homedecor_bed_kingsize_inv.png^(homedecor_bed_kingsize_overlay_inv.png^[colorize:"..hue..")", + groups = {snappy=3, not_in_creative_inventory=1}, description = S("Bed (%s, king sized)"):format(color), groups = {snappy=3, not_in_creative_inventory=1}, selection_box = kbed_sbox, collision_box = kbed_cbox, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.disallow, after_dig_node = function(pos, oldnode, oldmetadata, digger) local inv = digger:get_inventory() if digger:get_player_control().sneak and inv:room_for_item("main", "bed_"..color.."_regular 1") then diff --git a/mods/homedecor_modpack/homedecor/books.lua b/mods/homedecor_modpack/homedecor/books.lua index 6b52d27e..725e77ae 100755 --- a/mods/homedecor_modpack/homedecor/books.lua +++ b/mods/homedecor_modpack/homedecor/books.lua @@ -1,26 +1,35 @@ local S = homedecor.gettext local bookcolors = { - "red", - "green", - "blue", - "violet", - "grey", - "brown" + { "red", "#c00000:150" }, + { "green", "#008000:150" }, + { "blue", "#4040c0:150" }, + { "violet", "#600070:150" }, + { "grey", "#202020:150" }, + { "brown", "#603010:175" } } local BOOK_FORMNAME = "homedecor:book_form" +local player_current_book = { } + for c in ipairs(bookcolors) do - local color = bookcolors[c] - local color_d = S(bookcolors[c]) + local color = bookcolors[c][1] + local color_d = S(bookcolors[c][1]) + local hue = bookcolors[c][2] local function book_dig(pos, node, digger) if minetest.is_protected(pos, digger:get_player_name()) then return end local meta = minetest.get_meta(pos) + local data = minetest.serialize({ + title = meta:get_string("title") or "", + text = meta:get_string("text") or "", + owner = meta:get_string("owner") or "", + _recover = meta:get_string("_recover") or "", + }) local stack = ItemStack({ name = "homedecor:book_"..color, - metadata = meta:get_string("text"), + metadata = data, }) stack = digger:get_inventory():add_item("main", stack) if not stack:is_empty() then @@ -29,101 +38,119 @@ for c in ipairs(bookcolors) do minetest.remove_node(pos) end -homedecor.register("book_"..color, { - description = S("Writable Book (%s)"):format(color_d), - mesh = "homedecor_book.obj", - tiles = { "homedecor_book_"..color..".png" }, - inventory_image = "homedecor_book_"..color.."_inv.png", - wield_image = "homedecor_book_"..color.."_inv.png", - groups = { snappy=3, oddly_breakable_by_hand=3, book=1 }, - walkable = false, - stack_max = 1, - on_rightclick = function(pos, node, clicker) - local fdir = node.param2 - minetest.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) - end, - on_place = function(itemstack, placer, pointed_thing) - local plname = placer:get_player_name() - local pos = pointed_thing.under - local node = minetest.get_node(pos) - local n = minetest.registered_nodes[node.name] - if not n.buildable_to then - pos = pointed_thing.above - node = minetest.get_node(pos) - n = minetest.registered_nodes[node.name] - if not n.buildable_to then return end - end - if minetest.is_protected(pos, plname) then return end - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - minetest.set_node(pos, { - name = "homedecor:book_"..color, - param2 = fdir, - }) - local text = itemstack:get_metadata() or "" - local meta = minetest.get_meta(pos) - meta:set_string("text", text) - local data = minetest.deserialize(text) or {} - if data.title and data.title ~= "" then - meta:set_string("infotext", data.title) - end - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack - end, - on_dig = book_dig, - on_use = function(itemstack, user, pointed_thing) - local player_name = user:get_player_name() - local data = minetest.deserialize(itemstack:get_metadata()) - local title, text, owner = "", "", player_name - if data then - title, text, owner = data.title, data.text, data.owner - end - local formspec - if owner == player_name then - formspec = "size[8,8]"..default.gui_bg..default.gui_bg_img.. - "field[0.5,1;7.5,0;title;Book title :;".. - minetest.formspec_escape(title).."]".. - "textarea[0.5,1.5;7.5,7;text;Book content :;".. - minetest.formspec_escape(text).."]".. - "button_exit[2.5,7.5;3,1;save;Save]" - else - formspec = "size[8,8]"..default.gui_bg.. - "button_exit[7,0.25;1,0.5;close;X]".. - default.gui_bg_img.. - "label[0.5,0.5;by "..owner.."]".. - "label[0.5,0;"..minetest.formspec_escape(title).."]".. - "textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]" - end - minetest.show_formspec(user:get_player_name(), BOOK_FORMNAME, formspec) - end, - selection_box = { - type = "fixed", - fixed = {-0.2, -0.5, -0.25, 0.2, -0.35, 0.25} - } -}) + local inv_img = "homedecor_book_inv.png^[colorize:"..hue.."^homedecor_book_trim_inv.png" -homedecor.register("book_open_"..color, { - mesh = "homedecor_book_open.obj", - tiles = { "homedecor_book_open_"..color..".png" }, - groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 }, - drop = "homedecor:book_"..color, - walkable = false, - on_dig = book_dig, - on_rightclick = function(pos, node, clicker) - local fdir = node.param2 - minetest.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) - minetest.sound_play("homedecor_book_close", { - pos=pos, - max_hear_distance = 3, - gain = 2, + homedecor.register("book_"..color, { + description = S("Writable Book (%s)"):format(color_d), + mesh = "homedecor_book.obj", + tiles = { + "(homedecor_book_cover.png^[colorize:"..hue..")^homedecor_book_cover_trim.png", + "homedecor_book_edges.png" + }, + inventory_image = inv_img, + wield_image = inv_img, + groups = { snappy=3, oddly_breakable_by_hand=3, book=1 }, + walkable = false, + stack_max = 1, + on_punch = function(pos, node, puncher, pointed_thing) + local fdir = node.param2 + minetest.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) + end, + on_place = function(itemstack, placer, pointed_thing) + local plname = placer:get_player_name() + local pos = pointed_thing.under + local node = minetest.get_node(pos) + local n = minetest.registered_nodes[node.name] + if not n.buildable_to then + pos = pointed_thing.above + node = minetest.get_node(pos) + n = minetest.registered_nodes[node.name] + if not n.buildable_to then return end + end + if minetest.is_protected(pos, plname) then return end + local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + minetest.set_node(pos, { + name = "homedecor:book_"..color, + param2 = fdir, }) - end, - selection_box = { - type = "fixed", - fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25} - } -}) + local text = itemstack:get_metadata() or "" + local meta = minetest.get_meta(pos) + local data = minetest.deserialize(text) or {} + if type(data) ~= "table" then + data = {} + -- Store raw metadata in case some data is lost by the + -- transition to the new meta format, so it is not lost + -- and can be recovered if needed. + meta:set_string("_recover", text) + end + meta:set_string("title", data.title or "") + meta:set_string("text", data.text or "") + meta:set_string("owner", data.owner or "") + if data.title and data.title ~= "" then + meta:set_string("infotext", data.title) + end + if not minetest.setting_getbool("creative_mode") then + itemstack:take_item() + end + return itemstack + end, + on_dig = book_dig, + selection_box = { + type = "fixed", + fixed = {-0.2, -0.5, -0.25, 0.2, -0.35, 0.25} + } + }) + + homedecor.register("book_open_"..color, { + mesh = "homedecor_book_open.obj", + tiles = { + "(homedecor_book_cover.png^[colorize:"..hue..")^homedecor_book_cover_trim.png", + "homedecor_book_edges.png", + "homedecor_book_pages.png" + }, + groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 }, + drop = "homedecor:book_"..color, + walkable = false, + on_dig = book_dig, + on_rightclick = function(pos, node, clicker) + local meta = minetest.get_meta(pos) + local player_name = clicker:get_player_name() + local title = meta:get_string("title") or "" + local text = meta:get_string("text") or "" + local owner = meta:get_string("owner") or "" + local formspec + if owner == "" or owner == player_name then + formspec = "size[8,8]"..default.gui_bg..default.gui_bg_img.. + "field[0.5,1;7.5,0;title;Book title :;".. + minetest.formspec_escape(title).."]".. + "textarea[0.5,1.5;7.5,7;text;Book content :;".. + minetest.formspec_escape(text).."]".. + "button_exit[2.5,7.5;3,1;save;Save]" + else + formspec = "size[8,8]"..default.gui_bg.. + "button_exit[7,0.25;1,0.5;close;X]".. + default.gui_bg_img.. + "label[0.5,0.5;by "..owner.."]".. + "label[0.5,0;"..minetest.formspec_escape(title).."]".. + "textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]" + end + player_current_book[player_name] = pos + minetest.show_formspec(player_name, BOOK_FORMNAME, formspec) + end, + on_punch = function(pos, node, puncher, pointed_thing) + local fdir = node.param2 + minetest.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) + minetest.sound_play("homedecor_book_close", { + pos=pos, + max_hear_distance = 3, + gain = 2, + }) + end, + selection_box = { + type = "fixed", + fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25} + } + }) end @@ -131,15 +158,16 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields) if form_name ~= BOOK_FORMNAME or not fields.save then return end - local stack = player:get_wielded_item() - if minetest.get_item_group(stack:get_name(), "book") == 0 then - return + local player_name = player:get_player_name() + local pos = player_current_book[player_name] + if not pos then return end + local meta = minetest.get_meta(pos) + meta:set_string("title", fields.title or "") + meta:set_string("text", fields.text or "") + meta:set_string("owner", player_name) + if (fields.title or "") ~= "" then + meta:set_string("infotext", fields.title) end - local data = minetest.deserialize(stack:get_metadata()) or {} - data.title, data.text, data.owner = - fields.title, fields.text, player:get_player_name() - stack:set_metadata(minetest.serialize(data)) - player:set_wielded_item(stack) minetest.log("action", player:get_player_name().." has written in a book (title: \""..fields.title.."\"): \""..fields.text.. "\" at location: "..minetest.pos_to_string(player:getpos())) end) diff --git a/mods/homedecor_modpack/homedecor/climate-control.lua b/mods/homedecor_modpack/homedecor/climate-control.lua index 111960a4..cd495640 100755 --- a/mods/homedecor_modpack/homedecor/climate-control.lua +++ b/mods/homedecor_modpack/homedecor/climate-control.lua @@ -4,21 +4,13 @@ local S = homedecor.gettext homedecor.register("air_conditioner", { description = S("Air Conditioner"), - tiles = { 'homedecor_ac_tb.png', - 'homedecor_ac_tb.png', - 'homedecor_ac_sides.png', - 'homedecor_ac_sides.png', - 'homedecor_ac_back.png', - 'homedecor_ac_front.png'}, + mesh = "homedecor_ac.obj", + tiles = { + "homedecor_ac.png", + "default_glass.png" + }, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.124, 0.5 }, -- off by just a tad to force the adjoining faces to be drawn. - {-0.5, 0.125, -0.5, 0.5, 0.5, 0.5 }, - } - }, selection_box = { type="regular" }, }) @@ -45,6 +37,7 @@ homedecor.register("desk_fan", { inventory_image = "homedecor_desk_fan_inv.png", wield_image = "homedecor_desk_fan_inv.png", selection_box = { type = "regular" }, + on_rotate = screwdriver.disallow, on_construct = function(pos) local entity_remove = minetest.get_objects_inside_radius(pos, 0.1) local meta = minetest.get_meta(pos) @@ -160,7 +153,7 @@ local r_cbox = { homedecor.register("radiator", { mesh = "homedecor_radiator.obj", tiles = { - "homedecor_generic_metal_white.png", + "homedecor_generic_metal_black.png^[colorize:#ffffff:200", "homedecor_radiator_controls.png" }, inventory_image = "homedecor_radiator_inv.png", diff --git a/mods/homedecor_modpack/homedecor/clocks.lua b/mods/homedecor_modpack/homedecor/clocks.lua index b8cfd26e..1fc6a6cb 100755 --- a/mods/homedecor_modpack/homedecor/clocks.lua +++ b/mods/homedecor_modpack/homedecor/clocks.lua @@ -4,7 +4,7 @@ local clock_sbox = { } local clock_materials = { - { "plastic", "homedecor_generic_plastic_white.png" }, + { "plastic", "homedecor_generic_plastic_black.png^[colorize:#ffffff:220" }, { "wood", "default_wood.png" } } @@ -82,7 +82,7 @@ homedecor.register("grandfather_clock", { tiles = { "default_glass.png", "homedecor_grandfather_clock_face.png", - "homedecor_generic_wood_luxury_brown1.png", + "homedecor_generic_wood_luxury.png", "homedecor_grandfather_clock_face_edge.png", "homedecor_generic_metal_brass.png" }, @@ -92,6 +92,7 @@ homedecor.register("grandfather_clock", { collision_box = gf_cbox, sounds = default.node_sound_wood_defaults(), expand = { top="air" }, + on_rotate = screwdriver.rotate_simple }) minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock") diff --git a/mods/homedecor_modpack/homedecor/cobweb.lua b/mods/homedecor_modpack/homedecor/cobweb.lua index 4425d231..97310328 100755 --- a/mods/homedecor_modpack/homedecor/cobweb.lua +++ b/mods/homedecor_modpack/homedecor/cobweb.lua @@ -1,9 +1,9 @@ minetest.register_node("homedecor:cobweb_corner", { - description = "Cobweb Corner (only decorative)", --Description changé pour évitez conflit avec "Spider Cobweb" du mod "mobs" + description = "Cobweb", drawtype = "torchlike", tiles = { "homedecor_cobweb_torchlike.png" }, - inventory_image = "homedecor_cobweb_inv.png", - wield_image = "homedecor_cobweb_inv.png", + inventory_image = "homedecor_cobweb.png", + wield_image = "homedecor_cobweb.png", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -26,7 +26,7 @@ minetest.register_node("homedecor:cobweb_centered", { description = "Cobweb", drawtype = "nodebox", tiles = { "homedecor_cobweb.png" }, - inventory_image = "homedecor_cobweb_inv.png", + inventory_image = "homedecor_cobweb.png", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, @@ -53,7 +53,7 @@ minetest.register_node("homedecor:cobweb_flat", { description = "Cobweb", drawtype = "nodebox", tiles = { "homedecor_cobweb.png" }, - inventory_image = "homedecor_cobweb_inv.png", + inventory_image = "homedecor_cobweb.png", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, @@ -80,7 +80,7 @@ minetest.register_node("homedecor:cobweb_plantlike", { description = "Cobweb", drawtype = "plantlike", tiles = { "homedecor_cobweb_plantlike.png" }, - inventory_image = "homedecor_cobweb_inv.png", + inventory_image = "homedecor_cobweb.png", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, diff --git a/mods/homedecor_modpack/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index 89000424..8cfb0aa2 100755 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -118,6 +118,17 @@ minetest.register_craftitem("homedecor:chainlink_brass", { inventory_image = "homedecor_chainlink_brass.png" }) +minetest.register_craftitem("homedecor:soda_can", { + description = "Soda Can", + inventory_image = "homedecor_soda_can.png", + on_use = minetest.item_eat(2), +}) + +minetest.register_craftitem("homedecor:coin", { + description = "Gold Coin", + inventory_image = "homedecor_coin.png", +}) + -- alternate crafting if mesecons is/isn't installed if not minetest.get_modpath("mesecons") then @@ -911,26 +922,46 @@ minetest.register_craft( { type = "shapeless", output = "homedecor:rug_small 8", recipe = { - "wool:red", - "wool:yellow", - "wool:blue", - "wool:black" + "wool:red", + "wool:yellow", + "wool:blue", + "wool:black" }, }) --- cotton version: +minetest.register_craft( { + output = "homedecor:rug_persian 8", + recipe = { + { "", "wool:yellow", "" }, + { "wool:red", "wool:blue", "wool:red" }, + { "", "wool:yellow", "" } + }, +}) + +-- cotton versions: minetest.register_craft( { type = "shapeless", output = "homedecor:rug_small 8", recipe = { - "cotton:red", - "cotton:yellow", - "cotton:blue", - "cotton:black" + "cotton:red", + "cotton:yellow", + "cotton:blue", + "cotton:black" }, }) +minetest.register_craft( { + output = "homedecor:rug_persian 8", + recipe = { + { "", "cotton:yellow", "" }, + { "cotton:red", "cotton:blue", "cotton:red" }, + { "", "cotton:yellow", "" } + }, +}) + +-- fuel recipes for same + minetest.register_craft({ type = "fuel", recipe = "homedecor:rug_small", @@ -952,6 +983,12 @@ minetest.register_craft({ burntime = 30, }) +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:rug_persian", + burntime = 30, +}) + -- Speakers minetest.register_craft( { @@ -1493,6 +1530,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "homedecor:plasma_ball 2", + recipe = { + {"", "default:glass", ""}, + {"default:glass", "default:copper_ingot", "default:glass"}, + {"homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting"} + } +}) + -- Brass/wrought iron fences @@ -1753,7 +1799,7 @@ minetest.register_craft( { -- plain wood, non-windowed minetest.register_craft( { - output = "homedecor:door_wood_plain_bottom_left 2", + output = "homedecor:door_wood_plain_left 2", recipe = { { "group:wood", "group:wood", "" }, { "group:wood", "group:wood", "default:steel_ingot" }, @@ -1764,7 +1810,7 @@ minetest.register_craft( { -- fancy exterior minetest.register_craft( { - output = "homedecor:door_exterior_fancy_bottom_left 2", + output = "homedecor:door_exterior_fancy_left 2", recipe = { { "group:wood", "default:glass" }, { "group:wood", "group:wood" }, @@ -1777,7 +1823,7 @@ minetest.register_craft( { -- bare minetest.register_craft( { - output = "homedecor:door_wood_glass_bottom_left 2", + output = "homedecor:door_wood_glass_oak_left 2", recipe = { { "default:glass", "group:wood" }, { "group:wood", "default:glass" }, @@ -1786,7 +1832,7 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:door_wood_glass_bottom_left 2", + output = "homedecor:door_wood_glass_oak_left 2", recipe = { { "group:wood", "default:glass" }, { "default:glass", "group:wood" }, @@ -1798,22 +1844,22 @@ minetest.register_craft( { minetest.register_craft( { type = "shapeless", - output = "homedecor:door_wood_glass_mahogany_bottom_left 2", + output = "homedecor:door_wood_glass_mahogany_left 2", recipe = { "default:dirt", "default:coal_lump", - "homedecor:door_wood_glass_bottom_left", - "homedecor:door_wood_glass_bottom_left" + "homedecor:door_wood_glass_oak_left", + "homedecor:door_wood_glass_oak_left" }, }) minetest.register_craft( { type = "shapeless", - output = "homedecor:door_wood_glass_mahogany_bottom_left 2", + output = "homedecor:door_wood_glass_mahogany_left 2", recipe = { "dye:brown", - "homedecor:door_wood_glass_bottom_left", - "homedecor:door_wood_glass_bottom_left" + "homedecor:door_wood_glass_oak_left", + "homedecor:door_wood_glass_oak_left" }, }) @@ -1821,18 +1867,18 @@ minetest.register_craft( { minetest.register_craft( { type = "shapeless", - output = "homedecor:door_wood_glass_white_bottom_left 2", + output = "homedecor:door_wood_glass_white_left 2", recipe = { "dye:white", - "homedecor:door_wood_glass_bottom_left", - "homedecor:door_wood_glass_bottom_left" + "homedecor:door_wood_glass_oak_left", + "homedecor:door_wood_glass_oak_left" }, }) -- Solid glass with metal handle minetest.register_craft( { - output = "homedecor:door_glass_bottom_left 2", + output = "homedecor:door_glass_left 2", recipe = { { "default:glass", "default:glass" }, { "default:glass", "default:steel_ingot" }, @@ -1845,7 +1891,7 @@ minetest.register_craft( { -- oak minetest.register_craft( { - output = "homedecor:door_closet_oak_bottom_left 2", + output = "homedecor:door_closet_oak_left 2", recipe = { { "", "group:stick", "group:stick" }, { "default:steel_ingot", "group:stick", "group:stick" }, @@ -1857,10 +1903,10 @@ minetest.register_craft( { minetest.register_craft( { type = "shapeless", - output = "homedecor:door_closet_mahogany_bottom_left 2", + output = "homedecor:door_closet_mahogany_left 2", recipe = { - "homedecor:door_closet_oak_bottom_left", - "homedecor:door_closet_oak_bottom_left", + "homedecor:door_closet_oak_left", + "homedecor:door_closet_oak_left", "default:dirt", "default:coal_lump", }, @@ -1868,10 +1914,10 @@ minetest.register_craft( { minetest.register_craft( { type = "shapeless", - output = "homedecor:door_closet_mahogany_bottom_left 2", + output = "homedecor:door_closet_mahogany_left 2", recipe = { - "homedecor:door_closet_oak_bottom_left", - "homedecor:door_closet_oak_bottom_left", + "homedecor:door_closet_oak_left", + "homedecor:door_closet_oak_left", "dye:brown" }, }) @@ -1879,7 +1925,7 @@ minetest.register_craft( { -- wrought fence-like door minetest.register_craft( { - output = "homedecor:door_wrought_iron_bottom_left 2", + output = "homedecor:door_wrought_iron_left 2", recipe = { { "homedecor:pole_wrought_iron", "default:iron_lump" }, { "homedecor:pole_wrought_iron", "default:iron_lump" }, @@ -1890,10 +1936,10 @@ minetest.register_craft( { -- bedroom door minetest.register_craft( { - output = "homedecor:door_bedroom_bottom_left", + output = "homedecor:door_bedroom_left", recipe = { { "dye:white", "dye:white", "" }, - { "homedecor:door_wood_plain_bottom_left", "technic:brass_ingot", "" }, + { "homedecor:door_wood_plain_left", "technic:brass_ingot", "" }, { "", "", "" }, }, }) @@ -1901,7 +1947,7 @@ minetest.register_craft( { -- woodglass door minetest.register_craft( { - output = "homedecor:door_woodglass_bottom_left", + output = "homedecor:door_woodglass_left", recipe = { { "default:wood", "default:glass", "" }, { "default:wood", "default:glass", "technic:brass_ingot" }, @@ -1912,7 +1958,7 @@ minetest.register_craft( { -- woodglass door type 2 minetest.register_craft( { - output = "homedecor:door_woodglass2_bottom_left", + output = "homedecor:door_woodglass2_left", recipe = { { "default:glass", "default:glass", "" }, { "default:wood", "default:wood", "default:iron_lump" }, @@ -3005,7 +3051,7 @@ for _, color in ipairs(bookcolors) do end minetest.register_craft({ - output = "homedecor:jpn_door_bottom", + output = "homedecor:door_japanese_closed", recipe = { { "homedecor:japanese_wall_top" }, { "homedecor:japanese_wall_bottom" } @@ -3180,6 +3226,96 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:spiral_staircase", + recipe = { + { "default:steelblock", "homedecor:pole_wrought_iron", "" }, + { "", "homedecor:pole_wrought_iron", "default:steelblock" }, + { "default:steelblock", "homedecor:pole_wrought_iron", "" } + }, +}) + +minetest.register_craft({ + output = "homedecor:soda_machine", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "dye:red", "default:steel_ingot"}, + {"default:steel_ingot", "default:copperblock", "default:steel_ingot"}, + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:coin 5", + recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"} +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:coin 15", + recipe = {"default:gold_ingot", "default:sword_steel"} +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:coin 50", + recipe = {"default:goldblock", "default:sword_mese"} +}) + +minetest.register_craft({ + output = "homedecor:lattice_wood 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "", "group:wood"}, + {"group:stick", "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_white_wood 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "dye:white", "group:wood"}, + {"group:stick", "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_wood_vegetal 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "group:leaves", "group:wood"}, + {"group:stick", "group:wood", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:lattice_white_wood_vegetal 8", + recipe = { + {"group:stick", "group:wood", "group:stick"}, + {"group:wood", "group:leaves", "group:wood"}, + {"group:stick", "dye:white", "group:stick"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:stained_glass 8", + recipe = { + {"", "dye:blue", ""}, + {"dye:red", "default:glass", "dye:green"}, + {"", "dye:yellow", ""}, + }, +}) + +minetest.register_craft({ + output = "homedecor:stained_glass", + recipe = { + {"", "dye:blue", ""}, + {"dye:red", "xpanes:pane", "dye:green"}, + {"", "dye:yellow", ""}, + }, +}) + for i in ipairs(homedecor.banister_materials) do local name = homedecor.banister_materials[i][1] @@ -3189,7 +3325,7 @@ for i in ipairs(homedecor.banister_materials) do local dye2 = homedecor.banister_materials[i][8] minetest.register_craft({ - output = "homedecor:banister_"..name.."_left 2", + output = "homedecor:banister_"..name.."_horizontal 2", recipe = { { topmat, "", dye1 }, { vertmat, topmat, "" }, diff --git a/mods/homedecor_modpack/homedecor/depends.txt b/mods/homedecor_modpack/homedecor/depends.txt index 4e03f52a..bed6ac05 100755 --- a/mods/homedecor_modpack/homedecor/depends.txt +++ b/mods/homedecor_modpack/homedecor/depends.txt @@ -6,3 +6,5 @@ technic? dye? bees? intllib? +bucket? +beds? diff --git a/mods/homedecor_modpack/homedecor/doors_and_gates.lua b/mods/homedecor_modpack/homedecor/doors_and_gates.lua index eb9083cf..5a51dbf2 100755 --- a/mods/homedecor_modpack/homedecor/doors_and_gates.lua +++ b/mods/homedecor_modpack/homedecor/doors_and_gates.lua @@ -243,6 +243,7 @@ for i in ipairs(sides) do use_texture_alpha = door_model.usealpha, selection_box = selbox, collision_box = colbox, + on_rotate = screwdriver.rotate_simple, on_place = function(itemstack, placer, pointed_thing) return homedecor.stack_wing(itemstack, placer, pointed_thing, "homedecor:door_"..doorname.."_left", "air", @@ -337,17 +338,41 @@ for i in ipairs(gates_list) do local gate=gates_list[i] + local tiles = { + "homedecor_gate_"..gate.."_tb.png", + "homedecor_gate_"..gate.."_tb.png", + "homedecor_gate_"..gate.."_lr.png", + "homedecor_gate_"..gate.."_lr.png", + "homedecor_gate_"..gate.."_fb.png^[transformFX", + "homedecor_gate_"..gate.."_fb.png" + } + + if gate == "barbed_wire" then + tiles = { + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_fb.png^[transformFX", + "homedecor_gate_barbed_wire_fb.png" + } + end + + if gate == "picket" or gate == "picket_white" then + tiles = { + "homedecor_blanktile.png", + "homedecor_blanktile.png", + "homedecor_blanktile.png", + "homedecor_blanktile.png", + "homedecor_gate_"..gate.."_back.png", + "homedecor_gate_"..gate.."_front.png" + } + end + local def = { drawtype = "nodebox", description = S(gate_names[i].." Fence Gate"), - tiles = { - "homedecor_gate_"..gate.."_top.png", - "homedecor_gate_"..gate.."_bottom.png", - "homedecor_gate_"..gate.."_left.png", - "homedecor_gate_"..gate.."_right.png", - "homedecor_gate_"..gate.."_back.png", - "homedecor_gate_"..gate.."_front.png" - }, + tiles = tiles, paramtype = "light", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), @@ -378,15 +403,15 @@ for i in ipairs(gates_list) do def = homedecor.table_copy(def) def.groups.not_in_creative_inventory = 1 def.selection_box.fixed = { 0.4, -0.5, -0.5, 0.5, 0.5, 0.5 } - def.tiles = { - "homedecor_gate_"..gate.."_top.png", - "homedecor_gate_"..gate.."_bottom.png", - "homedecor_gate_"..gate.."_front.png", - "homedecor_gate_"..gate.."_back.png", - "homedecor_gate_"..gate.."_left.png", - "homedecor_gate_"..gate.."_right.png" - } def.node_box.fixed = gate_models_open[i] + def.tiles = { + tiles[1], + tiles[2], + tiles[6], + tiles[5], + tiles[4], + tiles[3] + } def.drop = "homedecor:gate_"..gate.."_closed" def.on_rightclick = function(pos, node, clicker) homedecor.flip_gate(pos, node, clicker, gate, "open") @@ -497,7 +522,7 @@ minetest.register_node("homedecor:japanese_wall_top", { drawtype = "mesh", mesh = "homedecor_wall_japanese_top.obj", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, paramtype = "light", @@ -513,7 +538,7 @@ minetest.register_node("homedecor:japanese_wall_middle", { drawtype = "mesh", mesh = "homedecor_wall_japanese_middle.obj", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, paramtype = "light", @@ -529,7 +554,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", { drawtype = "mesh", mesh = "homedecor_wall_japanese_bottom.obj", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, paramtype = "light", @@ -565,7 +590,7 @@ homedecor.register("door_japanese_closed", { description = "Japanese-style door", inventory_image = "homedecor_door_japanese_inv.png", tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, mesh = "homedecor_door_japanese_closed.obj", @@ -587,7 +612,7 @@ homedecor.register("door_japanese_closed", { minetest.register_node("homedecor:door_japanese_open", { tiles = { - "homedecor_generic_wood_luxury_brown2.png", + "homedecor_generic_wood_luxury.png", "homedecor_japanese_paper.png" }, drawtype = "mesh", @@ -596,6 +621,7 @@ minetest.register_node("homedecor:door_japanese_open", { paramtype2 = "facedir", groups = { snappy = 3, not_in_creative_inventory = 1 }, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.disallow, selection_box = { type = "fixed", fixed = {-1.5, -0.5, -0.0625, 0.5, 1.5, 0}, diff --git a/mods/homedecor_modpack/homedecor/exterior.lua b/mods/homedecor_modpack/homedecor/exterior.lua index 77ec36c3..6a7656bc 100755 --- a/mods/homedecor_modpack/homedecor/exterior.lua +++ b/mods/homedecor_modpack/homedecor/exterior.lua @@ -46,7 +46,7 @@ local bl1_cbox = { homedecor.register("bench_large_1", { mesh = "homedecor_bench_large_1.obj", tiles = { - "homedecor_generic_wood_neutral.png", + "homedecor_generic_wood_old.png", "homedecor_generic_metal_wrought_iron.png" }, description = "Garden Bench (style 1)", @@ -56,6 +56,7 @@ homedecor.register("bench_large_1", { sounds = default.node_sound_wood_defaults(), selection_box = bl1_sbox, node_box = bl1_cbox, + on_rotate = screwdriver.disallow }) minetest.register_alias("homedecor:bench_large_1_left", "homedecor:bench_large_1") @@ -77,13 +78,14 @@ local bl2_cbox = { homedecor.register("bench_large_2", { description = "Garden Bench (style 2)", mesh = "homedecor_bench_large_2.obj", - tiles = { "homedecor_generic_wood_neutral.png" }, + tiles = { "homedecor_generic_wood_old.png" }, inventory_image = "homedecor_bench_large_2_inv.png", groups = {snappy=3}, selection_box = bl2_sbox, node_box = bl2_cbox, expand = { right="air" }, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.disallow }) minetest.register_alias("homedecor:bench_large_2_left", "homedecor:bench_large_2") @@ -103,6 +105,7 @@ homedecor.register("deckchair", { sounds = default.node_sound_wood_defaults(), selection_box = dc_cbox, collision_box = dc_cbox, + on_rotate = screwdriver.disallow }) minetest.register_alias("homedecor:deckchair_foot", "homedecor:deckchair") @@ -117,6 +120,7 @@ homedecor.register("deckchair_striped_blue", { sounds = default.node_sound_wood_defaults(), selection_box = dc_cbox, collision_box = dc_cbox, + on_rotate = screwdriver.disallow }) homedecor.register("doghouse", { @@ -133,13 +137,14 @@ homedecor.register("doghouse", { groups = {snappy=3}, expand = { top="air" }, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple }) minetest.register_alias("homedecor:doghouse_roof", "air") minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse") homedecor.register("simple_bench", { - tiles = { "homedecor_generic_wood_neutral.png" }, + tiles = { "homedecor_generic_wood_old.png" }, description = "Simple Bench", groups = {snappy=3}, node_box = { @@ -180,6 +185,37 @@ homedecor.register("stonepath", { sounds = default.node_sound_stone_defaults(), }) +local lattice_colors = { + {"wood", ".png^[colorize:#704214:180"}, + {"white_wood", ".png"}, + {"wood_vegetal", ".png^[colorize:#704214:180^homedecor_lattice_vegetal.png"}, + {"white_wood_vegetal", ".png^homedecor_lattice_vegetal.png"}, +} + +for _, m in ipairs(lattice_colors) do +homedecor.register("lattice_"..m[1], { + description = "Garden Lattice ("..m[1]..")", + tiles = {"homedecor_lattice"..m[2]}, + inventory_image = "homedecor_lattice"..m[2], + groups = { snappy=3 }, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, 0.47, 0.5, 0.5, 0.47}, -- NodeBox1 + {-0.5, 0.421875, 0.44, 0.5, 0.5, 0.5}, -- NodeBox2 + {-0.5, -0.5, 0.44, 0.5, -0.421875, 0.5}, -- NodeBox3 + {0.421875, -0.5, 0.44, 0.5, 0.5, 0.5}, -- NodeBox4 + {-0.5, -0.5, 0.44, -0.421875, 0.5, 0.5} -- NodeBox5 + } + }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, 0.44, 0.5, 0.5, 0.5} + }, + sounds = default.node_sound_wood_defaults(), +}) +end + homedecor.register("swing", { description = "Tree's swing", tiles = { @@ -191,6 +227,7 @@ homedecor.register("swing", { groups = { snappy=3, oddly_breakable_by_hand=3 }, sounds = default.node_sound_wood_defaults(), walkable = false, + on_rotate = screwdriver.disallow, node_box = { type = "fixed", fixed = { @@ -274,7 +311,7 @@ homedecor.register("well", { mesh = "homedecor_well.obj", tiles = { "homedecor_rope_texture.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "default_water.png", "default_cobble.png", "default_wood.png", @@ -287,7 +324,29 @@ homedecor.register("well", { collision_box = homedecor.nodebox.slab_y(2), expand = { top="air" }, sounds = default.node_sound_stone_defaults(), + on_rotate = screwdriver.rotate_simple }) +if minetest.get_modpath("bucket") then + minetest.override_item("bucket:bucket_empty", { + on_use = function(itemstack, user, pointed_thing) + local wielditem = user:get_wielded_item() + local wieldname = itemstack:get_name() + local inv = user:get_inventory() + + if pointed_thing.type == "node" and minetest.get_node(pointed_thing.under).name == "homedecor:well" then + if inv:room_for_item("main", "bucket:bucket_water 1") then + wielditem:take_item() + user:set_wielded_item(wielditem) + inv:add_item("main", "bucket:bucket_water 1") + else + minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!") + end + end + return wielditem + end + }) +end + minetest.register_alias("homedecor:well_top", "air") minetest.register_alias("homedecor:well_base", "homedecor:well") diff --git a/mods/homedecor_modpack/homedecor/fences.lua b/mods/homedecor_modpack/homedecor/fences.lua index 29cae658..35ac827b 100755 --- a/mods/homedecor_modpack/homedecor/fences.lua +++ b/mods/homedecor_modpack/homedecor/fences.lua @@ -189,8 +189,8 @@ homedecor.register("fence_privacy", { homedecor.register("fence_privacy_corner", { description = S("Wooden Privacy Fence Corner"), tiles = { - "homedecor_fence_privacy_corner_top.png", - "homedecor_fence_privacy_corner_bottom.png", + "homedecor_fence_privacy_corner_tb.png", + "homedecor_fence_privacy_corner_tb.png^[transformFY", "homedecor_fence_privacy_corner_right.png", "homedecor_fence_privacy_backside2.png", "homedecor_fence_privacy_backside.png", @@ -365,10 +365,10 @@ homedecor.register("fence_wrought_iron_2_corner", { tiles = { "homedecor_fence_corner_wrought_iron_2_tb.png", "homedecor_fence_corner_wrought_iron_2_tb.png", - "homedecor_fence_corner_wrought_iron_2_lr.png", - "homedecor_fence_corner_wrought_iron_2_lr.png^[transformFX", - "homedecor_fence_corner_wrought_iron_2_fb.png^[transformFX", - "homedecor_fence_corner_wrought_iron_2_fb.png" + "homedecor_fence_corner_wrought_iron_2_sides.png^[transformFX", + "homedecor_fence_corner_wrought_iron_2_sides.png", + "homedecor_fence_corner_wrought_iron_2_sides.png^[transformFX", + "homedecor_fence_corner_wrought_iron_2_sides.png" }, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), diff --git a/mods/homedecor_modpack/homedecor/furniture.lua b/mods/homedecor_modpack/homedecor/furniture.lua index 90ffe009..d1054a85 100755 --- a/mods/homedecor_modpack/homedecor/furniture.lua +++ b/mods/homedecor_modpack/homedecor/furniture.lua @@ -1,21 +1,21 @@ local S = homedecor.gettext -local table_colors = { "", "mahogany", "white" } +local table_colors = { + { "", homedecor.plain_wood }, + { "_mahogany", homedecor.mahogany_wood }, + { "_white", homedecor.white_wood } +} -for _, i in ipairs(table_colors) do - local color = "_"..i - local color2 = "_"..i +for i in ipairs(table_colors) do local desc = S("Table ("..i..")") - if i == "" then - color = "" - color2 = "_beech" + if i == 1 then desc = S("Table") end - homedecor.register("table"..color, { + homedecor.register("table"..table_colors[i][1], { description = desc, - tiles = { "homedecor_generic_wood"..color2..".png" }, + tiles = { table_colors[i][2] }, node_box = { type = "fixed", fixed = { @@ -64,15 +64,15 @@ for i in ipairs(chaircolors) do local color2 = chaircolors[i][1] local name = S(chaircolors[i][2]) local chairtiles = { - "homedecor_generic_wood_beech.png", + homedecor.plain_wood, "wool"..color..".png", } if chaircolors[i][1] == "" then color = "" chairtiles = { - "homedecor_generic_wood_beech.png", - "homedecor_generic_wood_beech.png" + homedecor.plain_wood, + homedecor.plain_wood } end @@ -84,12 +84,10 @@ for i in ipairs(chaircolors) do collision_box = kc_cbox, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), - --[[ on_rightclick = function(pos, node, clicker) - pos.y = pos.y-0 -- player's sit position. - homedecor.sit_exec(pos, node, clicker) - end, - --]] + pos.y = pos.y+0 -- where do I put my ass ? + homedecor.sit(pos, node, clicker) + end }) if color ~= "" then @@ -183,54 +181,11 @@ homedecor.register("office_chair_"..c, { selection_box = ofchairs_sbox, collision_box = ofchairs_cbox, expand = { top = "air" }, + on_rotate = screwdriver.rotate_simple }) end --- Sitting functions disabled for now because of buggyness. - ---[[ -function homedecor.sit(pos, node, clicker) - local name = clicker:get_player_name() - local meta = minetest:get_meta(pos) - local param2 = node.param2 - if clicker:get_player_name() == meta:get_string("player") then - meta:set_string("player", "") - pos.y = pos.y-0.5 - clicker:setpos(pos) - clicker:set_eye_offset({x=0,y=0,z=0}, {x=0,y=0,z=0}) - clicker:set_physics_override(1, 1, 1) - default.player_attached[name] = false - default.player_set_animation(clicker, "stand", 30) - else - meta:set_string("player", clicker:get_player_name()) - clicker:set_eye_offset({x=0,y=-7,z=2}, {x=0,y=0,z=0}) - clicker:set_physics_override(0, 0, 0) - default.player_attached[name] = true - if param2 == 1 then - clicker:set_look_yaw(7.9) - elseif param2 == 3 then - clicker:set_look_yaw(4.75) - elseif param2 == 0 then - clicker:set_look_yaw(3.15) - else - clicker:set_look_yaw(6.28) - end - end -end - -function homedecor.sit_exec(pos, node, clicker) -- don't move these functions inside sit() - if not clicker or not clicker:is_player() - or clicker:get_player_control().up == true or clicker:get_player_control().down == true - or clicker:get_player_control().left == true or clicker:get_player_control().right == true - or clicker:get_player_control().jump == true then -- make sure that the player is immobile. - return end - homedecor.sit(pos, node, clicker) - clicker:setpos(pos) - default.player_set_animation(clicker, "sit", 30) -end ---]] - -- Aliases for 3dforniture mod. minetest.register_alias("3dforniture:table", "homedecor:table") diff --git a/mods/homedecor_modpack/homedecor/furniture_medieval.lua b/mods/homedecor_modpack/homedecor/furniture_medieval.lua index e7c1b8af..a029d5ce 100755 --- a/mods/homedecor_modpack/homedecor/furniture_medieval.lua +++ b/mods/homedecor_modpack/homedecor/furniture_medieval.lua @@ -3,7 +3,7 @@ local S = homedecor.gettext homedecor.register("bars", { description = S("Bars"), - tiles = { "homedecor_generic_metal_black.png" }, + tiles = { "homedecor_generic_metal_black.png^[transformR270" }, node_box = { type = "fixed", fixed = { @@ -25,7 +25,7 @@ homedecor.register("bars", { --L Binding Bars homedecor.register("L_binding_bars", { description = S("Binding Bars"), - tiles = { "homedecor_generic_metal_black.png" }, + tiles = { "homedecor_generic_metal_black.png^[transformR270" }, node_box = { type = "fixed", fixed = { @@ -72,7 +72,7 @@ homedecor.register("torch_wall", { }, }, "homedecor_generic_metal_black.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "forniture_coal.png", }, inventory_image="forniture_torch_inv.png", @@ -93,7 +93,9 @@ local wl_cbox = { homedecor.register("wall_lamp", { description = S("Wall Lamp"), mesh = "homedecor_wall_lamp.obj", - tiles = {"homedecor_wall_lamp.png"}, + tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury.png^[colorize:#000000:30", + "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png"}, + use_texture_alpha = true, inventory_image = "homedecor_wall_lamp_inv.png", groups = {snappy=3}, light_source = 11, diff --git a/mods/homedecor_modpack/homedecor/furniture_recipes.lua b/mods/homedecor_modpack/homedecor/furniture_recipes.lua index 7b197df5..208a31ae 100755 --- a/mods/homedecor_modpack/homedecor/furniture_recipes.lua +++ b/mods/homedecor_modpack/homedecor/furniture_recipes.lua @@ -104,7 +104,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:table_lamp_off", + output = "homedecor:table_lamp_white_off", recipe = { {"default:paper","default:torch" ,"default:paper"}, {"","group:stick",""}, @@ -113,7 +113,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:table_lamp_off", + output = "homedecor:table_lamp_white_off", recipe = { {"default:paper","default:torch" ,"default:paper"}, {"","group:stick",""}, @@ -122,9 +122,9 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:standing_lamp_bottom_off", + output = "homedecor:standing_lamp_white_off", recipe = { - {"homedecor:table_lamp_off"}, + {"homedecor:table_lamp_white_off"}, {"group:stick"}, {"group:stick"}, }, @@ -132,7 +132,7 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", - recipe = "homedecor:table_lamp_off", + recipe = "homedecor:table_lamp_white_off", burntime = 10, }) diff --git a/mods/homedecor_modpack/homedecor/handlers/expansion.lua b/mods/homedecor_modpack/homedecor/handlers/expansion.lua index 00ab9bd1..2afb38c9 100755 --- a/mods/homedecor_modpack/homedecor/handlers/expansion.lua +++ b/mods/homedecor_modpack/homedecor/handlers/expansion.lua @@ -222,20 +222,110 @@ function homedecor.place_banister(itemstack, placer, pointed_thing) return end + local lxd = homedecor.fdir_to_left[fdir+1][1] + local lzd = homedecor.fdir_to_left[fdir+1][2] + local rxd = homedecor.fdir_to_right[fdir+1][1] local rzd = homedecor.fdir_to_right[fdir+1][2] local fxd = homedecor.fdir_to_fwd[fdir+1][1] local fzd = homedecor.fdir_to_fwd[fdir+1][2] + local below_pos = { x=pos.x, y=pos.y-1, z=pos.z } + local fwd_pos = { x=pos.x+fxd, y=pos.y, z=pos.z+fzd } + local left_pos = { x=pos.x+lxd, y=pos.y, z=pos.z+lzd } + local right_pos = { x=pos.x+rxd, y=pos.y, z=pos.z+rzd } + local left_fwd_pos = { x=pos.x+lxd+fxd, y=pos.y, z=pos.z+lzd+fzd } + local right_fwd_pos = { x=pos.x+rxd+fxd, y=pos.y, z=pos.z+rzd+fzd } local right_fwd_above_pos = { x=pos.x+rxd+fxd, y=pos.y+1, z=pos.z+rzd+fzd } + local left_fwd_above_pos = { x=pos.x+lxd+fxd, y=pos.y+1, z=pos.z+lzd+fzd } + local right_fwd_below_pos = { x=pos.x+rxd+fxd, y=pos.y-1, z=pos.z+rzd+fzd } + local left_fwd_below_pos = { x=pos.x+lxd+fxd, y=pos.y-1, z=pos.z+lzd+fzd } + + local below_node = minetest.get_node(below_pos) + local fwd_node = minetest.get_node(fwd_pos) + local left_node = minetest.get_node(left_pos) + local right_node = minetest.get_node(right_pos) + local left_fwd_node = minetest.get_node(left_fwd_pos) + local right_fwd_node = minetest.get_node(right_fwd_pos) + local left_below_node = minetest.get_node({x=left_pos.x, y=left_pos.y-1, z=left_pos.z}) + local right_below_node = minetest.get_node({x=right_pos.x, y=right_pos.y-1, z=right_pos.z}) local right_fwd_above_node = minetest.get_node(right_fwd_above_pos) + local left_fwd_above_node = minetest.get_node(left_fwd_above_pos) + local right_fwd_below_node = minetest.get_node(right_fwd_below_pos) + local left_fwd_below_node = minetest.get_node(left_fwd_below_pos) local new_place_name = itemstack:get_name() + local n = 0 - if placer:get_player_control()["sneak"] + -- try to place a diagonal one on the side of blocks stacked like stairs + -- or follow an existing diagonal with another. + if (left_below_node and string.find(left_below_node.name, "banister_.-_diagonal_right") + and below_node and is_buildable_to(placer_name, below_pos, nil, below_pos)) or not is_buildable_to(placer_name, right_fwd_above_pos, nil, right_fwd_above_pos) then - new_place_name = string.gsub(new_place_name, "_left", "_right") + new_place_name = string.gsub(new_place_name, "_horizontal", "_diagonal_right") + elseif (right_below_node and string.find(right_below_node.name, "banister_.-_diagonal_left") + and below_node and is_buildable_to(placer_name, below_pos, nil, below_pos)) + or not is_buildable_to(placer_name, left_fwd_above_pos, nil, left_fwd_above_pos) then + new_place_name = string.gsub(new_place_name, "_horizontal", "_diagonal_left") + + -- try to follow a diagonal with the corresponding horizontal + -- from the top of a diagonal... + elseif left_below_node and string.find(left_below_node.name, "homedecor:banister_.*_diagonal") then + fdir = left_below_node.param2 + new_place_name = string.gsub(left_below_node.name, "_diagonal_.-$", "_horizontal") + elseif right_below_node and string.find(right_below_node.name, "homedecor:banister_.*_diagonal") then + fdir = right_below_node.param2 + new_place_name = string.gsub(right_below_node.name, "_diagonal_.-$", "_horizontal") + + -- try to place a horizontal in-line with the nearest diagonal, at the top + elseif left_fwd_below_node and string.find(left_fwd_below_node.name, "homedecor:banister_.*_diagonal") + and is_buildable_to(placer_name, fwd_pos, nil, fwd_pos) then + fdir = left_fwd_below_node.param2 + pos = fwd_pos + new_place_name = string.gsub(left_fwd_below_node.name, "_diagonal_.-$", "_horizontal") + elseif right_fwd_below_node and string.find(right_fwd_below_node.name, "homedecor:banister_.*_diagonal") + and is_buildable_to(placer_name, fwd_pos, nil, fwd_pos) then + fdir = right_fwd_below_node.param2 + pos = fwd_pos + new_place_name = string.gsub(right_fwd_below_node.name, "_diagonal_.-$", "_horizontal") + + -- try to follow a diagonal with a horizontal, at the bottom of the diagonal + elseif left_node and string.find(left_node.name, "homedecor:banister_.*_diagonal") then + fdir = left_node.param2 + new_place_name = string.gsub(left_node.name, "_diagonal_.-$", "_horizontal") + elseif right_node and string.find(right_node.name, "homedecor:banister_.*_diagonal") then + fdir = right_node.param2 + new_place_name = string.gsub(right_node.name, "_diagonal_.-$", "_horizontal") + + -- try to place a horizontal in-line with the nearest diagonal, at the bottom + elseif left_fwd_node and string.find(left_fwd_node.name, "homedecor:banister_.*_diagonal") + and is_buildable_to(placer_name, fwd_pos, nil, fwd_pos) then + fdir = left_fwd_node.param2 + pos = fwd_pos + new_place_name = string.gsub(left_fwd_node.name, "_diagonal_.-$", "_horizontal") + elseif right_fwd_node and string.find(right_fwd_node.name, "homedecor:banister_.*_diagonal") + and is_buildable_to(placer_name, fwd_pos, nil, fwd_pos) then + fdir = right_fwd_node.param2 + pos = fwd_pos + new_place_name = string.gsub(right_fwd_node.name, "_diagonal_.-$", "_horizontal") + + -- try to follow a horizontal with another of the same + elseif left_node and string.find(left_node.name, "homedecor:banister_.*_horizontal") then + fdir = left_node.param2 + new_place_name = left_node.name + elseif right_node and string.find(right_node.name, "homedecor:banister_.*_horizontal") then + fdir = right_node.param2 + new_place_name = right_node.name + end + + -- manually invert left-right orientation + if placer:get_player_control()["sneak"] then + if string.find(new_place_name, "banister_.*_diagonal") then + new_place_name = string.gsub(new_place_name, "_left", "_right") + else + new_place_name = string.gsub(new_place_name, "_right", "_left") + end end minetest.set_node(pos, {name = new_place_name, param2 = fdir}) diff --git a/mods/homedecor_modpack/homedecor/handlers/sit.lua b/mods/homedecor_modpack/homedecor/handlers/sit.lua new file mode 100644 index 00000000..636a585d --- /dev/null +++ b/mods/homedecor_modpack/homedecor/handlers/sit.lua @@ -0,0 +1,32 @@ +function homedecor.sit(pos, node, clicker) + do return end -- delete it when the engine is stabler for the player's physics + local meta = minetest.get_meta(pos) + local param2 = node.param2 + local name = clicker:get_player_name() + + if name == meta:get_string("is_sit") then + meta:set_string("is_sit", "") + pos.y = pos.y-0.5 + clicker:setpos(pos) + clicker:set_eye_offset({x=0,y=0,z=0}, {x=0,y=0,z=0}) + clicker:set_physics_override(1, 1, 1) + default.player_attached[name] = false + default.player_set_animation(clicker, "stand", 30) + else + meta:set_string("is_sit", clicker:get_player_name()) + clicker:set_eye_offset({x=0,y=-7,z=2}, {x=0,y=0,z=0}) + clicker:set_physics_override(0, 0, 0) + clicker:setpos(pos) + default.player_attached[name] = true + default.player_set_animation(clicker, "sit", 30) + if param2 == 0 then + clicker:set_look_yaw(3.15) + elseif param2 == 1 then + clicker:set_look_yaw(7.9) + elseif param2 == 2 then + clicker:set_look_yaw(6.28) + elseif param2 == 3 then + clicker:set_look_yaw(4.75) + else return end + end +end diff --git a/mods/homedecor_modpack/homedecor/handlers/water_particles.lua b/mods/homedecor_modpack/homedecor/handlers/water_particles.lua new file mode 100644 index 00000000..a3334b03 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/handlers/water_particles.lua @@ -0,0 +1,115 @@ +-- variables taken by the start... function +-- +-- pos and node are as usual, from e.g. on_rightclick. +-- +-- in the { particledef } table: +-- +-- outletx/y/z are the exact coords of the starting point +-- for the spawner, relative to the center of the node +-- +-- velocityx/y/z are the speed of the particles, +-- (x and z are relative to a node placed while looking north/facedir 0) +-- negative Y values flow downward. +-- +-- spread is the radius from the starting point, +-- along X and Z only, to randomly spawn particles. +-- +-- soundname is the filename (without .ogg) of the sound file +-- to be played along with the particle stream + +function homedecor.start_particle_spawner(pos, node, particledef, soundname) + + local this_spawner_meta = minetest.get_meta(pos) + local id = this_spawner_meta:get_int("active") + local s_handle = this_spawner_meta:get_int("sound") + + if id ~= 0 then + if s_handle then + minetest.after(0, function(s_handle) + minetest.sound_stop(s_handle) + end, s_handle) + end + minetest.delete_particlespawner(id) + this_spawner_meta:set_int("active", nil) + this_spawner_meta:set_int("sound", nil) + return + end + + local fdir = node.param2 + + if fdir and fdir < 4 and (not id or id == 0) then + + local outletx = particledef.outlet.x + local outlety = particledef.outlet.y + local outletz = particledef.outlet.z + local velocityx = particledef.velocity_x + local velocityy = particledef.velocity_y + local velocityz = particledef.velocity_z + local spread = particledef.spread + + local minx_t = { outletx - spread, -outletz - spread, outletx - spread, outletz - spread } + local maxx_t = { outletx + spread, -outletz + spread, outletx + spread, outletz + spread } + local minz_t = { -outletz - spread, outletx - spread, outletz - spread, outletx - spread } + local maxz_t = { -outletz + spread, outletx + spread, outletz + spread, outletx + spread } + + local minvelx_t = { velocityx.min, velocityz.min, -velocityx.max, -velocityz.max } + local maxvelx_t = { velocityx.max, velocityz.max, -velocityx.min, -velocityz.min } + local minvelz_t = { velocityz.min, velocityx.min, -velocityz.max, velocityx.min } + local maxvelz_t = { velocityz.max, velocityx.max, -velocityz.min, velocityx.max } + + local minx = minx_t[fdir + 1] + local maxx = maxx_t[fdir + 1] + local minz = minz_t[fdir + 1] + local maxz = maxz_t[fdir + 1] + + local minvelx = minvelx_t[fdir + 1] + local minvelz = minvelz_t[fdir + 1] + local maxvelx = maxvelx_t[fdir + 1] + local maxvelz = maxvelz_t[fdir + 1] + + id = minetest.add_particlespawner({ + amount = 60, + time = 0, + collisiondetection = true, + minpos = {x=pos.x - minx, y=pos.y + outlety, z=pos.z - minz}, + maxpos = {x=pos.x - maxx, y=pos.y + outlety, z=pos.z - maxz}, + minvel = {x = minvelx, y = velocityy, z = minvelz}, + maxvel = {x = maxvelx, y = velocityy, z = maxvelz}, + minacc = {x=0, y=0, z=0}, + maxacc = {x=0, y=-0.05, z=0}, + minexptime = 2, + maxexptime = 4, + minsize = 0.5, + maxsize = 1, + texture = "homedecor_water_particle.png", + }) + s_handle = minetest.sound_play(soundname, { + pos = pos, + max_hear_distance = 5, + loop = true + }) + this_spawner_meta:set_int("active", id) + this_spawner_meta:set_int("sound", s_handle) + return + end +end + +function homedecor.stop_particle_spawner(pos) + local this_spawner_meta = minetest.get_meta(pos) + local id = this_spawner_meta:get_int("active") + local s_handle = this_spawner_meta:get_int("sound") + + if id ~= 0 then + minetest.delete_particlespawner(id) + end + + if s_handle then + minetest.after(0, function(s_handle) + minetest.sound_stop(s_handle) + end, s_handle) + end + + this_spawner_meta:set_int("active", nil) + this_spawner_meta:set_int("sound", nil) +end + diff --git a/mods/homedecor_modpack/homedecor/init.lua b/mods/homedecor_modpack/homedecor/init.lua index e4f667a1..222b8fa6 100755 --- a/mods/homedecor_modpack/homedecor/init.lua +++ b/mods/homedecor_modpack/homedecor/init.lua @@ -99,6 +99,20 @@ function homedecor.find_ceiling(itemstack, placer, pointed_thing) return isceiling, pos end +if screwdriver == nil then screwdriver = {} end + +homedecor.plain_wood = "homedecor_generic_wood_plain.png^".. + "(homedecor_generic_wood_boards_overlay.png^[colorize:#a7682020:100)" + +homedecor.mahogany_wood = "(homedecor_generic_wood_plain.png^[colorize:#401010:125)^".. + "(homedecor_generic_wood_boards_overlay.png^[colorize:#66493880:200)" + +homedecor.white_wood = "(homedecor_generic_wood_plain.png^[colorize:#e0f0ff:200)^".. + "(homedecor_generic_wood_boards_overlay.png^[colorize:#ffffff:200)" + +homedecor.dark_wood = "(homedecor_generic_wood_plain.png^[colorize:#140900:200)^".. + "(homedecor_generic_wood_boards_overlay.png^[colorize:#21110180:180)" + -- nodebox arithmetics and helpers -- (please keep non-generic nodeboxes with their node definition) dofile(homedecor.modpath.."/handlers/nodeboxes.lua") @@ -108,6 +122,9 @@ dofile(homedecor.modpath.."/handlers/expansion.lua") dofile(homedecor.modpath.."/handlers/furnaces.lua") -- glue it all together into a registration function dofile(homedecor.modpath.."/handlers/registration.lua") +-- some nodes have particle spawners +dofile(homedecor.modpath.."/handlers/water_particles.lua") +dofile(homedecor.modpath.."/handlers/sit.lua") -- load various other components dofile(homedecor.modpath.."/misc-nodes.lua") -- the catch-all for all misc nodes diff --git a/mods/homedecor_modpack/homedecor/kitchen_appliances.lua b/mods/homedecor_modpack/homedecor/kitchen_appliances.lua index 3918909e..cb202793 100755 --- a/mods/homedecor_modpack/homedecor/kitchen_appliances.lua +++ b/mods/homedecor_modpack/homedecor/kitchen_appliances.lua @@ -18,6 +18,7 @@ homedecor.register("refrigerator_steel", { size=50, lockable=true, }, + on_rotate = screwdriver.rotate_simple }) -- white, enameled fridge @@ -36,6 +37,7 @@ homedecor.register("refrigerator_white", { size=50, lockable=true }, + on_rotate = screwdriver.rotate_simple }) minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") @@ -116,7 +118,8 @@ homedecor.register("coffee_maker", { walkable = false, groups = {snappy=3}, selection_box = cm_cbox, - node_box = cm_cbox + node_box = cm_cbox, + on_rotate = screwdriver.disallow }) local fdir_to_steampos = { diff --git a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua index 58ee196c..146ce089 100755 --- a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua +++ b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua @@ -3,6 +3,8 @@ local S = homedecor.gettext local counter_materials = { "", "granite", "marble", "steel" } +local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" +local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" for _, mat in ipairs(counter_materials) do @@ -17,10 +19,10 @@ for _, mat in ipairs(counter_materials) do homedecor.register("kitchen_cabinet"..material, { description = desc, tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png', - 'homedecor_kitchen_cabinet_bottom.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', + cabinet_bottom, + cabinet_sides, + cabinet_sides, + cabinet_sides, 'homedecor_kitchen_cabinet_front.png'}, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), @@ -34,12 +36,14 @@ end local kitchen_cabinet_half_box = homedecor.nodebox.slab_y(0.5, 0.5) homedecor.register("kitchen_cabinet_half", { description = S('Half-height Kitchen Cabinet (on ceiling)'), - tiles = { 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_bottom.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_sides.png', - 'homedecor_kitchen_cabinet_front_half.png'}, + tiles = { + cabinet_sides, + cabinet_bottom, + cabinet_sides, + cabinet_sides, + cabinet_sides, + 'homedecor_kitchen_cabinet_front_half.png' + }, selection_box = kitchen_cabinet_half_box, node_box = kitchen_cabinet_half_box, groups = { snappy = 3 }, @@ -56,8 +60,8 @@ homedecor.register("kitchen_cabinet_with_sink", { tiles = { "homedecor_kitchen_sink_top.png", "homedecor_kitchen_cabinet_front.png", - "homedecor_kitchen_cabinet_sides.png", - "homedecor_kitchen_cabinet_bottom.png" + cabinet_sides, + cabinet_bottom }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), @@ -65,6 +69,19 @@ homedecor.register("kitchen_cabinet_with_sink", { inventory = { size=16, }, + node_box = { + type = "fixed", + fixed = { + { -8/16, -8/16, -8/16, 8/16, 6/16, 8/16 }, + { -8/16, 6/16, -8/16, -6/16, 8/16, 8/16 }, + { 6/16, 6/16, -8/16, 8/16, 8/16, 8/16 }, + { -8/16, 6/16, -8/16, 8/16, 8/16, -6/16 }, + { -8/16, 6/16, 6/16, 8/16, 8/16, 8/16 }, + } + }, + on_destruct = function(pos) + homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z}) + end }) local cp_cbox = { @@ -95,7 +112,23 @@ homedecor.register("kitchen_faucet", { description = "Kitchen Faucet", groups = {snappy=3}, selection_box = kf_cbox, - walkable = false + walkable = false, + on_rotate = screwdriver.disallow, + on_rightclick = function(pos, node, clicker) + local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) + if below and + below.name == "homedecor:sink" or + below.name == "homedecor:kitchen_cabinet_with_sink" then + local particledef = { + outlet = { x = 0, y = -0.19, z = 0.13 }, + velocity_x = { min = -0.05, max = 0.05 }, + velocity_y = -0.3, + velocity_z = { min = -0.1, max = 0 }, + spread = 0 + } + homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet") + end + end }) homedecor.register("paper_towel", { diff --git a/mods/homedecor_modpack/homedecor/laundry.lua b/mods/homedecor_modpack/homedecor/laundry.lua index 1fed668e..01a448fe 100755 --- a/mods/homedecor_modpack/homedecor/laundry.lua +++ b/mods/homedecor_modpack/homedecor/laundry.lua @@ -52,7 +52,7 @@ homedecor.register("ironing_board", { mesh = "homedecor_ironing_board.obj", tiles = { "wool_grey.png", - "homedecor_generic_metal_neutral.png" + "homedecor_generic_metal_black.png^[brighten" }, expand = {right = "air"}, groups = { snappy = 3 }, diff --git a/mods/homedecor_modpack/homedecor/lighting.lua b/mods/homedecor_modpack/homedecor/lighting.lua index 61641af4..440e8b77 100755 --- a/mods/homedecor_modpack/homedecor/lighting.lua +++ b/mods/homedecor_modpack/homedecor/lighting.lua @@ -129,14 +129,14 @@ end homedecor.register("plasma_lamp", { description = "Plasma Lamp", drawtype = "glasslike_framed", - tiles = {"homedecor_gold_block.png","homedecor_glass_face_clean.png"}, + tiles = {"default_gold_block.png","homedecor_glass_face_clean.png"}, special_tiles = { { name="homedecor_plasma_storm.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}, } }, --- use_texture_alpha = true, + use_texture_alpha = true, light_source = LIGHT_MAX - 1, sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, @@ -146,6 +146,30 @@ homedecor.register("plasma_lamp", { end }) +homedecor.register("plasma_ball", { + description = "Plasma Ball", + mesh = "homedecor_plasma_ball.obj", + tiles = { + "homedecor_generic_plastic_black.png", + { + name = "homedecor_plasma_ball_streamers.png", + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}, + }, + "homedecor_plasma_ball_glass.png" + }, + inventory_image = "homedecor_plasma_ball_inv.png", + selection_box = { + type = "fixed", + fixed = { -0.1875, -0.5, -0.1875, 0.1875, 0, 0.1875 } + }, + walkable = false, + use_texture_alpha = true, + light_source = LIGHT_MAX - 5, + sunlight_propagates = true, + groups = {cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), +}) + local tc_cbox = { type = "fixed", fixed = { @@ -255,12 +279,14 @@ homedecor.register("oil_lamp", { description = S("Oil lamp (hurricane)"), mesh = "homedecor_oil_lamp.obj", tiles = { - "homedecor_oil_lamp_handles.png", - "homedecor_oil_lamp_glass.png", "homedecor_generic_metal_brass.png", - "homedecor_oil_lamp_base.png", - "homedecor_oil_lamp_top.png", + "homedecor_generic_metal_black.png", + "homedecor_generic_metal_black.png^[colorize:#ff0000:160", + "homedecor_oil_lamp_wick.png", + "homedecor_generic_metal_black.png^[colorize:#ff0000:150", + "homedecor_oil_lamp_glass.png", }, + use_texture_alpha = true, inventory_image = "homedecor_oil_lamp_inv.png", selection_box = ol_cbox, walkable = false, @@ -303,13 +329,13 @@ homedecor.register("ground_lantern", { local hl_cbox = { type = "fixed", - fixed = { -0.25, -0.4, -0.2, 0.25, 0.5, 0.5 }, + fixed = { -0.25, -0.5, -0.2, 0.25, 0.5, 0.5 }, } homedecor.register("hanging_lantern", { description = S("Hanging Lantern"), mesh = "homedecor_hanging_lantern.obj", - tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" }, + tiles = { "homedecor_generic_metal_wrought_iron.png", "homedecor_light.png" }, use_texture_alpha = true, inventory_image = "homedecor_hanging_lantern_inv.png", wield_image = "homedecor_hanging_lantern_inv.png", @@ -371,12 +397,12 @@ local repl = { off="low", low="med", med="hi", hi="max", max="off", } local brights_tab = { 0, 50, 100, 150, 200 } local lamp_colors = { - "", - "blue", - "green", - "pink", - "red", - "violet" + {"white", "#ffffffe0:175"}, + {"blue", "#2626c6e0:200"}, + {"green", "#27a927e0:200"}, + {"pink", "#ff8fb7e0:200"}, + {"red", "#ad2323e0:200"}, + {"violet", "#7f29d7e0:200"} } local tlamp_cbox = { @@ -390,9 +416,10 @@ local slamp_cbox = { } local function reg_lamp(suffix, nxt, tilesuffix, light, color) - local lampcolor = "_"..color - local colordesc = " ("..color..")" - local woolcolor = color + local lampcolor = "_"..color[1] + local colordesc = " ("..color[1]..")" + local woolcolor = color[1] + local invcolor = color[2] local wool_brighten = (light or 0) * 7 local bulb_brighten = (light or 0) * 14 @@ -409,9 +436,9 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_generic_wood_red.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", }, - inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png", + inventory_image = "homedecor_table_lamp_foot_inv.png^(homedecor_table_lamp_top_inv.png^[colorize:"..invcolor..")", walkable = false, light_source = light, selection_box = tlamp_cbox, @@ -435,9 +462,9 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_generic_wood_red.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", }, - inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png", + inventory_image = "homedecor_standing_lamp_foot_inv.png^(homedecor_standing_lamp_top_inv.png^[colorize:"..invcolor..")", walkable = false, light_source = light, groups = {cracky=2,oddly_breakable_by_hand=1, @@ -445,6 +472,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) }, selection_box = slamp_cbox, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple, on_punch = function(pos, node, puncher) node.name = "homedecor:standing_lamp"..lampcolor.."_"..repl[suffix] minetest.set_node(pos, node) @@ -454,6 +482,10 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) minetest.register_alias("homedecor:standing_lamp_bottom"..lampcolor.."_"..suffix, "homedecor:standing_lamp"..lampcolor.."_"..suffix) minetest.register_alias("homedecor:standing_lamp_top"..lampcolor.."_"..suffix, "air") + minetest.register_alias("homedecor:standing_lamp_"..suffix, "homedecor:standing_lamp_white_"..suffix) + minetest.register_alias("homedecor:standing_lamp_whiteoff", "homedecor:standing_lamp_white_off") + minetest.register_alias("homedecor:table_lamp_"..suffix, "homedecor:table_lamp_white_"..suffix) + minetest.register_alias("homedecor:table_lamp_whiteoff", "homedecor:table_lamp_white_off") -- for old maps that had the original 3dforniture mod if lampcolor == "" then @@ -480,9 +512,13 @@ for _, color in ipairs(dlamp_colors) do homedecor.register("desk_lamp_"..color, { description = S("Desk Lamp ("..color..")"), mesh = "homedecor_desk_lamp.obj", - tiles = {"homedecor_desk_lamp_"..color..".png"}, - inventory_image = "homedecor_desk_lamp_inv_"..color..".png", - wield_image = "homedecor_desk_lamp_inv_"..color..".png", + tiles = { + "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200", + "homedecor_generic_metal_black.png^[colorize:"..color..":150", + "homedecor_generic_metal_black.png", + "homedecor_generic_metal_black.png^[colorize:"..color..":150" + }, + inventory_image = "homedecor_desk_lamp_stem_inv.png^(homedecor_desk_lamp_metal_inv.png^[colorize:"..color..":140)", selection_box = dlamp_cbox, walkable = false, groups = {snappy=3}, @@ -496,7 +532,7 @@ homedecor.register("ceiling_lamp", { "homedecor_generic_metal_brass.png", "homedecor_ceiling_lamp_glass.png", "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200", - "homedecor_generic_plastic_brown.png", + "homedecor_generic_plastic_black.png^[colorize:#442d04:200", }, inventory_image = "homedecor_ceiling_lamp_inv.png", light_source = LIGHT_MAX, @@ -514,7 +550,7 @@ homedecor.register("ceiling_lamp_off", { "homedecor_generic_metal_brass.png", "homedecor_ceiling_lamp_glass.png", "homedecor_table_standing_lamp_lightbulb.png", - "homedecor_generic_plastic_brown.png", + "homedecor_generic_plastic_black.png^[colorize:#442d04:200", }, groups = {snappy=3, not_in_creative_inventory=1}, walkable = false, diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 47383866..c9ba3865 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -24,21 +24,44 @@ homedecor.register("ceiling_tile", { selection_box = { type = "wallmounted" }, }) -local rug_sizes = {"small", "large"} +local rug_types = { + { "small", "homedecor_small_rug.obj" }, + { "large", { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 } }, + { "persian", { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 } } +} -for _, s in ipairs(rug_sizes) do -homedecor.register("rug_"..s, { - description = S("Throw Rug ("..s..")"), - drawtype = 'signlike', - tiles = {"homedecor_rug_"..s..".png"}, - wield_image = "homedecor_rug_"..s..".png", - inventory_image = "homedecor_rug_"..s..".png", - paramtype2 = "wallmounted", - walkable = false, - groups = {snappy = 3}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { type = "wallmounted" }, -}) +for i in ipairs(rug_types) do + s = rug_types[i][1] + m = rug_types[i][2] + + local mesh = m + local nodebox = nil + local tiles = { "homedecor_rug_"..s..".png", "wool_grey.png" } + + if type(m) == "table" then + mesh = nil + nodebox = { + type = "fixed", + fixed = m + } + tiles = { + "homedecor_rug_"..s..".png", + "wool_grey.png", + "homedecor_rug_"..s..".png" + } + end + + homedecor.register("rug_"..s, { + description = S("Rug ("..s..")"), + mesh = mesh, + tiles = tiles, + node_box = nodebox, + paramtype2 = "wallmounted", + walkable = false, + groups = {snappy = 3}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { type = "wallmounted" }, + }) end local pot_colors = {"black", "green", "terracotta"} @@ -49,7 +72,7 @@ homedecor.register("flower_pot_"..p, { mesh = "homedecor_flowerpot.obj", tiles = { "homedecor_flower_pot_"..p..".png", - "homedecor_potting_soil.png" + "default_dirt.png^[colorize:#000000:175" }, groups = { snappy = 3, potting_soil=1 }, sounds = default.node_sound_stone_defaults(), @@ -124,73 +147,53 @@ homedecor.register("chimney", { sounds = default.node_sound_stone_defaults() }) +local ft_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 } +} + homedecor.register("fishtank", { description = "Fishtank", + mesh = "homedecor_fishtank.obj", tiles = { - "homedecor_fishtank_top.png", - "homedecor_fishtank_bottom.png", - "homedecor_fishtank_right.png", - "homedecor_fishtank_left.png", - "homedecor_fishtank_back.png", - "homedecor_fishtank_front.png" - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.375, 0.5, -0.4375, 0.375}, - {-0.4375, -0.4375, -0.3125, 0.4375, 0.1875, 0.3125}, - {-0.4375, 0.1875, -0.1875, 0.4375, 0.25, 0.1875}, - {-0.1875, 0.0625, 0.0625, 0.1875, 0.25, 0.375}, - { 0.125, -0.5, 0.25, 0.1875, 0.1875, 0.375}, - {-0.375, 0.25, -0.125, 0.375, 0.3125, 0.125}, - } + "homedecor_generic_plastic_black.png", + "homedecor_fishtank_filter.png", + "homedecor_fishtank_fishes.png", + "homedecor_fishtank_gravel.png", + "homedecor_fishtank_water_top.png", + "homedecor_fishtank_sides.png", }, use_texture_alpha = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 } - }, + selection_box = ft_cbox, + collision_box = ft_cbox, groups = {cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) - fdir = minetest.get_node(pos).param2 - minetest.set_node(pos, {name = "homedecor:fishtank_lighted", param2 = fdir}) + minetest.set_node(pos, {name = "homedecor:fishtank_lighted", param2 = node.param2}) end }) homedecor.register("fishtank_lighted", { - description = "Fishtank", + description = "Fishtank (lighted)", + mesh = "homedecor_fishtank.obj", tiles = { - "homedecor_fishtank_top.png", - "homedecor_fishtank_bottom.png", - "homedecor_fishtank_right_lighted.png", - "homedecor_fishtank_left_lighted.png", - "homedecor_fishtank_back_lighted.png", - "homedecor_fishtank_front_lighted.png" + "homedecor_generic_plastic_black.png", + "homedecor_fishtank_filter.png", + "homedecor_fishtank_fishes_lighted.png", + "homedecor_fishtank_gravel_lighted.png", + "homedecor_fishtank_water_top_lighted.png", + "homedecor_fishtank_sides_lighted.png", }, light_source = LIGHT_MAX-4, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.375, 0.5, -0.4375, 0.375}, - {-0.4375, -0.4375, -0.3125, 0.4375, 0.1875, 0.3125}, - {-0.4375, 0.1875, -0.1875, 0.4375, 0.25, 0.1875}, - {-0.1875, 0.0625, 0.0625, 0.1875, 0.25, 0.375}, - { 0.125, -0.5, 0.25, 0.1875, 0.1875, 0.375}, - {-0.375, 0.25, -0.125, 0.375, 0.3125, 0.125}, - } - }, use_texture_alpha = true, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 } - }, + selection_box = ft_cbox, + collision_box = ft_cbox, groups = {cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) - fdir = minetest.get_node(pos).param2 - minetest.set_node(pos, {name = "homedecor:fishtank", param2 = fdir}) - end + minetest.set_node(pos, {name = "homedecor:fishtank", param2 = node.param2}) + end, + drop = "homedecor:fishtank", }) homedecor.register("cardboard_box_big", { @@ -244,7 +247,7 @@ homedecor.register("filing_cabinet", { description = S("Filing Cabinet"), mesh = "homedecor_filing_cabinet.obj", tiles = { - "homedecor_generic_wood_beech.png", + homedecor.plain_wood, "homedecor_filing_cabinet_front.png", "homedecor_filing_cabinet_bottom.png" }, @@ -268,7 +271,7 @@ homedecor.register("pool_table", { "homedecor_pool_table_baize.png", "homedecor_pool_table_pockets.png", "homedecor_pool_table_balls.png", - "homedecor_generic_wood_luxury_brown3.png" + "homedecor_generic_wood_luxury.png^[colorize:#000000:90" }, description = "Pool Table", inventory_image = "homedecor_pool_table_inv.png", @@ -277,12 +280,13 @@ homedecor.register("pool_table", { collision_box = pooltable_cbox, expand = { forward="air" }, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.disallow }) minetest.register_alias("homedecor:pool_table_2", "air") homedecor.register("coatrack_wallmount", { - tiles = { "homedecor_generic_wood_beech.png" }, + tiles = { homedecor.plain_wood }, inventory_image = "homedecor_coatrack_wallmount_inv.png", description = "Coatrack (wallmounted)", groups = {snappy=3}, @@ -306,8 +310,8 @@ homedecor.register("coatrack_wallmount", { homedecor.register("coat_tree", { mesh = "homedecor_coatrack.obj", tiles = { - "homedecor_generic_wood_beech.png", - "homedecor_generic_wood_neutral.png" + homedecor.plain_wood, + "homedecor_generic_wood_old.png" }, inventory_image = "homedecor_coatrack_inv.png", description = "Coat tree", @@ -319,6 +323,7 @@ homedecor.register("coat_tree", { type = "fixed", fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 } }, + on_rotate = screwdriver.rotate_simple }) local cutlery_cbox = { @@ -425,9 +430,9 @@ local piano_cbox = { homedecor.register("piano", { mesh = "homedecor_piano.obj", tiles = { + "homedecor_generic_wood_luxury.png^[colorize:#000000:175", "homedecor_piano_keys.png", "homedecor_generic_metal_brass.png", - "homedecor_generic_wood_luxury_black.png" }, inventory_image = "homedecor_piano_inv.png", description = "Piano", @@ -436,6 +441,7 @@ homedecor.register("piano", { collision_box = piano_cbox, expand = { right="air" }, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.disallow }) minetest.register_alias("homedecor:piano_left", "homedecor:piano") @@ -500,31 +506,14 @@ homedecor.register("skateboard", { homedecor.register("beer_tap", { description = "Beer tap", + mesh = "homedecor_beer_taps.obj", tiles = { - "homedecor_beertap_front.png", - "homedecor_beertap_front.png", - "homedecor_beertap_right.png", - "homedecor_beertap_right.png^[transformFX", - "homedecor_beertap_front.png", - "homedecor_beertap_front.png" + "homedecor_generic_metal_bright.png", + "homedecor_generic_metal_black.png", }, inventory_image = "homedecor_beertap_inv.png", groups = { snappy=3 }, walkable = false, - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.4375, 0.25, -0.48, 0}, -- NodeBox1 - {-0.0625, -0.48, -0.1875, 0.0625, 0.125, -0.0625}, -- NodeBox2 - {-0.1875, 0, -0.375, -0.125, 0.0315, -0.125}, -- NodeBox3 - {-0.1875, 0, -0.1875, 0.1875, 0.0315, -0.125}, -- NodeBox4 - {0.125, 0, -0.375, 0.1875, 0.0315, -0.125}, -- NodeBox5 - {0.135, 0.0315, -0.3225, 0.1775, 0.235, -0.29}, -- NodeBox6 - {-0.1775, 0.0315, -0.3225, -0.135, 0.235, -0.29}, -- NodeBox7 - {-0.1675, -0.0825, -0.355, -0.145, 0, -0.3325}, -- NodeBox8 - {0.145, -0.0825, -0.355, 0.1675, 0, -0.3325}, -- NodeBox9 - } - }, selection_box = { type = "fixed", fixed = { -0.25, -0.5, -0.4375, 0.25, 0.235, 0 } @@ -568,14 +557,15 @@ homedecor.register("tool_cabinet", { description = "Metal tool cabinet and work table", mesh = "homedecor_tool_cabinet.obj", tiles = { - "homedecor_generic_metal_red.png", + "homedecor_generic_metal_black.png^[colorize:#ff0000:150", "homedecor_tool_cabinet_drawers.png", - "homedecor_generic_metal_green.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[colorize:#006000:150", + "homedecor_generic_metal_black.png^[brighten", "homedecor_generic_metal_bright.png", "homedecor_tool_cabinet_misc.png", }, inventory_image = "homedecor_tool_cabinet_inv.png", + on_rotate = screwdriver.rotate_simple, groups = { snappy=3 }, selection_box = homedecor.nodebox.slab_y(2), expand = { top="air" }, @@ -626,7 +616,7 @@ homedecor.register("desk_globe", { mesh = "homedecor_desk_globe.obj", tiles = { "homedecor_generic_wood_red.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "homedecor_earth.png" }, inventory_image = "homedecor_desk_globe_inv.png", @@ -667,7 +657,7 @@ for _, i in ipairs(n) do mesh = "homedecor_picture_frame.obj", tiles = { "homedecor_picture_frame_image"..i..".png", - "homedecor_picture_frame_edges.png", + "homedecor_generic_wood_luxury.png^[colorize:#000000:50", "homedecor_picture_frame_back.png", }, inventory_image = "homedecor_picture_frame"..i.."_inv.png", @@ -679,27 +669,24 @@ for _, i in ipairs(n) do }) end +local p_cbox = { + type = "fixed", + fixed = { + { -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 } + } +} + for i = 1,20 do homedecor.register("painting_"..i, { description = "Decorative painting #"..i, + mesh = "homedecor_painting.obj", tiles = { - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_back.png", + "default_wood.png", + "homedecor_blank_canvas.png", "homedecor_painting"..i..".png" }, - node_box = { - type = "fixed", - fixed = { - { -32/64, -32/64, 28/64, -30/64, 32/64, 32/64 }, -- left edge - { 30/64, -32/64, 28/64, 32/64, 32/64, 32/64 }, -- right edge - { -32/64, 30/64, 28/64, 32/64, 32/64, 32/64 }, -- top edge - { -32/64, -30/64, 28/64, 32/64, -32/64, 32/64 }, -- bottom edge - { -32/64, -32/64, 29/64, 32/64, 32/64, 29/64 } -- the canvas - } - }, + selection_box = p_cbox, + walkable = false, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), }) @@ -717,8 +704,8 @@ homedecor.banister_materials = { }, { "white_dark", "dark topped", - "homedecor_generic_wood_white.png", - "homedecor_generic_wood_dark.png", + homedecor.white_wood, + homedecor.dark_wood, "group:wood", "group:stick", "dye:brown", @@ -726,7 +713,7 @@ homedecor.banister_materials = { }, { "brass", "brass", - "homedecor_generic_wood_white.png", + homedecor.white_wood, "homedecor_generic_metal_brass.png", "technic:brass_ingot", "group:stick", @@ -744,26 +731,31 @@ homedecor.banister_materials = { } } -for _, side in ipairs({"left", "right"}) do +for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do for i in ipairs(homedecor.banister_materials) do local name = homedecor.banister_materials[i][1] + local nodename = "banister_"..name.."_"..side + + local groups = { snappy = 3, not_in_creative_inventory = 1 } local cbox = { type = "fixed", - fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16} + fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 } } - local onplace = nil - groups = { snappy = 3, not_in_creative_inventory = 1} - - if side == "left" then - onplace = homedecor.place_banister + if side == "horizontal" then groups = { snappy = 3 } + cbox = { + type = "fixed", + fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 } + } + else + minetest.register_alias(string.gsub("homedecor:"..nodename, "diagonal_", ""), "homedecor:"..nodename) end - homedecor.register("banister_"..name.."_"..side, { - description = S("Banister for Stairs ("..homedecor.banister_materials[i][2]..", "..side.." side)"), + homedecor.register(nodename, { + description = S("Banister for Stairs ("..homedecor.banister_materials[i][2]..", "..side..")"), mesh = "homedecor_banister_"..side..".obj", tiles = { homedecor.banister_materials[i][3], @@ -773,8 +765,132 @@ for _, side in ipairs({"left", "right"}) do groups = groups, selection_box = cbox, collision_box = cbox, - on_place = onplace, - drop = "homedecor:banister_"..name.."_left", + on_place = homedecor.place_banister, + drop = "homedecor:banister_"..name.."_horizontal", }) end end + +homedecor.register("spiral_staircase", { + description = "Spiral Staircase", + mesh = "homedecor_spiral_staircase.obj", + tiles = { + "homedecor_generic_metal_wrought_iron.png", + }, + selection_box = { + type = "fixed", + fixed = { -1.5, -0.5, -1.5, 0.5, 2.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { + {-0.5625, -0.5, -0.5625, -0.4375, 2.5, -0.4375}, -- NodeBox9 + {-0.5, -0.5, -0.5, 0.5, -0.4375, 0}, -- NodeBox14 + {-0.5, -0.125, -0.5, -0.25, -0.0625, 0.5}, -- NodeBox15 + {-0.25, -0.125, -0.0625, 0, -0.0625, 0.5}, -- NodeBox16 + {-1, 0.25, -0.5, -0.5, 0.3125, 0.5}, -- NodeBox17 + {-1.5, 0.625, -0.5, -0.5, 0.6875, -0.25}, -- NodeBox18 + {-1.5, 0.625, -0.25, -0.9375, 0.6875, 0}, -- NodeBox19 + {-1.5, 1, -1, -0.5, 1.0625, -0.5}, -- NodeBox20 + {-0.75, 1.375, -1.5, -0.5, 1.4375, -0.5}, -- NodeBox21 + {-1, 1.375, -1.5, -0.75, 1.4375, -1}, -- NodeBox22 + {-0.5, 1.75, -1.5, 0.0625, 1.8125, -0.5}, -- NodeBox23 + {-0.5, 2.125, -0.8125, 0.5, 2.1875, -0.5}, -- NodeBox24 + {-0.0625, 2.125, -1.0625, 0.5, 2.1875, -0.75}, -- NodeBox25 + {-1.5, -0.125, 0.4375, 0.5, 1.625, 0.5}, -- NodeBox26 + {-1.5, 1.5625, -1.5, -1.4375, 2.875, 0.5}, -- NodeBox27 + {-1.5, 1.75, -1.5, 0.5, 3.3125, -1.4375}, -- NodeBox28 + {0.4375, -0.5, -0.5, 0.5, 0.875, 0.5}, -- NodeBox29 + {0.4375, 2.125, -1.5, 0.5, 3.3125, 0.5}, -- NodeBox30 + } + }, + groups = {choppy=2}, + sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple, + after_place_node = function(pos, placer, itemstack, pointed_thing) + local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local leftx = homedecor.fdir_to_left[fdir+1][1] + local leftz = homedecor.fdir_to_left[fdir+1][2] + local revx = -homedecor.fdir_to_fwd[fdir+1][1] + local revz = -homedecor.fdir_to_fwd[fdir+1][2] + + local corner1 = { x = pos.x + leftx + revx, y = pos.y, z = pos.z + leftz + revz} + local corner2 = { x = pos.x, y = pos.y + 2, z = pos.z } + + local minp = { x = math.min(corner1.x, corner2.x), + y = math.min(corner1.y, corner2.y), + z = math.min(corner1.z, corner2.z) } + + local maxp = { x = math.max(corner1.x, corner2.x), + y = math.max(corner1.y, corner2.y), + z = math.max(corner1.z, corner2.z) } + + if #minetest.find_nodes_in_area(minp, maxp, "air") < 11 then + minetest.set_node(pos, {name = "air"}) + minetest.chat_send_player(placer:get_player_name(), "This object takes up a 2x3x2 block of space (the bottom step goes in the forward-right corner), and some of it is occupied!" ) + return true + end + + local belownode = minetest.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) + + if belownode and belownode.name == "homedecor:spiral_staircase" then + local newpos = { x = pos.x, y = pos.y + 2, z = pos.z } + minetest.set_node(pos, { name = "air" }) + minetest.set_node(newpos, { name = "homedecor:spiral_staircase", param2 = belownode.param2 }) + end + end +}) + +minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack, pointed_thing) + + local belownode = minetest.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) + + if belownode and belownode.name == "homedecor:spiral_staircase" then + + minetest.set_node(pos, { name = "air" }) + + local newpos = { x = pos.x, y = pos.y + 2, z = pos.z } + local checknode = minetest.get_node(newpos) + + if checknode and checknode.name == "air" then + local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + minetest.set_node(newpos, { name = newnode.name, param2 = fdir }) + else + return true + end + end +end) + +local svm_cbox = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5} +} + +homedecor.register("soda_machine", { + description = "Soda Vending Machine", + mesh = "homedecor_soda_machine.obj", + tiles = {"homedecor_soda_machine.png"}, + groups = {snappy=3}, + selection_box = svm_cbox, + collision_box = svm_cbox, + expand = { top="air" }, + sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple, + on_punch = function(pos, node, puncher, pointed_thing) + local wielditem = puncher:get_wielded_item() + local wieldname = wielditem:get_name() + local fdir_to_fwd = { {0, -1}, {-1, 0}, {0, 1}, {1, 0} } + local fdir = node.param2 + local pos_drop = { x=pos.x+fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+fdir_to_fwd[fdir+1][2] } + if wieldname == "homedecor:coin" then + wielditem:take_item() + puncher:set_wielded_item(wielditem) + minetest.spawn_item(pos_drop, "homedecor:soda_can") + minetest.sound_play("insert_coin", { + pos=pos, max_hear_distance = 5 + }) + else + minetest.chat_send_player(puncher:get_player_name(), "Please insert a coin in the machine.") + end + end +}) diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_4_bottles.obj b/mods/homedecor_modpack/homedecor/models/homedecor_4_bottles.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ac.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ac.obj new file mode 100644 index 00000000..959aa915 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_ac.obj @@ -0,0 +1,75 @@ +# Blender v2.73 (sub 0) OBJ File: 'ac.blend' +# www.blender.org +o Cylinder +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.125000 0.500000 +v -0.500000 0.125000 -0.500000 +v 0.500000 0.125000 -0.500000 +v 0.500000 0.125000 0.500000 +v -0.500000 0.125001 0.500000 +v -0.500000 0.125001 -0.500000 +v 0.500000 0.125001 -0.500000 +v 0.500000 0.125001 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.374999 0.500000 +v -0.500000 0.250001 -0.500000 +v 0.500000 0.250001 -0.500000 +v 0.500000 0.250001 0.500000 +v -0.500000 0.250001 0.500000 +v -0.500000 0.374999 -0.500000 +v 0.500000 0.374999 -0.500000 +v 0.500000 0.374999 0.500000 +vt 1.000000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.687500 +vt 1.000000 0.687500 +vt 0.000000 1.000000 +vt 0.000000 0.687500 +vt 0.500000 0.375000 +vt 1.000000 0.375000 +vt 0.000000 0.187500 +vt 0.500000 0.187500 +vt 1.000000 0.125000 +vt 0.000000 0.125000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt -0.000000 0.750000 +vt -0.000000 0.625000 +vt 1.000000 0.625000 +vt 1.000000 0.750000 +vt -0.000000 0.875000 +vt 1.000000 0.875000 +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 1.000000 0.000000 +g Cylinder_Cylinder_main +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 6/2/2 7/5/2 3/6/2 2/3/2 +f 7/1/3 8/2/3 4/3/3 3/4/3 +f 8/4/4 5/3/4 1/7/4 4/8/4 +f 1/6/5 2/9/5 3/10/5 4/3/5 +f 8/10/6 7/3/6 6/6/6 5/9/6 +g Cylinder_Cylinder_glass-tb +f 21/11/1 18/12/1 10/13/1 9/14/1 +f 18/11/2 19/12/2 11/13/2 10/14/2 +f 19/11/3 20/12/3 12/13/3 11/14/3 +f 20/11/4 21/12/4 9/13/4 12/14/4 +f 16/13/6 15/14/6 14/1/6 13/5/6 +f 24/15/3 20/16/3 19/17/3 23/18/3 +f 23/15/2 19/16/2 18/17/2 22/18/2 +f 22/15/1 18/16/1 21/17/1 17/18/1 +f 13/1/1 14/5/1 22/19/1 17/20/1 +f 14/1/2 15/5/2 23/19/2 22/20/2 +f 15/1/3 16/5/3 24/19/3 23/20/3 +f 16/1/4 13/5/4 17/19/4 24/20/4 +f 21/16/4 20/17/4 24/18/4 17/15/4 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_analog_clock.obj b/mods/homedecor_modpack/homedecor/models/homedecor_analog_clock.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_left.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_left.obj new file mode 100644 index 00000000..1a2fcc01 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_left.obj @@ -0,0 +1,170 @@ +# Blender v2.73 (sub 0) OBJ File: 'banister.blend' +# www.blender.org +o Cylinder_Cylinder_verticals +v 0.421453 1.531250 0.499999 +v -0.578547 0.531250 0.499999 +v -0.516047 0.468750 0.499999 +v 0.483953 1.468750 0.499999 +v 0.421453 1.531250 0.312499 +v 0.483953 1.468750 0.312499 +v -0.516047 0.468750 0.312499 +v -0.578547 0.531250 0.312499 +v 0.202703 0.250000 0.437499 +v 0.265203 0.250000 0.437499 +v 0.265203 1.250000 0.437499 +v 0.202703 1.187500 0.437499 +v 0.202703 0.250000 0.374999 +v 0.202703 1.187500 0.374999 +v 0.265203 1.250000 0.374999 +v 0.265203 0.250000 0.374999 +v 0.265203 0.250000 0.499999 +v 0.202703 0.250000 0.499999 +v -0.297297 -0.187500 0.437499 +v -0.234797 -0.187500 0.437499 +v -0.234797 0.812500 0.437499 +v -0.297297 0.750000 0.437499 +v -0.297297 -0.187500 0.374999 +v -0.297297 0.750000 0.374999 +v -0.234797 0.812500 0.374999 +v -0.234797 -0.187500 0.374999 +v -0.234797 -0.187500 0.499999 +v -0.297297 -0.187500 0.499999 +v -0.297297 -0.125000 0.499999 +v -0.297297 -0.125000 0.437499 +v -0.234797 -0.125000 0.437499 +v -0.234797 -0.125000 0.499999 +v 0.202703 0.312500 0.437499 +v 0.202703 0.312500 0.499999 +v 0.265203 0.312500 0.499999 +v 0.265203 0.312500 0.437499 +vt -0.312500 0.500000 +vt -0.312500 0.437500 +vt 0.625000 0.437500 +vt 0.562500 0.500000 +vt 0.125000 0.687500 +vt 1.000000 0.687500 +vt 1.062500 0.750000 +vt 0.125000 0.750000 +vt 1.000000 0.125000 +vt 1.000000 0.062500 +vt 1.125000 0.062500 +vt 1.125000 0.125000 +vt 0.125000 0.625000 +vt 0.125000 0.562500 +vt 1.062500 0.562500 +vt 1.000000 0.625000 +vt 1.062500 0.687500 +vt 1.187500 0.125000 +vt 1.187500 0.062500 +vt 1.312500 0.062500 +vt 1.312500 0.125000 +vt 0.875000 0.875000 +vt -0.062500 0.875000 +vt -0.062500 0.812500 +vt 0.875000 0.812500 +vt -0.312500 0.375000 +vt 0.562500 0.375000 +vt 0.562500 0.437500 +vt 0.875000 1.000000 +vt -0.062500 1.000000 +vt -0.062500 0.937500 +vt 0.875000 0.937500 +vt 0.437500 0.187500 +vt 1.312500 0.187500 +vt 1.312500 0.250000 +vt 0.437500 0.250000 +vt 0.437500 0.125000 +vt 0.500000 0.125000 +vt 0.500000 0.187500 +vt -0.375000 0.812500 +vt -0.312500 0.812500 +vt -0.312500 0.875000 +vt -0.375000 0.875000 +vt 0.812500 0.125000 +vt 0.750000 0.125000 +vt 0.750000 0.062500 +vt 0.812500 0.062500 +vt 0.937500 0.125000 +vt 0.875000 0.125000 +vt 0.875000 0.062500 +vt 0.937500 0.062500 +vt -0.250000 0.875000 +vt -0.250000 0.937500 +vt -0.312500 0.937500 +vt -0.250000 0.375000 +vt -0.312500 0.312500 +vt -0.250000 0.312500 +vt -0.125000 0.937500 +vt -0.125000 0.875000 +vt -0.125000 1.000000 +vt -0.187500 0.625000 +vt -0.375000 0.625000 +vt -0.375000 0.562500 +vt -0.187500 0.562500 +vt -0.125000 0.625000 +vt -0.125000 0.562500 +vt 0.062500 0.562500 +vt 0.062500 0.625000 +vt 1.375000 0.250000 +vt 0.375000 0.250000 +vt 0.375000 0.062500 +vt 1.375000 0.062500 +vt -0.375000 0.312500 +vt 0.625000 0.312500 +vt 0.625000 0.500000 +vt -0.375000 0.500000 +vn -0.707100 0.000000 0.707100 +vn 0.707100 0.000000 0.707100 +vn 0.894400 0.000000 0.447200 +vn -0.554700 0.000000 0.832000 +vn -0.577300 -0.577400 -0.577400 +vn -0.554700 -0.000000 -0.832100 +vn 0.894400 -0.000000 -0.447200 +vn 0.577400 -0.577400 -0.577400 +vn 0.577400 -0.577400 0.577400 +vn -0.577400 -0.577400 0.577300 +vn -0.554700 0.000000 0.832100 +vn -0.577400 -0.577400 -0.577400 +vn 0.577400 -0.577400 -0.577300 +vn -0.577400 -0.577400 0.577400 +vn -0.577300 0.577300 0.577300 +vn -0.707100 0.707100 -0.000000 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.707100 0.707100 -0.000000 +vn 0.577300 0.577300 0.577300 +vn 0.000000 0.816500 0.577300 +vn -0.816500 0.000000 0.577300 +vn 0.000000 -0.816500 0.577300 +vn 0.816500 0.000000 0.577300 +vn 0.000000 0.816500 -0.577300 +vn 0.816500 0.000000 -0.577300 +vn 0.000000 -0.816500 -0.577300 +vn -0.816500 0.000000 -0.577300 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_verticals +s 1 +f 9/1/1 10/2/2 11/3/3 12/4/4 +f 13/5/5 14/6/6 15/7/7 16/8/8 +f 13/9/5 16/10/8 17/11/9 18/12/10 +f 19/13/1 20/14/2 21/15/3 22/16/11 +f 23/13/12 24/16/6 25/17/7 26/5/13 +f 23/18/12 26/19/13 27/20/9 28/21/14 +f 11/22/3 10/23/2 16/24/8 15/25/7 +f 9/26/1 12/27/4 14/28/6 13/2/5 +f 21/29/3 20/30/2 26/31/13 25/32/7 +f 19/33/1 22/34/11 24/35/6 23/36/12 +f 28/37/14 29/38/15 30/39/16 19/33/17 +f 20/40/18 31/41/19 32/42/20 27/43/9 +f 33/44/16 34/45/15 35/46/20 36/47/19 +f 30/48/16 29/49/15 32/50/20 31/51/19 +f 10/42/18 36/52/19 35/53/20 17/54/9 +f 33/55/16 9/26/17 18/56/10 34/57/15 +f 17/42/9 35/52/20 34/53/15 18/54/10 +f 27/40/9 32/41/20 29/42/15 28/43/14 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_railing +f 1/32/21 2/58/22 3/59/23 4/22/24 +f 5/32/25 6/29/26 7/60/27 8/58/28 +f 1/61/21 4/62/24 6/63/26 5/64/25 +f 2/65/22 8/66/28 7/67/27 3/68/23 +f 4/69/24 3/70/23 7/71/27 6/72/26 +f 2/73/22 1/74/21 5/75/25 8/76/28 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_right.obj new file mode 100644 index 00000000..443aa421 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_right.obj @@ -0,0 +1,167 @@ +# Blender v2.73 (sub 0) OBJ File: 'banister-left.blend' +# www.blender.org +o Cylinder_Cylinder_verticals +v -0.421453 1.531250 0.499999 +v 0.578547 0.531250 0.499999 +v 0.516047 0.468750 0.499999 +v -0.483953 1.468750 0.499999 +v -0.421453 1.531250 0.312499 +v -0.483953 1.468750 0.312499 +v 0.516047 0.468750 0.312499 +v 0.578547 0.531250 0.312499 +v -0.202703 0.250000 0.437499 +v -0.265203 0.250000 0.437499 +v -0.265203 1.250000 0.437499 +v -0.202703 1.187500 0.437499 +v -0.202703 0.250000 0.374999 +v -0.202703 1.187500 0.374999 +v -0.265203 1.250000 0.374999 +v -0.265203 0.250000 0.374999 +v -0.265203 0.250000 0.499999 +v -0.202703 0.250000 0.499999 +v 0.297297 -0.187500 0.437499 +v 0.234797 -0.187500 0.437499 +v 0.234797 0.812500 0.437499 +v 0.297297 0.750000 0.437499 +v 0.297297 -0.187500 0.374999 +v 0.297297 0.750000 0.374999 +v 0.234797 0.812500 0.374999 +v 0.234797 -0.187500 0.374999 +v 0.234797 -0.187500 0.499999 +v 0.297297 -0.187500 0.499999 +v 0.297297 -0.125000 0.499999 +v 0.297297 -0.125000 0.437499 +v 0.234797 -0.125000 0.437499 +v 0.234797 -0.125000 0.499999 +v -0.202703 0.312500 0.437499 +v -0.202703 0.312500 0.499999 +v -0.265203 0.312500 0.499999 +v -0.265203 0.312500 0.437499 +vt -0.312500 0.500000 +vt 0.562500 0.500000 +vt 0.625000 0.437500 +vt -0.312500 0.437500 +vt 0.125000 0.687500 +vt 0.125000 0.750000 +vt 1.062500 0.750000 +vt 1.000000 0.687500 +vt 1.000000 0.125000 +vt 1.125000 0.125000 +vt 1.125000 0.062500 +vt 1.000000 0.062500 +vt 0.125000 0.625000 +vt 1.000000 0.625000 +vt 1.062500 0.562500 +vt 0.125000 0.562500 +vt 1.062500 0.687500 +vt 1.187500 0.125000 +vt 1.312500 0.125000 +vt 1.312500 0.062500 +vt 1.187500 0.062500 +vt 0.875000 0.875000 +vt 0.875000 0.812500 +vt -0.062500 0.812500 +vt -0.062500 0.875000 +vt -0.312500 0.375000 +vt 0.562500 0.437500 +vt 0.562500 0.375000 +vt 0.875000 1.000000 +vt 0.875000 0.937500 +vt -0.062500 0.937500 +vt -0.062500 1.000000 +vt 0.437500 0.187500 +vt 0.437500 0.250000 +vt 1.312500 0.250000 +vt 1.312500 0.187500 +vt 0.437500 0.125000 +vt 0.500000 0.187500 +vt 0.500000 0.125000 +vt -0.375000 0.812500 +vt -0.375000 0.875000 +vt -0.312500 0.875000 +vt -0.312500 0.812500 +vt 0.812500 0.125000 +vt 0.812500 0.062500 +vt 0.750000 0.062500 +vt 0.750000 0.125000 +vt 0.937500 0.125000 +vt 0.937500 0.062500 +vt 0.875000 0.062500 +vt 0.875000 0.125000 +vt -0.312500 0.937500 +vt -0.250000 0.937500 +vt -0.250000 0.875000 +vt -0.250000 0.375000 +vt -0.250000 0.312500 +vt -0.312500 0.312500 +vt -0.125000 0.875000 +vt -0.125000 0.937500 +vt -0.125000 1.000000 +vt -0.187500 0.625000 +vt -0.187500 0.562500 +vt -0.375000 0.562500 +vt -0.375000 0.625000 +vt -0.125000 0.625000 +vt 0.062500 0.625000 +vt 0.062500 0.562500 +vt -0.125000 0.562500 +vt 1.375000 0.250000 +vt 1.375000 0.062500 +vt 0.375000 0.062500 +vt 0.375000 0.250000 +vt -0.375000 0.312500 +vt -0.375000 0.500000 +vt 0.625000 0.500000 +vt 0.625000 0.312500 +vn 0.707100 0.000000 0.707100 +vn 0.554700 0.000000 0.832000 +vn -0.894400 0.000000 0.447200 +vn -0.707100 0.000000 0.707100 +vn 0.577400 -0.577400 -0.577400 +vn -0.577400 -0.577400 -0.577400 +vn -0.894400 -0.000000 -0.447200 +vn 0.554700 -0.000000 -0.832100 +vn 0.577400 -0.577400 0.577300 +vn -0.577400 -0.577400 0.577400 +vn 0.577400 -0.577400 0.577400 +vn 1.000000 0.000000 0.000000 +vn 0.707100 0.707100 -0.000000 +vn 0.577300 0.577300 0.577300 +vn -1.000000 0.000000 0.000000 +vn -0.577300 0.577300 0.577300 +vn -0.707100 0.707100 -0.000000 +vn 0.000000 0.816500 0.577300 +vn -0.816500 0.000000 0.577300 +vn 0.000000 -0.816500 0.577300 +vn 0.816500 0.000000 0.577300 +vn 0.000000 0.816500 -0.577300 +vn 0.816500 0.000000 -0.577300 +vn 0.000000 -0.816500 -0.577300 +vn -0.816500 0.000000 -0.577300 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_verticals +s 1 +f 9/1/1 12/2/2 11/3/3 10/4/4 +f 13/5/5 16/6/6 15/7/7 14/8/8 +f 13/9/5 18/10/9 17/11/10 16/12/6 +f 19/13/1 22/14/2 21/15/3 20/16/4 +f 23/13/5 26/5/6 25/17/7 24/14/8 +f 23/18/5 28/19/11 27/20/10 26/21/6 +f 11/22/3 15/23/7 16/24/6 10/25/4 +f 9/26/1 13/4/5 14/27/8 12/28/2 +f 21/29/3 25/30/7 26/31/6 20/32/4 +f 19/33/1 23/34/5 24/35/8 22/36/2 +f 28/37/11 19/33/12 30/38/13 29/39/14 +f 20/40/15 27/41/10 32/42/16 31/43/17 +f 33/44/13 36/45/17 35/46/16 34/47/14 +f 30/48/13 31/49/17 32/50/16 29/51/14 +f 10/42/15 17/52/10 35/53/16 36/54/17 +f 33/55/13 34/56/14 18/57/9 9/26/12 +f 17/42/10 18/52/9 34/53/14 35/54/16 +f 27/40/10 28/41/11 29/42/14 32/43/16 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_railing +f 1/30/18 4/22/19 3/58/20 2/59/21 +f 5/30/22 8/59/23 7/60/24 6/29/25 +f 1/61/18 5/62/22 6/63/25 4/64/19 +f 2/65/21 3/66/20 7/67/24 8/68/23 +f 4/69/19 6/70/25 7/71/24 3/72/20 +f 2/73/21 8/74/23 5/75/22 1/76/18 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_horizontal.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_horizontal.obj new file mode 100644 index 00000000..7784e990 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_banister_horizontal.obj @@ -0,0 +1,87 @@ +# Blender v2.73 (sub 0) OBJ File: 'banister-horizontal_left.blend' +# www.blender.org +o Cylinder_Cylinder_verticals +v -0.312500 0.437500 0.437500 +v -0.312500 0.437500 0.500000 +v -0.250000 0.437500 0.500000 +v -0.250000 0.437500 0.437500 +v -0.312500 -0.500000 0.437500 +v -0.312500 -0.500000 0.500000 +v -0.250000 -0.500000 0.500000 +v -0.250000 -0.500000 0.437500 +v 0.500000 0.437500 0.312500 +v 0.500000 0.437500 0.500000 +v -0.500000 0.437500 0.500000 +v -0.500000 0.437500 0.312500 +v 0.500000 0.500000 0.312500 +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.312500 +v 0.312500 -0.500000 0.437500 +v 0.312500 -0.500000 0.500000 +v 0.250000 -0.500000 0.500000 +v 0.250000 -0.500000 0.437500 +v 0.312500 0.437500 0.437500 +v 0.312500 0.437500 0.500000 +v 0.250000 0.437500 0.500000 +v 0.250000 0.437500 0.437500 +vt 0.750000 0.062500 +vt 0.750000 0.000000 +vt 0.812500 0.000000 +vt 0.812500 0.062500 +vt 0.937500 0.000000 +vt 0.937500 0.062500 +vt 0.000000 0.062500 +vt 0.000000 -0.000000 +vt 0.937500 0.562500 +vt 0.937500 0.625000 +vt -0.000000 0.625000 +vt -0.000000 0.562500 +vt 0.937500 0.875000 +vt 0.937500 0.812500 +vt 0.000000 0.812500 +vt 0.000000 0.875000 +vt 0.937500 0.750000 +vt 0.937500 0.687500 +vt -0.000000 0.687500 +vt -0.000000 0.750000 +vt 0.187500 0.062500 +vt 0.187500 0.000000 +vt 0.250000 0.000000 +vt 0.250000 0.062500 +vt -0.062500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.937500 +vt -0.062500 0.937500 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vt 1.000000 0.937500 +vt -0.000000 0.937500 +vt 0.000000 0.187500 +vt 1.000000 0.187500 +vt 1.000000 0.000000 +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.000000 1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_verticals +s off +f 8/1/1 7/2/1 6/3/1 5/4/1 +f 1/5/2 4/6/2 8/7/2 5/8/2 +f 2/9/3 1/10/3 5/11/3 6/12/3 +f 3/6/4 2/5/4 6/8/4 7/7/4 +f 21/13/5 22/14/5 18/15/5 17/16/5 +f 22/17/4 23/18/4 19/19/4 18/20/4 +f 23/9/3 24/10/3 20/11/3 19/12/3 +f 24/18/2 21/17/2 17/20/2 20/19/2 +f 17/21/1 18/22/1 19/23/1 20/24/1 +f 4/13/5 3/14/5 7/15/5 8/16/5 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_railing +f 13/25/5 14/26/5 10/27/5 9/28/5 +f 14/29/4 15/30/4 11/31/4 10/32/4 +f 15/26/3 16/25/3 12/28/3 11/27/3 +f 16/30/2 13/29/2 9/32/2 12/31/2 +f 9/8/1 10/33/1 11/34/1 12/35/1 +f 16/35/6 15/34/6 14/33/6 13/8/6 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_left.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_left.obj deleted file mode 100644 index 554ab1a4..00000000 --- a/mods/homedecor_modpack/homedecor/models/homedecor_banister_left.obj +++ /dev/null @@ -1,153 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'bannister.blend' -# www.blender.org -o Cylinder -v 0.265203 0.250000 0.437499 -v 0.202703 1.187500 0.437499 -v 0.265203 1.250000 0.437499 -v -0.297297 -0.187500 0.437499 -v -0.234797 0.812500 0.437499 -v 0.202703 0.250000 0.437499 -v -0.047297 1.000000 0.499999 -v 0.483953 1.468750 0.499999 -v -0.578547 0.531250 0.499999 -v 0.421453 1.531250 0.499999 -v -0.516047 0.468750 0.499999 -v 0.265203 0.250000 0.374999 -v 0.202703 1.187500 0.374999 -v 0.265203 1.250000 0.374999 -v -0.297297 0.750000 0.437499 -v -0.234797 -0.187500 0.437499 -v 0.202703 0.250000 0.374999 -v 0.483953 1.468750 0.312499 -v -0.578547 0.531250 0.312499 -v 0.421453 1.531250 0.312499 -v -0.516047 0.468750 0.312499 -v -0.234797 -0.187500 0.374999 -v -0.297297 0.750000 0.374999 -v -0.234797 0.812500 0.374999 -v -0.297297 -0.187500 0.374999 -v 0.265203 0.250000 0.499999 -v -0.297297 -0.187500 0.499999 -v 0.202703 0.250000 0.499999 -v -0.234797 -0.187500 0.499999 -v 0.265203 0.312500 0.437499 -v -0.297297 -0.125000 0.437499 -v 0.202703 0.312500 0.437499 -v -0.234797 -0.125000 0.437499 -v 0.265203 0.312500 0.499999 -v -0.297297 -0.125000 0.499999 -v 0.202703 0.312500 0.499999 -v -0.234797 -0.125000 0.499999 -vt 0.062500 0.812500 -vt 0.062500 0.750000 -vt 1.000000 0.750000 -vt 0.937500 0.812500 -vt 0.062500 0.937500 -vt 0.937500 0.937500 -vt 1.000000 1.000000 -vt 0.062500 1.000000 -vt 0.625000 0.375000 -vt 0.625000 0.312500 -vt 0.750000 0.312500 -vt 0.750000 0.375000 -vt 0.062500 0.875000 -vt 1.000000 0.812500 -vt 0.937500 0.875000 -vt 1.000000 0.937500 -vt 0.812500 0.375000 -vt 0.812500 0.312500 -vt 0.937500 0.312500 -vt 0.937500 0.375000 -vt 1.000000 0.062500 -vt 0.062500 0.062500 -vt 0.062500 0.000000 -vt 1.000000 0.000000 -vt 0.062500 0.625000 -vt 0.937500 0.625000 -vt 0.937500 0.687500 -vt 0.062500 0.687500 -vt 1.000000 0.250000 -vt 0.062500 0.250000 -vt 0.062500 0.187500 -vt 1.000000 0.187500 -vt 0.062500 0.437500 -vt 0.937500 0.437500 -vt 0.937500 0.500000 -vt 0.062500 0.500000 -vt 0.062500 0.375000 -vt 0.125000 0.375000 -vt 0.125000 0.437500 -vt 0.125000 0.250000 -vt 0.125000 0.312500 -vt 0.062500 0.312500 -vt 0.437500 0.375000 -vt 0.375000 0.375000 -vt 0.375000 0.312500 -vt 0.437500 0.312500 -vt 0.562500 0.375000 -vt 0.500000 0.375000 -vt 0.500000 0.312500 -vt 0.562500 0.312500 -vt 0.125000 0.062500 -vt 0.125000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.562500 -vt 0.125000 0.562500 -vt 0.125000 0.625000 -vt 1.000000 0.125000 -vt 0.000000 0.125000 -vt 0.000000 0.062500 -vt 0.000000 0.250000 -vt 0.000000 0.187500 -vt 0.187500 0.875000 -vt 0.000000 0.875000 -vt 0.000000 0.812500 -vt 0.187500 0.812500 -vt 0.250000 0.875000 -vt 0.250000 0.812500 -vt 0.437500 0.812500 -vt 0.437500 0.875000 -vt 1.000000 0.500000 -vt 0.000000 0.500000 -vt 0.000000 0.312500 -vt 1.000000 0.312500 -vt 0.000000 0.562500 -vt 1.000000 0.562500 -vt 0.000000 0.750000 -vn -0.000000 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 1.000000 0.000000 -vn 0.707100 0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 0.707100 0.000000 -g Cylinder_Cylinder_verticals -s off -f 6/1/1 1/2/1 3/3/1 2/4/1 -f 17/5/2 13/6/2 14/7/2 12/8/2 -f 17/9/3 12/10/3 26/11/3 28/12/3 -f 4/13/1 16/1/1 5/14/1 15/15/1 -f 25/13/2 23/15/2 24/16/2 22/5/2 -f 25/17/3 22/18/3 29/19/3 27/20/3 -f 3/21/4 1/22/4 12/23/4 14/24/4 -f 6/25/5 2/26/5 13/27/5 17/28/5 -f 5/29/4 16/30/4 22/31/4 24/32/4 -f 4/33/5 15/34/5 23/35/5 25/36/5 -f 27/37/5 35/38/5 31/39/5 4/33/5 -f 16/30/4 33/40/4 37/41/4 29/42/4 -f 32/43/6 36/44/6 34/45/6 30/46/6 -f 31/47/6 35/48/6 37/49/6 33/50/6 -f 1/22/4 30/51/4 34/52/4 26/53/4 -f 28/54/5 36/55/5 32/56/5 6/25/5 -f 26/22/1 34/51/1 36/52/1 28/53/1 -f 29/30/1 37/40/1 35/41/1 27/42/1 -g Cylinder_Cylinder_top -f 10/57/1 9/58/1 11/59/1 8/21/1 -f 20/32/2 18/29/2 21/60/2 19/61/2 -f 10/62/7 8/63/7 18/64/7 20/65/7 -f 9/66/8 19/67/8 21/68/8 11/69/8 -f 8/70/9 11/71/9 21/72/9 18/73/9 -f 9/74/10 10/75/10 20/3/10 19/76/10 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_right.obj deleted file mode 100644 index bdf14934..00000000 --- a/mods/homedecor_modpack/homedecor/models/homedecor_banister_right.obj +++ /dev/null @@ -1,153 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'bannister_right.blend' -# www.blender.org -o Cylinder -v -0.265203 0.250000 0.437499 -v -0.202703 1.187500 0.437499 -v -0.265203 1.250000 0.437499 -v 0.297297 -0.187500 0.437499 -v 0.234797 0.812500 0.437499 -v -0.202703 0.250000 0.437499 -v 0.047297 1.000000 0.499999 -v -0.483953 1.468750 0.499999 -v 0.578547 0.531250 0.499999 -v -0.421453 1.531250 0.499999 -v 0.516047 0.468750 0.499999 -v -0.265203 0.250000 0.374999 -v -0.202703 1.187500 0.374999 -v -0.265203 1.250000 0.374999 -v 0.297297 0.750000 0.437499 -v 0.234797 -0.187500 0.437499 -v -0.202703 0.250000 0.374999 -v -0.483953 1.468750 0.312499 -v 0.578547 0.531250 0.312499 -v -0.421453 1.531250 0.312499 -v 0.516047 0.468750 0.312499 -v 0.234797 -0.187500 0.374999 -v 0.297297 0.750000 0.374999 -v 0.234797 0.812500 0.374999 -v 0.297297 -0.187500 0.374999 -v -0.265203 0.250000 0.499999 -v 0.297297 -0.187500 0.499999 -v -0.202703 0.250000 0.499999 -v 0.234797 -0.187500 0.499999 -v -0.265203 0.312500 0.437499 -v 0.297297 -0.125000 0.437499 -v -0.202703 0.312500 0.437499 -v 0.234797 -0.125000 0.437499 -v -0.265203 0.312500 0.499999 -v 0.297297 -0.125000 0.499999 -v -0.202703 0.312500 0.499999 -v 0.234797 -0.125000 0.499999 -vt 0.062500 0.812500 -vt 0.937500 0.812500 -vt 1.000000 0.750000 -vt 0.062500 0.750000 -vt 0.062500 0.937500 -vt 0.062500 1.000000 -vt 1.000000 1.000000 -vt 0.937500 0.937500 -vt 0.625000 0.375000 -vt 0.750000 0.375000 -vt 0.750000 0.312500 -vt 0.625000 0.312500 -vt 0.062500 0.875000 -vt 0.937500 0.875000 -vt 1.000000 0.812500 -vt 1.000000 0.937500 -vt 0.812500 0.375000 -vt 0.937500 0.375000 -vt 0.937500 0.312500 -vt 0.812500 0.312500 -vt 1.000000 0.062500 -vt 1.000000 0.000000 -vt 0.062500 0.000000 -vt 0.062500 0.062500 -vt 0.062500 0.625000 -vt 0.062500 0.687500 -vt 0.937500 0.687500 -vt 0.937500 0.625000 -vt 1.000000 0.250000 -vt 1.000000 0.187500 -vt 0.062500 0.187500 -vt 0.062500 0.250000 -vt 0.062500 0.437500 -vt 0.062500 0.500000 -vt 0.937500 0.500000 -vt 0.937500 0.437500 -vt 0.062500 0.375000 -vt 0.125000 0.437500 -vt 0.125000 0.375000 -vt 0.062500 0.312500 -vt 0.125000 0.312500 -vt 0.125000 0.250000 -vt 0.437500 0.375000 -vt 0.437500 0.312500 -vt 0.375000 0.312500 -vt 0.375000 0.375000 -vt 0.562500 0.375000 -vt 0.562500 0.312500 -vt 0.500000 0.312500 -vt 0.500000 0.375000 -vt 0.062500 0.125000 -vt 0.125000 0.125000 -vt 0.125000 0.062500 -vt 0.062500 0.562500 -vt 0.125000 0.625000 -vt 0.125000 0.562500 -vt 1.000000 0.125000 -vt 0.000000 0.062500 -vt 0.000000 0.125000 -vt 0.000000 0.187500 -vt 0.000000 0.250000 -vt 0.187500 0.875000 -vt 0.187500 0.812500 -vt 0.000000 0.812500 -vt 0.000000 0.875000 -vt 0.250000 0.875000 -vt 0.437500 0.875000 -vt 0.437500 0.812500 -vt 0.250000 0.812500 -vt 1.000000 0.500000 -vt 1.000000 0.312500 -vt 0.000000 0.312500 -vt 0.000000 0.500000 -vt 0.000000 0.562500 -vt 0.000000 0.750000 -vt 1.000000 0.562500 -vn 0.000000 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 1.000000 0.000000 -vn -0.707100 0.707100 0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn 0.707100 0.707100 0.000000 -g Cylinder_Cylinder_verticals -s off -f 6/1/1 2/2/1 3/3/1 1/4/1 -f 17/5/2 12/6/2 14/7/2 13/8/2 -f 17/9/3 28/10/3 26/11/3 12/12/3 -f 4/13/1 15/14/1 5/15/1 16/1/1 -f 25/13/2 22/5/2 24/16/2 23/14/2 -f 25/17/3 27/18/3 29/19/3 22/20/3 -f 3/21/4 14/22/4 12/23/4 1/24/4 -f 6/25/5 17/26/5 13/27/5 2/28/5 -f 5/29/4 24/30/4 22/31/4 16/32/4 -f 4/33/5 25/34/5 23/35/5 15/36/5 -f 27/37/5 4/33/5 31/38/5 35/39/5 -f 16/32/4 29/40/4 37/41/4 33/42/4 -f 32/43/6 30/44/6 34/45/6 36/46/6 -f 31/47/6 33/48/6 37/49/6 35/50/6 -f 1/24/4 26/51/4 34/52/4 30/53/4 -f 28/54/5 6/25/5 32/55/5 36/56/5 -f 26/24/1 28/51/1 36/52/1 34/53/1 -f 29/32/1 27/40/1 35/41/1 37/42/1 -g Cylinder_Cylinder_top -f 10/57/1 8/21/1 11/58/1 9/59/1 -f 20/30/2 19/60/2 21/61/2 18/29/2 -f 10/62/7 20/63/7 18/64/7 8/65/7 -f 9/66/8 11/67/8 21/68/8 19/69/8 -f 8/70/9 18/71/9 21/72/9 11/73/9 -f 9/74/10 19/75/10 20/3/10 10/76/10 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_beer_mug.obj b/mods/homedecor_modpack/homedecor/models/homedecor_beer_mug.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_beer_taps.obj b/mods/homedecor_modpack/homedecor/models/homedecor_beer_taps.obj new file mode 100644 index 00000000..87929b84 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_beer_taps.obj @@ -0,0 +1,1198 @@ +# Blender v2.73 (sub 0) OBJ File: 'beer-taps.blend' +# www.blender.org +o Cylinder +v -0.250000 -0.500000 0.000000 +v -0.250000 -0.500000 -0.500000 +v 0.250000 -0.500000 -0.500000 +v 0.250000 -0.500000 0.000000 +v -0.250000 -0.468750 0.000000 +v -0.250000 -0.468750 -0.500000 +v 0.250000 -0.468750 -0.500000 +v 0.250000 -0.468750 0.000000 +v 0.000000 -0.468750 -0.187500 +v 0.000000 0.125000 -0.187500 +v 0.044194 -0.468750 -0.169194 +v 0.044194 0.125000 -0.169194 +v 0.062500 -0.468750 -0.125000 +v 0.062500 0.125000 -0.125000 +v 0.044194 -0.468750 -0.080806 +v 0.044194 0.125000 -0.080806 +v -0.000000 -0.468750 -0.062500 +v -0.000000 0.125000 -0.062500 +v -0.044194 -0.468750 -0.080806 +v -0.044194 0.125000 -0.080806 +v -0.062500 -0.468750 -0.125000 +v -0.062500 0.125000 -0.125000 +v -0.044194 -0.468750 -0.169194 +v -0.044194 0.125000 -0.169194 +v 0.031250 0.144531 -0.125000 +v 0.000000 0.148438 -0.125000 +v -0.175781 0.062500 -0.143125 +v 0.175781 0.062500 -0.143125 +v -0.175781 0.049684 -0.137816 +v 0.175781 0.049684 -0.137816 +v -0.175781 0.044375 -0.125000 +v 0.175781 0.044375 -0.125000 +v -0.175781 0.049684 -0.112184 +v 0.175781 0.049684 -0.112184 +v -0.175781 0.062500 -0.106875 +v 0.175781 0.062500 -0.106875 +v -0.175781 0.075316 -0.112184 +v 0.175781 0.075316 -0.112184 +v -0.175781 0.080625 -0.125000 +v 0.175781 0.080625 -0.125000 +v -0.175781 0.075316 -0.137816 +v 0.175781 0.075316 -0.137816 +v 0.022097 0.144531 -0.102903 +v -0.000000 0.144531 -0.093750 +v -0.022097 0.144531 -0.102903 +v -0.031250 0.144531 -0.125000 +v -0.022097 0.144531 -0.147097 +v 0.000000 0.144531 -0.156250 +v 0.022097 0.144531 -0.147097 +v 0.195312 0.033500 -0.093750 +v 0.195312 0.033500 -0.271224 +v 0.215819 0.041994 -0.093750 +v 0.215819 0.041994 -0.271224 +v 0.224312 0.062500 -0.093750 +v 0.224312 0.062500 -0.271224 +v 0.215819 0.083006 -0.093750 +v 0.215819 0.083006 -0.271224 +v 0.195312 0.091500 -0.093750 +v 0.195312 0.091500 -0.271224 +v 0.174806 0.083006 -0.093750 +v 0.174806 0.083006 -0.271224 +v 0.166313 0.062500 -0.093750 +v 0.166313 0.062500 -0.271224 +v 0.174806 0.041994 -0.093750 +v 0.174806 0.041994 -0.271224 +v 0.216430 0.121971 -0.271118 +v 0.195312 0.121971 -0.279865 +v 0.195312 0.410803 -0.268868 +v 0.208655 0.410803 -0.263342 +v 0.214181 0.410803 -0.250000 +v 0.208655 0.410803 -0.236658 +v 0.195312 0.410803 -0.231132 +v 0.181970 0.410803 -0.236658 +v 0.176444 0.410803 -0.250000 +v 0.181970 0.410803 -0.263342 +v 0.225177 0.121971 -0.250000 +v 0.216430 0.121971 -0.228882 +v 0.195312 0.121971 -0.220135 +v 0.174195 0.121971 -0.228882 +v 0.165448 0.121971 -0.250000 +v 0.174195 0.121971 -0.271118 +v 0.162768 0.316082 -0.282545 +v 0.149287 0.316082 -0.250000 +v 0.195312 0.316082 -0.296025 +v 0.162768 0.316082 -0.217455 +v 0.195312 0.316082 -0.203975 +v 0.227857 0.316082 -0.217455 +v 0.241338 0.316082 -0.250000 +v 0.227857 0.316082 -0.282545 +v 0.177125 0.178927 -0.268187 +v 0.169592 0.178927 -0.250000 +v 0.195312 0.390838 -0.285557 +v 0.177125 0.178927 -0.231813 +v 0.195312 0.178927 -0.224279 +v 0.213500 0.178927 -0.231813 +v 0.221033 0.178927 -0.250000 +v 0.213500 0.178927 -0.268187 +v 0.195312 0.083245 -0.268807 +v 0.170170 0.390838 -0.275143 +v 0.159755 0.390838 -0.250000 +v 0.195312 0.178927 -0.275721 +v 0.208611 0.083245 -0.263298 +v 0.170170 0.390838 -0.224857 +v 0.214119 0.083245 -0.250000 +v 0.195312 0.390838 -0.214443 +v 0.208611 0.083245 -0.236702 +v 0.220455 0.390838 -0.224857 +v 0.195312 0.083245 -0.231193 +v 0.230870 0.390838 -0.250000 +v 0.182014 0.083245 -0.236702 +v 0.220455 0.390838 -0.275143 +v 0.176506 0.083245 -0.250000 +v 0.182014 0.083245 -0.263298 +v 0.195312 0.062500 -0.082741 +v 0.195312 0.048000 -0.085938 +v 0.205566 0.052247 -0.085938 +v 0.209812 0.062500 -0.085938 +v 0.205566 0.072753 -0.085938 +v 0.195312 0.077000 -0.085938 +v 0.185059 0.072753 -0.085938 +v 0.180812 0.062500 -0.085938 +v 0.185059 0.052247 -0.085938 +v 0.195312 0.247505 -0.293022 +v 0.164892 0.247505 -0.280421 +v 0.152291 0.247505 -0.250000 +v 0.164892 0.247505 -0.219579 +v 0.195312 0.247505 -0.206978 +v 0.225733 0.247505 -0.219579 +v 0.238334 0.247505 -0.250000 +v 0.225733 0.247505 -0.280421 +v -0.195312 0.033500 -0.093750 +v -0.195312 0.033500 -0.271224 +v -0.174806 0.041994 -0.093750 +v -0.174806 0.041994 -0.271224 +v -0.166313 0.062500 -0.093750 +v -0.166313 0.062500 -0.271224 +v -0.174806 0.083006 -0.093750 +v -0.174806 0.083006 -0.271224 +v -0.195312 0.091500 -0.093750 +v -0.195312 0.091500 -0.271224 +v -0.215819 0.083006 -0.093750 +v -0.215819 0.083006 -0.271224 +v -0.224312 0.062500 -0.093750 +v -0.224312 0.062500 -0.271224 +v -0.215819 0.041994 -0.093750 +v -0.215819 0.041994 -0.271224 +v -0.174195 0.121971 -0.271118 +v -0.195313 0.121971 -0.279865 +v -0.195312 0.410803 -0.268868 +v -0.181970 0.410803 -0.263342 +v -0.176444 0.410803 -0.250000 +v -0.181970 0.410803 -0.236658 +v -0.195312 0.410803 -0.231132 +v -0.208655 0.410803 -0.236658 +v -0.185059 0.052247 -0.282943 +v -0.214181 0.410803 -0.250000 +v -0.195312 0.048000 -0.282943 +v -0.208655 0.410803 -0.263342 +v -0.165448 0.121971 -0.250000 +v -0.174195 0.121971 -0.228882 +v -0.195313 0.121971 -0.220135 +v -0.216430 0.121971 -0.228882 +v -0.225177 0.121971 -0.250000 +v -0.216430 0.121971 -0.271118 +v -0.227857 0.316082 -0.282545 +v -0.241338 0.316082 -0.250000 +v -0.195313 0.316082 -0.296025 +v -0.205566 0.052247 -0.282943 +v -0.227857 0.316082 -0.217455 +v -0.209812 0.062500 -0.282943 +v -0.195313 0.316082 -0.203975 +v -0.205566 0.072753 -0.282943 +v -0.162768 0.316082 -0.217455 +v -0.195312 0.077000 -0.282943 +v -0.149287 0.316082 -0.250000 +v -0.185059 0.072753 -0.282943 +v -0.162768 0.316082 -0.282545 +v -0.180813 0.062500 -0.282943 +v 0.205566 0.052247 -0.282943 +v 0.195312 0.048000 -0.282943 +v -0.213500 0.178927 -0.268187 +v -0.221033 0.178927 -0.250000 +v -0.195313 0.390838 -0.285557 +v 0.185059 0.052247 -0.282943 +v -0.213500 0.178927 -0.231813 +v 0.180812 0.062500 -0.282943 +v -0.195313 0.178927 -0.224279 +v 0.185059 0.072753 -0.282943 +v -0.177125 0.178927 -0.231813 +v 0.195312 0.077000 -0.282943 +v -0.169592 0.178927 -0.250000 +v 0.205566 0.072753 -0.282943 +v -0.177125 0.178927 -0.268187 +v 0.209812 0.062500 -0.282943 +v -0.195312 0.083245 -0.268807 +v 0.195312 0.062500 -0.285397 +v -0.220455 0.390838 -0.275143 +v -0.230870 0.390838 -0.250000 +v -0.195313 0.178927 -0.275721 +v -0.182014 0.083245 -0.263298 +v -0.220455 0.390838 -0.224857 +v -0.176506 0.083245 -0.250000 +v -0.195313 0.390838 -0.214443 +v -0.182014 0.083245 -0.236702 +v -0.170170 0.390838 -0.224857 +v -0.195312 0.083245 -0.231193 +v -0.159755 0.390838 -0.250000 +v -0.208611 0.083245 -0.236702 +v -0.170170 0.390838 -0.275143 +v -0.214119 0.083245 -0.250000 +v -0.195312 0.062500 -0.285397 +v -0.208611 0.083245 -0.263298 +v -0.195313 0.062500 -0.082741 +v -0.195312 0.048000 -0.085938 +v -0.185059 0.052247 -0.085938 +v -0.180813 0.062500 -0.085938 +v -0.185059 0.072753 -0.085938 +v -0.195312 0.077000 -0.085938 +v -0.205566 0.072753 -0.085938 +v -0.209813 0.062500 -0.085938 +v -0.205566 0.052247 -0.085938 +v -0.195313 0.247505 -0.293022 +v -0.225733 0.247505 -0.280421 +v -0.238334 0.247505 -0.250000 +v -0.225733 0.247505 -0.219579 +v -0.195313 0.247505 -0.206978 +v -0.164892 0.247505 -0.219579 +v -0.152291 0.247505 -0.250000 +v -0.164892 0.247505 -0.280421 +v 0.194190 -0.062272 -0.244231 +v 0.207204 -0.063594 -0.239118 +v 0.212675 -0.066445 -0.226501 +v 0.207399 -0.069154 -0.213770 +v 0.194465 -0.070135 -0.208383 +v 0.181451 -0.068813 -0.213496 +v 0.175980 -0.065963 -0.226113 +v 0.181256 -0.063253 -0.238844 +v 0.215533 0.027344 -0.233066 +v 0.223908 0.027344 -0.212845 +v 0.215533 0.027344 -0.192625 +v 0.195312 0.027344 -0.184250 +v 0.175092 0.027344 -0.192625 +v 0.166717 0.027344 -0.212845 +v 0.195312 0.027344 -0.241441 +v 0.175092 0.027344 -0.233066 +v 0.207622 -0.036555 -0.233190 +v 0.213093 -0.039406 -0.220573 +v 0.207816 -0.042116 -0.207842 +v 0.194883 -0.043097 -0.202455 +v 0.181869 -0.041775 -0.207568 +v 0.176397 -0.038924 -0.220185 +v 0.195312 0.062500 -0.241441 +v 0.181674 -0.036214 -0.232916 +v 0.215533 0.062500 -0.233066 +v 0.223908 0.062500 -0.212845 +v 0.215533 0.062500 -0.192625 +v 0.195312 0.062500 -0.184250 +v 0.175092 0.062500 -0.192625 +v 0.166717 0.062500 -0.212845 +v 0.194608 -0.035233 -0.238303 +v 0.175092 0.062500 -0.233066 +v -0.196435 -0.062272 -0.244231 +v -0.183421 -0.063594 -0.239118 +v -0.177950 -0.066445 -0.226501 +v -0.183226 -0.069154 -0.213770 +v -0.196160 -0.070135 -0.208383 +v -0.209174 -0.068813 -0.213496 +v -0.214645 -0.065963 -0.226113 +v -0.209369 -0.063253 -0.238844 +v -0.175092 0.027344 -0.233066 +v -0.166717 0.027344 -0.212845 +v -0.175092 0.027344 -0.192625 +v -0.195312 0.027344 -0.184250 +v -0.215533 0.027344 -0.192625 +v -0.223908 0.027344 -0.212845 +v -0.195312 0.027344 -0.241441 +v -0.215533 0.027344 -0.233066 +v -0.183003 -0.036555 -0.233190 +v -0.177532 -0.039406 -0.220573 +v -0.182809 -0.042116 -0.207842 +v -0.195742 -0.043097 -0.202455 +v -0.208756 -0.041775 -0.207568 +v -0.214228 -0.038924 -0.220185 +v -0.195312 0.062500 -0.241441 +v -0.208951 -0.036214 -0.232916 +v -0.175092 0.062500 -0.233066 +v -0.166717 0.062500 -0.212845 +v -0.175092 0.062500 -0.192625 +v -0.195312 0.062500 -0.184250 +v -0.215533 0.062500 -0.192625 +v -0.223908 0.062500 -0.212845 +v -0.196017 -0.035233 -0.238303 +v -0.215533 0.062500 -0.233066 +vt 0.437500 0.000000 +vt 0.437500 0.500000 +vt 0.375000 0.500000 +vt 0.375000 0.000000 +vt 0.812500 0.562500 +vt 0.187500 0.562500 +vt 0.187500 0.500000 +vt 0.812500 0.500000 +vt 0.562500 0.500000 +vt 0.562500 -0.000000 +vt 0.625000 -0.000000 +vt 0.625000 0.500000 +vt 0.187500 0.000000 +vt 0.812500 0.000000 +vt 0.812500 0.062500 +vt 0.187500 0.062500 +vt 1.000000 0.000000 +vt 1.000000 0.500000 +vt 0.500000 0.500000 +vt 0.500000 0.000000 +vt 0.000000 0.500000 +vt 0.000000 -0.000000 +vt 0.687500 0.000000 +vt 0.687500 1.000000 +vt 0.625000 1.000000 +vt 0.562500 1.000000 +vt 0.500000 1.000000 +vt 0.437500 1.000000 +vt 0.375000 1.000000 +vt 0.312500 1.000000 +vt 0.312500 0.000000 +vt 0.544710 0.892060 +vt 0.563230 0.936770 +vt 0.531615 0.936770 +vt 0.522355 0.914415 +vt 0.750000 0.000000 +vt 0.750000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.000000 +vt 0.436771 0.936770 +vt 0.455290 0.892060 +vt 0.477645 0.914415 +vt 0.468385 0.936770 +vt 0.500000 0.905156 +vt 0.500000 0.936770 +vt 0.687500 0.312500 +vt 0.750000 0.312500 +vt 0.500000 0.873541 +vt 0.875000 0.312500 +vt 0.875000 1.000000 +vt 0.812500 1.000000 +vt 0.812500 0.312500 +vt 0.455290 0.981480 +vt 0.477645 0.959126 +vt 0.500000 0.968385 +vt 0.544710 0.981480 +vt 0.522355 0.959126 +vt 0.937500 0.312500 +vt 0.937500 1.000000 +vt 1.000000 0.312500 +vt 1.000000 1.000000 +vt 0.500000 0.312500 +vt 0.562500 0.312500 +vt 0.881801 0.892798 +vt 0.881801 0.903548 +vt 0.868102 0.898212 +vt 0.625000 0.312500 +vt 0.907286 0.843075 +vt 0.904783 0.778118 +vt 0.922182 0.779608 +vt 0.918325 0.841397 +vt 0.937500 0.562500 +vt 1.000000 0.562500 +vt 1.000000 0.625000 +vt 0.937500 0.625000 +vt 1.000000 0.687500 +vt 0.937500 0.687500 +vt 1.000000 0.750000 +vt 0.937500 0.750000 +vt 1.000000 0.812500 +vt 0.937500 0.812500 +vt 1.000000 0.875000 +vt 0.937500 0.875000 +vt 1.000000 0.937500 +vt 0.937500 0.937500 +vt 0.874010 0.911124 +vt 0.937500 0.500000 +vt 0.880494 0.872007 +vt 0.896076 0.887262 +vt 0.874010 0.885170 +vt 0.614904 0.911175 +vt 0.575409 0.911138 +vt 0.576092 0.890715 +vt 0.615333 0.898314 +vt 0.469021 0.557609 +vt 0.449239 0.557630 +vt 0.449304 0.544707 +vt 0.469142 0.533257 +vt 0.812596 0.914007 +vt 0.773171 0.921519 +vt 0.772071 0.900870 +vt 0.811904 0.901004 +vt 0.469142 0.630715 +vt 0.450146 0.619342 +vt 0.449715 0.606387 +vt 0.468330 0.606303 +vt 0.773171 0.880601 +vt 0.812596 0.888240 +vt 0.450146 0.593484 +vt 0.469142 0.581987 +vt 0.963694 0.646698 +vt 0.924458 0.652842 +vt 0.923787 0.630904 +vt 0.963271 0.632883 +vt 0.469142 0.679433 +vt 0.450807 0.668312 +vt 0.450112 0.655266 +vt 0.467833 0.654848 +vt 0.962242 0.817991 +vt 0.923404 0.825559 +vt 0.923302 0.805084 +vt 0.962178 0.805097 +vt 0.450807 0.642460 +vt 0.923404 0.784631 +vt 0.962242 0.792217 +vt 0.924458 0.613250 +vt 0.963694 0.621766 +vt 0.560782 0.720099 +vt 0.542016 0.711761 +vt 0.542016 0.697894 +vt 0.560782 0.693968 +vt 0.674059 0.887136 +vt 0.674059 0.901130 +vt 0.663841 0.911026 +vt 0.649390 0.911026 +vt 0.639172 0.901130 +vt 0.639172 0.887136 +vt 0.649390 0.877240 +vt 0.663841 0.877240 +vt 0.449304 0.570566 +vt 0.643000 0.925967 +vt 0.670231 0.925967 +vt 0.615333 0.924087 +vt 0.576092 0.931643 +vt 0.156265 0.750000 +vt 0.169281 0.718577 +vt 0.184993 0.734289 +vt 0.178485 0.750000 +vt 0.169281 0.781424 +vt 0.184993 0.765712 +vt 0.200704 0.794440 +vt 0.200704 0.772220 +vt 0.232128 0.781424 +vt 0.216416 0.765712 +vt 0.245144 0.750000 +vt 0.222924 0.750000 +vt 0.232128 0.718577 +vt 0.216416 0.734289 +vt 0.200704 0.705561 +vt 0.200704 0.727781 +vt 0.862992 0.911088 +vt 0.855201 0.903460 +vt 0.855201 0.892710 +vt 0.862992 0.885134 +vt 0.858458 0.871935 +vt 0.842876 0.887086 +vt 0.842876 0.908587 +vt 0.858458 0.923842 +vt 0.880494 0.923915 +vt 0.896076 0.908763 +vt 0.798321 0.849484 +vt 0.798321 0.860234 +vt 0.784622 0.854898 +vt 0.000000 0.562500 +vt 0.062500 0.562500 +vt 0.062500 0.625000 +vt 0.000000 0.625000 +vt 0.062500 0.687500 +vt 0.000000 0.687500 +vt 0.062500 0.750000 +vt 0.000000 0.750000 +vt 0.062500 0.812500 +vt 0.000000 0.812500 +vt 0.062500 0.875000 +vt 0.000000 0.875000 +vt 0.062500 0.937500 +vt 0.000000 0.937500 +vt 0.790530 0.867810 +vt 0.062500 0.500000 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt 0.797014 0.828693 +vt 0.812596 0.843948 +vt 0.790530 0.841856 +vt 0.754856 0.750000 +vt 0.767872 0.718577 +vt 0.783584 0.734289 +vt 0.777076 0.750000 +vt 0.540926 0.911375 +vt 0.501431 0.911338 +vt 0.502113 0.890915 +vt 0.541355 0.898514 +vt 0.469021 0.508880 +vt 0.449239 0.508900 +vt 0.449304 0.495978 +vt 0.469142 0.484528 +vt 0.767872 0.781424 +vt 0.783584 0.765712 +vt 0.746058 0.910957 +vt 0.706632 0.918469 +vt 0.705532 0.897820 +vt 0.745365 0.897954 +vt 0.560782 0.645251 +vt 0.541786 0.633877 +vt 0.541355 0.620923 +vt 0.559970 0.620839 +vt 0.706632 0.877551 +vt 0.746058 0.885190 +vt 0.541786 0.608019 +vt 0.560782 0.596522 +vt 0.963208 0.859007 +vt 0.923973 0.865151 +vt 0.923302 0.843213 +vt 0.962786 0.845192 +vt 0.542447 0.682847 +vt 0.541752 0.669801 +vt 0.559473 0.669383 +vt 0.799295 0.794440 +vt 0.799295 0.772220 +vt 0.962242 0.777062 +vt 0.923302 0.764156 +vt 0.962178 0.764169 +vt 0.542447 0.656996 +vt 0.923404 0.743703 +vt 0.962242 0.751289 +vt 0.923973 0.825559 +vt 0.963208 0.834074 +vt 0.468879 0.705563 +vt 0.450112 0.697225 +vt 0.450112 0.683359 +vt 0.468879 0.679433 +vt 0.930963 0.881830 +vt 0.930963 0.895825 +vt 0.920745 0.905720 +vt 0.906294 0.905720 +vt 0.896076 0.895825 +vt 0.896076 0.881830 +vt 0.906294 0.871935 +vt 0.920745 0.871935 +vt 0.449304 0.521836 +vt 0.899904 0.920661 +vt 0.927135 0.920661 +vt 0.541355 0.924287 +vt 0.502113 0.931842 +vt 0.830719 0.781424 +vt 0.815007 0.765712 +vt 0.843735 0.750000 +vt 0.821515 0.750000 +vt 0.830719 0.718577 +vt 0.815007 0.734289 +vt 0.799295 0.705561 +vt 0.799295 0.727781 +vt 0.200704 0.750000 +vt 0.799295 0.750000 +vt 0.779512 0.867774 +vt 0.771721 0.860146 +vt 0.771721 0.849396 +vt 0.779512 0.841820 +vt 0.774978 0.828620 +vt 0.759396 0.843772 +vt 0.759396 0.865273 +vt 0.774978 0.880528 +vt 0.797014 0.880601 +vt 0.812596 0.865449 +vt 0.521821 0.796177 +vt 0.521112 0.856849 +vt 0.500889 0.856754 +vt 0.508805 0.794838 +vt 0.920813 0.515186 +vt 0.923751 0.577452 +vt 0.903533 0.579022 +vt 0.908060 0.513434 +vt 0.534769 0.795166 +vt 0.541355 0.856754 +vt 0.893595 0.845558 +vt 0.883089 0.777660 +vt 0.862898 0.639967 +vt 0.862913 0.709904 +vt 0.842876 0.708829 +vt 0.849996 0.640580 +vt 0.875960 0.640291 +vt 0.883331 0.708941 +vt 0.883331 0.579325 +vt 0.895211 0.511009 +vt 0.912686 0.487036 +vt 0.899837 0.484611 +vt 0.875677 0.613574 +vt 0.862616 0.613250 +vt 0.849713 0.613863 +vt 0.898571 0.871935 +vt 0.912262 0.869452 +vt 0.535180 0.769032 +vt 0.522231 0.770044 +vt 0.925440 0.611378 +vt 0.905221 0.612948 +vt 0.905903 0.744161 +vt 0.923302 0.745651 +vt 0.521112 0.890915 +vt 0.500889 0.890820 +vt 0.541355 0.890821 +vt 0.925440 0.488788 +vt 0.884209 0.743703 +vt 0.862913 0.743703 +vt 0.842876 0.742627 +vt 0.883331 0.742740 +vt 0.509215 0.768705 +vt 0.885020 0.613250 +vt 0.923302 0.867773 +vt 0.867073 0.843075 +vt 0.864571 0.778118 +vt 0.881969 0.779608 +vt 0.878112 0.841397 +vt 0.596341 0.795977 +vt 0.595632 0.856649 +vt 0.575409 0.856554 +vt 0.583325 0.794638 +vt 0.878705 0.515186 +vt 0.881643 0.577452 +vt 0.861424 0.579022 +vt 0.865952 0.513434 +vt 0.609290 0.794966 +vt 0.615875 0.856555 +vt 0.853382 0.845558 +vt 0.842876 0.777660 +vt 0.903354 0.639967 +vt 0.903368 0.709904 +vt 0.883331 0.708829 +vt 0.890451 0.640580 +vt 0.916415 0.640291 +vt 0.923787 0.708941 +vt 0.841223 0.579325 +vt 0.853103 0.511009 +vt 0.870578 0.487036 +vt 0.857729 0.484611 +vt 0.916132 0.613574 +vt 0.903071 0.613250 +vt 0.890169 0.613863 +vt 0.858358 0.871935 +vt 0.872049 0.869452 +vt 0.609700 0.768832 +vt 0.596752 0.769844 +vt 0.883331 0.611378 +vt 0.863113 0.612948 +vt 0.865690 0.744161 +vt 0.883089 0.745651 +vt 0.595632 0.890715 +vt 0.575409 0.890620 +vt 0.615875 0.890621 +vt 0.883331 0.488788 +vt 0.843996 0.743703 +vt 0.903368 0.743703 +vt 0.883331 0.742627 +vt 0.923787 0.742739 +vt 0.583736 0.768505 +vt 0.842912 0.613250 +vt 0.883089 0.867773 +vt 0.284406 0.527999 +vt 0.279899 0.275405 +vt 0.329616 0.274429 +vt 0.330878 0.527086 +vt 0.810948 0.527086 +vt 0.809685 0.274428 +vt 0.879986 0.275405 +vt 0.876661 0.527999 +vt 0.764476 0.527999 +vt 0.759969 0.275405 +vt 0.450896 0.527086 +vt 0.449633 0.274428 +vt 0.519934 0.275405 +vt 0.516608 0.527999 +vt 0.404424 0.527999 +vt 0.399916 0.275405 +vt 0.690931 0.527086 +vt 0.689668 0.274429 +vt 0.756643 0.527999 +vt 0.644458 0.527999 +vt 0.639951 0.275405 +vt 0.396591 0.527999 +vt 0.339037 0.990143 +vt 0.343056 0.780780 +vt 0.382343 0.781326 +vt 0.384653 0.990777 +vt 0.666829 0.990777 +vt 0.675325 0.781326 +vt 0.703109 0.780780 +vt 0.699089 0.990143 +vt 0.742395 0.781326 +vt 0.744705 0.990777 +vt 0.426794 0.990777 +vt 0.435290 0.781325 +vt 0.463074 0.780780 +vt 0.459054 0.990143 +vt 0.502361 0.781325 +vt 0.504671 0.990777 +vt 0.786846 0.990777 +vt 0.795342 0.781325 +vt 0.823126 0.780780 +vt 0.819106 0.990143 +vt 0.818801 0.000000 +vt 0.873112 0.000755 +vt 0.300322 0.000755 +vt 0.338731 0.000000 +vt 0.780391 0.000755 +vt 0.458749 0.000000 +vt 0.513060 0.000755 +vt 0.420339 0.000755 +vt 0.862413 0.781325 +vt 0.864723 0.990777 +vt 0.698783 0.000000 +vt 0.753095 0.000755 +vt 0.306776 0.990777 +vt 0.315273 0.781326 +vt 0.660374 0.000755 +vt 0.393042 0.000754 +vt 0.158519 0.525459 +vt 0.159996 0.272743 +vt 0.209688 0.275773 +vt 0.204968 0.528291 +vt 0.112056 0.466704 +vt 0.108812 0.719301 +vt 0.038567 0.714058 +vt 0.046395 0.461803 +vt 0.158519 0.468612 +vt 0.158519 0.721343 +vt 0.570913 0.527086 +vt 0.569651 0.274429 +vt 0.636626 0.527999 +vt 0.524441 0.527999 +vt 0.947994 0.462931 +vt 0.950288 0.715563 +vt 0.879986 0.715564 +vt 0.882280 0.462931 +vt 0.994462 0.461372 +vt 1.000000 0.713896 +vt 0.279899 0.282413 +vt 0.270597 0.534498 +vt 0.202156 0.991564 +vt 0.211129 0.782724 +vt 0.250365 0.786435 +vt 0.247714 0.995873 +vt 0.278084 0.789989 +vt 0.279899 1.000000 +vt 0.937946 0.000000 +vt 0.934781 0.209413 +vt 0.895493 0.209414 +vt 0.892328 0.000000 +vt 0.546811 0.990777 +vt 0.555308 0.781326 +vt 0.583091 0.780780 +vt 0.579072 0.990143 +vt 0.622378 0.781326 +vt 0.624688 0.990777 +vt 0.144414 0.004727 +vt 0.132187 0.213549 +vt 0.104409 0.212409 +vt 0.112160 0.003402 +vt 0.094807 0.993028 +vt 0.040538 0.988977 +vt 0.186902 0.000000 +vt 0.225292 0.002341 +vt 0.133209 0.994605 +vt 0.578766 0.000000 +vt 0.633077 0.000755 +vt 0.540357 0.000755 +vt 0.065153 0.209478 +vt 0.066580 0.000000 +vt 0.942294 0.990111 +vt 0.887981 0.990111 +vt 0.169912 0.989598 +vt 0.183359 0.781031 +vt 0.980699 0.988823 +vt 0.279534 0.007471 +vt 0.962562 0.208482 +vt 0.000000 0.456780 +vt 0.037415 0.206475 +vn -0.577300 0.577300 0.577300 +vn -0.577300 0.577300 -0.577300 +vn -0.577300 -0.577300 -0.577300 +vn -0.577300 -0.577300 0.577300 +vn 0.577300 0.577300 -0.577300 +vn 0.577300 -0.577300 -0.577300 +vn 0.577300 0.577300 0.577300 +vn 0.577300 -0.577300 0.577300 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.440600 -0.897700 +vn 0.634800 0.440600 -0.634800 +vn 0.707100 0.000000 -0.707100 +vn 0.897700 0.440600 0.000000 +vn 1.000000 0.000000 -0.000000 +vn 0.634800 0.440600 0.634800 +vn 0.707100 0.000000 0.707100 +vn 0.000000 0.440600 0.897700 +vn -0.000000 0.000000 1.000000 +vn -0.634800 0.440600 0.634800 +vn -0.707100 0.000000 0.707100 +vn -0.897700 0.440600 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.380800 0.924600 0.000000 +vn 0.269200 0.924600 0.269200 +vn -0.707100 0.000000 -0.707100 +vn -0.634800 0.440600 -0.634800 +vn -0.269200 0.924600 0.269200 +vn -0.380800 0.924600 0.000000 +vn 0.000000 0.924600 0.380800 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.707100 -0.707100 +vn 0.000000 -1.000000 0.000000 +vn -0.269200 0.924600 -0.269200 +vn 0.000000 0.924600 -0.380800 +vn -0.000000 -0.707100 0.707100 +vn 0.269200 0.924600 -0.269200 +vn 0.000000 0.707100 0.707100 +vn 0.000000 -0.377600 0.925900 +vn 0.267000 -0.267000 0.925900 +vn 0.000000 0.707100 -0.707100 +vn -0.997600 -0.068100 0.012800 +vn -0.997300 -0.072000 0.008800 +vn -0.711100 -0.036800 -0.702000 +vn -0.717800 0.040200 -0.695000 +vn 0.000000 -0.885700 0.464200 +vn 0.000000 -0.918800 -0.394700 +vn 0.649700 -0.649700 -0.394700 +vn 0.626300 -0.626300 0.464200 +vn 0.918800 0.000000 -0.394700 +vn 0.885700 0.000000 0.464200 +vn 0.649700 0.649700 -0.394700 +vn 0.626300 0.626300 0.464200 +vn 0.000000 0.918800 -0.394700 +vn 0.000000 0.885700 0.464200 +vn -0.649700 0.649700 -0.394700 +vn -0.626300 0.626300 0.464200 +vn -0.918800 0.000000 -0.394700 +vn -0.885700 0.000000 0.464200 +vn 0.377600 0.000000 0.925900 +vn -0.626300 -0.626300 0.464200 +vn -0.649700 -0.649700 -0.394700 +vn -0.267000 -0.267000 0.925900 +vn 0.961600 -0.274600 -0.000000 +vn 0.995100 -0.098500 0.000000 +vn 0.703700 -0.098500 0.703700 +vn 0.679900 -0.274600 0.679900 +vn 0.000000 0.382600 -0.923900 +vn 0.000000 0.864700 -0.502200 +vn 0.355100 0.864700 -0.355100 +vn 0.653300 0.382600 -0.653300 +vn 0.000000 -0.098500 0.995100 +vn 0.000000 -0.274600 0.961600 +vn 0.502200 0.864700 0.000000 +vn 0.923900 0.382600 0.000000 +vn -0.703700 -0.098500 0.703700 +vn -0.679900 -0.274600 0.679900 +vn 0.355100 0.864700 0.355100 +vn 0.653300 0.382600 0.653300 +vn -0.995100 -0.098500 0.000000 +vn -0.961600 -0.274600 0.000000 +vn 0.000000 0.864700 0.502200 +vn 0.000000 0.382600 0.923900 +vn -0.679900 -0.274600 -0.679900 +vn -0.703700 -0.098500 -0.703700 +vn 0.000000 -0.098500 -0.995100 +vn 0.000000 -0.274600 -0.961600 +vn -0.355100 0.864700 0.355100 +vn -0.653300 0.382600 0.653300 +vn 0.703700 -0.098500 -0.703700 +vn 0.679900 -0.274600 -0.679900 +vn -0.502200 0.864700 0.000000 +vn -0.923900 0.382600 0.000000 +vn -0.355100 0.864700 -0.355100 +vn -0.653300 0.382600 -0.653300 +vn 0.325800 -0.325800 -0.887500 +vn 0.460700 0.000000 -0.887500 +vn 0.325800 0.325800 -0.887500 +vn 0.000000 0.460700 -0.887500 +vn -0.325800 0.325800 -0.887500 +vn -0.460700 0.000000 -0.887500 +vn -0.325800 -0.325800 -0.887500 +vn 0.000000 -0.460700 -0.887500 +vn 0.267000 0.267000 0.925900 +vn 0.000000 0.377600 0.925900 +vn -0.267000 0.267000 0.925900 +vn -0.377600 0.000000 0.925900 +vn -0.005700 0.079400 -0.996800 +vn -0.000800 -0.024000 -0.999700 +vn 0.709600 -0.042300 -0.703300 +vn 0.709000 0.025700 -0.704800 +vn 0.996800 -0.079200 0.005800 +vn 0.996100 -0.088400 -0.002100 +vn -0.692000 -0.181000 0.698800 +vn -0.698300 -0.107200 0.707800 +vn 0.006100 -0.233100 0.972400 +vn 0.002000 -0.123000 0.992400 +vn 0.699800 -0.195100 0.687200 +vn 0.700500 -0.112000 0.704800 +vn 0.999900 -0.013100 -0.010600 +vn 0.712300 -0.160800 0.683200 +vn 0.007500 -0.214300 0.976700 +vn -0.701700 -0.142200 0.698100 +vn -0.999900 0.013100 0.010500 +vn -0.712300 0.160800 -0.683200 +vn -0.007500 0.214300 -0.976700 +vn 0.701700 0.142200 -0.698100 +vn -0.700000 -0.141500 -0.700000 +vn -0.706300 0.046600 -0.706300 +vn 0.000000 0.046600 -0.998900 +vn 0.000000 -0.141500 -0.989900 +vn -0.989900 -0.141500 0.000000 +vn -0.998900 0.046600 0.000000 +vn -0.700000 -0.141500 0.700000 +vn -0.706300 0.046600 0.706300 +vn 0.000000 -0.141500 0.989900 +vn 0.000000 0.046600 0.998900 +vn 0.700000 -0.141500 0.700000 +vn 0.706300 0.046600 0.706300 +vn 0.989900 -0.141500 0.000000 +vn 0.998900 0.046600 0.000000 +vn 0.700000 -0.141500 -0.700000 +vn 0.706300 0.046600 -0.706300 +vn 0.000000 -0.090700 -0.995800 +vn 0.704200 -0.090700 -0.704200 +vn 0.995800 -0.090700 0.000000 +vn 0.704200 -0.090700 0.704200 +vn 0.000000 -0.090700 0.995800 +vn -0.704200 -0.090700 0.704200 +vn -0.995800 -0.090700 0.000000 +vn -0.704200 -0.090700 -0.704200 +g Cylinder_Cylinder_steel +s 1 +f 5/1/1 6/2/2 2/3/3 1/4/4 +f 6/5/2 7/6/5 3/7/6 2/8/3 +f 7/9/5 8/10/7 4/11/8 3/12/6 +f 8/13/7 5/14/1 1/15/4 4/16/8 +f 1/17/4 2/18/3 3/19/6 4/20/8 +f 8/20/7 7/19/5 6/21/2 5/22/1 +f 9/23/9 10/24/10 12/25/11 11/11/12 +f 11/11/12 12/25/11 14/26/13 13/10/14 +f 13/10/14 14/26/13 16/27/15 15/20/16 +f 15/20/16 16/27/15 18/28/17 17/1/18 +f 17/1/18 18/28/17 20/29/19 19/4/20 +f 19/4/20 20/29/19 22/30/21 21/31/22 +f 16/32/15 14/33/13 25/34/23 43/35/24 +f 23/36/25 24/37/26 10/24/10 9/23/9 +f 21/31/22 22/30/21 24/38/26 23/39/25 +f 22/40/21 20/41/19 45/42/27 46/43/28 +f 44/44/29 43/35/24 26/45/30 +f 27/24/9 28/46/9 30/47/31 29/37/31 +f 20/41/19 18/48/17 44/44/29 45/42/27 +f 45/42/27 44/44/29 26/45/30 +f 29/49/31 30/50/31 32/51/32 31/52/32 +f 10/27/10 24/53/26 47/54/33 48/55/34 +f 46/43/28 45/42/27 26/45/30 +f 31/52/32 32/51/32 34/37/35 33/47/35 +f 14/33/13 12/56/11 49/57/36 25/34/23 +f 47/54/33 46/43/28 26/45/30 +f 33/50/35 34/49/35 36/58/18 35/59/18 +f 12/56/11 10/27/10 48/55/34 49/57/36 +f 48/55/34 47/54/33 26/45/30 +f 35/59/18 36/58/18 38/60/37 37/61/37 +f 25/34/23 49/57/36 26/45/30 +f 49/57/36 48/55/34 26/45/30 +f 37/27/37 38/62/37 40/63/30 39/26/30 +f 115/64/38 116/65/39 114/66/18 +f 41/25/40 42/67/40 28/46/9 27/24/9 +f 39/26/30 40/63/30 42/67/40 41/25/40 +f 24/53/26 22/40/21 46/43/28 47/54/33 +f 43/35/24 25/34/23 26/45/30 +f 251/68/41 243/69/42 245/70/43 253/71/44 +f 18/48/17 16/32/15 43/35/24 44/44/29 +f 50/72/45 51/73/46 53/74/47 52/75/48 +f 52/75/48 53/74/47 55/76/49 54/77/50 +f 54/77/50 55/76/49 57/78/51 56/79/52 +f 56/79/52 57/78/51 59/80/53 58/81/54 +f 58/81/54 59/80/53 61/82/55 60/83/56 +f 60/83/56 61/82/55 63/84/57 62/85/58 +f 116/65/39 117/86/59 114/66/18 +f 64/87/60 65/18/61 51/73/46 50/72/45 +f 62/85/58 63/84/57 65/61/61 64/59/60 +f 64/88/60 50/89/45 115/64/38 122/90/62 +f 104/91/63 76/92/64 77/93/65 106/94/66 +f 92/95/67 68/96/68 69/97/69 111/98/70 +f 106/99/66 77/100/65 78/101/71 108/102/72 +f 111/103/70 69/104/69 70/105/73 109/106/74 +f 108/102/72 78/101/71 79/107/75 110/108/76 +f 109/106/74 70/105/73 71/109/77 107/110/78 +f 110/111/76 79/112/75 80/113/79 112/114/80 +f 107/115/78 71/116/77 72/117/81 105/118/82 +f 113/119/83 81/120/84 67/121/85 98/122/86 +f 105/118/82 72/117/81 73/123/87 103/103/88 +f 98/122/86 67/121/85 66/124/89 102/125/90 +f 112/114/80 80/113/79 81/126/84 113/127/83 +f 103/128/88 73/129/87 74/130/91 100/131/92 +f 69/132/69 68/133/68 75/134/93 74/135/91 73/136/87 72/137/81 71/138/77 70/139/73 +f 99/110/94 75/140/93 68/96/68 92/95/67 +f 100/141/92 74/135/91 75/134/93 99/142/94 +f 102/143/90 66/144/89 76/92/64 104/91/63 +f 55/145/49 53/146/47 179/147/95 194/148/96 +f 57/149/51 55/145/49 194/148/96 192/150/97 +f 59/151/53 57/149/51 192/150/97 190/152/98 +f 61/153/55 59/151/53 190/152/98 188/154/99 +f 63/155/57 61/153/55 188/154/99 186/156/100 +f 65/157/61 63/155/57 186/156/100 184/158/101 +f 51/159/46 65/157/61 184/158/101 180/160/102 +f 117/86/59 118/161/103 114/66/18 +f 118/161/103 119/162/104 114/66/18 +f 119/162/104 120/163/105 114/66/18 +f 120/163/105 121/164/106 114/66/18 +f 121/164/106 122/90/62 114/66/18 +f 122/90/62 115/64/38 114/66/18 +f 62/165/58 64/88/60 122/90/62 121/164/106 +f 60/166/56 62/165/58 121/164/106 120/163/105 +f 58/167/54 60/166/56 120/163/105 119/162/104 +f 56/168/52 58/167/54 119/162/104 118/161/103 +f 54/169/50 56/168/52 118/161/103 117/86/59 +f 52/170/48 54/169/50 117/86/59 116/65/39 +f 50/89/45 52/170/48 116/65/39 115/64/38 +f 214/171/38 215/172/39 213/173/18 +f 131/174/45 132/175/46 134/176/47 133/177/48 +f 133/177/48 134/176/47 136/178/49 135/179/50 +f 135/179/50 136/178/49 138/180/51 137/181/52 +f 137/181/52 138/180/51 140/182/53 139/183/54 +f 139/183/54 140/182/53 142/184/55 141/185/56 +f 141/185/56 142/184/55 144/186/57 143/187/58 +f 215/172/39 216/188/59 213/173/18 +f 145/21/60 146/189/61 132/175/46 131/174/45 +f 143/187/58 144/186/57 146/190/61 145/191/60 +f 145/192/60 131/193/45 214/171/38 221/194/62 +f 136/195/49 134/196/47 155/197/95 178/198/96 +f 202/199/63 159/200/64 160/201/65 204/202/66 +f 183/203/67 149/204/68 150/205/69 209/206/70 +f 138/207/51 136/195/49 178/198/96 176/208/97 +f 204/209/66 160/210/65 161/211/71 206/212/72 +f 209/213/70 150/214/69 151/215/73 207/216/74 +f 206/212/72 161/211/71 162/217/75 208/218/76 +f 207/216/74 151/215/73 152/219/77 205/220/78 +f 208/221/76 162/222/75 163/223/79 210/224/80 +f 205/131/78 152/225/77 153/226/81 203/227/82 +f 140/228/53 138/207/51 176/208/97 174/229/98 +f 212/230/83 164/124/84 148/231/85 195/232/86 +f 203/227/82 153/226/81 154/233/87 201/213/88 +f 195/232/86 148/231/85 147/234/89 200/235/90 +f 210/224/80 163/223/79 164/236/84 212/237/83 +f 201/238/88 154/239/87 156/240/91 198/241/92 +f 150/242/69 149/243/68 158/244/93 156/245/91 154/246/87 153/247/81 152/248/77 151/249/73 +f 197/98/94 158/250/93 149/204/68 183/203/67 +f 198/251/92 156/245/91 158/244/93 197/252/94 +f 200/253/90 147/254/89 159/200/64 202/199/63 +f 142/255/55 140/228/53 174/229/98 172/256/99 +f 144/257/57 142/255/55 172/256/99 170/258/100 +f 146/259/61 144/257/57 170/258/100 168/260/101 +f 132/261/46 146/259/61 168/260/101 157/262/102 +f 134/196/47 132/261/46 157/262/102 155/197/95 +f 194/148/96 179/147/95 196/263/9 +f 192/150/97 194/148/96 196/263/9 +f 190/152/98 192/150/97 196/263/9 +f 188/154/99 190/152/98 196/263/9 +f 186/156/100 188/154/99 196/263/9 +f 184/158/101 186/156/100 196/263/9 +f 180/160/102 184/158/101 196/263/9 +f 178/198/96 155/197/95 211/264/9 +f 176/208/97 178/198/96 211/264/9 +f 174/229/98 176/208/97 211/264/9 +f 172/256/99 174/229/98 211/264/9 +f 170/258/100 172/256/99 211/264/9 +f 168/260/101 170/258/100 211/264/9 +f 157/262/102 168/260/101 211/264/9 +f 155/197/95 157/262/102 211/264/9 +f 179/147/95 180/160/102 196/263/9 +f 53/146/47 51/159/46 180/160/102 179/147/95 +f 216/188/59 217/265/103 213/173/18 +f 217/265/103 218/266/104 213/173/18 +f 218/266/104 219/267/105 213/173/18 +f 219/267/105 220/268/106 213/173/18 +f 220/268/106 221/194/62 213/173/18 +f 221/194/62 214/171/38 213/173/18 +f 143/269/58 145/192/60 221/194/62 220/268/106 +f 141/270/56 143/269/58 220/268/106 219/267/105 +f 139/271/54 141/270/56 219/267/105 218/266/104 +f 137/272/52 139/271/54 218/266/104 217/265/103 +f 135/273/50 137/272/52 217/265/103 216/188/59 +f 133/274/48 135/273/50 216/188/59 215/172/39 +f 131/193/45 133/274/48 215/172/39 214/171/38 +f 260/275/107 244/276/108 238/277/109 246/278/110 +f 246/279/110 238/280/109 239/281/111 247/282/112 +f 253/283/44 245/284/43 244/276/108 260/275/107 +f 250/285/113 242/286/114 243/69/42 251/68/41 +f 249/287/115 241/288/116 242/289/114 250/290/113 +f 248/291/117 240/292/118 241/288/116 249/287/115 +f 247/282/112 239/281/111 240/293/118 248/294/117 +f 232/295/119 247/282/112 248/294/117 233/296/120 +f 233/297/120 248/291/117 249/287/115 234/298/121 +f 234/298/121 249/287/115 250/290/113 235/299/122 +f 235/300/122 250/285/113 251/68/41 236/301/123 +f 237/302/124 253/283/44 260/275/107 230/303/125 +f 238/280/109 254/304/12 255/305/14 239/281/111 +f 243/69/42 259/306/22 261/307/25 245/70/43 +f 244/276/108 252/308/9 254/309/12 238/277/109 +f 245/284/43 261/310/25 252/308/9 244/276/108 +f 231/311/126 246/279/110 247/282/112 232/295/119 +f 242/286/114 258/312/20 259/306/22 243/69/42 +f 241/288/116 257/313/18 258/314/20 242/289/114 +f 240/292/118 256/315/16 257/313/18 241/288/116 +f 230/303/125 260/275/107 246/278/110 231/316/126 +f 239/281/111 255/305/14 256/317/16 240/293/118 +f 236/301/123 251/68/41 253/71/44 237/318/124 +f 283/319/41 275/320/42 277/321/43 285/322/44 +f 292/323/107 276/324/108 270/325/109 278/326/110 +f 278/327/110 270/328/109 271/329/111 279/330/112 +f 285/331/44 277/332/43 276/324/108 292/323/107 +f 282/333/113 274/334/114 275/320/42 283/319/41 +f 281/335/115 273/336/116 274/337/114 282/338/113 +f 280/339/117 272/340/118 273/336/116 281/335/115 +f 279/330/112 271/329/111 272/341/118 280/342/117 +f 264/343/119 279/330/112 280/342/117 265/344/120 +f 265/345/120 280/339/117 281/335/115 266/346/121 +f 266/346/121 281/335/115 282/338/113 267/347/122 +f 267/348/122 282/333/113 283/319/41 268/349/123 +f 269/350/124 285/331/44 292/323/107 262/351/125 +f 270/328/109 286/352/12 287/353/14 271/329/111 +f 275/320/42 291/354/22 293/355/25 277/321/43 +f 276/324/108 284/356/9 286/357/12 270/325/109 +f 277/332/43 293/358/25 284/356/9 276/324/108 +f 263/359/126 278/327/110 279/330/112 264/343/119 +f 274/334/114 290/360/20 291/354/22 275/320/42 +f 273/336/116 289/361/18 290/362/20 274/337/114 +f 272/340/118 288/363/16 289/361/18 273/336/116 +f 262/351/125 292/323/107 278/326/110 263/364/126 +f 271/329/111 287/353/14 288/365/16 272/341/118 +f 268/349/123 283/319/41 285/322/44 269/366/124 +g Cylinder_Cylinder_plastic +f 124/367/127 82/368/128 84/369/129 123/370/130 +f 125/371/131 83/372/132 82/373/128 124/374/127 +f 126/375/133 85/376/134 83/372/132 125/371/131 +f 127/377/135 86/378/136 85/379/134 126/380/133 +f 128/381/137 87/382/138 86/378/136 127/377/135 +f 129/383/139 88/384/140 87/376/138 128/385/137 +f 130/386/141 89/387/142 88/384/140 129/383/139 +f 123/370/130 84/369/129 89/382/142 130/388/141 +f 67/389/85 101/390/143 97/391/144 66/392/89 +f 66/393/89 97/394/144 96/395/145 76/396/64 +f 76/396/64 96/395/145 95/397/146 77/398/65 +f 77/399/65 95/400/146 94/401/147 78/402/71 +f 78/402/71 94/401/147 93/403/148 79/404/75 +f 79/405/75 93/406/148 91/407/149 80/408/79 +f 83/372/132 100/409/92 99/410/94 82/373/128 +f 82/368/128 99/411/94 92/412/67 84/369/129 +f 85/376/134 103/413/88 100/409/92 83/372/132 +f 86/378/136 105/414/82 103/415/88 85/379/134 +f 87/382/138 107/416/78 105/414/82 86/378/136 +f 80/408/79 91/407/149 90/417/150 81/418/84 +f 88/384/140 109/419/74 107/420/78 87/376/138 +f 81/421/84 90/422/150 101/390/143 67/389/85 +f 89/387/142 111/423/70 109/419/74 88/384/140 +f 84/369/129 92/412/67 111/424/70 89/382/142 +f 101/390/143 123/370/130 130/388/141 97/391/144 +f 97/394/144 130/386/141 129/383/139 96/395/145 +f 96/395/145 129/383/139 128/385/137 95/397/146 +f 95/400/146 128/381/137 127/377/135 94/401/147 +f 94/401/147 127/377/135 126/380/133 93/403/148 +f 93/406/148 126/375/133 125/371/131 91/407/149 +f 91/407/149 125/371/131 124/374/127 90/417/150 +f 90/422/150 124/367/127 123/370/130 101/390/143 +f 223/425/127 165/426/128 167/427/129 222/428/130 +f 224/429/131 166/430/132 165/431/128 223/432/127 +f 225/433/133 169/434/134 166/430/132 224/429/131 +f 226/435/135 171/436/136 169/387/134 225/437/133 +f 227/438/137 173/379/138 171/436/136 226/435/135 +f 228/439/139 175/440/140 173/441/138 227/442/137 +f 229/443/141 177/444/142 175/440/140 228/439/139 +f 222/428/130 167/427/129 177/445/142 229/446/141 +f 148/447/85 199/448/143 193/449/144 147/450/89 +f 147/450/89 193/449/144 191/451/145 159/452/64 +f 159/453/64 191/454/145 189/455/146 160/456/65 +f 160/457/65 189/458/146 187/459/147 161/460/71 +f 161/460/71 187/459/147 185/461/148 162/462/75 +f 162/463/75 185/464/148 182/465/149 163/466/79 +f 166/430/132 198/467/92 197/468/94 165/431/128 +f 165/426/128 197/469/94 183/470/67 167/427/129 +f 169/434/134 201/471/88 198/467/92 166/430/132 +f 171/436/136 203/472/82 201/473/88 169/387/134 +f 173/379/138 205/474/78 203/472/82 171/436/136 +f 163/466/79 182/465/149 181/475/150 164/476/84 +f 175/440/140 207/477/74 205/478/78 173/441/138 +f 164/479/84 181/480/150 199/448/143 148/447/85 +f 177/444/142 209/481/70 207/477/74 175/440/140 +f 167/427/129 183/470/67 209/482/70 177/445/142 +f 199/448/143 222/428/130 229/446/141 193/449/144 +f 193/483/144 229/443/141 228/439/139 191/454/145 +f 191/454/145 228/439/139 227/442/137 189/455/146 +f 189/458/146 227/438/137 226/435/135 187/459/147 +f 187/459/147 226/435/135 225/437/133 185/461/148 +f 185/464/148 225/433/133 224/429/131 182/465/149 +f 182/465/149 224/429/131 223/432/127 181/475/150 +f 181/475/150 223/432/127 222/484/130 199/485/143 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_book.obj b/mods/homedecor_modpack/homedecor/models/homedecor_book.obj old mode 100755 new mode 100644 index 9ae1ca4f..9b039861 --- a/mods/homedecor_modpack/homedecor/models/homedecor_book.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_book.obj @@ -1,186 +1,240 @@ -# Blender v2.72 (sub 0) OBJ File: '' +# Blender v2.73 (sub 0) OBJ File: 'book.blend' # www.blender.org -mtllib homedecor_book.mtl o Cube.002_Cube.001 -v 0.115781 -0.397147 -0.212050 -v 0.115781 -0.397147 0.208120 -v 0.145193 -0.397147 0.208120 -v 0.145193 -0.397147 -0.212050 -v 0.161995 -0.449141 -0.212050 -v 0.152482 -0.487098 -0.212050 -v 0.149566 -0.487098 -0.220555 -v 0.161995 -0.449141 -0.220555 -v 0.152482 -0.411183 -0.212050 -v 0.152482 -0.411183 0.208120 -v -0.148926 -0.411183 -0.212051 -v -0.155653 -0.449141 -0.212051 -v -0.155653 -0.449141 0.208120 -v -0.148926 -0.411183 0.208120 -v 0.161995 -0.449141 0.208120 -v 0.152482 -0.487098 0.208120 -v 0.115781 -0.499998 0.208120 -v 0.145193 -0.499998 0.208120 -v 0.141549 -0.499998 0.216624 -v 0.115781 -0.499998 0.216624 -v 0.115781 -0.411183 -0.212050 -v -0.159347 -0.411183 -0.220555 -v 0.113157 -0.411183 -0.220555 -v 0.115781 -0.487098 0.208120 -v 0.142021 -0.449141 0.208120 -v -0.148926 -0.487098 0.208120 -v 0.115781 -0.499998 -0.212050 -v 0.145193 -0.499998 -0.212050 -v 0.115781 -0.411183 0.208120 -v 0.142021 -0.449141 0.216625 -v 0.113157 -0.411183 0.216625 -v 0.149566 -0.411183 0.216625 -v 0.161995 -0.449141 0.216625 -v 0.115781 -0.397147 0.216625 -v 0.141549 -0.397147 0.216625 -v -0.148926 -0.499998 -0.212050 -v -0.148926 -0.499998 0.208120 -v -0.159347 -0.499998 0.216624 -v -0.159347 -0.499998 -0.220555 -v -0.148926 -0.487098 -0.212050 -v 0.115781 -0.487098 -0.212050 -v 0.113157 -0.487098 -0.220555 -v -0.159347 -0.487098 -0.220555 -v -0.148926 -0.397147 -0.212051 -v -0.148926 -0.397147 0.208120 -v 0.142021 -0.449141 -0.212050 -v 0.149566 -0.411183 -0.220555 -v 0.141549 -0.397147 -0.220555 -v -0.159346 -0.397147 -0.220555 -v -0.159347 -0.397147 0.216624 -v -0.159347 -0.487098 0.216624 -v 0.113157 -0.487098 0.216624 -v 0.149566 -0.487098 0.216624 -v 0.142021 -0.449141 -0.220555 -v 0.115781 -0.397147 -0.220555 -v -0.159347 -0.411183 0.216624 -v 0.115781 -0.499998 -0.220555 -v 0.141549 -0.499998 -0.220555 -vt 0.183561 0.065478 -vt 0.183562 0.933925 -vt 0.150275 0.933925 -vt 0.150275 0.065478 -vt 0.564551 0.044740 -vt 0.601180 0.044740 -vt 0.604843 -0.000355 -vt 0.564551 -0.000355 -vt 0.610338 0.044740 -vt 0.610338 0.946651 -vt 0.601180 0.946651 -vt 0.122698 0.645720 -vt 0.083984 0.645720 -vt 0.083984 0.397953 -vt 0.122698 0.397953 -vt 0.564551 0.946651 -vt 0.150275 0.977347 -vt 0.183562 0.977347 -vt 0.184398 0.044740 -vt 0.516959 0.044740 -vt 0.542903 -0.000356 -vt 0.187695 -0.000355 -vt 0.045271 0.174962 -vt 0.083984 0.152858 -vt 0.045271 0.397953 -vt 0.184399 0.946651 -vt 0.151432 0.946651 -vt 0.151432 0.991747 -vt 0.187695 0.991747 -vt 0.604843 0.991747 -vt 0.564551 0.991747 -vt 0.122698 0.174963 -vt 0.525512 0.065478 -vt 0.525512 0.933924 -vt 0.552189 0.977347 -vt 0.552189 0.022056 -vt 0.045271 0.645720 -vt 0.083984 0.890816 -vt 0.045271 0.868711 -vt 0.614916 -0.000355 -vt 0.516959 0.946651 -vt 0.542903 0.991746 -vt 0.122698 0.868711 -vt 0.614916 0.991747 -vt 0.650586 -0.000355 -vt 0.614322 -0.000355 -vt 0.647289 -0.000355 -vt 0.187695 0.972997 -vt 0.184399 0.972997 -vt 0.542903 0.972996 -vt 0.184399 0.979247 -vt 0.187695 0.979247 -vt 0.542903 0.979246 -vt 0.542903 0.009019 -vt 0.184398 0.009020 -vt 0.187695 0.009020 -vt 0.614322 0.991747 -vt 0.650586 0.991747 -vt 0.647289 0.991747 -vt 0.542903 0.015270 -vt 0.187695 0.015270 -vt 0.184399 0.015270 -vt 0.150275 0.022056 -vt 0.183561 0.022056 -vt 0.151432 0.044740 -vt 0.151432 -0.000355 -usemtl Material.004 +v 0.161995 -0.448008 0.216625 +v 0.149566 -0.485966 0.216625 +v 0.113157 -0.485966 0.216625 +v 0.142021 -0.448008 0.216625 +v 0.115781 -0.485966 0.208120 +v 0.142021 -0.448008 0.208120 +v 0.113157 -0.485966 -0.220555 +v -0.159347 -0.485966 -0.220555 +v 0.115781 -0.485966 -0.212050 +v 0.161995 -0.448008 0.208120 +v -0.148926 -0.485966 0.208120 +v -0.155653 -0.448008 0.208120 +v -0.155653 -0.448008 -0.212051 +v -0.148926 -0.485966 -0.212051 +v 0.152482 -0.485966 0.208120 +v 0.152482 -0.485966 -0.212050 +v 0.161995 -0.448008 -0.220555 +v 0.161995 -0.448008 -0.212050 +v 0.145193 -0.500002 -0.212050 +v 0.145193 -0.500002 0.208120 +v 0.115781 -0.500002 0.208120 +v 0.115781 -0.500002 -0.212050 +v 0.115781 -0.396013 -0.212050 +v 0.115781 -0.396013 0.208120 +v 0.145193 -0.396013 0.208120 +v 0.145193 -0.396013 -0.212050 +v 0.152482 -0.410049 -0.212050 +v 0.152482 -0.410049 0.208120 +v -0.148926 -0.410049 -0.212051 +v -0.148926 -0.410049 0.208120 +v 0.115781 -0.410049 -0.212050 +v -0.159347 -0.410049 -0.220555 +v 0.113157 -0.410049 -0.220555 +v 0.115781 -0.410049 0.208120 +v 0.113157 -0.410049 0.216625 +v 0.149566 -0.410049 0.216625 +v 0.115781 -0.396013 0.216625 +v 0.141549 -0.396013 0.216625 +v 0.149566 -0.410049 -0.220555 +v 0.141549 -0.396013 -0.220555 +v -0.159346 -0.396013 -0.220555 +v -0.159347 -0.396013 0.216624 +v 0.115781 -0.396013 -0.220555 +v -0.159347 -0.410049 0.216624 +v 0.115781 -0.500002 0.216625 +v 0.141549 -0.500002 0.216625 +v 0.142021 -0.448008 -0.212050 +v 0.149566 -0.485966 -0.220555 +v 0.141549 -0.500002 -0.220555 +v -0.159346 -0.500002 -0.220555 +v -0.159347 -0.500002 0.216624 +v 0.142021 -0.448008 -0.220555 +v 0.115781 -0.500002 -0.220555 +v -0.159347 -0.485966 0.216624 +vt 0.921987 0.383861 +vt 0.921987 0.340448 +vt 0.931829 0.340448 +vt 0.931829 0.383861 +vt 0.931829 0.427274 +vt 0.921987 0.427274 +vt 0.768089 0.490273 +vt 0.722954 0.490273 +vt 0.722954 0.009727 +vt 0.768089 0.009727 +vt 0.768089 0.500000 +vt 0.722404 0.500000 +vt 0.809636 0.490273 +vt 0.809086 0.500000 +vt 0.352434 0.000000 +vt 0.670829 0.000000 +vt 0.670829 0.009727 +vt 0.670829 0.490273 +vt 0.670829 0.500000 +vt 0.352433 0.499999 +vt 0.809636 0.009727 +vt 0.809086 0.000000 +vt 0.823601 0.000000 +vt 0.824288 0.009727 +vt 0.012060 0.509727 +vt 0.000000 0.500001 +vt 0.315359 0.500000 +vt 0.318396 0.509727 +vt 0.700649 0.000000 +vt 0.704866 0.009727 +vt 0.731001 0.867517 +vt 0.731001 0.844673 +vt 0.774928 0.811661 +vt 0.774928 0.853302 +vt 0.687072 0.853302 +vt 0.687072 0.811661 +vt 0.774928 0.500000 +vt 0.791171 0.500000 +vt 0.791171 0.814662 +vt 0.791171 0.844133 +vt 0.851343 0.522844 +vt 0.851343 0.500000 +vt 0.895271 0.514215 +vt 0.895271 0.555856 +vt 0.912144 0.383862 +vt 0.912144 0.340448 +vt 0.334639 0.500000 +vt 0.334639 0.999999 +vt 0.318396 0.999999 +vt 0.318396 0.500000 +vt 0.895271 0.867517 +vt 0.911514 0.523384 +vt 0.911514 0.552855 +vt 0.911514 0.867516 +vt 0.824288 0.490273 +vt 0.823601 0.500000 +vt 0.807415 0.555856 +vt 0.807415 0.514215 +vt 0.768089 0.000000 +vt 0.722404 0.000000 +vt 0.912144 0.427274 +vt 0.318396 0.990273 +vt 0.315359 1.000000 +vt 0.000000 1.000000 +vt 0.012060 0.990274 +vt 0.704866 0.490273 +vt 0.318396 0.490273 +vt 0.318396 0.009727 +vt 0.352433 0.009727 +vt 0.352433 0.490273 +vt 0.705553 0.490273 +vt 0.705553 0.009727 +vt 0.670829 0.509727 +vt 0.364493 0.509726 +vt 0.667792 0.500000 +vt 0.318396 0.000000 +vt 0.348216 0.000000 +vt 0.704866 0.500000 +vt 0.807415 0.867517 +vt 0.791172 0.867516 +vt 0.791171 0.552855 +vt 0.791171 0.523384 +vt 0.336190 0.500000 +vt 0.352433 0.999999 +vt 0.336190 0.999999 +vt 0.670829 0.844133 +vt 0.670829 0.814662 +vt 0.687072 0.500000 +vt 0.348216 0.500000 +vt 0.364493 0.990273 +vt 0.670829 0.990273 +vt 0.667792 1.000000 +vt 0.704866 0.000000 +vt 0.000000 0.000001 +vt 0.439305 1.000000 +vt 0.439305 0.319104 +vt 0.527160 0.379125 +vt 0.527160 0.984613 +vt 0.087857 1.000000 +vt 0.087857 0.319104 +vt 0.175712 0.334491 +vt 0.175712 0.939979 +vt 0.351448 0.984613 +vt 0.351448 0.379125 +vt 0.000000 0.939979 +vt 0.000000 0.334491 +vt 0.351448 0.000000 +vt 0.351448 0.961094 +vt 0.263593 0.961094 +vt 0.263593 0.000000 +vt 0.175736 0.000000 +vt 0.175736 0.961094 +vn -0.803100 -0.582900 0.123900 +vn -0.803000 0.582900 0.123900 +vn 0.970000 0.243100 0.000000 +vn 0.947900 0.274000 -0.162500 +vn 0.947900 -0.274000 -0.162500 +vn -0.000000 -1.000000 -0.000000 +vn 0.831600 -0.453400 0.320700 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.803100 -0.582900 -0.123900 +vn -1.000000 -0.000000 -0.000000 +vn 0.831600 -0.453400 -0.320700 +vn 0.947900 -0.274000 0.162500 +vn 0.970000 -0.243100 -0.000000 +vn 0.947900 0.274000 0.162500 +vn -0.803000 0.582900 -0.123900 +vn 0.887500 -0.460900 -0.000000 +vn 0.887500 0.460900 -0.000000 +vn 0.831600 0.453400 -0.320700 +vn 0.831600 0.453400 0.320700 +vn -0.984700 -0.174500 -0.000000 +vn -0.984700 0.174500 0.000000 +g Cube.002_Cube.001_Cube.002_Cube.001_cover s off -f 1/1 2/2 3/3 4/4 -f 5/5 6/6 7/7 8/8 -f 9/6 4/9 3/10 10/11 -f 11/12 12/13 13/14 14/15 -f 6/6 5/5 15/16 16/11 -f 17/2 18/3 19/17 20/18 -f 21/19 11/20 22/21 23/22 -f 24/23 25/24 13/14 26/25 -f 27/1 28/4 18/3 17/2 -f 29/26 25/27 30/28 31/29 -f 5/5 9/6 10/11 15/16 -f 15/16 10/11 32/30 33/31 -f 3/3 2/2 34/18 35/17 -f 25/24 29/32 14/15 13/14 -f 36/33 37/34 38/35 39/36 -f 28/9 6/6 16/11 18/10 -f 12/13 40/37 26/25 13/14 -f 40/20 41/19 42/22 43/21 -f 2/2 1/1 44/33 45/34 -f 40/37 12/13 46/38 41/39 -f 4/9 9/6 47/7 48/40 -f 45/34 44/33 49/36 50/35 -f 36/33 27/1 17/2 37/34 -f 24/26 26/41 51/42 52/29 -f 12/13 11/12 21/43 46/38 -f 37/34 17/2 20/18 38/35 -f 18/10 16/11 53/30 19/44 -f 2/2 45/34 50/35 34/18 -f 42/45 54/46 8/8 7/7 -f 23/45 55/47 48/40 47/7 -f 43/21 39/21 38/42 51/42 -f 31/48 34/49 50/50 56/50 -f 49/21 22/21 56/42 50/42 -f 54/46 23/45 47/7 8/8 -f 57/47 42/45 7/7 58/40 -f 20/51 52/52 51/53 38/53 -f 22/54 49/54 55/55 23/56 -f 53/30 33/31 30/57 52/58 -f 32/30 35/44 34/59 31/58 -f 33/31 32/30 31/58 30/57 -f 39/60 43/60 42/61 57/62 -f 19/44 53/30 52/58 20/59 -f 25/27 24/26 52/29 30/28 -f 1/1 4/4 48/63 55/64 -f 6/6 28/9 58/40 7/7 -f 14/41 29/26 31/29 56/42 -f 41/19 46/65 54/66 42/22 -f 28/4 27/1 57/64 58/63 -f 10/11 3/10 35/44 32/30 -f 11/20 14/41 56/42 22/21 -f 26/41 40/20 43/21 51/42 -f 44/33 1/1 55/64 49/36 -f 9/6 5/5 8/8 47/7 -f 46/65 21/19 23/22 54/66 -f 27/1 36/33 39/36 57/64 -f 16/11 15/16 33/31 53/30 +f 47/1/1 31/2/1 33/3/1 52/4/1 +f 47/1/2 52/4/2 7/5/2 9/6/2 +f 18/7/3 27/8/3 28/9/3 10/10/3 +f 27/8/4 18/7/4 17/11/4 39/12/4 +f 16/13/5 48/14/5 17/11/5 18/7/5 +f 50/15/6 53/16/6 22/17/6 21/18/6 45/19/6 51/20/6 +f 15/21/7 2/22/7 46/23/7 20/24/7 +f 11/25/8 54/26/8 3/27/8 5/28/8 +f 22/17/6 53/16/6 49/29/6 19/30/6 +f 1/31/9 4/32/9 3/33/9 2/34/9 +f 1/31/9 36/35/9 35/36/9 4/32/9 +f 2/34/9 3/33/9 54/37/9 51/38/9 45/39/9 46/40/9 +f 52/41/10 17/42/10 48/43/10 7/44/10 +f 34/2/11 6/1/11 4/45/11 35/46/11 +f 50/47/12 51/48/12 54/49/12 8/50/12 +f 8/51/10 7/44/10 48/43/10 49/52/10 53/53/10 50/54/10 +f 19/55/13 49/56/13 48/14/13 16/13/13 +f 52/41/10 33/57/10 39/58/10 17/42/10 +f 10/10/14 1/59/14 2/22/14 15/21/14 +f 18/7/15 10/10/15 15/21/15 16/13/15 +f 10/10/16 28/9/16 36/60/16 1/59/16 +f 5/6/17 3/61/17 4/45/17 6/1/17 +f 9/62/8 7/63/8 8/64/8 14/65/8 +f 16/13/18 15/21/18 20/24/18 19/55/18 +f 22/17/6 19/30/6 20/66/6 21/18/6 +f 23/67/8 24/68/8 25/69/8 26/70/8 +f 27/8/19 26/71/19 25/72/19 28/9/19 +f 31/73/6 29/74/6 32/20/6 33/75/6 +f 25/69/8 24/68/8 37/76/8 38/77/8 +f 26/71/20 27/8/20 39/12/20 40/78/20 +f 32/79/10 41/80/10 43/81/10 40/82/10 39/58/10 33/57/10 +f 41/83/12 32/20/12 44/84/12 42/85/12 +f 36/35/9 38/86/9 37/87/9 42/19/9 44/88/9 35/36/9 +f 23/67/8 26/70/8 40/89/8 43/50/8 +f 30/90/6 34/91/6 35/92/6 44/84/6 +f 28/9/21 25/72/21 38/93/21 36/60/21 +f 29/74/6 30/90/6 44/84/6 32/20/6 +f 41/26/8 42/94/8 37/76/8 24/68/8 23/67/8 43/50/8 +f 54/26/8 11/25/8 14/65/8 8/64/8 +g Cube.002_Cube.001_Cube.002_Cube.001_edges +f 13/95/10 47/96/10 9/97/10 14/98/10 +f 6/99/9 12/100/9 11/101/9 5/102/9 +f 13/95/10 29/103/10 31/104/10 47/96/10 +f 6/99/9 34/105/9 30/106/9 12/100/9 +f 14/107/22 11/108/22 12/109/22 13/110/22 +f 29/111/23 13/110/23 12/109/23 30/112/23 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_book_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_book_open.obj old mode 100755 new mode 100644 index 928623bd..046b6de1 --- a/mods/homedecor_modpack/homedecor/models/homedecor_book_open.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_book_open.obj @@ -1,416 +1,419 @@ -# Blender v2.72 (sub 0) OBJ File: '' +# Blender v2.73 (sub 0) OBJ File: 'book-open.blend' # www.blender.org -mtllib homedecor_book_open.mtl -o Cube.001 -v -0.307854 -0.485640 0.196803 -v -0.330489 -0.485640 0.196803 -v -0.330489 -0.485640 0.214467 -v -0.307854 -0.485640 0.214467 -v -0.307854 -0.499995 0.196803 -v -0.307854 -0.499995 0.214467 -v -0.330489 -0.499995 0.214467 -v -0.330489 -0.499995 0.196803 -v 0.330442 -0.485640 0.196804 -v 0.330442 -0.485640 0.214467 -v 0.330442 -0.499995 0.214467 -v 0.330442 -0.499995 0.196804 -v -0.330488 -0.485640 -0.205856 -v -0.330488 -0.485640 -0.223350 -v -0.330489 -0.499995 -0.223350 -v -0.330489 -0.499995 -0.205856 -v -0.307854 -0.499995 -0.223350 -v -0.307854 -0.485640 -0.223350 -v -0.204867 -0.485640 0.214467 -v -0.204867 -0.485640 0.196803 -v -0.204867 -0.499995 0.196803 -v -0.204867 -0.499995 0.214467 -v -0.204866 -0.499995 -0.223350 -v -0.204866 -0.485640 -0.223350 -v 0.310071 -0.485640 0.196804 -v 0.310071 -0.485640 0.214467 -v 0.310071 -0.499995 0.214467 -v 0.310071 -0.499995 0.196804 -v 0.330442 -0.499995 -0.223350 -v 0.310071 -0.499995 -0.223350 -v 0.310071 -0.485640 -0.223350 -v 0.330442 -0.485640 -0.223350 -v -0.307854 -0.485640 -0.205856 -v -0.307854 -0.499995 -0.205856 -v 0.330442 -0.485640 -0.205856 -v 0.330442 -0.499995 -0.205856 -v -0.204866 -0.485640 -0.205856 -v -0.204866 -0.499995 -0.205856 -v 0.310071 -0.485640 -0.205856 -v 0.310071 -0.499995 -0.205856 -v -0.204867 -0.455084 0.196803 -v -0.307854 -0.464591 0.196803 -v -0.204866 -0.455084 -0.205856 -v -0.307854 -0.464591 -0.205856 -v 0.310071 -0.464591 -0.205856 -v 0.310071 -0.464591 0.196804 -v 0.207083 -0.485640 -0.205856 -v 0.207083 -0.455084 -0.205856 -v 0.052602 -0.485640 0.196803 -v 0.001108 -0.485640 0.196803 -v 0.001108 -0.485640 0.214467 -v 0.052602 -0.485640 0.214467 -v 0.052602 -0.499995 0.196804 -v 0.052602 -0.499995 0.214467 -v 0.001108 -0.499995 0.214467 -v 0.001108 -0.499995 0.196804 -v 0.052602 -0.499995 -0.223350 -v 0.001108 -0.499995 -0.223350 -v 0.001108 -0.485640 -0.223350 -v 0.052602 -0.485640 -0.223350 -v 0.001108 -0.485640 -0.205856 -v 0.052602 -0.485640 -0.205856 -v 0.052602 -0.499995 -0.205856 -v 0.001108 -0.499995 -0.205856 -v 0.052602 -0.458824 0.196803 -v 0.001108 -0.473843 0.196803 -v 0.052602 -0.458824 -0.205856 -v 0.001108 -0.473843 -0.205856 -v -0.050385 -0.485640 -0.205856 -v -0.050385 -0.458824 -0.205856 -v 0.104096 -0.451710 -0.205856 -v 0.104096 -0.485640 -0.205856 -v 0.207083 -0.485640 0.196804 -v 0.207083 -0.485640 0.214467 -v 0.104096 -0.485640 0.196803 -v 0.104096 -0.485640 0.214467 -v 0.207083 -0.499995 0.214467 -v 0.207083 -0.499995 0.196804 -v 0.104096 -0.499995 0.214467 -v 0.104096 -0.499995 0.196804 -v 0.207083 -0.499995 -0.223350 -v 0.207083 -0.485640 -0.223350 -v 0.104096 -0.499995 -0.223350 -v 0.104096 -0.485640 -0.223350 -v 0.207083 -0.499995 -0.205856 -v 0.104096 -0.499995 -0.205856 -v 0.207083 -0.455084 0.196804 -v 0.104096 -0.451710 0.196803 -v -0.050385 -0.485640 0.196803 -v -0.101879 -0.485640 0.196803 -v -0.101879 -0.485640 0.214467 -v -0.050385 -0.485640 0.214467 -v -0.050385 -0.499995 0.196804 -v -0.050385 -0.499995 0.214467 -v -0.101879 -0.499995 0.214467 -v -0.101879 -0.499995 0.196804 -v -0.050385 -0.499995 -0.223350 -v -0.101879 -0.499995 -0.223350 -v -0.101879 -0.485640 -0.223350 -v -0.050385 -0.485640 -0.223350 -v -0.101879 -0.485640 -0.205856 -v -0.050385 -0.499995 -0.205856 -v -0.101879 -0.499995 -0.205856 -v -0.050385 -0.458824 0.196803 -v -0.101879 -0.451710 0.196803 -v -0.101879 -0.451710 -0.205856 -vt 0.145116 0.822671 -vt 0.146799 0.822860 -vt 0.146977 0.821590 -vt 0.145383 0.821311 -vt 0.295366 0.524765 -vt 0.295437 0.506389 -vt 0.271889 0.506298 -vt 0.271818 0.524675 -vt 0.180003 0.804148 -vt 0.180102 0.801196 -vt 0.177702 0.801116 -vt 0.177602 0.804066 -vt 0.071439 0.795052 -vt 0.067670 0.794921 -vt 0.067587 0.797311 -vt 0.071356 0.797442 -vt 0.055739 0.865933 -vt 0.056022 0.868592 -vt 0.058185 0.868444 -vt 0.058038 0.865839 -vt 0.068824 0.870361 -vt 0.065054 0.870230 -vt 0.064971 0.872621 -vt 0.068741 0.872752 -vt 0.137033 0.819871 -vt 0.137310 0.818567 -vt 0.402512 0.525175 -vt 0.402582 0.506798 -vt 0.088592 0.795647 -vt 0.088509 0.798038 -vt 0.085976 0.870957 -vt 0.085893 0.873348 -vt 0.094115 0.822949 -vt 0.095431 0.822859 -vt 0.095085 0.821653 -vt 0.093920 0.821913 -vt 0.959689 0.527232 -vt 0.959744 0.508799 -vt 0.938495 0.508737 -vt 0.938429 0.527156 -vt 0.177783 0.798720 -vt 0.174382 0.798605 -vt 0.174301 0.801000 -vt 0.175057 0.874484 -vt 0.171697 0.874264 -vt 0.171562 0.876641 -vt 0.174910 0.876845 -vt 0.144830 0.852308 -vt 0.146169 0.852109 -vt 0.146052 0.851005 -vt 0.144530 0.851059 -vt 0.293698 0.961888 -vt 0.293768 0.943688 -vt 0.270219 0.943598 -vt 0.270149 0.961798 -vt 0.177408 0.874746 -vt 0.177777 0.871723 -vt 0.175307 0.871549 -vt 0.057537 0.798198 -vt 0.059990 0.798418 -vt 0.137086 0.855280 -vt 0.136756 0.853899 -vt 0.400844 0.962299 -vt 0.400914 0.944099 -vt 0.093037 0.852282 -vt 0.094455 0.852518 -vt 0.094704 0.851179 -vt 0.093190 0.851026 -vt 0.957389 0.967127 -vt 0.958381 0.948762 -vt 0.936908 0.948201 -vt 0.936381 0.966404 -vt 0.153557 0.601007 -vt 0.155559 0.599320 -vt 0.142752 0.594883 -vt 0.141758 0.599052 -vt 0.057965 0.795140 -vt 0.060355 0.795458 -vt 0.836622 0.436815 -vt 0.920392 0.436329 -vt 0.921012 0.042547 -vt 0.836346 0.042756 -vt 0.075680 0.644491 -vt 0.077685 0.642795 -vt 0.079487 0.601303 -vt 0.076832 0.599618 -vt 0.151944 0.642579 -vt 0.154631 0.644302 -vt 0.088498 0.648873 -vt 0.089483 0.644708 -vt 0.115599 0.819011 -vt 0.119874 0.819261 -vt 0.119876 0.817756 -vt 0.115646 0.817553 -vt 0.670385 0.526189 -vt 0.670453 0.507810 -vt 0.616876 0.507611 -vt 0.616807 0.525989 -vt 0.131473 0.797134 -vt 0.122897 0.796838 -vt 0.122814 0.799229 -vt 0.131391 0.799526 -vt 0.128853 0.872457 -vt 0.120279 0.872153 -vt 0.120195 0.874543 -vt 0.128767 0.874847 -vt 0.115560 0.856252 -vt 0.119937 0.856037 -vt 0.119941 0.854547 -vt 0.115513 0.854768 -vt 0.668683 0.963391 -vt 0.668777 0.945194 -vt 0.615202 0.944947 -vt 0.615123 0.963145 -vt 0.108789 0.593520 -vt 0.108686 0.596836 -vt 0.115550 0.595554 -vt 0.115563 0.593916 -vt 0.569449 0.436484 -vt 0.624107 0.437340 -vt 0.624671 0.042717 -vt 0.569233 0.040910 -vt 0.122441 0.650231 -vt 0.122550 0.646915 -vt 0.115683 0.648190 -vt 0.115668 0.649828 -vt 0.108652 0.650179 -vt 0.108510 0.646770 -vt 0.102059 0.645955 -vt 0.101862 0.650304 -vt 0.103086 0.819964 -vt 0.102740 0.818578 -vt 0.111410 0.818944 -vt 0.111336 0.817484 -vt 0.831226 0.508382 -vt 0.831161 0.526774 -vt 0.724035 0.508005 -vt 0.723969 0.526388 -vt 0.157210 0.798020 -vt 0.157128 0.800413 -vt 0.140051 0.797431 -vt 0.139968 0.799822 -vt 0.154570 0.873447 -vt 0.154466 0.875833 -vt 0.137426 0.872771 -vt 0.137335 0.875160 -vt 0.102523 0.855234 -vt 0.102794 0.853944 -vt 0.111154 0.856307 -vt 0.111228 0.854847 -vt 0.829574 0.946408 -vt 0.829348 0.964606 -vt 0.722365 0.945495 -vt 0.722239 0.963696 -vt 0.089950 0.598958 -vt 0.088962 0.595030 -vt 0.102364 0.597686 -vt 0.102151 0.593414 -vt 0.334804 0.436016 -vt 0.417682 0.436509 -vt 0.417909 0.041333 -vt 0.335172 0.041774 -vt 0.517618 0.435877 -vt 0.518178 0.041780 -vt 0.124303 0.819037 -vt 0.128591 0.818959 -vt 0.128666 0.817484 -vt 0.124255 0.817538 -vt 0.563232 0.525786 -vt 0.563302 0.507410 -vt 0.509728 0.507206 -vt 0.509659 0.525583 -vt 0.114320 0.796541 -vt 0.105744 0.796243 -vt 0.105661 0.798634 -vt 0.114237 0.798931 -vt 0.111704 0.871852 -vt 0.103128 0.871553 -vt 0.103045 0.873944 -vt 0.111620 0.874243 -vt 0.124165 0.856246 -vt 0.128474 0.856327 -vt 0.128406 0.854879 -vt 0.124215 0.854802 -vt 0.561557 0.962924 -vt 0.561630 0.944725 -vt 0.508058 0.944513 -vt 0.507987 0.962713 -vt 0.122581 0.593562 -vt 0.122724 0.596972 -vt 0.129176 0.597789 -vt 0.129376 0.593438 -vt 0.681211 0.436806 -vt 0.732349 0.436019 -vt 0.732956 0.043295 -vt 0.682616 0.042679 -vt 0.141353 0.644846 -vt 0.142313 0.648801 -vt 0.128882 0.646074 -vt 0.129082 0.650354 -usemtl None -s off -f 1/1 2/2 3/3 4/4 -f 5/5 6/6 7/7 8/8 -f 9/9 10/10 11/11 12/12 -f 4/13 3/14 7/15 6/16 -f 13/17 14/18 15/19 16/20 -f 17/21 15/22 14/23 18/24 -f 20/25 1/1 4/4 19/26 -f 21/27 22/28 6/6 5/5 -f 19/29 4/13 6/16 22/30 -f 23/31 17/21 18/24 24/32 -f 9/33 25/34 26/35 10/36 -f 12/37 11/38 27/39 28/40 -f 10/41 26/42 27/43 11/11 -f 29/44 30/45 31/46 32/47 -f 18/48 14/49 13/50 33/51 -f 17/52 34/53 16/54 15/55 -f 32/56 35/57 36/58 29/44 -f 2/59 13/17 16/20 8/60 -f 24/61 18/48 33/51 37/62 -f 23/63 38/64 34/53 17/52 -f 32/65 31/66 39/67 35/68 -f 29/69 36/70 40/71 30/72 -f 2/2 1/1 33/51 13/50 -f 34/53 5/5 8/8 16/54 -f 35/57 9/9 12/12 36/58 -f 42/73 1/74 20/75 41/76 -f 38/64 21/27 5/5 34/53 -f 35/68 39/67 25/34 9/33 -f 36/70 12/37 28/40 40/71 -f 3/77 2/59 8/60 7/78 -f 43/79 44/80 42/81 41/82 -f 39/83 45/84 46/85 25/86 -f 1/74 42/73 44/87 33/88 -f 47/89 48/90 45/84 39/83 -f 49/91 50/92 51/93 52/94 -f 53/95 54/96 55/97 56/98 -f 52/99 51/100 55/101 54/102 -f 57/103 58/104 59/105 60/106 -f 60/107 59/108 61/109 62/110 -f 57/111 63/112 64/113 58/114 -f 49/115 65/116 66/117 50/118 -f 63/112 53/95 56/98 64/113 -f 67/119 68/120 66/121 65/122 -f 69/123 70/124 68/125 61/126 -f 62/127 67/128 71/129 72/130 -f 72/130 71/129 48/90 47/89 -f 25/34 73/131 74/132 26/35 -f 73/131 75/133 76/134 74/132 -f 28/40 27/39 77/135 78/136 -f 78/136 77/135 79/137 80/138 -f 26/42 74/139 77/140 27/43 -f 74/139 76/141 79/142 77/140 -f 30/45 81/143 82/144 31/46 -f 81/143 83/145 84/146 82/144 -f 31/66 82/147 47/148 39/67 -f 82/147 84/149 72/150 47/148 -f 30/72 40/71 85/151 81/152 -f 81/152 85/151 86/153 83/154 -f 25/86 46/85 87/155 73/156 -f 73/156 87/155 88/157 75/158 -f 40/71 28/40 78/136 85/151 -f 85/151 78/136 80/138 86/153 -f 45/159 48/160 87/161 46/162 -f 48/160 71/163 88/164 87/161 -f 89/165 90/166 91/167 92/168 -f 90/166 20/25 19/26 91/167 -f 93/169 94/170 95/171 96/172 -f 96/172 95/171 22/28 21/27 -f 92/173 91/174 95/175 94/176 -f 91/174 19/29 22/30 95/175 -f 97/177 98/178 99/179 100/180 -f 98/178 23/31 24/32 99/179 -f 100/181 99/182 101/183 69/184 -f 99/182 24/61 37/62 101/183 -f 97/185 102/186 103/187 98/188 -f 98/188 103/187 38/64 23/63 -f 89/189 104/190 105/191 90/192 -f 90/192 105/191 41/76 20/75 -f 102/186 93/169 96/172 103/187 -f 103/187 96/172 21/27 38/64 -f 70/193 106/194 105/195 104/196 -f 106/194 43/79 41/82 105/195 -f 33/88 44/87 43/197 37/198 -f 37/198 43/197 106/199 101/200 -f 101/200 106/199 70/124 69/123 -f 50/92 89/165 92/168 51/93 -f 56/98 55/97 94/170 93/169 -f 51/100 92/173 94/176 55/101 -f 58/104 97/177 100/180 59/105 -f 59/108 100/181 69/184 61/109 -f 58/114 64/113 102/186 97/185 -f 50/118 66/117 104/190 89/189 -f 64/113 56/98 93/169 102/186 -f 68/120 70/193 104/196 66/121 -f 75/133 49/91 52/94 76/134 -f 80/138 79/137 54/96 53/95 -f 76/141 52/99 54/102 79/142 -f 83/145 57/103 60/106 84/146 -f 84/149 60/107 62/110 72/150 -f 83/154 86/153 63/112 57/111 -f 75/158 88/157 65/116 49/115 -f 86/153 80/138 53/95 63/112 -f 71/163 67/119 65/122 88/164 -f 61/126 68/125 67/128 62/127 +o Cube.002_Cube.001 +v -0.012428 -0.485966 0.216625 +v 0.000001 -0.486750 -0.220555 +v -0.321341 -0.485966 -0.220555 +v 0.000001 -0.462863 0.208120 +v -0.310920 -0.485966 0.208120 +v -0.306022 -0.464409 0.208120 +v -0.306022 -0.464409 -0.212051 +v -0.310920 -0.485966 -0.212051 +v 0.000001 -0.462862 -0.212050 +v -0.016802 -0.500002 -0.212050 +v -0.016802 -0.500002 0.208120 +v -0.046214 -0.500002 0.208120 +v -0.046214 -0.500002 -0.212050 +v -0.046214 -0.500002 0.216625 +v -0.020445 -0.500002 0.216625 +v -0.012428 -0.485966 -0.220555 +v -0.020445 -0.500002 -0.220555 +v -0.321340 -0.500002 -0.220555 +v -0.321341 -0.500002 0.216624 +v -0.046214 -0.500002 -0.220555 +v -0.321341 -0.485966 0.216624 +v -0.238235 -0.450057 0.208120 +v 0.000001 -0.486750 0.216625 +v -0.238235 -0.450057 -0.212051 +v 0.306023 -0.464409 0.208120 +v 0.306023 -0.464409 -0.212051 +v 0.238237 -0.450057 0.208120 +v 0.238237 -0.450057 -0.212051 +v 0.046215 -0.500003 -0.212050 +v 0.046215 -0.500003 0.208120 +v 0.016803 -0.500003 0.208120 +v 0.016803 -0.500003 -0.212050 +v 0.000001 -0.481442 0.216625 +v 0.000001 -0.481442 -0.220555 +v 0.310922 -0.485967 -0.212051 +v 0.310922 -0.485967 0.208120 +v 0.321343 -0.485967 -0.220555 +v 0.012430 -0.485967 0.216625 +v 0.046215 -0.500003 0.216625 +v 0.020447 -0.500003 0.216625 +v 0.012430 -0.485967 -0.220555 +v 0.020447 -0.500003 -0.220555 +v 0.321342 -0.500003 -0.220555 +v 0.321343 -0.500003 0.216624 +v 0.046215 -0.500003 -0.220555 +v 0.321343 -0.485967 0.216624 +v 0.000001 -0.486750 0.208120 +v 0.000001 -0.486750 -0.212050 +v 0.086920 -0.442244 -0.212051 +v 0.086920 -0.442244 0.208120 +v -0.086847 -0.442244 -0.212051 +v -0.086847 -0.442244 0.208120 +v -0.043405 -0.447755 -0.212050 +v -0.043405 -0.447755 0.208120 +v 0.043478 -0.447755 -0.212050 +v 0.043478 -0.447755 0.208120 +v 0.010224 -0.490836 0.216625 +v -0.006214 -0.482857 0.216625 +v -0.006214 -0.482857 -0.220555 +v -0.008400 -0.490836 0.208120 +v -0.008400 -0.490836 -0.212050 +v -0.010222 -0.490836 -0.220555 +v -0.010222 -0.490836 0.216625 +v 0.010224 -0.490836 -0.220555 +v 0.008402 -0.490836 -0.212050 +v 0.008402 -0.490836 0.208120 +v 0.006215 -0.482858 -0.220555 +v 0.006215 -0.482858 0.216625 +v -0.012428 -0.485966 -0.212050 +v 0.000001 -0.481442 -0.212050 +v 0.012430 -0.485967 -0.212050 +v -0.006214 -0.482857 -0.212050 +v 0.006215 -0.482858 -0.212050 +v -0.012428 -0.485966 0.208120 +v 0.000001 -0.481442 0.208120 +v 0.012430 -0.485967 0.208120 +v -0.006214 -0.482857 0.208120 +v 0.006215 -0.482858 0.208120 +vt 0.965735 0.839196 +vt 0.711783 0.839196 +vt 0.711783 0.832541 +vt 0.711783 0.503765 +vt 0.711783 0.497110 +vt 0.965736 0.497110 +vt 0.395683 0.494736 +vt 0.395683 0.261171 +vt 0.403533 0.261171 +vt 0.403532 0.502890 +vt 0.687998 0.839196 +vt 0.684635 0.832541 +vt 0.987044 0.738829 +vt 0.987044 0.497110 +vt 1.000000 0.497110 +vt 0.999999 0.712393 +vt 0.999999 0.732556 +vt 0.992051 0.000000 +vt 0.992051 0.342086 +vt 0.979145 0.342086 +vt 0.979145 0.000000 +vt 0.969912 1.000000 +vt 0.969911 0.758280 +vt 0.982867 0.764553 +vt 0.982867 0.784716 +vt 0.982868 0.999999 +vt 0.403533 0.241720 +vt 0.395683 0.241720 +vt 0.395683 0.008154 +vt 0.403532 0.000000 +vt 0.684634 0.503765 +vt 0.007850 0.008154 +vt 0.000000 0.000000 +vt 0.657486 0.832541 +vt 0.657486 0.503765 +vt 0.657486 0.497110 +vt 0.681271 0.497110 +vt 0.969911 0.497110 +vt 0.982867 0.497110 +vt 0.982868 0.712393 +vt 0.982868 0.732556 +vt 0.969912 0.738829 +vt 0.966239 0.000000 +vt 0.966239 0.342086 +vt 0.987044 0.758280 +vt 1.000000 0.764553 +vt 1.000000 0.784716 +vt 0.999999 1.000000 +vt 0.987043 1.000000 +vt 0.681271 0.839196 +vt 0.657486 0.839196 +vt 0.000000 0.261171 +vt 0.007850 0.261171 +vt 0.007850 0.494736 +vt 0.000000 0.502891 +vt 0.403534 0.839196 +vt 0.403533 0.497110 +vt 0.687998 0.497110 +vt 0.974407 0.740555 +vt 0.970635 0.748555 +vt 0.967042 0.743692 +vt 0.965736 0.748555 +vt 0.967042 0.753417 +vt 0.974406 0.756554 +vt 0.991539 0.740555 +vt 0.987768 0.748555 +vt 0.984174 0.743692 +vt 0.982868 0.748555 +vt 0.984174 0.753417 +vt 0.991539 0.756554 +vt 0.044849 0.844977 +vt 0.035593 0.844977 +vt 0.035446 0.838322 +vt 0.044554 0.838322 +vt 0.956803 0.342087 +vt 0.956803 0.335432 +vt 0.964557 0.335432 +vt 0.947366 0.342087 +vt 0.949048 0.335432 +vt 0.045143 0.838322 +vt 0.054251 0.838322 +vt 0.054104 0.844977 +vt 0.044554 0.509546 +vt 0.035446 0.509546 +vt 0.035593 0.502890 +vt 0.044849 0.502891 +vt 0.964557 0.006655 +vt 0.956803 0.006655 +vt 0.956803 0.000000 +vt 0.949048 0.006655 +vt 0.947366 0.000000 +vt 0.054104 0.502891 +vt 0.054251 0.509546 +vt 0.045143 0.509546 +vt 0.000000 0.256308 +vt 0.000000 0.251445 +vt 0.007850 0.251445 +vt 0.007850 0.256308 +vt 0.000000 0.246582 +vt 0.000000 0.241720 +vt 0.007850 0.241720 +vt 0.007850 0.246582 +vt 0.403533 0.251445 +vt 0.403533 0.256308 +vt 0.395683 0.256308 +vt 0.395683 0.251445 +vt 0.403533 0.246582 +vt 0.395683 0.246582 +vt 0.779948 0.000000 +vt 0.779948 1.000000 +vt 0.724984 1.000000 +vt 0.724983 0.000000 +vt 0.717416 1.000000 +vt 0.662450 1.000000 +vt 0.662449 0.000000 +vt 0.717416 0.000000 +vt 0.184400 1.000000 +vt 0.126957 0.970419 +vt 0.221962 0.896695 +vt 0.485666 0.793134 +vt 0.471964 0.896524 +vt 0.376957 0.970419 +vt 0.216239 0.433002 +vt 0.126957 0.260013 +vt 0.059402 0.000000 +vt 0.001957 0.029581 +vt 0.009688 0.014790 +vt 0.235664 0.793305 +vt 0.013207 0.000000 +vt 0.091241 0.566998 +vt 0.055557 0.728328 +vt 0.001957 0.739987 +vt 0.110666 0.206866 +vt 0.134686 0.985210 +vt 0.096964 0.103476 +vt 0.180555 0.271672 +vt 0.138205 1.000000 +vt 0.341239 0.566998 +vt 0.305555 0.728328 +vt 0.251957 0.739987 +vt 0.251957 0.029581 +vt 0.360664 0.206695 +vt 0.388207 1.000000 +vt 0.384688 0.985210 +vt 0.434402 1.000000 +vt 0.346962 0.103305 +vt 0.466241 0.433002 +vt 0.376957 0.260013 +vt 0.309400 0.000000 +vt 0.259687 0.014790 +vt 0.263205 0.000000 +vt 0.430558 0.271672 +vt 0.636817 0.156314 +vt 0.875000 0.156314 +vt 0.875000 0.984312 +vt 0.636817 0.984312 +vt 0.000000 0.156314 +vt 0.125000 0.156314 +vt 0.125000 0.984312 +vt 0.000000 0.984313 +vt 1.000000 0.156314 +vt 1.000000 0.984313 +vt 0.363296 0.156314 +vt 0.431676 0.156314 +vt 0.431676 0.984311 +vt 0.363296 0.984312 +vt 0.500000 0.156314 +vt 0.568437 0.156314 +vt 0.568437 0.984311 +vt 0.500000 0.984311 +vn -0.577300 -0.577300 -0.577300 +vn 0.000000 -0.707100 -0.707100 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -0.707100 0.707100 +vn -0.577300 -0.577300 0.577300 +vn 0.280700 0.927500 0.246900 +vn 0.172900 0.732100 0.658800 +vn 0.148700 0.629400 0.762700 +vn 0.577300 0.577300 0.577300 +vn 0.216600 -0.711100 -0.668800 +vn 0.428700 -0.900500 -0.071700 +vn -0.148700 0.629400 0.762700 +vn -0.577300 0.577300 0.577300 +vn 0.216600 -0.711100 0.668800 +vn -0.577300 0.577300 -0.577300 +vn -0.148700 0.629400 -0.762700 +vn -0.172900 0.732100 0.658800 +vn -0.280700 0.927500 0.246900 +vn 0.428700 -0.900500 0.071700 +vn -0.280700 0.927500 -0.246900 +vn -0.428800 -0.900500 0.071700 +vn -0.428800 -0.900500 -0.071700 +vn -0.216600 -0.711100 0.668800 +vn 0.577300 0.577300 -0.577300 +vn 0.577300 -0.577300 -0.577300 +vn 0.000000 -0.707100 -0.707000 +vn -0.216600 -0.711100 -0.668800 +vn 0.148700 0.629400 -0.762700 +vn 0.577300 -0.577300 0.577300 +vn 0.172900 0.732100 -0.658800 +vn 0.280700 0.927500 -0.246900 +vn -0.350300 -0.496700 -0.794100 +vn 0.000000 -0.580000 -0.814600 +vn 0.246900 0.689300 -0.681100 +vn 0.000000 0.750900 -0.660400 +vn -0.246800 0.689300 -0.681100 +vn 0.350300 -0.496700 -0.794100 +vn 0.350300 -0.496700 0.794100 +vn 0.000000 -0.580000 0.814600 +vn -0.246800 0.689300 0.681100 +vn 0.000000 0.750900 0.660400 +vn 0.246900 0.689300 0.681100 +vn -0.350300 -0.496700 0.794100 +vn -0.569600 -0.819500 0.062900 +vn 0.000000 -0.999700 0.023700 +vn 0.569600 -0.819500 0.062900 +vn -0.569600 -0.819500 -0.062900 +vn 0.000000 -0.999700 -0.023700 +vn 0.569600 -0.819500 -0.062900 +vn 0.000000 0.649100 -0.760600 +vn 0.228600 0.638300 -0.735000 +vn -0.172900 0.732100 -0.658800 +vn -0.228600 0.638300 -0.735000 +vn 0.228600 0.638300 0.735000 +vn 0.000000 0.649100 0.760600 +vn -0.228600 0.638300 0.735000 +vn -0.559600 0.567900 0.603500 +vn -0.559600 0.567900 -0.603500 +vn 0.559600 0.567900 -0.603500 +vn 0.559600 0.567900 0.603500 +vn 0.000200 0.614300 -0.789000 +vn 0.166600 0.709800 -0.684400 +vn -0.027100 0.725500 0.687600 +vn -0.166400 0.709800 0.684400 +vn -0.093900 0.717800 -0.689800 +vn 0.027100 0.725500 -0.687600 +vn 0.093900 0.717800 -0.689800 +vn -0.027100 0.725500 -0.687600 +vn -0.166400 0.709800 -0.684400 +vn -0.093900 0.717800 0.689800 +vn 0.027100 0.725500 0.687600 +vn 0.000200 0.614300 0.789000 +vn 0.166600 0.709800 0.684400 +vn 0.093900 0.717800 0.689800 +g Cube.002_Cube.001_Cube.002_Cube.001_cover +s 1 +f 18/1/1 20/2/2 13/3/3 12/4/3 14/5/4 19/6/5 +f 36/7/6 76/8/7 38/9/8 46/10/9 +f 13/3/3 20/2/2 17/11/10 10/12/11 +f 1/13/12 21/14/13 19/15/5 14/16/4 15/17/14 +f 18/18/1 19/19/5 21/20/13 3/21/15 +f 3/22/15 16/23/16 17/24/10 20/25/2 18/26/1 +f 1/27/12 74/28/17 5/29/18 21/30/13 +f 13/3/3 10/12/11 11/31/19 12/4/3 +f 21/30/13 5/29/18 8/32/20 3/33/15 +f 29/34/3 30/35/3 31/31/21 32/12/22 +f 31/31/21 30/35/3 39/36/4 40/37/23 +f 37/38/24 43/39/25 45/40/26 42/41/27 41/42/28 +f 43/43/25 37/21/24 46/20/9 44/44/29 +f 38/45/8 40/46/23 39/47/4 44/48/29 46/49/9 +f 29/34/3 32/12/22 42/50/27 45/51/26 +f 41/52/28 71/53/30 35/54/31 37/55/24 +f 35/54/31 36/7/6 46/10/9 37/55/24 +f 43/56/25 44/57/29 39/36/4 30/35/3 29/34/3 45/51/26 +f 15/58/14 14/5/4 12/4/3 11/31/19 +f 42/41/27 64/59/32 41/42/28 +f 41/42/28 64/59/32 2/60/33 67/61/34 +f 67/61/34 2/60/33 34/62/35 +f 34/62/35 2/60/33 59/63/36 +f 2/60/33 62/64/37 16/23/16 59/63/36 +f 16/23/16 62/64/37 17/24/10 +f 15/17/14 63/65/38 1/13/12 +f 23/66/39 58/67/40 1/13/12 63/65/38 +f 58/67/40 23/66/39 33/68/41 +f 68/69/42 33/68/41 23/66/39 +f 38/45/8 68/69/42 23/66/39 57/70/43 +f 57/70/43 40/46/23 38/45/8 +f 40/71/23 57/72/43 66/73/44 31/74/21 +f 57/44/43 23/75/39 47/76/45 66/77/44 +f 47/76/45 23/75/39 63/78/38 60/79/46 +f 15/71/14 11/80/19 60/81/46 63/82/38 +f 32/83/22 65/84/47 64/85/32 42/86/27 +f 64/43/32 65/87/47 48/88/48 2/89/33 +f 48/88/48 61/90/49 62/91/37 2/89/33 +f 17/86/10 62/92/37 61/93/49 10/94/11 +f 67/95/34 34/96/35 70/97/50 73/98/51 +f 59/99/36 16/100/16 69/101/52 72/102/53 +f 41/52/28 67/95/34 73/98/51 71/53/30 +f 34/96/35 59/99/36 72/102/53 70/97/50 +f 33/103/41 68/104/42 78/105/54 75/106/55 +f 1/27/12 58/107/40 77/108/56 74/28/17 +f 68/104/42 38/9/8 76/8/7 78/105/54 +f 58/107/40 33/103/41 75/106/55 77/108/56 +f 8/32/20 69/101/52 16/100/16 3/33/15 +f 10/94/11 61/93/49 60/81/46 11/80/19 +f 47/76/45 60/79/46 61/90/49 48/88/48 +f 65/87/47 66/77/44 47/76/45 48/88/48 +f 31/74/21 66/73/44 65/84/47 32/83/22 +g Cube.002_Cube.001_Cube.002_Cube.001_edges +f 8/109/20 5/110/18 6/111/57 7/112/58 +f 35/113/31 26/114/59 25/115/60 36/116/6 +f 9/117/61 69/118/52 53/119/62 +f 50/120/63 56/121/64 76/122/7 +f 24/123/65 69/118/52 8/124/20 +f 9/125/61 71/126/30 73/127/51 +f 51/128/66 53/119/62 69/118/52 +f 9/125/61 73/127/51 70/129/50 +f 28/130/67 26/131/59 35/132/31 +f 71/126/30 49/133/68 28/130/67 +f 72/134/53 69/118/52 9/117/61 +f 71/126/30 55/135/69 49/133/68 +f 28/130/67 35/132/31 71/126/30 +f 24/123/65 8/124/20 7/136/58 +f 69/118/52 24/123/65 51/128/66 +f 9/125/61 55/135/69 71/126/30 +f 70/137/50 72/134/53 9/117/61 +f 22/138/70 6/139/57 5/140/18 +f 74/141/17 52/142/71 22/138/70 +f 75/143/55 78/144/54 4/145/72 +f 74/141/17 54/146/73 52/142/71 +f 22/138/70 5/140/18 74/141/17 +f 27/147/74 76/122/7 36/148/6 +f 4/149/72 74/141/17 77/150/56 +f 27/147/74 50/120/63 76/122/7 +f 4/149/72 77/150/56 75/151/55 +f 4/145/72 78/144/54 76/122/7 +f 4/149/72 54/146/73 74/141/17 +f 27/147/74 36/148/6 25/152/60 +f 56/121/64 4/145/72 76/122/7 +g Cube.002_Cube.001_Cube.002_Cube.001_pages +f 50/153/63 27/154/74 28/155/67 49/156/68 +f 6/157/57 22/158/70 24/159/65 7/160/58 +f 27/154/74 25/161/60 26/162/59 28/155/67 +f 52/163/71 54/164/73 53/165/62 51/166/66 +f 22/158/70 52/163/71 51/166/66 24/159/65 +f 4/167/72 56/168/64 55/169/69 9/170/61 +f 54/164/73 4/167/72 9/170/61 53/165/62 +f 56/168/64 50/153/63 49/156/68 55/169/69 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bottle.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bottle.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_cutlery_set.obj b/mods/homedecor_modpack/homedecor/models/homedecor_cutlery_set.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_dartboard.obj b/mods/homedecor_modpack/homedecor/models/homedecor_dartboard.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan.b3d b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan.b3d old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_globe.obj b/mods/homedecor_modpack/homedecor/models/homedecor_desk_globe.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_desk_lamp.obj old mode 100755 new mode 100644 index 76e2ebda..c1213ea9 --- a/mods/homedecor_modpack/homedecor/models/homedecor_desk_lamp.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_desk_lamp.obj @@ -1,473 +1,144 @@ -# Blender v2.69 (sub 0) OBJ File: 'desk_lamp.blend' +# Blender v2.72 (sub 0) OBJ File: '' # www.blender.org mtllib homedecor_desk_lamp.mtl -o Sphere.001 -v -0.219622 0.008131 0.009094 -v -0.237842 -0.035856 0.009094 -v -0.219622 -0.079844 0.009094 -v -0.175634 -0.098064 0.009094 -v -0.206738 0.008131 -0.022010 -v -0.219622 -0.035856 -0.034893 -v -0.206738 -0.079844 -0.022010 -v -0.175634 0.008131 -0.034893 -v -0.175634 -0.035856 -0.053114 -v -0.175634 -0.079844 -0.034893 -v -0.144530 0.008131 -0.022010 -v -0.131647 -0.035856 -0.034893 -v -0.144530 -0.079844 -0.022010 -v -0.131647 0.008131 0.009094 -v -0.113426 -0.035856 0.009094 -v -0.131647 -0.079844 0.009094 -v -0.144530 0.008131 0.040198 -v -0.131647 -0.035856 0.053082 -v -0.144530 -0.079844 0.040198 -v -0.175634 0.008131 0.053082 -v -0.175634 -0.035856 0.071302 -v -0.175634 -0.079844 0.053082 -v -0.175634 0.026351 0.009094 -v -0.206738 0.008131 0.040198 -v -0.219622 -0.035856 0.053082 -v -0.206738 -0.079844 0.040198 -v 0.051743 -0.449625 0.009095 -v 0.054882 -0.411177 0.009097 -v 0.057389 -0.450070 -0.004579 -v 0.060531 -0.411592 -0.004576 -v 0.071021 -0.451144 -0.010243 -v 0.074168 -0.412595 -0.010240 -v 0.084652 -0.452218 -0.004580 -v 0.087804 -0.413600 -0.004577 -v 0.090299 -0.452662 0.009094 -v 0.093453 -0.414018 0.009097 -v 0.084653 -0.452218 0.022768 -v 0.087804 -0.413603 0.022771 -v 0.071021 -0.451144 0.028432 -v 0.074168 -0.412599 0.028435 -v 0.057390 -0.450070 0.022768 -v 0.060531 -0.411595 0.022771 -v 0.053313 -0.430401 0.009096 -v 0.058960 -0.430831 -0.004578 -v 0.072594 -0.431869 -0.010242 -v 0.086228 -0.432909 -0.004578 -v 0.091876 -0.433340 0.009096 -v 0.086229 -0.432910 0.022769 -v 0.072594 -0.431872 0.028433 -v 0.058960 -0.430832 0.022770 -v 0.054882 -0.411177 0.009097 -v 0.057294 -0.373087 0.009103 -v 0.060531 -0.411592 -0.004576 -v 0.062952 -0.373353 -0.004571 -v 0.074168 -0.412595 -0.010240 -v 0.076610 -0.374001 -0.010235 -v 0.087804 -0.413600 -0.004577 -v 0.090268 -0.374650 -0.004571 -v 0.093453 -0.414018 0.009097 -v 0.095926 -0.374920 0.009102 -v 0.087804 -0.413603 0.022771 -v 0.090269 -0.374654 0.022776 -v 0.074168 -0.412599 0.028435 -v 0.076610 -0.374006 0.028440 -v 0.060531 -0.411595 0.022771 -v 0.062952 -0.373357 0.022776 -v 0.056107 -0.392122 0.009100 -v 0.061760 -0.392466 -0.004574 -v 0.075408 -0.393299 -0.010238 -v 0.089056 -0.394134 -0.004574 -v 0.094710 -0.394481 0.009100 -v 0.089056 -0.394138 0.022773 -v 0.075408 -0.393304 0.028437 -v 0.061760 -0.392469 0.022774 -v 0.057294 -0.373087 0.009103 -v 0.058403 -0.335224 0.009109 -v 0.062952 -0.373353 -0.004571 -v 0.064067 -0.335261 -0.004565 -v 0.076610 -0.374001 -0.010235 -v 0.077740 -0.335356 -0.010229 -v 0.090268 -0.374650 -0.004571 -v 0.091414 -0.335453 -0.004565 -v 0.095926 -0.374920 0.009102 -v 0.097077 -0.335495 0.009109 -v 0.090269 -0.374654 0.022776 -v 0.091414 -0.335458 0.022782 -v 0.076610 -0.374006 0.028440 -v 0.077740 -0.335362 0.028446 -v 0.062952 -0.373357 0.022776 -v 0.064067 -0.335266 0.022782 -v 0.058004 -0.354129 0.009106 -v 0.063665 -0.354291 -0.004568 -v 0.077333 -0.354684 -0.010232 -v 0.091001 -0.355080 -0.004568 -v 0.096663 -0.355245 0.009105 -v 0.091002 -0.355084 0.022779 -v 0.077333 -0.354690 0.028443 -v 0.063666 -0.354295 0.022779 -v 0.058403 -0.335224 0.009109 -v 0.057764 -0.297613 0.009115 -v 0.064067 -0.335261 -0.004565 -v 0.063422 -0.297349 -0.004559 -v 0.077740 -0.335356 -0.010229 -v 0.077081 -0.296717 -0.010222 -v 0.091414 -0.335453 -0.004565 -v 0.090740 -0.296088 -0.004559 -v 0.097077 -0.335495 0.009109 -v 0.096398 -0.295828 0.009115 -v 0.091414 -0.335458 0.022782 -v 0.090740 -0.296092 0.022789 -v 0.077740 -0.335362 0.028446 -v 0.077081 -0.296724 0.028453 -v 0.064067 -0.335266 0.022782 -v 0.063422 -0.297354 0.022789 -v 0.058466 -0.316365 0.009112 -v 0.064129 -0.316266 -0.004562 -v 0.077800 -0.316032 -0.010226 -v 0.091472 -0.315800 -0.004562 -v 0.097135 -0.315706 0.009112 -v 0.091472 -0.315804 0.022786 -v 0.077800 -0.316039 0.028449 -v 0.064129 -0.316271 0.022785 -v 0.057764 -0.297613 0.009115 -v 0.054957 -0.260374 0.009121 -v 0.063422 -0.297349 -0.004559 -v 0.060585 -0.259738 -0.004553 -v 0.077081 -0.296717 -0.010222 -v 0.074173 -0.258205 -0.010216 -v 0.090740 -0.296088 -0.004559 -v 0.087761 -0.256674 -0.004552 -v 0.096398 -0.295828 0.009115 -v 0.093389 -0.256042 0.009121 -v 0.090740 -0.296092 0.022789 -v 0.087761 -0.256678 0.022795 -v 0.077081 -0.296724 0.028453 -v 0.074173 -0.258211 0.028459 -v 0.063422 -0.297354 0.022789 -v 0.060585 -0.259742 0.022795 -v 0.057059 -0.278863 0.009118 -v 0.062707 -0.278435 -0.004556 -v 0.076341 -0.277404 -0.010219 -v 0.089976 -0.276376 -0.004555 -v 0.095624 -0.275952 0.009118 -v 0.089976 -0.276380 0.022792 -v 0.076341 -0.277411 0.028456 -v 0.062707 -0.278439 0.022792 -v 0.054957 -0.260374 0.009121 -v 0.049564 -0.223722 0.009126 -v 0.060585 -0.259738 -0.004553 -v 0.055124 -0.222637 -0.004548 -v 0.074173 -0.258205 -0.010216 -v 0.068545 -0.220021 -0.010211 -v 0.087761 -0.256674 -0.004552 -v 0.081966 -0.217407 -0.004547 -v 0.093389 -0.256042 0.009121 -v 0.087526 -0.216325 0.009127 -v 0.087761 -0.256678 0.022795 -v 0.081966 -0.217410 0.022801 -v 0.074173 -0.258211 0.028459 -v 0.068545 -0.220026 0.028464 -v 0.060585 -0.259742 0.022795 -v 0.055124 -0.222641 0.022800 -v 0.052882 -0.241882 0.009124 -v 0.058483 -0.241038 -0.004550 -v 0.072004 -0.239006 -0.010213 -v 0.085526 -0.236974 -0.004549 -v 0.091127 -0.236135 0.009124 -v 0.085526 -0.236978 0.022798 -v 0.072004 -0.239011 0.028462 -v 0.058483 -0.241042 0.022797 -v 0.049564 -0.223722 0.009126 -v 0.041164 -0.187972 0.009130 -v 0.055124 -0.222637 -0.004548 -v 0.046594 -0.186362 -0.004544 -v 0.068545 -0.220021 -0.010211 -v 0.059704 -0.182475 -0.010207 -v 0.081966 -0.217407 -0.004547 -v 0.072814 -0.178590 -0.004543 -v 0.087526 -0.216325 0.009127 -v 0.078244 -0.176981 0.009131 -v 0.081966 -0.217410 0.022801 -v 0.072814 -0.178592 0.022805 -v 0.068545 -0.220026 0.028464 -v 0.059704 -0.182479 0.028468 -v 0.055124 -0.222641 0.022800 -v 0.046594 -0.186364 0.022804 -v 0.045791 -0.205686 0.009128 -v 0.051295 -0.204348 -0.004545 -v 0.064583 -0.201121 -0.010209 -v 0.077870 -0.197895 -0.004545 -v 0.083374 -0.196560 0.009129 -v 0.077870 -0.197898 0.022803 -v 0.064582 -0.201125 0.028466 -v 0.051295 -0.204351 0.022802 -v 0.041164 -0.187972 0.009130 -v 0.029340 -0.153548 0.009132 -v 0.046594 -0.186362 -0.004544 -v 0.034556 -0.151339 -0.004541 -v 0.059704 -0.182475 -0.010207 -v 0.047148 -0.146008 -0.010205 -v 0.072814 -0.178590 -0.004543 -v 0.059740 -0.140676 -0.004540 -v 0.078244 -0.176981 0.009131 -v 0.064955 -0.138469 0.009134 -v 0.072814 -0.178592 0.022805 -v 0.059739 -0.140678 0.022807 -v 0.059704 -0.182479 0.028468 -v 0.047147 -0.146009 0.028470 -v 0.046594 -0.186364 0.022804 -v 0.034556 -0.151340 0.022806 -v 0.035381 -0.170691 0.009131 -v 0.040714 -0.168781 -0.004542 -v 0.053588 -0.164173 -0.010206 -v 0.066462 -0.159566 -0.004541 -v 0.071794 -0.157658 0.009133 -v 0.066461 -0.159567 0.022806 -v 0.053587 -0.164176 0.028469 -v 0.040713 -0.168783 0.022805 -v 0.029340 -0.153548 0.009132 -v 0.013301 -0.121266 0.009132 -v 0.034556 -0.151339 -0.004541 -v 0.018187 -0.118400 -0.004542 -v 0.047148 -0.146008 -0.010205 -v 0.029982 -0.111482 -0.010205 -v 0.059740 -0.140676 -0.004540 -v 0.041776 -0.104563 -0.004540 -v 0.064955 -0.138469 0.009134 -v 0.046661 -0.101698 0.009133 -v 0.059739 -0.140678 0.022807 -v 0.041775 -0.104563 0.022807 -v 0.047147 -0.146009 0.028470 -v 0.029980 -0.111481 0.028470 -v 0.034556 -0.151340 0.022806 -v 0.018186 -0.118400 0.022806 -v 0.021284 -0.137425 0.009132 -v 0.026346 -0.134882 -0.004542 -v 0.038565 -0.128745 -0.010205 -v 0.050784 -0.122607 -0.004540 -v 0.055844 -0.120065 0.009134 -v 0.050782 -0.122607 0.022807 -v 0.038563 -0.128745 0.028470 -v 0.026345 -0.134883 0.022806 -v 0.013301 -0.121266 0.009132 -v -0.007108 -0.091928 0.009129 -v 0.018187 -0.118400 -0.004542 -v -0.002677 -0.088399 -0.004545 -v 0.029982 -0.111482 -0.010205 -v 0.008016 -0.079877 -0.010208 -v 0.041776 -0.104563 -0.004540 -v 0.018709 -0.071355 -0.004544 -v 0.046661 -0.101698 0.009133 -v 0.023137 -0.067824 0.009130 -v 0.041775 -0.104563 0.022807 -v 0.018706 -0.071353 0.022804 -v 0.029980 -0.111481 0.028470 -v 0.008013 -0.079874 0.028467 -v 0.018186 -0.118400 0.022806 -v -0.002680 -0.088397 0.022803 -v 0.003263 -0.106486 0.009130 -v 0.007935 -0.103284 -0.004543 -v 0.019212 -0.095550 -0.010206 -v 0.030488 -0.087816 -0.004542 -v 0.035158 -0.084612 0.009132 -v 0.030486 -0.087815 0.022805 -v 0.019209 -0.095548 0.028469 -v 0.007933 -0.103282 0.022804 -v -0.007108 -0.091928 0.009129 -v -0.031389 -0.065905 0.009123 -v -0.002677 -0.088399 -0.004545 -v -0.027519 -0.061770 -0.004551 -v 0.008016 -0.079877 -0.010208 -v -0.018180 -0.051782 -0.010214 -v 0.018709 -0.071355 -0.004544 -v -0.008842 -0.041793 -0.004550 -v 0.023137 -0.067824 0.009130 -v -0.004976 -0.037654 0.009123 -v 0.018706 -0.071353 0.022804 -v -0.008846 -0.041790 0.022797 -v 0.008013 -0.079874 0.028467 -v -0.018185 -0.051777 0.028461 -v -0.002680 -0.088397 0.022803 -v -0.027523 -0.061766 0.022797 -v -0.018728 -0.078465 0.009126 -v -0.014565 -0.074624 -0.004547 -v -0.004518 -0.065348 -0.010211 -v 0.005528 -0.056072 -0.004547 -v 0.009687 -0.052228 0.009127 -v 0.005524 -0.056069 0.022801 -v -0.004523 -0.065344 0.028464 -v -0.014568 -0.074621 0.022800 -v -0.031389 -0.065905 0.009123 -v -0.059103 -0.043471 0.009115 -v -0.027519 -0.061770 -0.004551 -v -0.055860 -0.038828 -0.004559 -v -0.018180 -0.051782 -0.010214 -v -0.048034 -0.027616 -0.010223 -v -0.008842 -0.041793 -0.004550 -v -0.040211 -0.016401 -0.004560 -v -0.004976 -0.037654 0.009123 -v -0.036973 -0.011753 0.009114 -v -0.008846 -0.041790 0.022797 -v -0.040217 -0.016396 0.022787 -v -0.018185 -0.051777 0.028461 -v -0.048042 -0.027609 0.028452 -v -0.027523 -0.061766 0.022797 -v -0.055865 -0.038824 0.022788 -v -0.044496 -0.053850 0.009119 -v -0.040935 -0.049445 -0.004554 -v -0.032345 -0.038807 -0.010218 -v -0.023757 -0.028167 -0.004554 -v -0.020202 -0.023758 0.009119 -v -0.023762 -0.028162 0.022793 -v -0.032352 -0.038801 0.028457 -v -0.040940 -0.049441 0.022793 -v -0.059103 -0.043471 0.009115 -v -0.089672 -0.024601 0.009104 -v -0.055860 -0.038828 -0.004559 -v -0.087076 -0.019567 -0.004570 -v -0.048034 -0.027616 -0.010223 -v -0.080817 -0.007411 -0.010235 -v -0.040211 -0.016401 -0.004560 -v -0.074562 0.004748 -0.004572 -v -0.036973 -0.011753 0.009114 -v -0.071973 0.009787 0.009101 -v -0.040217 -0.016396 0.022787 -v -0.074569 0.004754 0.022775 -v -0.048042 -0.027609 0.028452 -v -0.080828 -0.007403 0.028440 -v -0.055865 -0.038824 0.022788 -v -0.087084 -0.019562 0.022777 -v -0.073657 -0.033014 0.009110 -v -0.070745 -0.028157 -0.004564 -v -0.063723 -0.016424 -0.010229 -v -0.056703 -0.004690 -0.004565 -v -0.053798 0.000173 0.009108 -v -0.056710 -0.004684 0.022782 -v -0.063732 -0.016417 0.028446 -v -0.070752 -0.028151 0.022783 -v 0.070721 -0.502168 -0.126921 -v 0.070721 -0.448710 -0.126921 -v 0.097256 -0.502168 -0.124308 -v 0.097256 -0.448710 -0.124308 -v 0.122772 -0.502168 -0.116568 -v 0.122772 -0.448710 -0.116568 -v 0.146287 -0.502168 -0.103999 -v 0.146287 -0.448710 -0.103999 -v 0.166898 -0.502168 -0.087083 -v 0.166898 -0.448710 -0.087083 -v 0.183814 -0.502168 -0.066472 -v 0.183814 -0.448710 -0.066472 -v 0.196383 -0.502168 -0.042957 -v 0.196383 -0.448710 -0.042957 -v 0.204123 -0.502168 -0.017441 -v 0.204123 -0.448710 -0.017441 -v 0.206737 -0.502168 0.009094 -v 0.206737 -0.448710 0.009094 -v 0.204123 -0.502168 0.035629 -v 0.204123 -0.448710 0.035629 -v 0.196383 -0.502168 0.061145 -v 0.196383 -0.448710 0.061145 -v 0.183814 -0.502168 0.084660 -v 0.183814 -0.448710 0.084660 -v 0.166898 -0.502168 0.105272 -v 0.166898 -0.448710 0.105272 -v 0.146287 -0.502168 0.122187 -v 0.146287 -0.448710 0.122187 -v 0.122772 -0.502168 0.134756 -v 0.122772 -0.448710 0.134756 -v 0.097256 -0.502168 0.142496 -v 0.097256 -0.448710 0.142496 -v 0.070721 -0.502168 0.145110 -v 0.070721 -0.448710 0.145110 -v 0.044185 -0.502168 0.142496 -v 0.044185 -0.448710 0.142496 -v 0.018670 -0.502168 0.134756 -v 0.018670 -0.448710 0.134756 -v -0.004845 -0.502168 0.122187 -v -0.004845 -0.448710 0.122187 -v -0.025457 -0.502168 0.105272 -v -0.025457 -0.448710 0.105272 -v -0.042372 -0.502168 0.084660 -v -0.042372 -0.448710 0.084660 -v -0.054941 -0.502168 0.061145 -v -0.054941 -0.448710 0.061145 -v -0.062681 -0.502168 0.035629 -v -0.062681 -0.448710 0.035629 -v -0.065295 -0.502168 0.009094 -v -0.065295 -0.448710 0.009094 -v -0.062681 -0.502168 -0.017441 -v -0.062681 -0.448710 -0.017441 -v -0.054941 -0.502168 -0.042957 -v -0.054941 -0.448710 -0.042957 -v -0.042372 -0.502168 -0.066472 -v -0.042372 -0.448710 -0.066472 -v -0.025457 -0.502168 -0.087084 -v -0.025457 -0.448710 -0.087084 -v -0.004845 -0.502168 -0.103999 -v -0.004845 -0.448710 -0.103999 -v 0.018670 -0.502168 -0.116568 -v 0.018670 -0.448710 -0.116568 -v 0.044186 -0.502168 -0.124308 -v 0.044186 -0.448710 -0.124308 -v -0.202905 0.052560 0.010102 -v -0.247764 0.045512 0.010160 -v -0.286512 0.021833 0.010199 +o bulb +v -0.157569 -0.085144 0.010337 +v -0.206730 -0.062515 0.010337 +v -0.191531 -0.048448 -0.039662 +v -0.146821 -0.075197 -0.025018 +v -0.225492 -0.011753 0.010337 +v -0.214743 -0.001806 -0.025018 +v -0.154835 -0.014486 -0.060373 +v -0.120873 -0.051182 -0.039662 +v -0.188796 0.022209 -0.039662 +v -0.120873 -0.051182 0.060337 +v -0.154835 -0.014486 0.081047 +v -0.191531 -0.048448 0.060337 +v -0.146821 -0.075197 0.045692 +v -0.188796 0.022209 0.060337 +v -0.214743 -0.001806 0.045692 +v -0.106806 -0.066382 0.010337 +v -0.202863 0.037408 0.010337 +vt 0.375348 0.375348 +vt 0.624652 0.375348 +vt 0.624652 0.624652 +vt 0.375348 0.624652 +g bulb_bulb_Material.001 +usemtl Material.001 +s 1 +f 1/1 2/2 3/3 4/4 +f 2/1 5/2 6/3 3/4 +f 4/1 3/2 7/3 8/4 +f 3/1 6/2 9/3 7/4 +f 10/1 11/2 12/3 13/4 +f 11/1 14/2 15/3 12/4 +f 16/1 1/2 4/3 +f 5/1 17/2 6/3 +f 16/1 4/2 8/3 +f 6/1 17/2 9/3 +f 16/1 10/2 13/3 +f 14/1 17/2 15/3 +f 13/1 1/2 16/3 +f 2/1 1/2 13/3 12/4 +f 12/1 15/2 5/3 2/4 +f 15/1 17/2 5/3 +o metal_bulb v -0.319468 -0.008127 0.010226 -v -0.198702 0.047975 -0.021400 -v -0.242273 0.039521 -0.030999 +v -0.286512 0.021833 0.010199 v -0.280568 0.015348 -0.034351 v -0.313508 -0.014629 -0.034445 -v -0.186646 0.034877 -0.048123 -v -0.226521 0.022408 -0.065914 +v -0.247764 0.045512 0.010160 +v -0.242273 0.039521 -0.030999 +v -0.202905 0.052560 0.010102 +v -0.198702 0.047975 -0.021400 v -0.263519 -0.003175 -0.072143 v -0.296412 -0.033202 -0.072339 -v -0.168573 0.015261 -0.066000 -v -0.202907 -0.003222 -0.089271 +v -0.226521 0.022408 -0.065914 +v -0.186646 0.034877 -0.048123 v -0.237959 -0.030916 -0.097425 v -0.270783 -0.061019 -0.097689 -v -0.147233 -0.007887 -0.072308 -v -0.175025 -0.033467 -0.097514 +v -0.202907 -0.003222 -0.089271 +v -0.168573 0.015261 -0.066000 v -0.207779 -0.063653 -0.106346 v -0.240522 -0.093844 -0.106635 -v -0.125876 -0.031043 -0.066088 -v -0.147121 -0.063721 -0.089387 +v -0.175025 -0.033467 -0.097514 +v -0.147233 -0.007887 -0.072308 v -0.177576 -0.096400 -0.097550 v -0.210236 -0.126680 -0.097815 -v -0.107752 -0.050682 -0.048287 -v -0.123441 -0.089380 -0.066128 +v -0.147121 -0.063721 -0.089387 +v -0.125876 -0.031043 -0.066088 v -0.151945 -0.124173 -0.072375 v -0.184537 -0.154528 -0.072572 -v -0.095622 -0.063813 -0.021614 -v -0.107592 -0.106537 -0.031278 +v -0.123441 -0.089380 -0.066128 +v -0.107752 -0.050682 -0.048287 v -0.134791 -0.142744 -0.034653 v -0.167335 -0.173150 -0.034748 -v -0.091332 -0.068438 0.009870 -v -0.101987 -0.112580 0.009857 +v -0.107592 -0.106537 -0.031278 +v -0.095622 -0.063813 -0.021614 v -0.128723 -0.149285 0.009871 v -0.161251 -0.179708 0.009897 -v -0.095534 -0.063853 0.041372 -v -0.107478 -0.106589 0.051016 +v -0.101987 -0.112580 0.009857 +v -0.091332 -0.068438 0.009870 v -0.134667 -0.142800 0.054421 v -0.167211 -0.173206 0.054568 -v -0.107590 -0.050755 0.068095 -v -0.123230 -0.089476 0.085931 +v -0.107478 -0.106589 0.051016 +v -0.095534 -0.063853 0.041372 v -0.151716 -0.124277 0.092213 v -0.184307 -0.154633 0.092462 -v -0.125664 -0.031139 0.085971 -v -0.146844 -0.063846 0.109288 +v -0.123230 -0.089476 0.085931 +v -0.107590 -0.050755 0.068095 v -0.177276 -0.096536 0.117495 v -0.209936 -0.126816 0.117812 -v -0.147004 -0.007991 0.092280 -v -0.174726 -0.033602 0.117531 +v -0.146844 -0.063846 0.109288 +v -0.125664 -0.031139 0.085971 v -0.207456 -0.063799 0.126416 v -0.240197 -0.093991 0.126758 -v -0.168361 0.015165 0.086060 -v -0.202631 -0.003347 0.109404 +v -0.174726 -0.033602 0.117531 +v -0.147004 -0.007991 0.092280 v -0.237660 -0.031052 0.117620 v -0.270483 -0.061155 0.117938 -v -0.186484 0.034804 0.068258 -v -0.226310 0.022312 0.086145 +v -0.202631 -0.003347 0.109404 +v -0.168361 0.015165 0.086060 v -0.263290 -0.003278 0.092445 v -0.296183 -0.033306 0.092694 -v -0.198615 0.047935 0.041585 -v -0.242159 0.039469 0.051295 +v -0.226310 0.022312 0.086145 +v -0.186484 0.034804 0.068258 v -0.280444 0.015292 0.054723 v -0.313384 -0.014685 0.054871 +v -0.242159 0.039469 0.051295 +v -0.198615 0.047935 0.041585 +v -0.042757 0.003935 0.009848 +v -0.045990 0.007420 -0.013878 +v -0.038616 0.014220 -0.013884 +v -0.035383 0.010734 0.009842 +v -0.055009 0.017261 0.053726 +v -0.045924 0.007390 0.033588 +v -0.038550 0.014190 0.033582 +v -0.047635 0.024060 0.053721 +v -0.084711 0.049488 0.071953 +v -0.068629 0.032044 0.067198 +v -0.061256 0.038843 0.067192 +v -0.077338 0.056288 0.071947 +v -0.123672 0.091664 -0.013717 +v -0.126839 0.095120 0.010023 +v -0.119465 0.101919 0.010017 +v -0.116298 0.098464 -0.013723 +v -0.114464 0.081739 0.053850 +v -0.100806 0.066939 0.067265 +v -0.093433 0.073738 0.067259 +v -0.107090 0.088538 0.053844 +v -0.100966 0.067011 -0.047328 +v -0.114586 0.081794 -0.033856 +v -0.107212 0.088593 -0.033862 +v -0.093592 0.073810 -0.047334 +v -0.123605 0.091634 0.033749 +v -0.116232 0.098434 0.033743 +v -0.068789 0.032116 -0.047394 +v -0.084884 0.049566 -0.052082 +v -0.077510 0.056366 -0.052088 +v -0.061415 0.038915 -0.047400 +v -0.055131 0.017316 -0.033979 +v -0.047757 0.024115 -0.033985 v -0.179199 0.046838 0.010065 v -0.176032 0.043382 -0.013675 v -0.166947 0.033512 -0.033813 @@ -489,7 +160,6 @@ v -0.096754 0.094505 -0.007063 v -0.090230 0.087416 -0.021526 v -0.080448 0.076800 -0.031201 v -0.068899 0.064272 -0.034615 -v -0.062325 0.070250 0.009917 v -0.057341 0.051740 -0.031248 v -0.047533 0.041112 -0.021614 v -0.040968 0.034005 -0.007179 @@ -501,1122 +171,1053 @@ v -0.068775 0.064216 0.054460 v -0.080334 0.076748 0.051093 v -0.090142 0.087377 0.041459 v -0.096707 0.094483 0.027024 -v -0.119465 0.101919 0.010017 -v -0.116298 0.098464 -0.013723 -v -0.107212 0.088593 -0.033862 -v -0.093592 0.073810 -0.047334 -v -0.077510 0.056366 -0.052088 -v -0.061415 0.038915 -0.047400 -v -0.047757 0.024115 -0.033985 -v -0.038616 0.014220 -0.013884 -v -0.035383 0.010734 0.009842 -v -0.038550 0.014190 0.033582 -v -0.047635 0.024060 0.053721 -v -0.061256 0.038843 0.067192 -v -0.077338 0.056288 0.071947 -v -0.093433 0.073738 0.067259 -v -0.107090 0.088538 0.053844 -v -0.116232 0.098434 0.033743 -v -0.126839 0.095120 0.010023 -v -0.045990 0.007420 -0.013878 -v -0.042757 0.003935 0.009848 -v -0.045924 0.007390 0.033588 -v -0.055009 0.017261 0.053726 -v -0.068629 0.032044 0.067198 -v -0.084711 0.049488 0.071953 -v -0.100806 0.066939 0.067265 -v -0.123672 0.091664 -0.013717 -v -0.114586 0.081794 -0.033856 -v -0.114464 0.081739 0.053850 -v -0.123605 0.091634 0.033749 -v -0.100966 0.067011 -0.047328 -v -0.084884 0.049566 -0.052082 -v -0.068789 0.032116 -0.047394 -v -0.055131 0.017316 -0.033979 -v -0.171636 0.053812 0.010059 -v -0.090787 -0.033888 -0.013842 -v -0.090721 -0.033918 0.033624 -v -0.113427 -0.009264 0.067235 -v -0.145604 0.025631 0.067301 -v -0.159383 0.040486 -0.033819 -v -0.168403 0.050326 0.033785 -v -0.129681 0.008259 -0.052045 -v -0.099928 -0.023992 -0.033943 -v -0.087554 -0.037373 0.009884 -v -0.099806 -0.024047 0.053763 -v -0.129509 0.008180 0.071989 -v -0.168469 0.050356 -0.013681 -v -0.159261 0.040431 0.053886 -v -0.145763 0.025703 -0.047291 -v -0.113586 -0.009192 -0.047358 -v -0.149812 0.073936 0.010041 +v -0.062325 0.070250 0.009917 +v -0.065729 -0.017249 0.009867 v -0.068963 -0.013763 -0.013860 +v -0.077982 -0.003923 0.053745 v -0.068897 -0.013793 0.033606 +v -0.107684 0.028305 0.071971 v -0.091602 0.010860 0.067217 +v -0.146644 0.070481 -0.013698 +v -0.149812 0.073936 0.010041 +v -0.137437 0.060555 0.053868 v -0.123779 0.045755 0.067284 +v -0.123939 0.045827 -0.047309 v -0.137559 0.060610 -0.033837 v -0.146578 0.070451 0.033768 +v -0.091762 0.010932 -0.047376 v -0.107857 0.028383 -0.052063 v -0.078104 -0.003867 -0.033960 -v -0.065729 -0.017249 0.009867 -v -0.077982 -0.003923 0.053745 -v -0.107684 0.028305 0.071971 -v -0.146644 0.070481 -0.013698 -v -0.137437 0.060555 0.053868 -v -0.123939 0.045827 -0.047309 -v -0.091762 0.010932 -0.047376 -vt 0.971782 0.524261 -vt 0.971782 0.652282 -vt 0.888879 0.586277 -vt 0.900963 0.543099 -vt 0.825267 0.693781 -vt 0.854139 0.602488 -vt 0.862161 0.568155 -vt 0.870119 0.542888 -vt 0.847306 0.582232 -vt 0.845252 0.560470 -vt 0.850411 0.540671 -vt 0.838161 0.573817 -vt 0.830826 0.557082 -vt 0.834105 0.538099 -vt 0.828470 0.570802 -vt 0.815678 0.556727 -vt 0.817385 0.535007 -vt 0.818103 0.572139 -vt 0.796115 0.560591 -vt 0.795967 0.530286 -vt 0.806847 0.579715 -vt 0.762341 0.575924 -vt 0.759323 0.519209 -vt 0.796813 0.601969 -vt 0.850323 0.429812 -vt 0.827177 0.589224 -vt 0.657516 0.465846 -vt 0.651869 0.660346 -vt 0.505694 0.922140 -vt 0.506211 0.922878 -vt 0.505675 0.923367 -vt 0.504958 0.922621 -vt 0.505373 0.924315 -vt 0.503814 0.923356 -vt 0.506357 0.926373 -vt 0.500767 0.925862 -vt 0.509094 0.926462 -vt 0.437217 0.972045 -vt 0.550560 0.903735 -vt 0.509618 0.923709 -vt 0.510748 0.918454 -vt 0.508057 0.922603 -vt 0.507553 0.920632 -vt 0.506942 0.922608 -vt 0.506409 0.921556 -vt 0.505137 0.921442 -vt 0.504641 0.921723 -vt 0.503681 0.921491 -vt 0.501262 0.920395 -vt 0.471663 0.871880 -vt 0.505299 0.917025 -vt 0.505744 0.919814 -vt 0.505500 0.920903 -vt 0.568497 0.789014 -vt 0.568751 0.789267 -vt 0.568557 0.789471 -vt 0.568278 0.789228 -vt 0.568455 0.789820 -vt 0.567945 0.789516 -vt 0.568847 0.790654 -vt 0.567052 0.790205 -vt 0.582368 0.802799 -vt 0.546429 0.802799 -vt 0.580157 0.767866 -vt 0.570365 0.789196 -vt 0.569681 0.787461 -vt 0.569362 0.788968 -vt 0.569007 0.788406 -vt 0.568986 0.789090 -vt 0.568711 0.788776 -vt 0.568261 0.788797 -vt 0.568075 0.788942 -vt 0.567758 0.788985 -vt 0.567195 0.788585 -vt 0.567276 0.787775 -vt 0.568104 0.787707 -vt 0.568403 0.788215 -vt 0.568374 0.788569 -vt 0.527267 0.784580 -vt 0.527609 0.784946 -vt 0.527381 0.785240 -vt 0.526933 0.784925 -vt 0.527318 0.785739 -vt 0.526483 0.785448 -vt 0.527949 0.786612 -vt 0.525412 0.786840 -vt 0.529214 0.786481 -vt 0.506722 0.817372 -vt 0.558510 0.766920 -vt 0.529316 0.785187 -vt 0.529682 0.782712 -vt 0.528521 0.784720 -vt 0.528217 0.783775 -vt 0.527966 0.784767 -vt 0.527640 0.784242 -vt 0.526872 0.784187 -vt 0.526555 0.784490 -vt 0.526012 0.784649 -vt 0.524717 0.784046 -vt 0.506722 0.764090 -vt 0.526969 0.781676 -vt 0.527332 0.783232 -vt 0.527145 0.783819 -vt 0.379140 0.792781 -vt 0.387106 0.786844 -vt 0.390599 0.785799 -vt 0.380895 0.794697 -vt 0.400082 0.781856 -vt 0.383786 0.799101 -vt 0.418118 0.771919 -vt 0.390365 0.811311 -vt 0.452298 0.759409 -vt 0.408333 0.843074 -vt 0.346090 0.758468 -vt 0.413137 0.771945 -vt 0.366479 0.776733 -vt 0.395552 0.780028 -vt 0.374170 0.786971 -vt 0.388712 0.784273 -vt 0.377386 0.790753 -vt 0.371134 0.798937 -vt 0.369386 0.799713 -vt 0.361351 0.803018 -vt 0.342433 0.815398 -vt 0.298296 0.844492 -vt 0.342839 0.817292 -vt 0.360511 0.804744 -vt 0.368383 0.799947 -vt 0.245655 0.800323 -vt 0.246501 0.799657 -vt 0.247312 0.800061 -vt 0.246377 0.801270 -vt 0.248466 0.800724 -vt 0.247387 0.802815 -vt 0.251347 0.800141 -vt 0.249974 0.806549 -vt 0.315762 0.756715 -vt 0.282443 0.850342 -vt 0.208088 0.757850 -vt 0.248264 0.794433 -vt 0.241127 0.793787 -vt 0.246387 0.797645 -vt 0.243880 0.797800 -vt 0.246219 0.798941 -vt 0.244922 0.799374 -vt 0.244811 0.800995 -vt 0.245096 0.801698 -vt 0.244944 0.802961 -vt 0.243178 0.806041 -vt 0.177796 0.851690 -vt 0.239523 0.800358 -vt 0.242784 0.800046 -vt 0.244009 0.800606 -vt 0.576909 0.952768 -vt 0.604690 0.950762 -vt 0.611228 0.948061 -vt 0.590665 0.955721 -vt 0.630339 0.941957 -vt 0.609809 0.957496 -vt 0.665117 0.938827 -vt 0.628788 0.964544 -vt 0.729555 0.935943 -vt 0.643433 0.989354 -vt 0.634873 0.900912 -vt 0.666069 0.946870 -vt 0.625066 0.928749 -vt 0.631880 0.948642 -vt 0.608003 0.940119 -vt 0.612449 0.949974 -vt 0.589890 0.946469 -vt 0.506346 0.960110 -vt 0.560178 0.965595 -vt 0.588158 0.964361 -vt 0.599784 0.957715 -vt 0.594610 0.948661 -vt 0.596754 0.940984 -vt 0.584627 0.940197 -vt 0.557704 0.943019 -vt 0.565840 0.868092 -vt 0.568715 0.866326 -vt 0.570600 0.867709 -vt 0.567715 0.869860 -vt 0.574434 0.868674 -vt 0.570702 0.872677 -vt 0.583804 0.865405 -vt 0.580031 0.881999 -vt 0.606209 0.843431 -vt 0.596729 0.917917 -vt 0.527625 0.818614 -vt 0.571460 0.854664 -vt 0.556572 0.855779 -vt 0.568348 0.860617 -vt 0.562024 0.862752 -vt 0.568016 0.864198 -vt 0.564255 0.865969 -vt 0.562119 0.870655 -vt 0.564085 0.871480 -vt 0.564110 0.873256 -vt 0.556083 0.876627 -vt 0.553147 0.875931 -vt 0.554934 0.868555 -vt 0.559281 0.867740 -vt 0.561407 0.868846 -vt 0.762954 0.828016 -vt 0.766131 0.826158 -vt 0.768100 0.828611 -vt 0.764608 0.831006 -vt 0.771649 0.830808 -vt 0.766740 0.835530 -vt 0.781773 0.830966 -vt 0.771270 0.846610 -vt 0.808007 0.802451 -vt 0.797615 0.913425 -vt 0.719210 0.756766 -vt 0.771713 0.813346 -vt 0.753882 0.811134 -vt 0.765494 0.820178 -vt 0.758953 0.820977 -vt 0.764665 0.823631 -vt 0.761230 0.825149 -vt 0.759980 0.829696 -vt 0.760890 0.832274 -vt 0.760197 0.836088 -vt 0.752755 0.841885 -vt 0.725802 0.846202 -vt 0.746421 0.826131 -vt 0.754432 0.825826 -vt 0.758000 0.827632 -vt 0.362981 0.912360 -vt 0.364638 0.914720 -vt 0.362745 0.916064 -vt 0.360791 0.913834 -vt 0.362208 0.918839 -vt 0.357774 0.916117 -vt 0.364421 0.925861 -vt 0.350379 0.922013 -vt 0.402209 0.964265 -vt 0.295821 0.964135 -vt 0.428032 0.862364 -vt 0.374069 0.917025 -vt 0.374608 0.903830 -vt 0.369388 0.913253 -vt 0.367879 0.908813 -vt 0.366580 0.913445 -vt 0.365077 0.910913 -vt 0.361429 0.910015 -vt 0.359270 0.910981 -vt 0.356178 0.911193 -vt 0.349385 0.907762 -vt 0.327421 0.862364 -vt 0.361978 0.899872 -vt 0.363824 0.906231 -vt 0.363254 0.908792 -vt 0.701060 0.846785 -vt 0.702219 0.846177 -vt 0.702977 0.846972 -vt 0.701727 0.847950 -vt 0.704339 0.847586 -vt 0.702694 0.849625 -vt 0.706710 0.847112 -vt 0.705224 0.853713 -vt 0.707602 0.843857 -vt 0.764368 0.924557 -vt 0.679504 0.757548 -vt 0.704655 0.842339 -vt 0.698392 0.839256 -vt 0.702260 0.843835 -vt 0.699809 0.843794 -vt 0.701913 0.845184 -vt 0.700491 0.845580 -vt 0.699721 0.847479 -vt 0.700331 0.848561 -vt 0.699962 0.850049 -vt 0.697055 0.853326 -vt 0.627841 0.881366 -vt 0.693918 0.845903 -vt 0.697783 0.845420 -vt 0.699122 0.846344 -vt 0.488323 0.821046 -vt 0.487797 0.821276 -vt 0.487584 0.820912 -vt 0.488103 0.820535 -vt 0.487172 0.820542 -vt 0.487801 0.819796 -vt 0.485951 0.820530 -vt 0.487151 0.818012 -vt 0.448821 0.839089 -vt 0.482174 0.790731 -vt 0.510569 0.846429 -vt 0.487112 0.823400 -vt 0.490036 0.824066 -vt 0.487882 0.822244 -vt 0.488902 0.822270 -vt 0.487921 0.821679 -vt 0.488538 0.821553 -vt 0.488801 0.820842 -vt 0.488739 0.820391 -vt 0.488884 0.819798 -vt 0.489637 0.819150 -vt 0.490955 0.819700 -vt 0.490686 0.821076 -vt 0.489559 0.821452 -vt 0.489037 0.821204 -vt 0.231857 0.926010 -vt 0.230277 0.927879 -vt 0.228565 0.927146 -vt 0.229720 0.924300 -vt 0.225567 0.927107 -vt 0.226507 0.921716 -vt 0.219161 0.929680 -vt 0.219251 0.915193 -vt 0.182338 0.974249 -vt 0.182338 0.879485 -vt 0.280113 0.975066 -vt 0.229382 0.937815 -vt 0.242990 0.937741 -vt 0.231141 0.931834 -vt 0.236336 0.930803 -vt 0.231336 0.929156 -vt 0.233751 0.927891 -vt 0.233658 0.924069 -vt 0.232313 0.922513 -vt 0.231281 0.920025 -vt 0.233212 0.914670 -vt 0.296246 0.862364 -vt 0.243543 0.924307 -vt 0.237739 0.925981 -vt 0.235264 0.925290 -vt 0.775451 0.950190 -vt 0.757930 0.958223 -vt 0.753460 0.962425 -vt 0.765662 0.953757 -vt 0.741312 0.969785 -vt 0.752408 0.959726 -vt 0.719693 0.980521 -vt 0.739356 0.965386 -vt 0.677540 0.990354 -vt 0.730056 0.968272 -vt 0.714215 0.967622 -vt 0.738313 0.964026 -vt 0.736699 0.957774 -vt 0.751708 0.958677 -vt 0.751880 0.956718 -vt 0.765993 0.954387 -vt 0.801538 0.936607 -vt 0.784447 0.940303 -vt 0.764785 0.949063 -vt 0.753071 0.955490 -vt 0.748306 0.960103 -vt 0.753507 0.961832 -vt 0.767262 0.957319 -vt 0.789319 0.951983 -vt 0.489911 0.359855 -vt 0.490256 0.259811 -vt 0.525061 0.259473 -vt 0.525729 0.360679 -vt 0.559886 0.259073 -vt 0.561881 0.360926 -vt 0.594443 0.258610 -vt 0.598541 0.360264 -vt 0.628250 0.258130 -vt 0.635968 0.357863 -vt 0.660348 0.257870 -vt 0.674534 0.351744 -vt 0.687995 0.258869 -vt 0.714161 0.335097 -vt 0.715235 0.256622 -vt 0.765281 0.313370 -vt 0.730820 0.257406 -vt 0.828047 0.257406 -vt 0.716320 0.258734 -vt 0.765690 0.201575 -vt 0.691974 0.258701 -vt 0.718676 0.176906 -vt 0.661866 0.258551 -vt 0.676202 0.165069 -vt 0.628878 0.258392 -vt 0.636400 0.159691 -vt 0.594521 0.258263 -vt 0.598248 0.157631 -vt 0.559599 0.258167 -vt 0.561159 0.157298 -vt 0.524558 0.258100 -vt 0.524780 0.157904 -vt 0.489663 0.258055 -vt 0.488887 0.159099 -vt 0.455118 0.258030 -vt 0.453320 0.160808 -vt 0.421132 0.258032 -vt 0.417933 0.163173 -vt 0.388005 0.258083 -vt 0.382558 0.166578 -vt 0.356226 0.258226 -vt 0.346945 0.171757 -vt 0.326618 0.258538 -vt 0.310686 0.180015 -vt 0.300611 0.259151 -vt 0.273076 0.193623 -vt 0.280610 0.259870 -vt 0.232698 0.217183 -vt 0.271082 0.260389 -vt 0.187274 0.258972 -vt 0.280227 0.260693 -vt 0.232252 0.301049 -vt 0.300167 0.260819 -vt 0.272697 0.325469 -vt 0.326371 0.260813 -vt 0.310640 0.339742 -vt 0.356237 0.260715 -vt 0.347238 0.348187 -vt 0.388264 0.260554 -vt 0.383150 0.353285 -vt 0.421586 0.260346 -vt 0.418760 0.356457 -vt 0.455690 0.260099 -vt 0.454295 0.358505 -vt 0.612863 0.559534 -vt 0.582763 0.590842 -vt 0.552360 0.560328 -vt 0.580814 0.528806 -vt 0.548902 0.620229 -vt 0.523169 0.589398 -vt 0.509109 0.644073 -vt 0.490506 0.617622 -vt 0.521393 0.533158 -vt 0.546394 0.500402 -vt 0.496104 0.564074 -vt 0.468980 0.595499 -vt 0.488288 0.510065 -vt 0.510043 0.475004 -vt 0.467122 0.542917 -vt 0.444858 0.576793 -vt 0.453219 0.491001 -vt 0.470846 0.453640 -vt 0.436285 0.525752 -vt 0.418702 0.561633 -vt 0.416363 0.476424 -vt 0.429276 0.437164 -vt 0.403912 0.512717 -vt 0.391038 0.550314 -vt 0.378286 0.466779 -vt 0.385951 0.426019 -vt 0.370532 0.503906 -vt 0.362549 0.542564 -vt 0.339815 0.461468 -vt 0.342111 0.421759 -vt 0.336694 0.499282 -vt 0.333482 0.538362 -vt 0.301364 0.461372 -vt 0.299287 0.421759 -vt 0.302934 0.498962 -vt 0.304293 0.537501 -vt 0.263566 0.465562 -vt 0.256887 0.426636 -vt 0.269580 0.501718 -vt 0.275548 0.540208 -vt 0.227115 0.474406 -vt 0.215455 0.436531 -vt 0.237218 0.509313 -vt 0.247664 0.545908 -vt 0.192101 0.487038 -vt 0.176473 0.452232 -vt 0.206329 0.520522 -vt 0.221071 0.555110 -vt 0.159285 0.504099 -vt 0.139953 0.471069 -vt 0.177325 0.535394 -vt 0.196207 0.567448 -vt 0.128647 0.524776 -vt 0.105627 0.493875 -vt 0.150441 0.553858 -vt 0.173337 0.583058 -vt 0.100328 0.549010 -vt 0.073767 0.520401 -vt 0.125780 0.575462 -vt 0.153035 0.601655 -vt 0.074254 0.577085 -vt 0.044382 0.550401 -vt 0.103933 0.601185 -vt 0.135234 0.623161 -vt 0.306410 0.632344 -vt 0.327663 0.629845 -vt 0.328392 0.637842 -vt 0.307720 0.641722 -vt 0.266491 0.628953 -vt 0.283941 0.628893 -vt 0.283181 0.636451 -vt 0.267001 0.635495 -vt 0.236564 0.637425 -vt 0.250809 0.631741 -vt 0.252431 0.637811 -vt 0.239440 0.642899 -vt 0.415839 0.677781 -vt 0.425631 0.698112 -vt 0.416491 0.702289 -vt 0.408258 0.681751 -vt 0.213178 0.657744 -vt 0.223936 0.646199 -vt 0.228199 0.651043 -vt 0.218462 0.661677 -vt 0.392533 0.649146 -vt 0.404901 0.661662 -vt 0.399098 0.666326 -vt 0.388129 0.654469 -vt 0.195253 0.689747 -vt 0.203789 0.672052 -vt 0.210291 0.675413 -vt 0.203173 0.693301 -vt 0.363318 0.633539 -vt 0.378638 0.639799 -vt 0.375531 0.645731 -vt 0.361404 0.639913 -vt 0.346505 0.629927 -vt 0.345923 0.637302 -vt 0.304115 0.632038 -vt 0.302247 0.641072 -vt 0.049510 0.609368 -vt 0.017048 0.583126 -vt 0.084631 0.631717 -vt 0.121700 0.647674 -vt 0.486359 0.654710 -vt 0.470910 0.633627 -vt 0.451672 0.613999 -vt 0.430452 0.597250 -vt 0.407380 0.584343 -vt 0.383417 0.573947 -vt 0.358094 0.566749 -vt 0.332012 0.562950 -vt 0.305613 0.561956 -vt 0.279569 0.563969 -vt 0.254303 0.568377 -vt 0.230539 0.576406 -vt 0.208157 0.586888 -vt 0.187945 0.600783 -vt 0.169137 0.616835 -vt 0.154275 0.636116 -vt 0.141817 0.655214 -vt 0.393757 0.704616 -vt 0.391855 0.687714 -vt 0.386409 0.674703 -vt 0.378567 0.664767 -vt 0.368921 0.657616 -vt 0.357863 0.653266 -vt 0.345399 0.652055 -vt 0.331959 0.654107 -vt 0.317177 0.661141 -vt 0.292638 0.658468 -vt 0.279336 0.651507 -vt 0.266951 0.649077 -vt 0.255680 0.650138 -vt 0.245480 0.654077 -vt 0.236619 0.660469 -vt 0.229469 0.669261 -vt 0.224522 0.680578 -vt 0.350360 0.690827 -vt 0.261504 0.684259 -vt 0.222762 0.695365 -vt 0.305896 0.602687 -vt 0.328488 0.602844 -vt 0.262806 0.605213 -vt 0.283578 0.602765 -vt 0.226004 0.618397 -vt 0.243599 0.610355 -vt 0.439100 0.660963 -vt 0.453555 0.680776 -vt 0.195633 0.642303 -vt 0.209825 0.628876 -vt 0.407650 0.629623 -vt 0.424034 0.643816 -vt 0.171694 0.675486 -vt 0.183128 0.658008 -vt 0.370743 0.610280 -vt 0.389864 0.618470 -vt 0.350224 0.605348 -vt 0.330939 0.573767 -vt 0.305697 0.572724 -vt 0.280834 0.574241 -vt 0.256836 0.578628 -vt 0.234193 0.585613 -vt 0.213232 0.595778 -vt 0.477960 0.661186 -vt 0.462463 0.640869 -vt 0.193943 0.608557 -vt 0.176606 0.623986 -vt 0.444294 0.622338 -vt 0.424147 0.606501 -vt 0.162096 0.641841 -vt 0.149624 0.660357 -vt 0.402520 0.593825 -vt 0.379745 0.584074 -vt 0.355783 0.577243 +v -0.090787 -0.033888 -0.013842 +v -0.087554 -0.037373 0.009884 +v -0.090721 -0.033918 0.033624 +v -0.099806 -0.024047 0.053763 +v -0.113427 -0.009264 0.067235 +v -0.129509 0.008180 0.071989 +v -0.171636 0.053812 0.010059 +v -0.168469 0.050356 -0.013681 +v -0.145604 0.025631 0.067301 +v -0.159261 0.040431 0.053886 +v -0.159383 0.040486 -0.033819 +v -0.145763 0.025703 -0.047291 +v -0.168403 0.050326 0.033785 +v -0.129681 0.008259 -0.052045 +v -0.113586 -0.009192 -0.047358 +v -0.099928 -0.023992 -0.033943 +vt 0.007655 0.335684 +vt 0.088864 0.317550 +vt 0.116908 0.383352 +vt 0.045014 0.430784 +vt 0.149431 0.304465 +vt 0.169310 0.347402 +vt 0.195420 0.295389 +vt 0.207538 0.322304 +vt 0.168378 0.433745 +vt 0.118294 0.506560 +vt 0.202495 0.381547 +vt 0.228525 0.342495 +vt 0.234941 0.461062 +vt 0.215801 0.548975 +vt 0.247081 0.400958 +vt 0.255417 0.354292 +vt 0.307861 0.462461 +vt 0.323740 0.551944 +vt 0.295348 0.399423 +vt 0.285361 0.354455 +vt 0.375220 0.433589 +vt 0.426410 0.512010 +vt 0.340191 0.381959 +vt 0.313449 0.343049 +vt 0.427084 0.381076 +vt 0.508428 0.433617 +vt 0.373097 0.346286 +vt 0.334086 0.321151 +vt 0.455163 0.312779 +vt 0.542091 0.327329 +vt 0.392121 0.301698 +vt 0.345605 0.293668 +vt 0.451516 0.240164 +vt 0.542091 0.220170 +vt 0.392388 0.252805 +vt 0.345695 0.263443 +vt 0.425053 0.173305 +vt 0.495831 0.125079 +vt 0.372476 0.208436 +vt 0.334045 0.235260 +vt 0.372835 0.122674 +vt 0.424368 0.047947 +vt 0.337530 0.175120 +vt 0.311810 0.214099 +vt 0.304541 0.095984 +vt 0.322573 0.000101 +vt 0.292062 0.157691 +vt 0.283613 0.203892 +vt 0.230734 0.095653 +vt 0.209292 0.006915 +vt 0.244170 0.159255 +vt 0.253704 0.203883 +vt 0.163666 0.125603 +vt 0.113594 0.054409 +vt 0.199570 0.176878 +vt 0.226219 0.216305 +vt 0.114775 0.178767 +vt 0.035273 0.128658 +vt 0.166640 0.212635 +vt 0.205969 0.237982 +vt 0.087319 0.245782 +vt 0.000101 0.232502 +vt 0.150125 0.257229 +vt 0.194552 0.265466 +vt 0.286212 0.275766 +vt 0.286505 0.282321 +vt 0.283810 0.281816 +vt 0.283734 0.276327 +vt 0.279017 0.265280 +vt 0.283711 0.269791 +vt 0.281639 0.271211 +vt 0.277640 0.267418 +vt 0.266579 0.262961 +vt 0.273007 0.263022 +vt 0.272521 0.265505 +vt 0.267050 0.265496 +vt 0.256409 0.288660 +vt 0.253654 0.282755 +vt 0.256198 0.282176 +vt 0.258425 0.287240 +vt 0.256075 0.270212 +vt 0.260535 0.265413 +vt 0.262006 0.267589 +vt 0.258309 0.271652 +vt 0.266913 0.295729 +vt 0.260993 0.293116 +vt 0.262408 0.291037 +vt 0.267434 0.293170 +vt 0.253614 0.276227 +vt 0.256148 0.276688 +vt 0.279426 0.292926 +vt 0.273471 0.295552 +vt 0.272935 0.293026 +vt 0.277972 0.290788 +vt 0.283888 0.288305 +vt 0.281791 0.286878 +vt 0.216742 0.290668 +vt 0.225269 0.310030 +vt 0.240281 0.324688 +vt 0.259793 0.332794 +vt 0.281151 0.332900 +vt 0.300875 0.324522 +vt 0.315970 0.309294 +vt 0.323874 0.289466 +vt 0.324031 0.267839 +vt 0.315162 0.248142 +vt 0.300110 0.232690 +vt 0.279881 0.225136 +vt 0.258551 0.225929 +vt 0.239013 0.234383 +vt 0.223802 0.249425 +vt 0.216565 0.269459 +vt 0.260738 0.281262 +vt 0.262231 0.284613 +vt 0.264844 0.287195 +vt 0.268285 0.288610 +vt 0.272008 0.288514 +vt 0.275373 0.287005 +vt 0.277984 0.284376 +vt 0.279329 0.280905 +vt 0.279256 0.277201 +vt 0.277785 0.273845 +vt 0.275174 0.271261 +vt 0.271728 0.269965 +vt 0.268057 0.269971 +vt 0.264639 0.271401 +vt 0.262102 0.274115 +vt 0.260665 0.277542 +vt 0.270015 0.279236 +vt 0.297586 0.273355 +vt 0.297766 0.284407 +vt 0.285219 0.255745 +vt 0.293167 0.263274 +vt 0.264144 0.251590 +vt 0.275169 0.251317 +vt 0.247079 0.295039 +vt 0.242657 0.285120 +vt 0.246399 0.263951 +vt 0.254045 0.256020 +vt 0.264854 0.306854 +vt 0.254558 0.302882 +vt 0.242390 0.274150 +vt 0.286071 0.302647 +vt 0.275795 0.306598 +vt 0.293684 0.294701 +vt 0.315512 0.287747 +vt 0.315779 0.269492 +vt 0.308369 0.252844 +vt 0.295369 0.240070 +vt 0.278365 0.233438 +vt 0.260295 0.233775 +vt 0.225281 0.288844 +vt 0.231767 0.305545 +vt 0.243906 0.241337 +vt 0.231089 0.254123 +vt 0.244739 0.317727 +vt 0.261505 0.324167 +vt 0.224503 0.270863 +vt 0.279556 0.324657 +vt 0.296137 0.317398 +vt 0.309039 0.304700 +g metal_bulb_metal_bulb_Material.003 +usemtl Material.003 +s 1 +f 18/5 19/6 20/7 21/8 +f 19/6 22/9 23/10 20/7 +f 22/9 24/11 25/12 23/10 +f 21/8 20/7 26/13 27/14 +f 20/7 23/10 28/15 26/13 +f 23/10 25/12 29/16 28/15 +f 27/14 26/13 30/17 31/18 +f 26/13 28/15 32/19 30/17 +f 28/15 29/16 33/20 32/19 +f 31/18 30/17 34/21 35/22 +f 30/17 32/19 36/23 34/21 +f 32/19 33/20 37/24 36/23 +f 35/22 34/21 38/25 39/26 +f 34/21 36/23 40/27 38/25 +f 36/23 37/24 41/28 40/27 +f 39/26 38/25 42/29 43/30 +f 38/25 40/27 44/31 42/29 +f 40/27 41/28 45/32 44/31 +f 43/30 42/29 46/33 47/34 +f 42/29 44/31 48/35 46/33 +f 44/31 45/32 49/36 48/35 +f 47/34 46/33 50/37 51/38 +f 46/33 48/35 52/39 50/37 +f 48/35 49/36 53/40 52/39 +f 51/38 50/37 54/41 55/42 +f 50/37 52/39 56/43 54/41 +f 52/39 53/40 57/44 56/43 +f 55/42 54/41 58/45 59/46 +f 54/41 56/43 60/47 58/45 +f 56/43 57/44 61/48 60/47 +f 59/46 58/45 62/49 63/50 +f 58/45 60/47 64/51 62/49 +f 60/47 61/48 65/52 64/51 +f 63/50 62/49 66/53 67/54 +f 62/49 64/51 68/55 66/53 +f 64/51 65/52 69/56 68/55 +f 67/54 66/53 70/57 71/58 +f 66/53 68/55 72/59 70/57 +f 68/55 69/56 73/60 72/59 +f 71/58 70/57 74/61 75/62 +f 70/57 72/59 76/63 74/61 +f 72/59 73/60 77/64 76/63 +f 75/62 74/61 78/65 79/66 +f 74/61 76/63 80/67 78/65 +f 76/63 77/64 81/68 80/67 +f 82/69 83/70 84/71 85/72 +f 86/73 87/74 88/75 89/76 +f 90/77 91/78 92/79 93/80 +f 94/81 95/82 96/83 97/84 +f 98/85 99/86 100/87 101/88 +f 102/89 103/90 104/91 105/92 +f 95/82 106/93 107/94 96/83 +f 108/95 109/96 110/97 111/98 +f 83/70 112/99 113/100 84/71 +f 87/74 82/69 85/72 88/75 +f 91/78 86/73 89/76 92/79 +f 99/86 90/77 93/80 100/87 +f 103/90 94/81 97/84 104/91 +f 106/93 98/85 101/88 107/94 +f 19/6 18/5 79/66 78/65 +f 78/65 80/67 22/9 19/6 +f 80/67 81/68 24/11 22/9 +f 109/96 102/89 105/92 110/97 +f 112/99 108/95 111/98 113/100 +f 24/11 114/101 115/102 25/12 +f 25/12 115/102 116/103 29/16 +f 29/16 116/103 117/104 33/20 +f 33/20 117/104 118/105 37/24 +f 37/24 118/105 119/106 41/28 +f 41/28 119/106 120/107 45/32 +f 45/32 120/107 121/108 49/36 +f 49/36 121/108 122/109 53/40 +f 53/40 122/109 123/110 57/44 +f 57/44 123/110 124/111 61/48 +f 61/48 124/111 125/112 65/52 +f 65/52 125/112 126/113 69/56 +f 69/56 126/113 127/114 73/60 +f 73/60 127/114 128/115 77/64 +f 77/64 128/115 129/116 81/68 +f 81/68 129/116 114/101 24/11 +f 96/83 130/117 131/118 97/84 +f 97/84 131/118 132/119 104/91 +f 104/91 132/119 133/120 105/92 +f 105/92 133/120 134/121 110/97 +f 110/97 134/121 135/122 111/98 +f 111/98 135/122 136/123 113/100 +f 113/100 136/123 137/124 84/71 +f 84/71 137/124 138/125 85/72 +f 85/72 138/125 139/126 88/75 +f 88/75 139/126 140/127 89/76 +f 89/76 140/127 141/128 92/79 +f 92/79 141/128 142/129 93/80 +f 93/80 142/129 143/130 100/87 +f 100/87 143/130 144/131 101/88 +f 101/88 144/131 145/132 107/94 +f 130/117 146/133 131/118 +f 131/118 146/133 132/119 +f 132/119 146/133 133/120 +f 133/120 146/133 134/121 +f 134/121 146/133 135/122 +f 135/122 146/133 136/123 +f 136/123 146/133 137/124 +f 137/124 146/133 138/125 +f 138/125 146/133 139/126 +f 139/126 146/133 140/127 +f 140/127 146/133 141/128 +f 141/128 146/133 142/129 +f 142/129 146/133 143/130 +f 143/130 146/133 144/131 +f 144/131 146/133 145/132 +f 107/94 145/132 130/117 96/83 +f 145/132 146/133 130/117 +f 147/134 148/135 83/70 82/69 +f 149/136 150/137 87/74 86/73 +f 151/138 152/139 91/78 90/77 +f 153/140 154/141 95/82 94/81 +f 155/142 156/143 99/86 98/85 +f 157/144 158/145 103/90 102/89 +f 154/141 159/146 106/93 95/82 +f 160/147 161/148 109/96 108/95 +f 148/135 162/149 112/99 83/70 +f 150/137 147/134 82/69 87/74 +f 152/139 149/136 86/73 91/78 +f 156/143 151/138 90/77 99/86 +f 158/145 153/140 94/81 103/90 +f 159/146 155/142 98/85 106/93 +f 161/148 157/144 102/89 109/96 +f 162/149 160/147 108/95 112/99 +f 122/109 121/108 163/150 164/151 +f 124/111 123/110 165/152 166/153 +f 126/113 125/112 167/154 168/155 +f 115/102 114/101 169/156 170/157 +f 128/115 127/114 171/158 172/159 +f 117/104 116/103 173/160 174/161 +f 114/101 129/116 175/162 169/156 +f 119/106 118/105 176/163 177/164 +f 121/108 120/107 178/165 163/150 +f 123/110 122/109 164/151 165/152 +f 125/112 124/111 166/153 167/154 +f 127/114 126/113 168/155 171/158 +f 116/103 115/102 170/157 173/160 +f 129/116 128/115 172/159 175/162 +f 118/105 117/104 174/161 176/163 +f 120/107 119/106 177/164 178/165 +f 164/151 163/150 148/135 147/134 +f 166/153 165/152 150/137 149/136 +f 168/155 167/154 152/139 151/138 +f 170/157 169/156 154/141 153/140 +f 172/159 171/158 156/143 155/142 +f 174/161 173/160 158/145 157/144 +f 169/156 175/162 159/146 154/141 +f 177/164 176/163 161/148 160/147 +f 163/150 178/165 162/149 148/135 +f 165/152 164/151 147/134 150/137 +f 167/154 166/153 149/136 152/139 +f 171/158 168/155 151/138 156/143 +f 173/160 170/157 153/140 158/145 +f 175/162 172/159 155/142 159/146 +f 176/163 174/161 157/144 161/148 +f 178/165 177/164 160/147 162/149 +o tube +v 0.053313 -0.430401 0.009096 +v 0.054882 -0.411177 0.009097 +v 0.060531 -0.411592 -0.004576 +v 0.058960 -0.430831 -0.004578 +v 0.074168 -0.412595 -0.010240 +v 0.072594 -0.431869 -0.010242 +v 0.087804 -0.413600 -0.004577 +v 0.086228 -0.432909 -0.004578 +v 0.093453 -0.414018 0.009097 +v 0.091876 -0.433340 0.009096 +v 0.087804 -0.413603 0.022771 +v 0.086229 -0.432910 0.022769 +v 0.074168 -0.412599 0.028435 +v 0.072594 -0.431872 0.028433 +v 0.058960 -0.430832 0.022770 +v 0.060531 -0.411595 0.022771 +v 0.051743 -0.449086 0.009095 +v 0.057389 -0.449531 -0.004579 +v 0.071021 -0.450605 -0.010243 +v 0.084652 -0.451679 -0.004580 +v 0.090299 -0.452123 0.009094 +v 0.084653 -0.451679 0.022768 +v 0.071021 -0.450605 0.028432 +v 0.057390 -0.449531 0.022768 +v 0.056107 -0.392122 0.009100 +v 0.057294 -0.373087 0.009103 +v 0.062952 -0.373353 -0.004571 +v 0.061760 -0.392466 -0.004574 +v 0.076610 -0.374001 -0.010235 +v 0.075408 -0.393299 -0.010238 +v 0.090268 -0.374650 -0.004571 +v 0.089056 -0.394134 -0.004574 +v 0.095926 -0.374920 0.009102 +v 0.094710 -0.394481 0.009100 +v 0.090269 -0.374654 0.022776 +v 0.089056 -0.394138 0.022773 +v 0.076610 -0.374006 0.028440 +v 0.075408 -0.393304 0.028437 +v 0.061760 -0.392469 0.022774 +v 0.062952 -0.373357 0.022776 +v 0.054882 -0.411177 0.009097 +v 0.060531 -0.411592 -0.004576 +v 0.074168 -0.412595 -0.010240 +v 0.087804 -0.413600 -0.004577 +v 0.093453 -0.413479 0.009097 +v 0.087804 -0.413064 0.022771 +v 0.074168 -0.412599 0.028435 +v 0.060531 -0.411595 0.022771 +v 0.058004 -0.354129 0.009106 +v 0.058403 -0.335224 0.009109 +v 0.064067 -0.335261 -0.004565 +v 0.063665 -0.354291 -0.004568 +v 0.077740 -0.335356 -0.010229 +v 0.077333 -0.354684 -0.010232 +v 0.091414 -0.335453 -0.004565 +v 0.091001 -0.355080 -0.004568 +v 0.097077 -0.335495 0.009109 +v 0.096663 -0.355245 0.009105 +v 0.091414 -0.335458 0.022782 +v 0.091002 -0.355084 0.022779 +v 0.077740 -0.335362 0.028446 +v 0.077333 -0.354690 0.028443 +v 0.063666 -0.354295 0.022779 +v 0.064067 -0.335266 0.022782 +v 0.057294 -0.373087 0.009103 +v 0.062952 -0.373353 -0.004571 +v 0.076610 -0.374001 -0.010235 +v 0.090268 -0.374650 -0.004571 +v 0.095926 -0.374920 0.009102 +v 0.090269 -0.374654 0.022776 +v 0.076610 -0.374006 0.028440 +v 0.062952 -0.373357 0.022776 +v 0.058466 -0.316365 0.009112 +v 0.057764 -0.297613 0.009115 +v 0.063422 -0.297349 -0.004559 +v 0.064129 -0.316266 -0.004562 +v 0.077081 -0.296717 -0.010222 +v 0.077800 -0.316032 -0.010226 +v 0.090740 -0.296088 -0.004559 +v 0.091472 -0.315800 -0.004562 +v 0.096398 -0.295828 0.009115 +v 0.097135 -0.315706 0.009112 +v 0.090740 -0.296092 0.022789 +v 0.091472 -0.315804 0.022786 +v 0.077081 -0.296724 0.028453 +v 0.077800 -0.316039 0.028449 +v 0.064129 -0.316271 0.022785 +v 0.063422 -0.297354 0.022789 +v 0.058403 -0.335224 0.009109 +v 0.064067 -0.335261 -0.004565 +v 0.077740 -0.335356 -0.010229 +v 0.091414 -0.335453 -0.004565 +v 0.097077 -0.335495 0.009109 +v 0.091414 -0.335458 0.022782 +v 0.077740 -0.335362 0.028446 +v 0.064067 -0.335266 0.022782 +v 0.057059 -0.278863 0.009118 +v 0.054957 -0.260374 0.009121 +v 0.060585 -0.259738 -0.004553 +v 0.062707 -0.278435 -0.004556 +v 0.074173 -0.258205 -0.010216 +v 0.076341 -0.277404 -0.010219 +v 0.087761 -0.256674 -0.004552 +v 0.089976 -0.276376 -0.004555 +v 0.093389 -0.256042 0.009121 +v 0.095624 -0.275952 0.009118 +v 0.087761 -0.256678 0.022795 +v 0.089976 -0.276380 0.022792 +v 0.074173 -0.258211 0.028459 +v 0.076341 -0.277411 0.028456 +v 0.062707 -0.278439 0.022792 +v 0.060585 -0.259742 0.022795 +v 0.057764 -0.297613 0.009115 +v 0.063422 -0.297349 -0.004559 +v 0.077081 -0.296717 -0.010222 +v 0.090740 -0.296088 -0.004559 +v 0.096398 -0.295828 0.009115 +v 0.090740 -0.296092 0.022789 +v 0.077081 -0.296724 0.028453 +v 0.063422 -0.297354 0.022789 +v 0.052882 -0.241882 0.009124 +v 0.049564 -0.223722 0.009126 +v 0.055124 -0.222637 -0.004548 +v 0.058483 -0.241038 -0.004550 +v 0.068545 -0.220021 -0.010211 +v 0.072004 -0.239006 -0.010213 +v 0.081966 -0.217407 -0.004547 +v 0.085526 -0.236974 -0.004549 +v 0.087526 -0.216325 0.009127 +v 0.091127 -0.236135 0.009124 +v 0.081966 -0.217410 0.022801 +v 0.085526 -0.236978 0.022798 +v 0.068545 -0.220026 0.028464 +v 0.072004 -0.239011 0.028462 +v 0.058483 -0.241042 0.022797 +v 0.055124 -0.222641 0.022800 +v 0.054957 -0.260374 0.009121 +v 0.060585 -0.259738 -0.004553 +v 0.074173 -0.258205 -0.010216 +v 0.087761 -0.256674 -0.004552 +v 0.093389 -0.256042 0.009121 +v 0.087761 -0.256678 0.022795 +v 0.074173 -0.258211 0.028459 +v 0.060585 -0.259742 0.022795 +v 0.045791 -0.205686 0.009128 +v 0.041164 -0.187972 0.009130 +v 0.046594 -0.186362 -0.004544 +v 0.051295 -0.204348 -0.004545 +v 0.059704 -0.182475 -0.010207 +v 0.064583 -0.201121 -0.010209 +v 0.072814 -0.178590 -0.004543 +v 0.077870 -0.197895 -0.004545 +v 0.078244 -0.176981 0.009131 +v 0.083374 -0.196560 0.009129 +v 0.072814 -0.178592 0.022805 +v 0.077870 -0.197898 0.022803 +v 0.059704 -0.182479 0.028468 +v 0.064582 -0.201125 0.028466 +v 0.051295 -0.204351 0.022802 +v 0.046594 -0.186364 0.022804 +v 0.049564 -0.223722 0.009126 +v 0.055124 -0.222637 -0.004548 +v 0.068545 -0.220021 -0.010211 +v 0.081966 -0.217407 -0.004547 +v 0.087526 -0.216325 0.009127 +v 0.081966 -0.217410 0.022801 +v 0.068545 -0.220026 0.028464 +v 0.055124 -0.222641 0.022800 +v 0.035381 -0.170691 0.009131 +v 0.029340 -0.153548 0.009132 +v 0.034556 -0.151339 -0.004541 +v 0.040714 -0.168781 -0.004542 +v 0.047148 -0.146008 -0.010205 +v 0.053588 -0.164173 -0.010206 +v 0.059740 -0.140676 -0.004540 +v 0.066462 -0.159566 -0.004541 +v 0.064955 -0.138469 0.009134 +v 0.071794 -0.157658 0.009133 +v 0.059739 -0.140678 0.022807 +v 0.066461 -0.159567 0.022806 +v 0.047147 -0.146009 0.028470 +v 0.053587 -0.164176 0.028469 +v 0.040713 -0.168783 0.022805 +v 0.034556 -0.151340 0.022806 +v 0.041164 -0.187972 0.009130 +v 0.046594 -0.186362 -0.004544 +v 0.059704 -0.182475 -0.010207 +v 0.072814 -0.178590 -0.004543 +v 0.078244 -0.176981 0.009131 +v 0.072814 -0.178592 0.022805 +v 0.059704 -0.182479 0.028468 +v 0.046594 -0.186364 0.022804 +v 0.021284 -0.137425 0.009132 +v 0.013301 -0.121266 0.009132 +v 0.018187 -0.118400 -0.004542 +v 0.026346 -0.134882 -0.004542 +v 0.029982 -0.111482 -0.010205 +v 0.038565 -0.128745 -0.010205 +v 0.041776 -0.104563 -0.004540 +v 0.050784 -0.122607 -0.004540 +v 0.046661 -0.101698 0.009133 +v 0.055844 -0.120065 0.009134 +v 0.041775 -0.104563 0.022807 +v 0.050782 -0.122607 0.022807 +v 0.029980 -0.111481 0.028470 +v 0.038563 -0.128745 0.028470 +v 0.026345 -0.134883 0.022806 +v 0.018186 -0.118400 0.022806 +v 0.029340 -0.153548 0.009132 +v 0.034556 -0.151339 -0.004541 +v 0.047148 -0.146008 -0.010205 +v 0.059740 -0.140676 -0.004540 +v 0.064955 -0.138469 0.009134 +v 0.059739 -0.140678 0.022807 +v 0.047147 -0.146009 0.028470 +v 0.034556 -0.151340 0.022806 +v 0.003263 -0.106486 0.009130 +v -0.007108 -0.091928 0.009129 +v -0.002677 -0.088399 -0.004545 +v 0.007935 -0.103284 -0.004543 +v 0.008016 -0.079877 -0.010208 +v 0.019212 -0.095550 -0.010206 +v 0.018709 -0.071355 -0.004544 +v 0.030488 -0.087816 -0.004542 +v 0.023137 -0.067824 0.009130 +v 0.035158 -0.084612 0.009132 +v 0.018706 -0.071353 0.022804 +v 0.030486 -0.087815 0.022805 +v 0.008013 -0.079874 0.028467 +v 0.019209 -0.095548 0.028469 +v 0.007933 -0.103282 0.022804 +v -0.002680 -0.088397 0.022803 +v 0.013301 -0.121266 0.009132 +v 0.018187 -0.118400 -0.004542 +v 0.029982 -0.111482 -0.010205 +v 0.041776 -0.104563 -0.004540 +v 0.046661 -0.101698 0.009133 +v 0.041775 -0.104563 0.022807 +v 0.029980 -0.111481 0.028470 +v 0.018186 -0.118400 0.022806 +v -0.018728 -0.078465 0.009126 +v -0.031389 -0.065905 0.009123 +v -0.027519 -0.061770 -0.004551 +v -0.014565 -0.074624 -0.004547 +v -0.018180 -0.051782 -0.010214 +v -0.004518 -0.065348 -0.010211 +v -0.008842 -0.041793 -0.004550 +v 0.005528 -0.056072 -0.004547 +v -0.004976 -0.037654 0.009123 +v 0.009687 -0.052228 0.009127 +v -0.008846 -0.041790 0.022797 +v 0.005524 -0.056069 0.022801 +v -0.018185 -0.051777 0.028461 +v -0.004523 -0.065344 0.028464 +v -0.014568 -0.074621 0.022800 +v -0.027523 -0.061766 0.022797 +v -0.007108 -0.091928 0.009129 +v -0.002677 -0.088399 -0.004545 +v 0.008016 -0.079877 -0.010208 +v 0.018709 -0.071355 -0.004544 +v 0.023137 -0.067824 0.009130 +v 0.018706 -0.071353 0.022804 +v 0.008013 -0.079874 0.028467 +v -0.002680 -0.088397 0.022803 +v -0.044496 -0.053850 0.009119 +v -0.059103 -0.043471 0.009115 +v -0.055860 -0.038828 -0.004559 +v -0.040935 -0.049445 -0.004554 +v -0.048034 -0.027616 -0.010223 +v -0.032345 -0.038807 -0.010218 +v -0.040211 -0.016401 -0.004560 +v -0.023757 -0.028167 -0.004554 +v -0.036973 -0.011753 0.009114 +v -0.020202 -0.023758 0.009119 +v -0.040217 -0.016396 0.022787 +v -0.023762 -0.028162 0.022793 +v -0.048042 -0.027609 0.028452 +v -0.032352 -0.038801 0.028457 +v -0.040940 -0.049441 0.022793 +v -0.055865 -0.038824 0.022788 +v -0.031389 -0.065905 0.009123 +v -0.027519 -0.061770 -0.004551 +v -0.018180 -0.051782 -0.010214 +v -0.008842 -0.041793 -0.004550 +v -0.004976 -0.037654 0.009123 +v -0.008846 -0.041790 0.022797 +v -0.018185 -0.051777 0.028461 +v -0.027523 -0.061766 0.022797 +v -0.073657 -0.033014 0.009110 +v -0.089672 -0.024601 0.009104 +v -0.087076 -0.019567 -0.004570 +v -0.070745 -0.028157 -0.004564 +v -0.080817 -0.007411 -0.010235 +v -0.063723 -0.016424 -0.010229 +v -0.074562 0.004748 -0.004572 +v -0.056703 -0.004690 -0.004565 +v -0.071973 0.009787 0.009101 +v -0.053798 0.000173 0.009108 +v -0.074569 0.004754 0.022775 +v -0.056710 -0.004684 0.022782 +v -0.080828 -0.007403 0.028440 +v -0.063732 -0.016417 0.028446 +v -0.070752 -0.028151 0.022783 +v -0.087084 -0.019562 0.022777 +v -0.059103 -0.043471 0.009115 +v -0.055860 -0.038828 -0.004559 +v -0.048034 -0.027616 -0.010223 +v -0.040211 -0.016401 -0.004560 +v -0.036973 -0.011753 0.009114 +v -0.040217 -0.016396 0.022787 +v -0.048042 -0.027609 0.028452 +v -0.055865 -0.038824 0.022788 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +g tube_tube_Material.001 usemtl Material.001 s 1 -f 3/1 2/2 6/3 7/4 -f 2/2 1/5 5/6 6/3 -f 7/4 6/3 9/7 10/8 -f 6/3 5/6 8/9 9/7 -f 10/8 9/7 12/10 13/11 -f 9/7 8/9 11/12 12/10 -f 13/11 12/10 15/13 16/14 -f 12/10 11/12 14/15 15/13 -f 16/14 15/13 18/16 19/17 -f 15/13 14/15 17/18 18/16 -f 19/17 18/16 21/19 22/20 -f 18/16 17/18 20/21 21/19 -f 22/20 21/19 25/22 26/23 -f 21/19 20/21 24/24 25/22 -f 4/25 3/1 7/4 -f 1/5 23/26 5/6 -f 4/25 7/4 10/8 -f 5/6 23/26 8/9 -f 4/25 10/8 13/11 -f 8/9 23/26 11/12 -f 4/25 13/11 16/14 -f 11/12 23/26 14/15 -f 4/25 16/14 19/17 -f 14/15 23/26 17/18 -f 4/25 19/17 22/20 -f 17/18 23/26 20/21 -f 4/25 22/20 26/23 -f 20/21 23/26 24/24 -f 4/25 26/23 3/27 -f 26/23 25/22 2/28 3/27 -f 25/22 24/24 1/5 2/28 -f 24/24 23/26 1/5 -f 43/29 28/30 30/31 44/32 -f 44/32 30/31 32/33 45/34 -f 45/34 32/33 34/35 46/36 -f 46/36 34/35 36/37 47/38 -f 47/39 36/37 38/40 48/41 -f 48/41 38/40 40/42 49/43 -f 30/31 28/30 42/44 40/42 38/40 36/37 34/35 32/33 -f 50/45 42/44 28/30 43/29 -f 49/43 40/42 42/44 50/45 -f 27/46 29/47 31/48 33/49 35/50 37/51 39/52 41/53 -f 27/46 43/29 44/32 29/47 -f 29/47 44/32 45/34 31/48 -f 31/48 45/34 46/36 33/49 -f 33/49 46/36 47/38 35/50 -f 35/50 47/39 48/41 37/51 -f 37/51 48/41 49/43 39/52 -f 41/53 50/45 43/29 27/46 -f 39/52 49/43 50/45 41/53 -f 67/54 52/55 54/56 68/57 -f 68/57 54/56 56/58 69/59 -f 69/59 56/58 58/60 70/61 -f 70/61 58/60 60/62 71/63 -f 71/64 60/62 62/65 72/66 -f 72/66 62/65 64/67 73/68 -f 54/56 52/55 66/69 64/67 62/65 60/62 58/60 56/58 -f 74/70 66/69 52/55 67/54 -f 73/68 64/67 66/69 74/70 -f 51/71 53/72 55/73 57/74 59/75 61/76 63/77 65/78 -f 51/71 67/54 68/57 53/72 -f 53/72 68/57 69/59 55/73 -f 55/73 69/59 70/61 57/74 -f 57/74 70/61 71/63 59/75 -f 59/75 71/64 72/66 61/76 -f 61/76 72/66 73/68 63/77 -f 65/78 74/70 67/54 51/71 -f 63/77 73/68 74/70 65/78 -f 91/79 76/80 78/81 92/82 -f 92/82 78/81 80/83 93/84 -f 93/84 80/83 82/85 94/86 -f 94/86 82/85 84/87 95/88 -f 95/89 84/87 86/90 96/91 -f 96/91 86/90 88/92 97/93 -f 78/81 76/80 90/94 88/92 86/90 84/87 82/85 80/83 -f 98/95 90/94 76/80 91/79 -f 97/93 88/92 90/94 98/95 -f 75/96 77/97 79/98 81/99 83/100 85/101 87/102 89/103 -f 75/96 91/79 92/82 77/97 -f 77/97 92/82 93/84 79/98 -f 79/98 93/84 94/86 81/99 -f 81/99 94/86 95/88 83/100 -f 83/100 95/89 96/91 85/101 -f 85/101 96/91 97/93 87/102 -f 89/103 98/95 91/79 75/96 -f 87/102 97/93 98/95 89/103 -f 115/104 100/105 102/106 116/107 -f 116/107 102/106 104/108 117/109 -f 117/109 104/108 106/110 118/111 -f 118/111 106/110 108/112 119/113 -f 119/114 108/112 110/115 120/116 -f 120/116 110/115 112/117 121/118 -f 102/106 100/105 114/119 112/117 110/115 108/112 106/110 104/108 -f 122/120 114/119 100/105 115/104 -f 121/118 112/117 114/119 122/120 -f 99/121 101/122 103/123 105/124 107/125 109/126 111/127 113/128 -f 99/121 115/104 116/107 101/122 -f 101/122 116/107 117/109 103/123 -f 103/123 117/109 118/111 105/124 -f 105/124 118/111 119/113 107/125 -f 107/125 119/114 120/116 109/126 -f 109/126 120/116 121/118 111/127 -f 113/128 122/120 115/104 99/121 -f 111/127 121/118 122/120 113/128 -f 139/129 124/130 126/131 140/132 -f 140/132 126/131 128/133 141/134 -f 141/134 128/133 130/135 142/136 -f 142/136 130/135 132/137 143/138 -f 143/139 132/137 134/140 144/141 -f 144/141 134/140 136/142 145/143 -f 126/131 124/130 138/144 136/142 134/140 132/137 130/135 128/133 -f 146/145 138/144 124/130 139/129 -f 145/143 136/142 138/144 146/145 -f 123/146 125/147 127/148 129/149 131/150 133/151 135/152 137/153 -f 123/146 139/129 140/132 125/147 -f 125/147 140/132 141/134 127/148 -f 127/148 141/134 142/136 129/149 -f 129/149 142/136 143/138 131/150 -f 131/150 143/139 144/141 133/151 -f 133/151 144/141 145/143 135/152 -f 137/153 146/145 139/129 123/146 -f 135/152 145/143 146/145 137/153 -f 163/154 148/155 150/156 164/157 -f 164/157 150/156 152/158 165/159 -f 165/159 152/158 154/160 166/161 -f 166/161 154/160 156/162 167/163 -f 167/164 156/162 158/165 168/166 -f 168/166 158/165 160/167 169/168 -f 150/156 148/155 162/169 160/167 158/165 156/162 154/160 152/158 -f 170/170 162/169 148/155 163/154 -f 169/168 160/167 162/169 170/170 -f 147/171 149/172 151/173 153/174 155/175 157/176 159/177 161/178 -f 147/171 163/154 164/157 149/172 -f 149/172 164/157 165/159 151/173 -f 151/173 165/159 166/161 153/174 -f 153/174 166/161 167/163 155/175 -f 155/175 167/164 168/166 157/176 -f 157/176 168/166 169/168 159/177 -f 161/178 170/170 163/154 147/171 -f 159/177 169/168 170/170 161/178 -f 187/179 172/180 174/181 188/182 -f 188/182 174/181 176/183 189/184 -f 189/184 176/183 178/185 190/186 -f 190/186 178/185 180/187 191/188 -f 191/189 180/187 182/190 192/191 -f 192/191 182/190 184/192 193/193 -f 174/181 172/180 186/194 184/192 182/190 180/187 178/185 176/183 -f 194/195 186/194 172/180 187/179 -f 193/193 184/192 186/194 194/195 -f 171/196 173/197 175/198 177/199 179/200 181/201 183/202 185/203 -f 171/196 187/179 188/182 173/197 -f 173/197 188/182 189/184 175/198 -f 175/198 189/184 190/186 177/199 -f 177/199 190/186 191/188 179/200 -f 179/200 191/189 192/191 181/201 -f 181/201 192/191 193/193 183/202 -f 185/203 194/195 187/179 171/196 -f 183/202 193/193 194/195 185/203 -f 211/204 196/205 198/206 212/207 -f 212/207 198/206 200/208 213/209 -f 213/209 200/208 202/210 214/211 -f 214/211 202/210 204/212 215/213 -f 215/214 204/212 206/215 216/216 -f 216/216 206/215 208/217 217/218 -f 198/206 196/205 210/219 208/217 206/215 204/212 202/210 200/208 -f 218/220 210/219 196/205 211/204 -f 217/218 208/217 210/219 218/220 -f 195/221 197/222 199/223 201/224 203/225 205/226 207/227 209/228 -f 195/221 211/204 212/207 197/222 -f 197/222 212/207 213/209 199/223 -f 199/223 213/209 214/211 201/224 -f 201/224 214/211 215/213 203/225 -f 203/225 215/214 216/216 205/226 -f 205/226 216/216 217/218 207/227 -f 209/228 218/220 211/204 195/221 -f 207/227 217/218 218/220 209/228 -f 235/229 220/230 222/231 236/232 -f 236/232 222/231 224/233 237/234 -f 237/234 224/233 226/235 238/236 -f 238/236 226/235 228/237 239/238 -f 239/239 228/237 230/240 240/241 -f 240/241 230/240 232/242 241/243 -f 222/231 220/230 234/244 232/242 230/240 228/237 226/235 224/233 -f 242/245 234/244 220/230 235/229 -f 241/243 232/242 234/244 242/245 -f 219/246 221/247 223/248 225/249 227/250 229/251 231/252 233/253 -f 219/246 235/229 236/232 221/247 -f 221/247 236/232 237/234 223/248 -f 223/248 237/234 238/236 225/249 -f 225/249 238/236 239/238 227/250 -f 227/250 239/239 240/241 229/251 -f 229/251 240/241 241/243 231/252 -f 233/253 242/245 235/229 219/246 -f 231/252 241/243 242/245 233/253 -f 259/254 244/255 246/256 260/257 -f 260/257 246/256 248/258 261/259 -f 261/259 248/258 250/260 262/261 -f 262/261 250/260 252/262 263/263 -f 263/264 252/262 254/265 264/266 -f 264/266 254/265 256/267 265/268 -f 246/256 244/255 258/269 256/267 254/265 252/262 250/260 248/258 -f 266/270 258/269 244/255 259/254 -f 265/268 256/267 258/269 266/270 -f 243/271 245/272 247/273 249/274 251/275 253/276 255/277 257/278 -f 243/271 259/254 260/257 245/272 -f 245/272 260/257 261/259 247/273 -f 247/273 261/259 262/261 249/274 -f 249/274 262/261 263/263 251/275 -f 251/275 263/264 264/266 253/276 -f 253/276 264/266 265/268 255/277 -f 257/278 266/270 259/254 243/271 -f 255/277 265/268 266/270 257/278 -f 283/279 268/280 270/281 284/282 -f 284/282 270/281 272/283 285/284 -f 285/284 272/283 274/285 286/286 -f 286/286 274/285 276/287 287/288 -f 287/289 276/287 278/290 288/291 -f 288/291 278/290 280/292 289/293 -f 270/281 268/280 282/294 280/292 278/290 276/287 274/285 272/283 -f 290/295 282/294 268/280 283/279 -f 289/293 280/292 282/294 290/295 -f 267/296 269/297 271/298 273/299 275/300 277/301 279/302 281/303 -f 267/296 283/279 284/282 269/297 -f 269/297 284/282 285/284 271/298 -f 271/298 285/284 286/286 273/299 -f 273/299 286/286 287/288 275/300 -f 275/300 287/289 288/291 277/301 -f 277/301 288/291 289/293 279/302 -f 281/303 290/295 283/279 267/296 -f 279/302 289/293 290/295 281/303 -f 307/304 292/305 294/306 308/307 -f 308/307 294/306 296/308 309/309 -f 309/309 296/308 298/310 310/311 -f 310/311 298/310 300/312 311/313 -f 311/314 300/312 302/315 312/316 -f 312/316 302/315 304/317 313/318 -f 294/306 292/305 306/319 304/317 302/315 300/312 298/310 296/308 -f 314/320 306/319 292/305 307/304 -f 313/318 304/317 306/319 314/320 -f 291/321 293/322 295/323 297/324 299/325 301/326 303/327 305/328 -f 291/321 307/304 308/307 293/322 -f 293/322 308/307 309/309 295/323 -f 295/323 309/309 310/311 297/324 -f 297/324 310/311 311/313 299/325 -f 299/325 311/314 312/316 301/326 -f 301/326 312/316 313/318 303/327 -f 305/328 314/320 307/304 291/321 -f 303/327 313/318 314/320 305/328 -f 331/329 316/330 318/331 332/332 -f 332/332 318/331 320/333 333/334 -f 333/334 320/333 322/335 334/336 -f 334/336 322/335 324/337 335/338 -f 335/338 324/337 326/339 336/340 -f 336/340 326/339 328/341 337/342 -f 318/331 316/330 330/343 328/341 326/339 324/337 322/335 320/333 -f 338/344 330/343 316/330 331/329 -f 337/342 328/341 330/343 338/344 -f 315/345 317/346 319/347 321/348 323/349 325/350 327/351 329/352 -f 315/345 331/329 332/332 317/346 -f 317/346 332/332 333/334 319/347 -f 319/347 333/334 334/336 321/348 -f 321/348 334/336 335/338 323/349 -f 323/349 335/338 336/340 325/350 -f 325/350 336/340 337/342 327/351 -f 329/352 338/344 331/329 315/345 -f 327/351 337/342 338/344 329/352 +f 179/166 180/167 181/168 182/169 +f 182/166 181/167 183/168 184/169 +f 184/166 183/167 185/168 186/169 +f 186/166 185/167 187/168 188/169 +f 188/166 187/167 189/168 190/169 +f 190/166 189/167 191/168 192/169 +f 180/168 179/169 193/166 194/167 +f 192/166 191/167 194/168 193/169 +f 195/166 179/167 182/168 196/169 +f 196/166 182/167 184/168 197/169 +f 197/166 184/167 186/168 198/169 +f 198/166 186/167 188/168 199/169 +f 199/166 188/167 190/168 200/169 +f 200/166 190/167 192/168 201/169 +f 179/168 195/169 202/166 193/167 +f 201/166 192/167 193/168 202/169 +f 203/166 204/167 205/168 206/169 +f 206/166 205/167 207/168 208/169 +f 208/166 207/167 209/168 210/169 +f 210/166 209/167 211/168 212/169 +f 212/166 211/167 213/168 214/169 +f 214/166 213/167 215/168 216/169 +f 217/166 218/167 204/168 203/169 +f 216/166 215/167 218/168 217/169 +f 219/166 203/167 206/168 220/169 +f 220/166 206/167 208/168 221/169 +f 221/166 208/167 210/168 222/169 +f 222/166 210/167 212/168 223/169 +f 223/166 212/167 214/168 224/169 +f 224/166 214/167 216/168 225/169 +f 226/166 217/167 203/168 219/169 +f 225/166 216/167 217/168 226/169 +f 227/166 228/167 229/168 230/169 +f 230/166 229/167 231/168 232/169 +f 232/166 231/167 233/168 234/169 +f 234/166 233/167 235/168 236/169 +f 236/166 235/167 237/168 238/169 +f 238/166 237/167 239/168 240/169 +f 241/166 242/167 228/168 227/169 +f 240/166 239/167 242/168 241/169 +f 243/166 227/167 230/168 244/169 +f 244/166 230/167 232/168 245/169 +f 245/166 232/167 234/168 246/169 +f 246/166 234/167 236/168 247/169 +f 247/166 236/167 238/168 248/169 +f 248/166 238/167 240/168 249/169 +f 250/166 241/167 227/168 243/169 +f 249/166 240/167 241/168 250/169 +f 251/166 252/167 253/168 254/169 +f 254/166 253/167 255/168 256/169 +f 256/166 255/167 257/168 258/169 +f 258/166 257/167 259/168 260/169 +f 260/166 259/167 261/168 262/169 +f 262/166 261/167 263/168 264/169 +f 265/166 266/167 252/168 251/169 +f 264/166 263/167 266/168 265/169 +f 267/166 251/167 254/168 268/169 +f 268/166 254/167 256/168 269/169 +f 269/166 256/167 258/168 270/169 +f 270/166 258/167 260/168 271/169 +f 271/166 260/167 262/168 272/169 +f 272/166 262/167 264/168 273/169 +f 274/166 265/167 251/168 267/169 +f 273/166 264/167 265/168 274/169 +f 275/166 276/167 277/168 278/169 +f 278/166 277/167 279/168 280/169 +f 280/166 279/167 281/168 282/169 +f 282/166 281/167 283/168 284/169 +f 284/166 283/167 285/168 286/169 +f 286/166 285/167 287/168 288/169 +f 289/166 290/167 276/168 275/169 +f 288/166 287/167 290/168 289/169 +f 291/166 275/167 278/168 292/169 +f 292/166 278/167 280/168 293/169 +f 293/166 280/167 282/168 294/169 +f 294/166 282/167 284/168 295/169 +f 295/166 284/167 286/168 296/169 +f 296/166 286/167 288/168 297/169 +f 298/166 289/167 275/168 291/169 +f 297/166 288/167 289/168 298/169 +f 299/166 300/167 301/168 302/169 +f 302/166 301/167 303/168 304/169 +f 304/166 303/167 305/168 306/169 +f 306/166 305/167 307/168 308/169 +f 308/166 307/167 309/168 310/169 +f 310/166 309/167 311/168 312/169 +f 313/166 314/167 300/168 299/169 +f 312/166 311/167 314/168 313/169 +f 315/166 299/167 302/168 316/169 +f 316/166 302/167 304/168 317/169 +f 317/166 304/167 306/168 318/169 +f 318/166 306/167 308/168 319/169 +f 319/166 308/167 310/168 320/169 +f 320/166 310/167 312/168 321/169 +f 322/166 313/167 299/168 315/169 +f 321/166 312/167 313/168 322/169 +f 323/166 324/167 325/168 326/169 +f 326/166 325/167 327/168 328/169 +f 328/166 327/167 329/168 330/169 +f 330/166 329/167 331/168 332/169 +f 332/166 331/167 333/168 334/169 +f 334/166 333/167 335/168 336/169 +f 337/166 338/167 324/168 323/169 +f 336/166 335/167 338/168 337/169 +f 339/166 323/167 326/168 340/169 +f 340/166 326/167 328/168 341/169 +f 341/166 328/167 330/168 342/169 +f 342/166 330/167 332/168 343/169 +f 343/166 332/167 334/168 344/169 +f 344/166 334/167 336/168 345/169 +f 346/166 337/167 323/168 339/169 +f 345/166 336/167 337/168 346/169 +f 347/166 348/167 349/168 350/169 +f 350/166 349/167 351/168 352/169 +f 352/166 351/167 353/168 354/169 +f 354/166 353/167 355/168 356/169 +f 356/166 355/167 357/168 358/169 +f 358/166 357/167 359/168 360/169 +f 361/166 362/167 348/168 347/169 +f 360/166 359/167 362/168 361/169 +f 363/166 347/167 350/168 364/169 +f 364/166 350/167 352/168 365/169 +f 365/166 352/167 354/168 366/169 +f 366/166 354/167 356/168 367/169 +f 367/166 356/167 358/168 368/169 +f 368/166 358/167 360/168 369/169 +f 370/166 361/167 347/168 363/169 +f 369/166 360/167 361/168 370/169 +f 371/166 372/167 373/168 374/169 +f 374/166 373/167 375/168 376/169 +f 376/166 375/167 377/168 378/169 +f 378/166 377/167 379/168 380/169 +f 380/166 379/167 381/168 382/169 +f 382/166 381/167 383/168 384/169 +f 385/166 386/167 372/168 371/169 +f 384/166 383/167 386/168 385/169 +f 387/166 371/167 374/168 388/169 +f 388/166 374/167 376/168 389/169 +f 389/166 376/167 378/168 390/169 +f 390/166 378/167 380/168 391/169 +f 391/166 380/167 382/168 392/169 +f 392/166 382/167 384/168 393/169 +f 394/166 385/167 371/168 387/169 +f 393/166 384/167 385/168 394/169 +f 395/166 396/167 397/168 398/169 +f 398/166 397/167 399/168 400/169 +f 400/166 399/167 401/168 402/169 +f 402/166 401/167 403/168 404/169 +f 404/166 403/167 405/168 406/169 +f 406/166 405/167 407/168 408/169 +f 409/166 410/167 396/168 395/169 +f 408/166 407/167 410/168 409/169 +f 411/166 395/167 398/168 412/169 +f 412/166 398/167 400/168 413/169 +f 413/166 400/167 402/168 414/169 +f 414/166 402/167 404/168 415/169 +f 415/166 404/167 406/168 416/169 +f 416/166 406/167 408/168 417/169 +f 418/166 409/167 395/168 411/169 +f 417/166 408/167 409/168 418/169 +f 419/166 420/167 421/168 422/169 +f 422/166 421/167 423/168 424/169 +f 424/166 423/167 425/168 426/169 +f 426/166 425/167 427/168 428/169 +f 428/166 427/167 429/168 430/169 +f 430/166 429/167 431/168 432/169 +f 433/166 434/167 420/168 419/169 +f 432/166 431/167 434/168 433/169 +f 435/166 419/167 422/168 436/169 +f 436/166 422/167 424/168 437/169 +f 437/166 424/167 426/168 438/169 +f 438/166 426/167 428/168 439/169 +f 439/166 428/167 430/168 440/169 +f 440/166 430/167 432/168 441/169 +f 442/166 433/167 419/168 435/169 +f 441/166 432/167 433/168 442/169 +f 443/166 444/167 445/168 446/169 +f 446/166 445/167 447/168 448/169 +f 448/166 447/167 449/168 450/169 +f 450/166 449/167 451/168 452/169 +f 452/166 451/167 453/168 454/169 +f 454/166 453/167 455/168 456/169 +f 457/166 458/167 444/168 443/169 +f 456/166 455/167 458/168 457/169 +f 459/166 443/167 446/168 460/169 +f 460/166 446/167 448/168 461/169 +f 461/166 448/167 450/168 462/169 +f 462/166 450/167 452/168 463/169 +f 463/166 452/167 454/168 464/169 +f 464/166 454/167 456/168 465/169 +f 466/166 457/167 443/168 459/169 +f 465/166 456/167 457/168 466/169 +f 467/166 468/167 469/168 470/169 +f 470/166 469/167 471/168 472/169 +f 472/166 471/167 473/168 474/169 +f 474/166 473/167 475/168 476/169 +f 476/166 475/167 477/168 478/169 +f 478/166 477/167 479/168 480/169 +f 481/166 482/167 468/168 467/169 +f 480/166 479/167 482/168 481/169 +f 483/166 467/167 470/168 484/169 +f 484/166 470/167 472/168 485/169 +f 485/166 472/167 474/168 486/169 +f 486/166 474/167 476/168 487/169 +f 487/166 476/167 478/168 488/169 +f 488/166 478/167 480/168 489/169 +f 490/166 481/167 467/168 483/169 +f 489/166 480/167 481/168 490/169 +o metal_base +v 0.070721 -0.502168 -0.126921 +v 0.070721 -0.448710 -0.126921 +v 0.097256 -0.448710 -0.124308 +v 0.097256 -0.502168 -0.124308 +v 0.122772 -0.448710 -0.116568 +v 0.122772 -0.502168 -0.116568 +v 0.146287 -0.448710 -0.103999 +v 0.146287 -0.502168 -0.103999 +v 0.166898 -0.448710 -0.087083 +v 0.166898 -0.502168 -0.087083 +v 0.183814 -0.448710 -0.066472 +v 0.183814 -0.502168 -0.066472 +v 0.196383 -0.448710 -0.042957 +v 0.196383 -0.502168 -0.042957 +v 0.204123 -0.448710 -0.017441 +v 0.204123 -0.502168 -0.017441 +v 0.206737 -0.448710 0.009094 +v 0.206737 -0.502168 0.009094 +v 0.204123 -0.448710 0.035629 +v 0.204123 -0.502168 0.035629 +v 0.196383 -0.448710 0.061145 +v 0.196383 -0.502168 0.061145 +v 0.183814 -0.448710 0.084660 +v 0.183814 -0.502168 0.084660 +v 0.166898 -0.448710 0.105272 +v 0.166898 -0.502168 0.105272 +v 0.146287 -0.448710 0.122187 +v 0.146287 -0.502168 0.122187 +v 0.122772 -0.448710 0.134756 +v 0.122772 -0.502168 0.134756 +v 0.097256 -0.448710 0.142496 +v 0.097256 -0.502168 0.142496 +v 0.070721 -0.448710 0.145110 +v 0.070721 -0.502168 0.145110 +v 0.044185 -0.448710 0.142496 +v 0.044185 -0.502168 0.142496 +v 0.018670 -0.448710 0.134756 +v 0.018670 -0.502168 0.134756 +v -0.004845 -0.448710 0.122187 +v -0.004845 -0.502168 0.122187 +v -0.025457 -0.448710 0.105272 +v -0.025457 -0.502168 0.105272 +v -0.042372 -0.448710 0.084660 +v -0.042372 -0.502168 0.084660 +v -0.054941 -0.448710 0.061145 +v -0.054941 -0.502168 0.061145 +v -0.062681 -0.448710 0.035629 +v -0.062681 -0.502168 0.035629 +v -0.065295 -0.448710 0.009094 +v -0.065295 -0.502168 0.009094 +v -0.062681 -0.448710 -0.017441 +v -0.062681 -0.502168 -0.017441 +v -0.054941 -0.448710 -0.042957 +v -0.054941 -0.502168 -0.042957 +v -0.042372 -0.448710 -0.066472 +v -0.042372 -0.502168 -0.066472 +v -0.025457 -0.448710 -0.087084 +v -0.025457 -0.502168 -0.087084 +v -0.004845 -0.448710 -0.103999 +v -0.004845 -0.502168 -0.103999 +v 0.018670 -0.448710 -0.116568 +v 0.018670 -0.502168 -0.116568 +v 0.044186 -0.502168 -0.124308 +v 0.044186 -0.448710 -0.124308 +vt 0.836800 0.450973 +vt 0.814919 0.378979 +vt 0.842632 0.366791 +vt 0.878227 0.433213 +vt 0.867543 0.349321 +vt 0.915371 0.407714 +vt 0.888734 0.327215 +vt 0.946865 0.375587 +vt 0.905470 0.301250 +vt 0.971685 0.338207 +vt 0.918014 0.273246 +vt 0.989234 0.297104 +vt 0.924683 0.243712 +vt 0.998847 0.253475 +vt 0.925318 0.213657 +vt 0.999899 0.208758 +vt 0.919929 0.184174 +vt 0.992156 0.164619 +vt 0.908721 0.156378 +vt 0.975800 0.122784 +vt 0.892159 0.131230 +vt 0.951406 0.084913 +vt 0.870890 0.109822 +vt 0.919916 0.052555 +vt 0.845738 0.093005 +vt 0.882557 0.027023 +vt 0.817688 0.081457 +vt 0.840809 0.009353 +vt 0.787837 0.075645 +vt 0.796320 0.000256 +vt 0.757352 0.075811 +vt 0.750845 0.000101 +vt 0.727426 0.081961 +vt 0.706173 0.008896 +vt 0.699225 0.093864 +vt 0.664054 0.026300 +vt 0.673852 0.111061 +vt 0.626136 0.051628 +vt 0.652289 0.132889 +vt 0.593893 0.083888 +vt 0.635370 0.158503 +vt 0.568575 0.121818 +vt 0.623745 0.186910 +vt 0.551156 0.163931 +vt 0.617853 0.217010 +vt 0.542292 0.208574 +vt 0.617907 0.247645 +vt 0.542292 0.254004 +vt 0.623887 0.277639 +vt 0.551102 0.298452 +vt 0.635551 0.305853 +vt 0.568304 0.340212 +vt 0.652086 0.331142 +vt 0.593133 0.377730 +vt 0.673224 0.352491 +vt 0.624739 0.409655 +vt 0.698142 0.369114 +vt 0.662002 0.434725 +vt 0.725878 0.380380 +vt 0.703516 0.451923 +vt 0.755381 0.385902 +vt 0.747668 0.460540 +vt 0.792697 0.460218 +vt 0.785455 0.385431 +g metal_base_metal_base_Material.002 usemtl Material.002 -f 339/353 340/354 342/355 341/356 -f 341/356 342/355 344/357 343/358 -f 343/358 344/357 346/359 345/360 -f 345/360 346/359 348/361 347/362 -f 347/362 348/361 350/363 349/364 -f 349/364 350/363 352/365 351/366 -f 351/366 352/365 354/367 353/368 -f 353/368 354/367 356/369 355/370 -f 355/370 356/369 358/371 357/372 -f 357/372 358/371 360/373 359/374 -f 359/374 360/373 362/375 361/376 -f 361/376 362/375 364/377 363/378 -f 363/378 364/377 366/379 365/380 -f 365/380 366/379 368/381 367/382 -f 367/382 368/381 370/383 369/384 -f 369/384 370/383 372/385 371/386 -f 371/386 372/385 374/387 373/388 -f 373/388 374/387 376/389 375/390 -f 375/390 376/389 378/391 377/392 -f 377/392 378/391 380/393 379/394 -f 379/394 380/393 382/395 381/396 -f 381/396 382/395 384/397 383/398 -f 383/398 384/397 386/399 385/400 -f 385/400 386/399 388/401 387/402 -f 387/402 388/401 390/403 389/404 -f 389/404 390/403 392/405 391/406 -f 391/406 392/405 394/407 393/408 -f 393/408 394/407 396/409 395/410 -f 395/410 396/409 398/411 397/412 -f 397/412 398/411 400/413 399/414 -f 342/355 340/354 402/415 400/413 398/411 396/409 394/407 392/405 390/403 388/401 386/399 384/397 382/395 380/393 378/391 376/389 374/387 372/385 370/383 368/381 366/379 364/377 362/375 360/373 358/371 356/369 354/367 352/365 350/363 348/361 346/359 344/357 -f 401/416 402/415 340/354 339/353 -f 399/414 400/413 402/415 401/416 -f 339/353 341/356 343/358 345/360 347/362 349/364 351/366 353/368 355/370 357/372 359/374 361/376 363/378 365/380 367/382 369/384 371/386 373/388 375/390 377/392 379/394 381/396 383/398 385/400 387/402 389/404 391/406 393/408 395/410 397/412 399/414 401/416 -usemtl Material.003 -f 406/417 405/418 409/419 410/420 -f 405/418 404/421 408/422 409/419 -f 404/421 403/423 407/424 408/422 -f 410/420 409/419 413/425 414/426 -f 409/419 408/422 412/427 413/425 -f 408/422 407/424 411/428 412/427 -f 414/426 413/425 417/429 418/430 -f 413/425 412/427 416/431 417/429 -f 412/427 411/428 415/432 416/431 -f 418/430 417/429 421/433 422/434 -f 417/429 416/431 420/435 421/433 -f 416/431 415/432 419/436 420/435 -f 422/434 421/433 425/437 426/438 -f 421/433 420/435 424/439 425/437 -f 420/435 419/436 423/440 424/439 -f 426/438 425/437 429/441 430/442 -f 425/437 424/439 428/443 429/441 -f 424/439 423/440 427/444 428/443 -f 430/442 429/441 433/445 434/446 -f 429/441 428/443 432/447 433/445 -f 428/443 427/444 431/448 432/447 -f 434/446 433/445 437/449 438/450 -f 433/445 432/447 436/451 437/449 -f 432/447 431/448 435/452 436/451 -f 438/450 437/449 441/453 442/454 -f 437/449 436/451 440/455 441/453 -f 436/451 435/452 439/456 440/455 -f 442/454 441/453 445/457 446/458 -f 441/453 440/455 444/459 445/457 -f 440/455 439/456 443/460 444/459 -f 446/458 445/457 449/461 450/462 -f 445/457 444/459 448/463 449/461 -f 444/459 443/460 447/464 448/463 -f 450/462 449/461 453/465 454/466 -f 449/461 448/463 452/467 453/465 -f 448/463 447/464 451/468 452/467 -f 454/466 453/465 457/469 458/470 -f 453/465 452/467 456/471 457/469 -f 452/467 451/468 455/472 456/471 -f 458/470 457/469 461/473 462/474 -f 457/469 456/471 460/475 461/473 -f 456/471 455/472 459/476 460/475 -f 462/474 461/473 465/477 466/478 -f 461/473 460/475 464/479 465/477 -f 460/475 459/476 463/480 464/479 -f 518/481 517/482 507/483 508/484 -f 520/485 519/486 509/487 510/488 -f 522/489 521/490 511/491 512/492 -f 524/493 516/494 500/495 501/496 -f 526/497 523/498 513/499 514/500 -f 528/501 525/502 502/503 503/504 -f 516/505 527/506 515/507 500/508 -f 530/509 529/510 504/511 505/512 -f 517/482 531/513 506/514 507/483 -f 519/486 518/515 508/516 509/487 -f 521/490 520/485 510/488 511/491 -f 523/498 522/489 512/492 513/499 -f 525/502 524/493 501/496 502/503 -f 527/506 526/497 514/500 515/507 -f 466/478 465/477 405/517 406/518 -f 465/477 464/479 404/519 405/517 -f 464/479 463/480 403/520 404/519 -f 529/510 528/501 503/504 504/511 -f 531/513 530/509 505/512 506/514 -f 403/423 467/521 468/522 407/424 -f 407/424 468/522 469/523 411/428 -f 411/428 469/523 470/524 415/432 -f 415/432 470/524 471/525 419/436 -f 419/436 471/525 472/526 423/440 -f 423/440 472/526 473/527 427/444 -f 427/444 473/527 474/528 431/448 -f 431/448 474/528 475/529 435/452 -f 435/452 475/529 476/530 439/456 -f 439/456 476/530 477/531 443/460 -f 443/460 477/531 478/532 447/464 -f 447/464 478/532 479/533 451/468 -f 451/468 479/533 480/534 455/472 -f 455/472 480/534 481/535 459/476 -f 459/476 481/535 482/536 463/480 -f 463/480 482/536 467/537 403/520 -f 500/495 483/538 484/539 501/496 -f 501/496 484/539 485/540 502/503 -f 502/503 485/540 486/541 503/504 -f 503/504 486/541 487/542 504/511 -f 504/511 487/542 489/543 505/512 -f 505/512 489/543 490/544 506/514 -f 506/514 490/544 491/545 507/483 -f 507/483 491/545 492/546 508/484 -f 508/516 492/547 493/548 509/487 -f 509/487 493/548 494/549 510/488 -f 510/488 494/549 495/550 511/491 -f 511/491 495/550 496/551 512/492 -f 512/492 496/551 497/552 513/499 -f 513/499 497/552 498/553 514/500 -f 514/500 498/553 499/554 515/507 -f 483/538 488/555 484/539 -f 484/539 488/555 485/540 -f 485/540 488/555 486/541 -f 486/541 488/555 487/542 -f 487/542 488/555 489/543 -f 489/543 488/555 490/544 -f 490/544 488/555 491/545 -f 491/545 488/555 492/546 -f 492/547 488/556 493/548 -f 493/548 488/556 494/549 -f 494/549 488/556 495/550 -f 495/550 488/556 496/551 -f 496/551 488/556 497/552 -f 497/552 488/556 498/553 -f 498/553 488/556 499/554 -f 515/507 499/554 483/557 500/508 -f 499/554 488/556 483/557 -f 557/558 549/559 517/482 518/481 -f 558/560 550/561 519/486 520/485 -f 559/562 551/563 521/490 522/489 -f 560/564 548/565 516/494 524/493 -f 561/566 552/567 523/498 526/497 -f 562/568 553/569 525/502 528/501 -f 548/570 554/571 527/506 516/505 -f 563/572 555/573 529/510 530/509 -f 549/559 556/574 531/513 517/482 -f 550/561 557/558 518/515 519/486 -f 551/563 558/560 520/485 521/490 -f 552/567 559/562 522/489 523/498 -f 553/569 560/564 524/493 525/502 -f 554/571 561/566 526/497 527/506 -f 555/573 562/568 528/501 529/510 -f 556/574 563/572 530/509 531/513 -f 475/529 474/528 533/575 541/576 -f 477/531 476/530 534/577 542/578 -f 479/533 478/532 535/579 543/580 -f 468/522 467/521 532/581 544/582 -f 481/535 480/534 536/583 545/584 -f 470/524 469/523 537/585 546/586 -f 467/537 482/536 538/587 532/588 -f 472/526 471/525 539/589 547/590 -f 474/528 473/527 540/591 533/575 -f 476/530 475/529 541/576 534/577 -f 478/532 477/531 542/578 535/579 -f 480/534 479/533 543/580 536/583 -f 469/523 468/522 544/582 537/585 -f 482/536 481/535 545/584 538/587 -f 471/525 470/524 546/586 539/589 -f 473/527 472/526 547/590 540/591 -f 541/576 533/575 549/559 557/558 -f 542/578 534/577 550/561 558/560 -f 543/580 535/579 551/563 559/562 -f 544/582 532/581 548/565 560/564 -f 545/584 536/583 552/567 561/566 -f 546/586 537/585 553/569 562/568 -f 532/588 538/587 554/571 548/570 -f 547/590 539/589 555/573 563/572 -f 533/575 540/591 556/574 549/559 -f 534/577 541/576 557/558 550/561 -f 535/579 542/578 558/560 551/563 -f 536/583 543/580 559/562 552/567 -f 537/585 544/582 560/564 553/569 -f 538/587 545/584 561/566 554/571 -f 539/589 546/586 562/568 555/573 -f 540/591 547/590 563/572 556/574 +s 1 +f 491/170 492/171 493/172 494/173 +f 494/173 493/172 495/174 496/175 +f 496/175 495/174 497/176 498/177 +f 498/177 497/176 499/178 500/179 +f 500/179 499/178 501/180 502/181 +f 502/181 501/180 503/182 504/183 +f 504/183 503/182 505/184 506/185 +f 506/185 505/184 507/186 508/187 +f 508/187 507/186 509/188 510/189 +f 510/189 509/188 511/190 512/191 +f 512/191 511/190 513/192 514/193 +f 514/193 513/192 515/194 516/195 +f 516/195 515/194 517/196 518/197 +f 518/197 517/196 519/198 520/199 +f 520/199 519/198 521/200 522/201 +f 522/201 521/200 523/202 524/203 +f 524/203 523/202 525/204 526/205 +f 526/205 525/204 527/206 528/207 +f 528/207 527/206 529/208 530/209 +f 530/209 529/208 531/210 532/211 +f 532/211 531/210 533/212 534/213 +f 534/213 533/212 535/214 536/215 +f 536/215 535/214 537/216 538/217 +f 538/217 537/216 539/218 540/219 +f 540/219 539/218 541/220 542/221 +f 542/221 541/220 543/222 544/223 +f 544/223 543/222 545/224 546/225 +f 546/225 545/224 547/226 548/227 +f 548/227 547/226 549/228 550/229 +f 550/229 549/228 551/230 552/231 +f 492/171 491/170 553/232 554/233 +f 552/231 551/230 554/233 553/232 +f 541/220 539/218 537/216 535/214 533/212 531/210 529/208 527/206 525/204 523/202 521/200 519/198 517/196 515/194 513/192 511/190 509/188 507/186 505/184 503/182 501/180 499/178 497/176 495/174 493/172 492/171 554/233 551/230 549/228 547/226 545/224 543/222 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_fishtank.obj b/mods/homedecor_modpack/homedecor/models/homedecor_fishtank.obj new file mode 100644 index 00000000..0f7327bb --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_fishtank.obj @@ -0,0 +1,1506 @@ +# Blender v2.73 (sub 0) OBJ File: 'fish_tank.blend' +# www.blender.org +o plastic_Cube.007 +v -0.399999 0.152343 0.137231 +v -0.399999 0.152343 -0.137231 +v 0.399999 0.152343 -0.137231 +v 0.399999 0.152343 0.137231 +v 0.499999 0.136718 0.312499 +v 0.499999 0.136718 -0.312499 +v -0.499999 0.136718 -0.312499 +v -0.499999 0.136718 0.312499 +v 0.499999 0.109376 0.312499 +v 0.499999 0.109376 -0.312499 +v -0.499999 0.109376 -0.312499 +v -0.499999 0.109376 0.312499 +v -0.499999 -0.499999 0.312499 +v -0.499999 -0.499999 -0.312499 +v 0.499999 -0.499999 -0.312499 +v 0.499999 -0.499999 0.312499 +v -0.499999 -0.472657 0.312499 +v -0.499999 -0.472657 -0.312499 +v 0.499999 -0.472657 -0.312499 +v 0.499999 -0.472657 0.312499 +v -0.346650 0.249999 0.118928 +v -0.346650 0.249999 -0.118928 +v 0.346650 0.249999 -0.118928 +v 0.346650 0.249999 0.118928 +vt 0.000000 -0.000000 +vt 0.629990 -0.000000 +vt 0.453321 0.100000 +vt 0.176667 0.100000 +vt 0.713114 0.000000 +vt 0.713114 0.799999 +vt 0.613728 0.746651 +vt 0.613728 0.053349 +vt 0.266243 0.624998 +vt 0.266242 0.000000 +vt 0.293428 0.000000 +vt 0.293428 0.624998 +vt 0.629990 1.000000 +vt 0.000000 1.000000 +vt 0.453321 0.900000 +vt 0.972492 1.000000 +vt 0.972492 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.944984 1.000000 +vt 0.944984 0.000000 +vt 0.176668 0.900000 +vt 0.320614 0.000000 +vt 0.320614 0.624998 +vt 0.239057 0.624998 +vt 0.239057 0.000000 +vt 0.917477 1.000000 +vt 0.917477 0.000000 +vt 0.211871 0.624998 +vt 0.211871 0.000000 +vt 0.889968 1.000000 +vt 0.889968 0.000000 +vt 0.373972 0.000000 +vt 0.613728 0.000000 +vt 0.613728 0.693302 +vt 0.373972 0.693302 +vt 0.211871 0.274462 +vt 0.105936 0.256159 +vt 0.105936 0.018303 +vt 0.812500 0.000000 +vt 0.812500 0.799999 +vt 0.713114 0.746651 +vt 0.713114 0.053349 +vt 0.000000 0.274462 +vn 0.154400 0.988000 0.000000 +vn 0.000000 0.184200 -0.982900 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.996000 -0.088800 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.154400 0.988000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.996000 0.088800 +vn 0.000000 1.000000 0.000000 +vn -0.877600 0.479400 0.000000 +vn 0.000000 0.184200 0.982900 +vn 0.877600 0.479400 0.000000 +g plastic_Cube.007_plastic +s off +f 5/1/1 6/2/1 3/3/1 4/4/1 +f 3/5/2 2/6/2 22/7/2 23/8/2 +f 6/9/3 5/10/3 9/11/3 10/12/3 +f 12/13/4 11/14/4 10/1/4 9/2/4 +f 6/2/5 7/13/5 2/15/5 3/3/5 +f 7/16/6 6/17/6 10/18/6 11/19/6 +f 5/17/7 8/16/7 12/20/7 9/21/7 +f 7/13/8 8/14/8 1/22/8 2/15/8 +f 8/12/9 7/11/9 11/23/9 12/24/9 +f 8/14/10 5/1/10 4/4/10 1/22/10 +f 17/25/9 18/26/9 14/10/9 13/9/9 +f 18/27/6 19/28/6 15/21/6 14/20/6 +f 19/29/3 20/30/3 16/26/3 15/25/3 +f 20/28/7 17/27/7 13/31/7 16/32/7 +f 13/13/4 14/14/4 15/1/4 16/2/4 +f 20/1/11 19/2/11 18/13/11 17/14/11 +f 24/33/11 23/34/11 22/35/11 21/36/11 +f 2/30/12 1/37/12 21/38/12 22/39/12 +f 1/40/13 4/41/13 24/42/13 21/43/13 +f 4/44/14 3/1/14 23/39/14 24/38/14 +o filter_Cube.006 +v -0.386517 -0.020232 0.404567 +v -0.386517 -0.020232 0.312358 +v -0.042524 -0.020232 0.312358 +v -0.042524 -0.020232 0.404567 +v -0.386517 0.191081 0.404567 +v -0.386517 0.191081 0.312358 +v -0.042524 0.191081 0.312358 +v -0.042524 0.191081 0.404567 +v -0.355457 0.064888 0.284670 +v -0.355457 0.064888 0.220149 +v -0.167259 0.064888 0.220149 +v -0.167259 0.064888 0.284670 +v -0.355457 0.191081 0.220149 +v -0.167259 0.191081 0.220149 +v -0.355457 0.146464 0.312359 +v -0.355457 0.146464 0.284669 +v -0.167259 0.146464 0.284669 +v -0.167259 0.146464 0.312359 +v -0.355457 0.191081 0.312359 +v -0.167259 0.191081 0.312359 +v -0.087800 -0.174056 0.235776 +v -0.087800 0.132063 0.235776 +v -0.068925 -0.174056 0.247182 +v -0.068925 0.132063 0.247182 +v -0.068925 -0.174056 0.269995 +v -0.068925 0.132063 0.269995 +v -0.087800 -0.174056 0.281402 +v -0.087800 0.132063 0.281402 +v -0.106675 -0.174056 0.269995 +v -0.106675 0.132063 0.269995 +v -0.106675 -0.174056 0.247182 +v -0.106675 0.132063 0.247182 +v -0.087800 0.160395 0.240973 +v -0.068432 0.155675 0.251109 +v -0.068432 0.146235 0.271381 +v -0.087800 0.141516 0.281517 +v -0.107167 0.146235 0.271381 +v -0.107167 0.155675 0.251109 +v -0.087800 0.179869 0.261940 +v -0.068696 0.171806 0.267713 +v -0.068696 0.155679 0.279257 +v -0.087800 0.147615 0.285030 +v -0.106904 0.155679 0.279257 +v -0.106904 0.171806 0.267713 +v -0.087800 0.188307 0.292003 +v -0.068925 0.179107 0.292003 +v -0.068925 0.160708 0.292003 +v -0.087800 0.151509 0.292003 +v -0.106675 0.160708 0.292003 +v -0.106675 0.179107 0.292003 +v -0.087800 0.188307 0.313956 +v -0.068925 0.179107 0.313956 +v -0.068925 0.160708 0.313956 +v -0.087800 0.151509 0.313956 +v -0.106675 0.160708 0.313956 +v -0.106675 0.179107 0.313956 +v -0.362834 -0.499998 0.356887 +v -0.362834 -0.499998 0.350069 +v -0.356319 -0.499998 0.350069 +v -0.356319 -0.499998 0.356887 +v -0.362834 -0.019909 0.356887 +v -0.362834 -0.019909 0.350069 +v -0.356319 -0.019909 0.350069 +v -0.356319 -0.019909 0.356887 +vt 0.763340 0.684141 +vt 0.839007 0.684141 +vt 0.839007 0.939900 +vt 0.763340 0.939899 +vt 0.345682 0.939662 +vt 0.000000 0.939662 +vt 0.000000 0.684201 +vt 0.345682 0.684201 +vt 0.691364 0.939900 +vt 0.691364 0.684141 +vt 0.345682 0.939900 +vt 0.691364 0.684201 +vt 0.345682 0.632730 +vt 0.691364 0.632730 +vt -0.000000 1.000000 +vt 0.345682 1.000000 +vt 0.000000 0.000000 +vt 0.189123 0.000000 +vt 0.189123 0.006201 +vt 0.000000 0.006201 +vt 0.189123 0.230620 +vt 0.189123 0.149082 +vt 0.233643 0.149082 +vt 0.233642 0.000000 +vt 0.337384 0.000000 +vt 0.337384 0.230620 +vt 0.337384 0.461241 +vt 0.189123 0.461240 +vt 0.292864 0.230620 +vt 0.292864 0.379702 +vt 0.337384 0.379702 +vt 0.189123 0.236643 +vt 0.000000 0.236643 +vt 0.001829 0.236643 +vt 0.001829 0.438115 +vt 0.000000 0.438115 +vt 0.141751 0.236643 +vt 0.141751 0.438115 +vt 0.388904 0.980042 +vt 0.947914 0.980501 +vt 0.948663 0.999470 +vt 0.389654 0.999010 +vt 0.000000 0.726108 +vt 0.559441 0.726108 +vt 0.559441 0.762788 +vt 0.000000 0.762788 +vt 0.585292 0.715652 +vt 0.025938 0.715652 +vt 0.025593 0.696684 +vt 0.584948 0.696684 +vt 0.025938 0.677717 +vt 0.585292 0.677716 +vt 0.611203 0.716147 +vt 0.646793 0.749859 +vt 0.632071 0.759118 +vt 0.602592 0.732422 +vt 0.389689 0.961075 +vt 0.948699 0.961534 +vt 0.000000 0.904198 +vt 0.559441 0.904198 +vt 0.559441 0.940878 +vt 0.000000 0.940878 +vt 0.992081 0.961075 +vt 1.000000 0.980544 +vt 0.585341 0.901970 +vt 0.602592 0.934564 +vt 0.008318 0.696684 +vt 0.000000 0.677222 +vt 0.000000 0.716147 +vt 0.585341 0.765016 +vt 0.662213 0.798195 +vt 0.645415 0.798173 +vt 0.632071 0.907868 +vt 0.646793 0.917127 +vt 0.611202 0.950839 +vt 0.602599 0.889306 +vt 0.576701 0.885650 +vt 0.587848 0.880003 +vt 0.602599 0.777680 +vt 0.587848 0.786983 +vt 0.576701 0.781336 +vt 0.645415 0.868813 +vt 0.662213 0.868791 +vt 0.611791 0.868813 +vt 0.594964 0.868791 +vt 0.611791 0.798173 +vt 0.594964 0.798195 +vt 0.645415 0.833515 +vt 0.662213 0.833493 +vt 0.611791 0.833515 +vt 0.594964 0.833493 +vt 0.877375 0.655296 +vt 0.877375 0.666259 +vt 0.000000 0.666258 +vt 0.000000 0.655295 +vt 0.000000 0.648749 +vt 0.000000 0.642203 +vt 0.876699 0.642203 +vt 0.876699 0.648749 +vt 0.877375 0.677222 +vt 0.877239 0.648749 +vt 0.877239 0.655296 +vt 0.877445 0.648749 +vt 0.992045 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 1.000000 0.000000 +vn 0.000000 0.082100 -0.996600 +vn 0.856300 0.038400 -0.515100 +vn 0.871000 0.000000 -0.491300 +vn 0.873900 -0.026000 0.485500 +vn 0.871000 0.000000 0.491300 +vn 0.000000 -0.038000 0.999300 +vn -0.873900 -0.026000 0.485500 +vn -0.871000 0.000000 0.491300 +vn 0.000000 0.468600 -0.883400 +vn 0.000000 0.865900 -0.500200 +vn 0.818600 0.504200 -0.275100 +vn 0.826300 0.267700 -0.495600 +vn -0.871000 0.000000 -0.491300 +vn -0.856300 0.038400 -0.515100 +vn -0.826300 0.267700 -0.495600 +vn -0.906100 -0.151900 0.394800 +vn 0.000000 -0.332600 0.943100 +vn 0.906100 -0.151900 0.394800 +vn 0.000000 0.990900 -0.134300 +vn 0.825300 0.559000 -0.079300 +vn -0.818600 0.504200 -0.275100 +vn -0.891100 -0.345300 0.294500 +vn 0.000000 -0.767400 0.641100 +vn 0.891100 -0.345300 0.294500 +vn -0.825300 0.559000 -0.079300 +vn -0.877500 -0.468700 0.101600 +vn 0.000000 -0.973800 0.227500 +vn 0.877500 -0.468700 0.101600 +vn -0.848000 0.530000 0.000000 +vn -0.848000 -0.530000 -0.000000 +vn 0.848000 -0.530000 -0.000000 +vn 0.848000 0.530000 0.000000 +vn -0.707100 0.000000 0.707100 +vn -0.707100 0.000000 -0.707100 +vn -0.577300 -0.577300 -0.577300 +vn -0.577300 -0.577300 0.577300 +vn 0.707100 0.000000 -0.707100 +vn 0.577300 -0.577300 -0.577300 +vn 0.707100 0.000000 0.707100 +vn 0.577300 -0.577300 0.577300 +g filter_Cube.006_filter +s off +f 29/45/15 30/46/15 26/47/15 25/48/15 +f 30/49/16 31/50/16 27/51/16 26/52/16 +f 31/48/17 32/53/17 28/54/17 27/45/17 +f 32/53/18 29/55/18 25/52/18 28/56/18 +f 25/52/19 26/57/19 27/58/19 28/56/19 +f 32/59/20 31/50/20 30/49/20 29/60/20 +f 43/61/20 44/62/20 38/63/20 37/64/20 +f 44/65/17 42/66/17 41/67/17 36/68/17 35/69/17 38/70/17 +f 43/71/15 37/72/15 34/65/15 33/73/15 40/74/15 39/75/15 +f 37/64/16 38/63/16 35/76/16 34/77/16 +f 35/77/19 36/78/19 33/79/19 34/80/19 +f 33/79/18 36/78/18 41/81/18 40/82/18 +s 1 +f 45/83/16 46/84/21 48/85/22 47/86/23 +f 47/87/23 48/88/22 50/89/24 49/90/25 +f 49/91/25 50/92/24 52/93/26 51/94/18 +f 51/94/18 52/93/26 54/95/27 53/96/28 +f 57/97/29 63/98/30 64/99/31 58/100/32 +f 55/101/33 56/102/34 46/84/21 45/83/16 +f 53/103/28 54/104/27 56/105/34 55/106/33 +f 56/102/34 62/107/35 57/108/29 46/84/21 +f 54/104/27 61/109/36 62/110/35 56/105/34 +f 52/93/26 60/111/37 61/112/36 54/95/27 +f 50/92/24 59/113/38 60/111/37 52/93/26 +f 48/88/22 58/100/32 59/114/38 50/89/24 +f 63/98/30 69/115/39 70/116/40 64/99/31 +f 62/110/35 68/117/41 63/118/30 57/119/29 +f 61/109/36 67/120/42 68/117/41 62/110/35 +f 60/121/37 66/122/43 67/120/42 61/109/36 +f 59/114/38 65/123/44 66/124/43 60/125/37 +f 58/100/32 64/99/31 65/123/44 59/114/38 +f 68/117/41 74/126/45 69/127/39 63/118/30 +f 67/120/42 73/128/46 74/126/45 68/117/41 +f 66/122/43 72/129/47 73/128/46 67/120/42 +f 65/123/44 71/130/48 72/131/47 66/124/43 +f 64/99/31 70/116/40 71/130/48 65/123/44 +f 69/127/39 74/126/45 80/132/49 75/133/20 +f 74/126/45 73/128/46 79/134/50 80/132/49 +f 73/128/46 72/129/47 78/135/19 79/134/50 +f 72/131/47 71/130/48 77/134/51 78/135/19 +f 71/130/48 70/116/40 76/132/52 77/134/51 +f 70/116/40 69/115/39 75/133/20 76/132/52 +f 85/136/53 86/137/54 82/138/55 81/139/56 +f 86/140/54 87/141/57 83/142/58 82/143/55 +f 87/112/57 88/138/59 84/137/60 83/144/58 +f 88/139/59 85/140/53 81/145/56 84/146/60 +f 81/145/56 82/147/55 83/136/58 84/146/60 +f 46/84/21 57/108/29 58/148/32 48/85/22 +o fishes-algae_Cube.001 +v -0.037177 -0.137407 0.133984 +v -0.331691 -0.137407 0.096134 +v -0.037177 -0.443943 0.133984 +v -0.331691 -0.443943 0.096134 +v 0.355968 -0.045720 0.120009 +v -0.012986 -0.045720 0.167427 +v 0.355968 -0.429736 0.120009 +v -0.012986 -0.429736 0.167427 +v 0.265530 -0.190725 -0.002159 +v 0.265530 -0.190725 0.002159 +v 0.179484 -0.178956 0.001123 +v 0.179484 -0.178956 -0.001123 +v 0.265530 -0.147625 -0.001150 +v 0.265530 -0.147625 0.001150 +v 0.179484 -0.159395 0.000598 +v 0.179484 -0.159395 -0.000599 +v 0.265530 -0.169175 -0.006530 +v 0.265530 -0.169175 0.006530 +v 0.179484 -0.169175 0.003397 +v 0.179484 -0.169175 -0.003397 +v -0.156667 -0.275667 0.025454 +v -0.156667 -0.275667 0.027823 +v -0.109468 -0.282123 0.027254 +v -0.109468 -0.282123 0.026022 +v -0.156667 -0.299308 0.026007 +v -0.156667 -0.299308 0.027269 +v -0.109468 -0.292853 0.026967 +v -0.109468 -0.292853 0.026310 +v -0.156667 -0.287488 0.023056 +v -0.156667 -0.287488 0.030220 +v -0.109468 -0.287488 0.028502 +v -0.109468 -0.287488 0.024775 +v 0.135944 -0.389451 -0.046850 +v 0.135944 -0.389451 -0.044481 +v 0.088744 -0.382995 -0.045049 +v 0.088744 -0.382995 -0.046282 +v 0.135944 -0.365810 -0.046296 +v 0.135944 -0.365810 -0.045034 +v 0.088744 -0.372265 -0.045337 +v 0.088744 -0.372265 -0.045994 +v 0.135944 -0.377630 -0.049247 +v 0.135944 -0.377630 -0.042084 +v 0.088744 -0.377630 -0.043802 +v 0.088744 -0.377630 -0.047529 +v -0.091668 -0.183560 -0.002849 +v -0.091668 -0.183560 0.002849 +v 0.021862 -0.199088 0.001482 +v 0.021862 -0.199088 -0.001482 +v -0.091668 -0.240426 -0.001518 +v -0.091668 -0.240426 0.001518 +v 0.021862 -0.224898 0.000790 +v 0.021862 -0.224898 -0.000790 +v -0.091668 -0.211993 -0.008616 +v -0.091668 -0.211993 0.008616 +v 0.021862 -0.211993 0.004482 +v 0.021862 -0.211993 -0.004482 +v -0.273523 -0.061488 0.034326 +v -0.273523 -0.061488 0.036694 +v -0.226323 -0.067943 0.036126 +v -0.226323 -0.067943 0.034894 +v -0.273523 -0.085129 0.034879 +v -0.273523 -0.085129 0.036141 +v -0.226323 -0.078673 0.035838 +v -0.226323 -0.078673 0.035182 +v -0.273523 -0.073308 0.031928 +v -0.273523 -0.073308 0.039092 +v -0.226323 -0.073308 0.037373 +v -0.226323 -0.073308 0.033647 +v 0.166458 -0.000601 -0.116305 +v 0.166458 -0.000601 -0.112537 +v 0.091370 0.009669 -0.113441 +v 0.091370 0.009669 -0.115401 +v 0.166458 0.037010 -0.115425 +v 0.166458 0.037010 -0.113417 +v 0.091370 0.026740 -0.113899 +v 0.091370 0.026740 -0.114943 +v 0.166458 0.018204 -0.120120 +v 0.166458 0.018204 -0.108723 +v 0.091370 0.018205 -0.111457 +v 0.091370 0.018205 -0.117386 +v -0.290799 -0.343810 -0.179388 +v -0.290799 -0.343810 -0.177020 +v -0.243600 -0.350266 -0.177588 +v -0.243600 -0.350266 -0.178820 +v -0.290799 -0.367452 -0.178835 +v -0.290799 -0.367452 -0.177573 +v -0.243600 -0.360996 -0.177876 +v -0.243600 -0.360996 -0.178532 +v -0.290799 -0.355631 -0.181786 +v -0.290799 -0.355631 -0.174622 +v -0.243600 -0.355631 -0.176341 +v -0.243600 -0.355631 -0.180068 +v 0.298260 -0.253874 -0.149797 +v 0.298260 -0.253874 -0.147429 +v 0.251061 -0.247418 -0.147997 +v 0.251061 -0.247418 -0.149229 +v 0.298260 -0.230232 -0.149244 +v 0.298260 -0.230232 -0.147982 +v 0.251061 -0.236688 -0.148285 +v 0.251061 -0.236688 -0.148941 +v 0.298260 -0.242053 -0.152195 +v 0.298260 -0.242053 -0.145031 +v 0.251061 -0.242053 -0.146750 +v 0.251061 -0.242053 -0.150476 +vt 0.500000 0.500000 +vt 0.500000 -0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.500000 +vt -0.000000 0.500000 +vt 0.000000 -0.000000 +vt 0.030927 0.875000 +vt 0.030927 0.829388 +vt 0.219073 0.875000 +vt 0.219073 0.854299 +vt 0.219073 0.895702 +vt 0.030927 0.920612 +vt 0.676602 0.625000 +vt 0.676602 0.650020 +vt 0.573398 0.625000 +vt 0.573398 0.636355 +vt 0.573398 0.613644 +vt 0.676602 0.599980 +vt 0.323398 0.625000 +vt 0.323398 0.599980 +vt 0.426602 0.625000 +vt 0.426602 0.613644 +vt 0.426602 0.636355 +vt 0.323398 0.650020 +vt 0.749121 0.875000 +vt 0.749121 0.935181 +vt 0.500879 0.875000 +vt 0.500879 0.902314 +vt 0.500879 0.847686 +vt 0.749121 0.814819 +vt 0.926602 0.875000 +vt 0.926602 0.900020 +vt 0.823398 0.875000 +vt 0.823398 0.886355 +vt 0.823398 0.863645 +vt 0.926602 0.849980 +vt 0.292907 0.875000 +vt 0.292907 0.835196 +vt 0.457093 0.875000 +vt 0.457093 0.856935 +vt 0.457093 0.893065 +vt 0.292907 0.914803 +vt 0.926602 0.625000 +vt 0.926602 0.650020 +vt 0.823398 0.625000 +vt 0.823398 0.636356 +vt 0.823398 0.613645 +vt 0.926602 0.599980 +vt 0.073398 0.625000 +vt 0.073398 0.599980 +vt 0.176602 0.625000 +vt 0.176602 0.613645 +vt 0.176602 0.636355 +vt 0.073398 0.650020 +vn 0.127500 0.000000 -0.991800 +vn -0.127500 0.000000 -0.991800 +vn 0.646900 0.017500 -0.762400 +vn 0.646900 0.017500 0.762400 +vn 0.544400 -0.666600 0.509100 +vn 0.544400 -0.666600 -0.509100 +vn -0.667400 0.017300 0.744400 +vn -0.633200 -0.585200 0.506500 +vn -0.667400 0.017300 -0.744400 +vn -0.633200 -0.585200 -0.506500 +vn -0.635900 0.595200 -0.491200 +vn -0.635900 0.595200 0.491200 +vn 0.547500 0.676500 0.492400 +vn 0.547500 0.676500 -0.492400 +vn -0.646900 -0.017500 -0.762400 +vn -0.646900 -0.017500 0.762400 +vn -0.544400 0.666600 0.509100 +vn -0.544400 0.666600 -0.509100 +vn 0.667400 -0.017300 0.744400 +vn 0.633200 0.585200 0.506500 +vn 0.667400 -0.017300 -0.744400 +vn 0.633200 0.585200 -0.506500 +vn 0.635900 -0.595200 -0.491200 +vn 0.635900 -0.595200 0.491200 +vn -0.547500 -0.676500 0.492400 +vn -0.547500 -0.676500 -0.492400 +g fishes-algae_Cube.001_fishes-algae +s off +f 89/149/61 91/150/61 92/151/61 90/152/61 +f 93/153/62 95/154/62 96/150/62 94/149/62 +s 1 +f 105/155/63 106/155/64 98/156/65 97/156/66 +f 106/155/64 107/157/67 99/158/68 98/156/65 +f 107/157/67 108/157/69 100/158/70 99/158/68 +f 108/157/69 105/155/63 97/156/66 100/158/70 +f 97/156/66 98/156/65 99/158/68 100/158/70 +f 104/159/71 103/159/72 102/160/73 101/160/74 +f 101/160/74 102/160/73 106/155/64 105/155/63 +f 102/160/73 103/159/72 107/157/67 106/155/64 +f 103/159/72 104/159/71 108/157/69 107/157/67 +f 104/159/71 101/160/74 105/155/63 108/157/69 +f 117/161/75 118/161/76 110/162/77 109/162/78 +f 118/161/76 119/163/79 111/164/80 110/162/77 +f 119/163/79 120/163/81 112/164/82 111/164/80 +f 120/163/81 117/161/75 109/162/78 112/164/82 +f 109/162/78 110/162/77 111/164/80 112/164/82 +f 116/165/83 115/165/84 114/166/85 113/166/86 +f 113/166/86 114/166/85 118/161/76 117/161/75 +f 114/166/85 115/165/84 119/163/79 118/161/76 +f 115/165/84 116/165/83 120/163/81 119/163/79 +f 116/165/83 113/166/86 117/161/75 120/163/81 +f 129/167/63 130/167/64 122/168/65 121/168/66 +f 130/167/64 131/169/67 123/170/68 122/168/65 +f 131/169/67 132/169/69 124/170/70 123/170/68 +f 132/169/69 129/167/63 121/168/66 124/170/70 +f 121/168/66 122/168/65 123/170/68 124/170/70 +f 128/171/71 127/171/72 126/172/73 125/172/74 +f 125/172/74 126/172/73 130/167/64 129/167/63 +f 126/172/73 127/171/72 131/169/67 130/167/64 +f 127/171/72 128/171/71 132/169/69 131/169/67 +f 128/171/71 125/172/74 129/167/63 132/169/69 +f 141/173/75 142/173/76 134/174/77 133/174/78 +f 142/173/76 143/175/79 135/176/80 134/174/77 +f 143/175/79 144/175/81 136/176/82 135/176/80 +f 144/175/81 141/173/75 133/174/78 136/176/82 +f 133/174/78 134/174/77 135/176/80 136/176/82 +f 140/177/83 139/177/84 138/178/85 137/178/86 +f 137/178/86 138/178/85 142/173/76 141/173/75 +f 138/178/85 139/177/84 143/175/79 142/173/76 +f 139/177/84 140/177/83 144/175/81 143/175/79 +f 140/177/83 137/178/86 141/173/75 144/175/81 +f 153/179/75 154/179/76 146/180/77 145/180/78 +f 154/179/76 155/181/79 147/182/80 146/180/77 +f 155/181/79 156/181/81 148/182/82 147/182/80 +f 156/181/81 153/179/75 145/180/78 148/182/82 +f 145/180/78 146/180/77 147/182/80 148/182/82 +f 152/183/83 151/183/84 150/184/85 149/184/86 +f 149/184/86 150/184/85 154/179/76 153/179/75 +f 150/184/85 151/183/84 155/181/79 154/179/76 +f 151/183/84 152/183/83 156/181/81 155/181/79 +f 152/183/83 149/184/86 153/179/75 156/181/81 +f 165/185/63 166/185/64 158/186/65 157/186/66 +f 166/185/64 167/187/67 159/188/68 158/186/65 +f 167/187/67 168/187/69 160/188/70 159/188/68 +f 168/187/69 165/185/63 157/186/66 160/188/70 +f 157/186/66 158/186/65 159/188/68 160/188/70 +f 164/189/71 163/189/72 162/190/73 161/190/74 +f 161/190/74 162/190/73 166/185/64 165/185/63 +f 162/190/73 163/189/72 167/187/67 166/185/64 +f 163/189/72 164/189/71 168/187/69 167/187/67 +f 164/189/71 161/190/74 165/185/63 168/187/69 +f 177/191/75 178/191/76 170/192/77 169/192/78 +f 178/191/76 179/193/79 171/194/80 170/192/77 +f 179/193/79 180/193/81 172/194/82 171/194/80 +f 180/193/81 177/191/75 169/192/78 172/194/82 +f 169/192/78 170/192/77 171/194/80 172/194/82 +f 176/195/83 175/195/84 174/196/85 173/196/86 +f 173/196/86 174/196/85 178/191/76 177/191/75 +f 174/196/85 175/195/84 179/193/79 178/191/76 +f 175/195/84 176/195/83 180/193/81 179/193/79 +f 176/195/83 173/196/86 177/191/75 180/193/81 +f 189/197/63 190/197/64 182/198/65 181/198/66 +f 190/197/64 191/199/67 183/200/68 182/198/65 +f 191/199/67 192/199/69 184/200/70 183/200/68 +f 192/199/69 189/197/63 181/198/66 184/200/70 +f 181/198/66 182/198/65 183/200/68 184/200/70 +f 188/201/71 187/201/72 186/202/73 185/202/74 +f 185/202/74 186/202/73 190/197/64 189/197/63 +f 186/202/73 187/201/72 191/199/67 190/197/64 +f 187/201/72 188/201/71 192/199/69 191/199/67 +f 188/201/71 185/202/74 189/197/63 192/199/69 +o gravel-stone_Plane.008 +v 0.315382 -0.341614 -0.018744 +v 0.300898 -0.370402 0.075791 +v 0.250033 -0.389519 -0.034640 +v 0.291965 -0.373437 -0.122742 +v 0.371613 -0.380137 -0.066342 +v 0.376038 -0.364604 0.056198 +v 0.275600 -0.352679 -0.028287 +v 0.306141 -0.349470 0.036716 +v 0.268182 -0.383257 0.027439 +v 0.341794 -0.362983 0.080766 +v 0.350307 -0.346062 0.025199 +v 0.300891 -0.351254 -0.079978 +v 0.261836 -0.371384 -0.089416 +v 0.347063 -0.347165 -0.046921 +v 0.333299 -0.365870 -0.108050 +v 0.383811 -0.374335 -0.002712 +v 0.325584 -0.401572 0.098671 +v 0.369751 -0.398164 0.087155 +v 0.249966 -0.422528 0.000770 +v 0.280507 -0.419319 0.065774 +v 0.270917 -0.408548 -0.123202 +v 0.246721 -0.423630 -0.071351 +v 0.362351 -0.414708 -0.101502 +v 0.315083 -0.405140 -0.134718 +v 0.396138 -0.410397 0.035623 +v 0.392893 -0.411499 -0.036498 +v -0.327265 -0.358234 -0.163275 +v -0.386078 -0.370934 -0.142210 +v -0.343324 -0.388474 -0.207781 +v -0.280028 -0.384663 -0.210296 +v -0.285568 -0.388340 -0.144492 +v -0.350383 -0.370851 -0.103096 +v -0.335794 -0.364740 -0.190289 +v -0.361352 -0.359722 -0.151347 +v -0.371091 -0.381208 -0.177225 +v -0.374940 -0.367138 -0.115974 +v -0.340371 -0.359673 -0.128356 +v -0.299017 -0.367792 -0.191367 +v -0.308029 -0.380275 -0.217928 +v -0.301846 -0.364661 -0.153089 +v -0.274081 -0.380196 -0.180728 +v -0.316162 -0.381081 -0.117034 +v -0.392888 -0.390868 -0.120169 +v -0.371907 -0.390819 -0.097178 +v -0.365229 -0.408020 -0.196706 +v -0.390787 -0.403003 -0.157763 +v -0.289199 -0.407057 -0.223199 +v -0.326704 -0.413008 -0.221440 +v -0.271775 -0.412880 -0.161248 +v -0.268219 -0.407008 -0.200209 +v -0.335858 -0.402875 -0.097572 +v -0.297333 -0.407863 -0.122305 +v 0.042178 -0.378028 0.072190 +v -0.002185 -0.404144 0.057129 +v 0.058160 -0.398029 0.033944 +v 0.099663 -0.380938 0.063631 +v 0.068709 -0.395710 0.105185 +v 0.004335 -0.402711 0.101158 +v 0.049784 -0.380596 0.049700 +v 0.015154 -0.388506 0.063332 +v 0.025137 -0.403288 0.040855 +v -0.007090 -0.403014 0.080359 +v 0.018986 -0.387663 0.089212 +v 0.075019 -0.374866 0.067154 +v 0.083573 -0.382307 0.044669 +v 0.055984 -0.379233 0.091574 +v 0.089773 -0.380944 0.086543 +v 0.035170 -0.401083 0.108609 +v -0.011226 -0.424855 0.068403 +v -0.007393 -0.424013 0.094283 +v 0.043868 -0.419919 0.030358 +v 0.009238 -0.427829 0.043991 +v 0.104672 -0.398417 0.050168 +v 0.080866 -0.411489 0.032721 +v 0.108504 -0.397575 0.076047 +v -0.103195 -0.367590 -0.076236 +v -0.174172 -0.396537 -0.122640 +v -0.069784 -0.423197 -0.116477 +v -0.015611 -0.400204 -0.047773 +v -0.091183 -0.390695 -0.003483 +v -0.187397 -0.376450 -0.052806 +v -0.081328 -0.385283 -0.103710 +v -0.143732 -0.376653 -0.105537 +v -0.124827 -0.414276 -0.127932 +v -0.193224 -0.381861 -0.091765 +v -0.151505 -0.364847 -0.064490 +v -0.050533 -0.378809 -0.061532 +v -0.029847 -0.404453 -0.086979 +v -0.093906 -0.366179 -0.037293 +v -0.042425 -0.385349 -0.020563 +v -0.145179 -0.383365 -0.020469 +v -0.204445 -0.419588 -0.106442 +v -0.212219 -0.407781 -0.065394 +v -0.162853 -0.444198 -0.127629 +v -0.010272 -0.435706 -0.059478 +v -0.042848 -0.454159 -0.098603 +v -0.063200 -0.423248 0.008861 +v -0.018046 -0.423899 -0.018431 +v -0.183205 -0.413286 -0.020164 +v -0.125605 -0.414618 0.007033 +v -0.478547 -0.472347 -0.268548 +v -0.478547 -0.472347 -0.291887 +v -0.455208 -0.472347 -0.291887 +v 0.478447 -0.393881 -0.291887 +v 0.455108 -0.393881 -0.291887 +v -0.478547 -0.472347 0.291646 +v -0.478547 -0.472347 0.268306 +v -0.455208 -0.393881 0.291646 +v -0.455208 -0.472347 0.291646 +v -0.478547 -0.393881 0.268306 +v 0.455108 -0.472347 -0.291887 +v 0.478447 -0.472347 -0.291887 +v 0.478447 -0.472347 -0.268548 +v -0.455208 -0.393881 -0.291887 +v 0.455108 -0.472347 0.291646 +v -0.478547 -0.393881 -0.291887 +v 0.478447 -0.472347 0.268306 +v 0.478447 -0.472347 0.291646 +v -0.478547 -0.393881 -0.268548 +v 0.478447 -0.393881 -0.268548 +v 0.455108 -0.393881 0.291646 +v 0.478447 -0.393881 0.268306 +v 0.478447 -0.393881 0.291646 +v -0.478547 -0.393881 0.291646 +v -0.455208 -0.393881 0.268306 +v -0.455208 -0.393881 -0.268548 +v 0.455108 -0.393881 -0.268548 +v 0.455108 -0.393881 0.268306 +v -0.000050 -0.393881 0.268306 +v -0.000050 -0.375071 0.291646 +v -0.478547 -0.393881 -0.000121 +v -0.455208 -0.393881 -0.000121 +v 0.478447 -0.375071 -0.000121 +v 0.455108 -0.393881 -0.000121 +v -0.000050 -0.375071 -0.291887 +v -0.000050 -0.393881 -0.268548 +v -0.000050 -0.415139 -0.000121 +v 0.227529 -0.407051 0.268306 +v 0.227529 -0.393881 0.291646 +v -0.478547 -0.375071 0.134092 +v -0.455208 -0.393881 0.134092 +v 0.478447 -0.393881 0.134092 +v 0.455108 -0.385500 0.134092 +v 0.227529 -0.393881 -0.291887 +v 0.227529 -0.400536 -0.268548 +v -0.227629 -0.393881 0.268306 +v -0.227629 -0.393881 0.291646 +v -0.478547 -0.393881 -0.134334 +v -0.455208 -0.375071 -0.134334 +v 0.478447 -0.393881 -0.134334 +v 0.455108 -0.385500 -0.134334 +v -0.227629 -0.393881 -0.291887 +v -0.227629 -0.400536 -0.268548 +v -0.227629 -0.415139 -0.000121 +v 0.227529 -0.393881 -0.000121 +v -0.000050 -0.393881 0.134092 +v -0.000050 -0.393881 -0.134334 +v 0.227529 -0.375071 -0.134334 +v 0.227529 -0.375071 0.134092 +v -0.227629 -0.375071 0.134092 +v -0.227629 -0.393881 -0.134334 +vt 0.068582 0.106280 +vt 0.000000 0.111965 +vt 0.095358 0.041031 +vt 0.248095 0.473625 +vt 0.284263 0.428259 +vt 0.331886 0.473625 +vt 0.015069 0.177735 +vt 0.119741 0.147447 +vt 0.169361 0.062959 +vt 0.174940 0.434670 +vt 0.428377 0.174835 +vt 0.348665 0.131664 +vt 0.449710 0.096657 +vt 0.806614 0.363180 +vt 0.720712 0.387499 +vt 0.737568 0.329187 +vt 0.198322 0.183664 +vt 0.203685 0.231743 +vt 0.079540 0.221193 +vt 0.262687 0.036474 +vt 0.348665 0.076319 +vt 0.253888 0.109866 +vt 0.495776 0.032501 +vt 0.369803 0.047670 +vt 0.435442 0.000000 +vt 0.819769 0.412369 +vt 0.299043 0.160808 +vt 0.313540 0.007099 +vt 0.529216 0.162999 +vt 0.550354 0.079006 +vt 0.209450 0.000000 +vt 0.840555 0.324433 +vt 0.550354 0.220859 +vt 0.481146 0.239076 +vt 0.000189 0.231743 +vt 0.219377 0.383727 +vt 0.323697 0.386955 +vt 0.401240 0.277759 +vt 0.348665 0.219335 +vt 0.897848 0.429409 +vt 0.897848 0.369428 +vt 0.455780 0.324666 +vt 0.389527 0.332393 +vt 0.460835 0.294345 +vt 0.601924 0.430168 +vt 0.604611 0.464635 +vt 0.550354 0.430122 +vt 0.412556 0.365101 +vt 0.498097 0.347268 +vt 0.527934 0.303538 +vt 0.667070 0.447561 +vt 0.234023 0.311584 +vt 0.174940 0.291364 +vt 0.235744 0.266288 +vt 0.302906 0.379321 +vt 0.239848 0.383727 +vt 0.281906 0.350454 +vt 0.535352 0.377687 +vt 0.512691 0.415362 +vt 0.457235 0.392245 +vt 0.896788 0.206488 +vt 0.977239 0.220723 +vt 0.916941 0.250354 +vt 0.662466 0.401344 +vt 0.191126 0.344975 +vt 0.386261 0.401186 +vt 0.423590 0.426354 +vt 0.356491 0.417161 +vt 0.917216 0.293522 +vt 0.977239 0.272769 +vt 0.960687 0.313000 +vt 0.940258 0.178253 +vt 0.300346 0.303002 +vt 0.302906 0.257588 +vt 0.258350 0.231743 +vt 0.869731 0.180703 +vt 0.852038 0.225506 +vt 0.535352 0.277759 +vt 0.348665 0.377371 +vt 0.852038 0.277552 +vt 0.667070 0.479999 +vt 0.177500 0.245950 +vt 0.584574 0.391167 +vt 0.720712 0.246238 +vt 0.752177 0.234122 +vt 0.736887 0.279405 +vt 0.351981 0.470048 +vt 0.398435 0.456435 +vt 0.392379 0.487160 +vt 0.948700 0.341216 +vt 0.947896 0.369975 +vt 0.897848 0.354002 +vt 1.000000 0.351700 +vt 0.982154 0.324433 +vt 0.348665 0.439580 +vt 0.809456 0.228114 +vt 0.852038 0.252110 +vt 0.795866 0.269234 +vt 0.948700 0.398097 +vt 0.919917 0.418599 +vt 0.897848 0.387436 +vt 0.766906 0.303985 +vt 0.836748 0.297393 +vt 0.795471 0.324433 +vt 0.852038 0.207049 +vt 0.983050 0.417177 +vt 0.449983 0.447546 +vt 0.449983 0.473934 +vt 0.439679 0.499818 +vt 0.779329 0.195155 +vt 0.923970 0.067164 +vt 0.976849 0.076478 +vt 0.938875 0.108250 +vt 1.000000 0.385134 +vt 0.925103 0.022563 +vt 0.961556 0.000000 +vt 0.976871 0.035023 +vt 0.406269 0.426354 +vt 0.820211 0.178253 +vt 0.685107 0.138507 +vt 0.754241 0.107867 +vt 0.765496 0.165761 +vt 0.110975 0.269504 +vt 0.153299 0.237108 +vt 0.174940 0.298959 +vt 0.646095 0.084578 +vt 0.590514 0.128080 +vt 0.664308 0.178253 +vt 0.054379 0.231743 +vt 0.616784 0.035559 +vt 0.659078 0.000000 +vt 0.714081 0.047355 +vt 0.638782 0.293017 +vt 0.701278 0.337498 +vt 0.576917 0.348095 +vt 0.610084 0.178253 +vt 0.720712 0.195999 +vt 0.637059 0.228412 +vt 0.000000 0.289393 +vt 0.557890 0.012492 +vt 0.720712 0.262014 +vt 0.854474 0.034652 +vt 0.765496 0.058013 +vt 0.769025 0.000000 +vt 0.174940 0.373484 +vt 0.083548 0.394658 +vt 0.082264 0.331396 +vt 0.851740 0.083189 +vt 0.923970 0.041656 +vt 0.923970 0.091572 +vt 0.153301 0.432218 +vt 0.550354 0.281799 +vt 0.550354 0.067568 +vt 0.550354 0.215785 +vt 0.765496 0.107929 +vt 0.765496 0.013371 +vt 0.026952 0.425218 +vt 0.641135 0.391167 +vt 0.976871 0.130571 +vt 0.024440 0.781660 +vt 0.975560 0.781660 +vt 0.500000 0.883297 +vt 0.270458 0.670230 +vt 0.729542 0.670230 +vt 0.500000 0.753415 +vt 0.975560 0.892548 +vt 0.500000 0.994185 +vt 0.024440 0.892548 +vt 0.000000 0.750000 +vt 0.000000 0.634999 +vt 0.024388 0.634999 +vt 0.024388 0.750000 +vt 0.262194 0.519999 +vt 0.262194 0.500000 +vt 0.500000 0.500000 +vt 0.500000 0.519999 +vt 1.000000 0.634999 +vt 1.000000 0.750000 +vt 0.975612 0.750000 +vt 0.975612 0.634999 +vt 0.262194 0.865001 +vt 0.262194 0.980001 +vt 0.024388 0.980001 +vt 0.024388 0.865001 +vt 0.262194 0.634999 +vt 0.262194 0.750000 +vt 0.737806 0.634999 +vt 0.737806 0.750000 +vt 0.500000 0.750000 +vt 0.500000 0.634999 +vt 0.737806 0.865001 +vt 0.737806 0.980001 +vt 0.500000 0.980001 +vt 0.500000 0.865001 +vt 0.737806 1.000000 +vt 0.500000 1.000000 +vt 0.975612 0.980001 +vt 0.975612 1.000000 +vt 0.000000 0.865001 +vt 0.024388 0.519999 +vt 0.000000 0.519999 +vt 0.000000 0.500000 +vt 0.024388 0.500000 +vt 1.000000 0.980001 +vt 1.000000 1.000000 +vt 0.024388 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.980001 +vt 0.737806 0.500000 +vt 0.737806 0.519999 +vt 1.000000 0.865001 +vt 0.975612 0.865001 +vt 0.262194 1.000000 +vt 0.975612 0.519999 +vt 0.975612 0.500000 +vt 1.000000 0.500000 +vt 1.000000 0.519999 +vt 0.500000 0.646573 +vt 0.385229 0.646573 +vt 0.270458 0.579473 +vt 0.262220 0.863644 +vt 0.024440 0.863644 +vt 0.737780 0.863644 +vt 0.975560 0.863644 +vt 0.385229 0.737330 +vt 0.270458 0.737330 +vt 0.614771 0.737330 +vt 0.729542 0.737330 +vt 0.737780 0.974532 +vt 0.975560 0.974532 +vt 0.262220 0.974532 +vt 0.024440 0.974532 +vt 0.729542 0.579473 +vt 0.729542 0.646573 +vt 0.614771 0.662658 +vt 0.270458 0.646573 +vn -0.079300 0.996800 -0.009600 +vn -0.581300 0.812100 0.049300 +vn -0.346700 0.897900 0.271200 +vn -0.535200 0.549500 0.641500 +vn 0.120600 0.722600 0.680700 +vn -0.147000 0.947300 -0.284500 +vn 0.411600 0.889500 -0.198200 +vn 0.302300 0.947000 0.108900 +vn -0.215200 0.320200 0.922600 +vn -0.900000 0.430200 0.070800 +vn -0.925100 0.217900 0.310900 +vn -0.838100 0.422000 0.345600 +vn -0.242600 0.606300 -0.757300 +vn -0.672400 0.251000 -0.696400 +vn -0.747500 0.578900 -0.325700 +vn 0.802500 0.467500 -0.370500 +vn 0.744200 0.288600 -0.602400 +vn 0.410200 0.670700 -0.617900 +vn 0.691500 0.641700 0.331600 +vn 0.942400 0.305700 0.135500 +vn 0.832100 0.550000 -0.070600 +vn -0.801200 0.172200 0.573100 +vn 0.213000 0.321500 -0.922600 +vn 0.920600 0.321700 -0.221300 +vn 0.582200 0.380300 0.718700 +vn -0.950400 0.189800 -0.246200 +vn 0.078800 0.994100 -0.074500 +vn -0.236900 0.849800 -0.470800 +vn -0.311700 0.936800 -0.158600 +vn -0.762700 0.632100 -0.136200 +vn -0.468100 0.771700 0.430600 +vn 0.288700 0.919500 -0.266800 +vn 0.474400 0.844400 0.248500 +vn 0.148700 0.939300 0.309200 +vn -0.872200 0.409500 0.267600 +vn -0.482700 0.397600 -0.780300 +vn -0.671000 0.257200 -0.695400 +vn -0.674000 0.504800 -0.539300 +vn 0.618900 0.536800 -0.573400 +vn 0.325500 0.219600 -0.919700 +vn -0.002700 0.589200 -0.807900 +vn 0.776700 0.388800 0.495400 +vn 0.926700 0.185700 0.326800 +vn 0.815000 0.578200 0.038500 +vn 0.104800 0.639900 0.761200 +vn 0.370900 0.273800 0.887400 +vn 0.533100 0.504300 0.679300 +vn -0.879000 0.272700 -0.391300 +vn -0.302200 0.195700 -0.932900 +vn 0.939600 0.211400 -0.269200 +vn 0.688800 0.252500 0.679500 +vn -0.320100 0.414400 0.851900 +vn -0.223000 0.974800 0.001400 +vn -0.198100 0.840500 -0.504200 +vn -0.458400 0.841800 -0.284900 +vn -0.723500 0.445200 -0.527600 +vn -0.839000 0.533400 0.107200 +vn 0.072100 0.996500 -0.043000 +vn -0.049400 0.872200 0.486500 +vn -0.363200 0.862500 0.352200 +vn -0.956700 0.134000 -0.258500 +vn -0.066300 0.413300 -0.908100 +vn -0.219100 0.219900 -0.950600 +vn -0.388300 0.426800 -0.816700 +vn 0.627700 0.769400 -0.117900 +vn 0.687500 0.452200 -0.568200 +vn 0.257200 0.711100 -0.654300 +vn -0.564000 0.127800 -0.815800 +vn 0.221700 0.287800 -0.931700 +vn 0.838600 0.463000 0.287200 +vn -0.573200 0.662400 0.482300 +vn 0.160400 0.599100 0.784500 +vn 0.456600 0.695900 0.554200 +vn -0.156300 0.697800 0.699000 +vn -0.929800 0.212600 0.300400 +vn 0.138300 0.958500 -0.249100 +vn 0.289700 0.682300 -0.671200 +vn -0.015600 0.813700 -0.581100 +vn -0.306400 0.438800 -0.844700 +vn -0.601700 0.729300 -0.325600 +vn 0.418500 0.891000 -0.176000 +vn 0.085400 0.958000 0.273800 +vn -0.147300 0.988600 0.030700 +vn -0.715600 0.274400 -0.642300 +vn 0.848500 0.528900 0.012500 +vn 0.945400 0.099600 -0.310500 +vn 0.687100 0.411200 -0.599000 +vn 0.035000 0.629400 0.776300 +vn 0.264200 0.431900 0.862400 +vn 0.458800 0.733600 0.501200 +vn -0.551300 0.768900 0.323800 +vn -0.524000 0.496800 0.691900 +vn -0.258400 0.717600 0.646700 +vn -0.243600 0.043600 -0.968900 +vn 0.778900 0.342700 0.525100 +vn -0.177400 0.509000 0.842300 +vn -0.867700 0.485400 0.107400 +vn 0.420300 0.286500 -0.861000 +vn 0.086100 0.403200 -0.911000 +vn 0.676200 -0.004600 -0.736700 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.868100 -0.496400 +vn 1.000000 -0.000000 0.000000 +vn 0.608100 0.793800 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.009600 0.863600 0.504100 +vn -0.748400 0.663300 0.000000 +vn -0.538800 0.842400 0.000000 +vn 0.181900 0.983100 -0.019900 +vn 0.024200 0.999700 0.000200 +vn -0.009700 0.998200 -0.059500 +vn -0.015000 0.753800 0.656900 +vn 0.013000 0.979900 -0.198800 +vn 0.728500 0.684600 0.023900 +vn -0.097000 0.995300 0.000000 +vn -0.006100 0.999500 0.029500 +vn 0.032300 0.998400 0.046500 +vn 0.001700 0.991700 0.128100 +vn -0.077200 0.997000 -0.004600 +vn -0.149900 0.988600 0.013900 +vn 0.011400 0.998300 -0.057600 +vn 0.033600 0.999300 -0.016700 +vn -0.020700 0.999800 0.004600 +vn -0.032500 0.999500 0.000000 +vn -0.033600 0.999300 -0.016900 +vn -0.004500 0.998900 -0.046500 +vn -0.020700 0.999800 0.007200 +vn 0.004200 0.994700 0.103000 +vn -0.010700 0.975500 0.219600 +vn -0.032300 0.998400 0.046600 +vn 0.015000 0.796500 -0.604400 +vn 0.042900 0.999100 -0.003700 +vn -0.006700 0.918100 -0.396300 +vn -0.829200 0.559000 0.000000 +vn 0.084200 0.995800 0.034200 +vn -0.348200 0.936900 0.031600 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.894400 0.447200 +vn 0.510100 0.860000 -0.013300 +vn 0.006700 0.918100 -0.396300 +vn -0.580300 0.813900 -0.027400 +vn 0.014500 0.832400 0.553900 +vn 0.003000 0.989000 -0.147800 +vn 0.728500 0.684600 -0.023900 +vn -0.002400 0.999700 -0.023400 +vn -0.015000 0.796500 -0.604400 +vn 0.036200 0.999100 -0.023300 +vn -0.013300 0.937400 0.348100 +vn 0.510100 0.860000 0.013300 +vn -1.000000 -0.000000 0.000000 +g gravel-stone_Plane.008_gravel-stone +s 1 +f 193/203/87 199/204/88 200/205/89 +f 194/206/90 202/207/91 200/208/89 +f 193/203/87 204/209/92 199/204/88 +f 193/203/87 206/210/93 204/209/92 +f 193/203/87 203/211/94 206/210/93 +f 194/206/90 209/212/95 202/207/91 +f 195/213/96 211/214/97 201/215/98 +f 196/216/99 213/217/100 205/218/101 +f 197/219/102 215/220/103 207/221/104 +f 198/222/105 217/223/106 208/224/107 +f 194/225/90 212/226/108 209/227/95 +f 196/216/99 216/228/109 213/217/100 +f 197/219/102 218/229/110 215/220/103 +f 198/222/105 210/230/111 217/223/106 +f 199/231/88 195/213/96 201/215/98 +f 199/231/88 201/215/98 200/232/89 +f 200/232/89 201/215/98 194/225/90 +f 202/233/91 198/222/105 203/211/94 +f 202/233/91 203/211/94 200/205/89 +f 200/205/89 203/211/94 193/203/87 +f 204/234/92 196/216/99 205/218/101 +f 204/235/92 205/236/101 199/231/88 +f 199/231/88 205/236/101 195/213/96 +f 206/210/93 197/219/102 207/221/104 +f 206/210/93 207/221/104 204/209/92 +f 204/209/92 207/221/104 196/237/99 +f 203/211/94 198/222/105 208/224/107 +f 203/211/94 208/224/107 206/210/93 +f 206/210/93 208/224/107 197/219/102 +f 209/212/95 210/238/111 202/207/91 +f 202/207/91 210/238/111 198/239/105 +f 211/214/97 212/226/108 201/215/98 +f 201/215/98 212/226/108 194/225/90 +f 213/240/100 214/241/112 205/236/101 +f 205/236/101 214/241/112 195/213/96 +f 215/242/103 216/228/109 207/243/104 +f 207/243/104 216/228/109 196/216/99 +f 217/223/106 218/229/110 208/224/107 +f 208/224/107 218/229/110 197/219/102 +f 219/244/113 225/245/114 226/246/115 +f 220/247/116 228/248/117 226/249/115 +f 219/244/113 230/250/118 225/245/114 +f 219/244/113 232/251/119 230/250/118 +f 219/244/113 229/252/120 232/251/119 +f 220/247/116 235/253/121 228/248/117 +f 221/254/122 237/255/123 227/256/124 +f 222/257/125 239/258/126 231/259/127 +f 223/260/128 241/261/129 233/262/130 +f 224/263/131 243/264/132 234/265/133 +f 220/247/116 238/266/134 235/253/121 +f 221/254/122 240/267/135 237/255/123 +f 222/268/125 242/269/136 239/270/126 +f 223/271/128 244/272/137 241/273/129 +f 224/263/131 236/274/138 243/264/132 +f 225/275/114 221/254/122 227/256/124 +f 225/275/114 227/256/124 226/276/115 +f 226/276/115 227/256/124 220/277/116 +f 228/278/117 224/263/131 229/279/120 +f 228/280/117 229/252/120 226/246/115 +f 226/246/115 229/252/120 219/244/113 +f 230/250/118 222/268/125 231/281/127 +f 230/250/118 231/281/127 225/245/114 +f 225/275/114 231/259/127 221/254/122 +f 232/251/119 223/260/128 233/262/130 +f 232/251/119 233/262/130 230/250/118 +f 230/250/118 233/262/130 222/268/125 +f 229/279/120 224/263/131 234/265/133 +f 229/279/120 234/265/133 232/282/119 +f 232/282/119 234/265/133 223/271/128 +f 235/253/121 236/283/138 228/248/117 +f 228/278/117 236/274/138 224/263/131 +f 237/255/123 238/284/134 227/256/124 +f 227/285/124 238/266/134 220/247/116 +f 239/258/126 240/267/135 231/259/127 +f 231/259/127 240/267/135 221/254/122 +f 241/261/129 242/269/136 233/262/130 +f 233/262/130 242/269/136 222/268/125 +f 243/264/132 244/272/137 234/265/133 +f 234/265/133 244/272/137 223/271/128 +f 245/286/139 251/287/140 252/288/141 +f 246/289/142 254/290/143 252/291/141 +f 245/292/139 256/293/144 251/294/140 +f 245/292/139 258/295/145 256/293/144 +f 245/292/139 255/296/146 258/295/145 +f 246/289/142 261/297/147 254/290/143 +f 247/298/148 263/299/149 253/300/150 +f 248/301/151 265/302/152 257/303/153 +f 246/304/142 264/305/154 261/306/147 +f 247/298/148 266/307/155 263/299/149 +f 248/301/151 267/308/156 265/302/152 +f 251/287/140 247/298/148 253/300/150 +f 251/287/140 253/300/150 252/288/141 +f 252/288/141 253/300/150 246/304/142 +f 254/290/143 250/309/157 255/310/146 +f 254/290/143 255/310/146 252/291/141 +f 252/291/141 255/310/146 245/311/139 +f 256/293/144 248/301/151 257/303/153 +f 256/293/144 257/303/153 251/294/140 +f 251/287/140 257/312/153 247/298/148 +f 258/313/145 249/314/158 259/315/159 +f 258/295/145 259/316/159 256/293/144 +f 256/293/144 259/316/159 248/301/151 +f 255/317/146 250/318/157 260/319/160 +f 255/317/146 260/319/160 258/313/145 +f 258/313/145 260/319/160 249/314/158 +f 261/297/147 262/320/161 254/290/143 +f 254/290/143 262/320/161 250/309/157 +f 263/299/149 264/305/154 253/300/150 +f 253/300/150 264/305/154 246/304/142 +f 265/321/152 266/307/155 257/312/153 +f 257/312/153 266/307/155 247/298/148 +f 259/316/159 267/308/156 248/301/151 +f 268/322/162 274/323/163 275/324/164 +f 269/325/165 277/326/166 275/327/164 +f 268/322/162 279/328/167 274/323/163 +f 268/322/162 281/329/168 279/328/167 +f 268/322/162 278/330/169 281/329/168 +f 269/325/165 284/331/170 277/326/166 +f 271/332/171 287/333/172 280/334/173 +f 272/335/174 289/336/175 282/337/176 +f 273/338/177 291/339/178 283/340/179 +f 269/325/165 286/341/180 284/331/170 +f 271/332/171 290/342/181 287/333/172 +f 272/335/174 292/343/182 289/336/175 +f 273/344/177 285/345/183 291/346/178 +f 274/347/163 270/348/184 276/349/185 +f 274/347/163 276/349/185 275/327/164 +f 275/327/164 276/349/185 269/325/165 +f 277/350/166 273/344/177 278/351/169 +f 277/350/166 278/351/169 275/352/164 +f 275/324/164 278/330/169 268/322/162 +f 279/328/167 271/332/171 280/334/173 +f 279/328/167 280/334/173 274/323/163 +f 274/347/163 280/353/173 270/348/184 +f 281/354/168 272/335/174 282/337/176 +f 281/329/168 282/355/176 279/328/167 +f 279/328/167 282/355/176 271/332/171 +f 278/356/169 273/338/177 283/340/179 +f 278/356/169 283/340/179 281/354/168 +f 281/354/168 283/340/179 272/335/174 +f 284/357/170 285/345/183 277/350/166 +f 277/350/166 285/345/183 273/344/177 +f 276/349/185 286/341/180 269/325/165 +f 287/333/172 288/358/186 280/334/173 +f 280/353/173 288/359/186 270/348/184 +f 289/336/175 290/360/181 282/337/176 +f 282/355/176 290/342/181 271/332/171 +f 291/339/178 292/343/182 283/340/179 +f 283/340/179 292/343/182 272/335/174 +f 259/315/159 249/314/158 267/361/156 +f 303/362/187 295/363/187 327/364/188 +f 309/365/189 305/366/189 325/367/190 +f 307/368/191 322/369/192 301/370/191 +f 323/371/193 332/372/194 333/373/195 324/374/196 +f 338/375/197 339/376/198 322/377/192 321/378/199 +f 334/379/200 325/380/190 326/381/201 335/382/202 +f 353/383/203 345/384/204 318/385/205 341/386/206 +f 352/387/207 346/388/208 324/374/196 333/373/195 +f 351/389/209 347/390/210 329/391/211 348/392/212 +f 350/393/213 337/394/214 328/395/215 349/396/216 +f 336/397/217 327/398/188 328/395/215 337/394/214 +f 319/399/218 297/400/219 336/397/217 337/394/214 +f 340/401/220 323/371/193 324/374/196 341/386/206 +f 317/402/221 302/403/222 316/404/223 300/405/224 +f 319/399/218 312/406/225 296/407/223 297/400/219 +f 318/385/205 306/408/226 308/409/223 311/410/227 +f 321/378/199 322/377/192 331/411/228 330/412/229 +f 325/380/190 342/413/230 343/414/231 326/381/201 +f 327/398/188 344/415/232 345/384/204 328/395/215 +f 347/390/210 350/393/213 349/396/216 329/391/211 +f 326/381/201 343/414/231 350/393/213 347/390/210 +f 343/414/231 319/399/218 337/394/214 350/393/213 +f 330/412/229 351/389/209 348/392/212 321/378/199 +f 320/416/233 335/382/202 351/389/209 330/412/229 +f 335/382/202 326/381/201 347/390/210 351/389/209 +f 338/375/197 352/387/207 333/373/195 317/402/221 +f 321/378/199 348/392/212 352/387/207 338/375/197 +f 348/392/212 329/391/211 346/388/208 352/387/207 +f 346/388/208 353/383/203 341/386/206 324/374/196 +f 329/391/211 349/396/216 353/383/203 346/388/208 +f 349/396/216 328/395/215 345/384/204 353/383/203 +f 300/405/224 339/376/198 338/375/197 317/402/221 +f 320/416/233 313/417/234 315/418/223 314/419/235 +f 342/413/230 312/406/225 319/399/218 343/414/231 +f 320/416/233 314/419/235 334/379/200 335/382/202 +f 311/410/227 340/401/220 341/386/206 318/385/205 +f 344/415/232 306/408/226 318/385/205 345/384/204 +f 332/372/194 302/403/222 317/402/221 333/373/195 +f 330/412/229 331/411/228 313/417/234 320/416/233 +f 323/420/193 340/421/220 293/422/236 +f 303/362/187 327/364/188 336/423/217 +f 336/423/217 297/424/219 303/362/187 +f 344/425/232 295/363/187 306/426/226 +f 295/363/187 344/425/232 327/364/188 +f 309/365/189 325/367/190 334/427/200 +f 334/427/200 314/428/235 309/365/189 +f 342/429/230 305/366/189 312/430/225 +f 305/366/189 342/429/230 325/367/190 +f 331/431/228 307/368/191 313/432/234 +f 339/433/198 300/434/224 301/370/191 +f 301/370/191 322/369/192 339/433/198 +f 322/369/192 307/368/191 331/431/228 +f 299/435/236 302/436/222 332/437/194 +f 323/420/193 293/422/236 299/435/236 +f 293/422/236 340/421/220 311/438/227 +f 299/435/236 332/437/194 323/420/193 +l 308 294 +l 296 304 +l 315 310 +l 298 316 +o water-top_Plane.007 +v -0.480468 0.062499 -0.292968 +v -0.480468 0.062499 0.292968 +v 0.480467 0.062499 -0.292968 +v 0.480467 0.062499 0.292968 +vt 0.000029 0.195140 +vt 0.999971 0.195140 +vt 0.999971 0.804860 +vt 0.000029 0.804860 +vn 0.000000 1.000000 0.000000 +g water-top_Plane.007_water-top +s off +f 355/439/237 357/440/237 356/441/237 354/442/237 +o sides_Plane.006 +v -0.480468 -0.472656 -0.269532 +v -0.480468 -0.472656 -0.292968 +v -0.457033 -0.472656 -0.292968 +v -0.480468 0.124999 -0.269532 +v -0.480468 0.124999 -0.292968 +v -0.457033 0.124999 -0.292968 +v -0.480468 -0.472656 0.292968 +v -0.480468 -0.472656 0.269532 +v -0.457033 -0.472656 0.292968 +v -0.480468 0.124999 0.292968 +v -0.480468 0.124999 0.269532 +v -0.457033 0.124999 0.292968 +v 0.457032 -0.472656 -0.292968 +v 0.480467 -0.472656 -0.292968 +v 0.480467 -0.472656 -0.269532 +v 0.457032 0.124999 -0.292968 +v 0.480467 0.124999 -0.292968 +v 0.480467 0.124999 -0.269532 +v 0.457032 -0.472656 0.292968 +v 0.480467 -0.472656 0.269532 +v 0.480467 -0.472656 0.292968 +v 0.457032 0.124999 0.292968 +v 0.480467 0.124999 0.269532 +v 0.480467 0.124999 0.292968 +v 0.457032 -0.393866 -0.292968 +v -0.457033 -0.393866 0.292968 +v -0.480468 -0.393866 0.269532 +v -0.457033 -0.393866 -0.292968 +v -0.480468 -0.393866 -0.269532 +v 0.480467 -0.393866 -0.269532 +v 0.457032 -0.393866 0.292968 +v 0.480467 -0.393866 0.269532 +v -0.480468 0.062499 -0.269532 +v -0.457033 0.062499 -0.292968 +v -0.480468 0.062499 0.269532 +v -0.457033 0.062499 0.292968 +v 0.457032 0.062499 -0.292968 +v 0.480467 0.062499 -0.269532 +v 0.457032 0.062499 0.292968 +v 0.480467 0.062499 0.269532 +vt 0.810958 0.640907 +vt 0.810958 0.665294 +vt 0.189042 0.665294 +vt 0.189042 0.640907 +vt 0.032017 0.936656 +vt 0.958426 0.936656 +vt 0.958426 1.000000 +vt 0.032017 1.000000 +vt 0.222049 0.811656 +vt 0.768394 0.811656 +vt 0.768394 0.875000 +vt 0.222049 0.875000 +vt 0.036795 0.542382 +vt 0.036795 0.000000 +vt 0.963205 0.000000 +vt 0.963205 0.542382 +vt 0.773172 0.000000 +vt 0.773172 0.542383 +vt 0.226828 0.542383 +vt 0.226828 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000000 +g sides_Plane.006_sides +s off +f 361/443/238 362/444/238 359/445/238 358/446/238 +f 362/443/239 363/444/239 360/445/239 359/446/239 +f 367/443/238 368/444/238 365/445/238 364/446/238 +f 369/443/240 367/444/240 364/445/240 366/446/240 +f 373/443/239 374/444/239 371/445/239 370/446/239 +f 374/443/241 375/444/241 372/445/241 371/446/241 +f 380/443/241 381/444/241 378/445/241 377/446/241 +f 381/443/240 379/444/240 376/445/240 378/446/240 +f 394/447/239 391/448/239 363/449/239 373/450/239 +f 390/451/238 392/452/238 368/453/238 361/454/238 +f 393/447/240 396/448/240 379/449/240 369/450/240 +f 397/451/241 395/452/241 375/453/241 380/454/241 +f 394/455/239 370/456/239 360/457/239 391/458/239 +f 365/459/238 392/460/238 390/461/238 358/462/238 +f 376/457/240 396/458/240 393/455/240 366/456/240 +f 397/461/241 377/462/241 372/459/241 395/460/241 +l 389 380 +l 387 375 +l 388 379 +l 383 369 +l 384 368 +l 386 361 +l 382 373 +l 385 363 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot.obj b/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ground_lantern.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ground_lantern.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_hanging_lantern.obj b/mods/homedecor_modpack/homedecor/models/homedecor_hanging_lantern.obj old mode 100755 new mode 100644 index 4d113af9..0f731f97 --- a/mods/homedecor_modpack/homedecor/models/homedecor_hanging_lantern.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_hanging_lantern.obj @@ -1,51 +1,15 @@ # Blender v2.72 (sub 0) OBJ File: '' # www.blender.org mtllib homedecor_hanging_lantern.mtl -o lantern_light_light_(null) -v -0.175969 -0.037568 -0.110205 -v 0.175970 -0.037568 -0.110204 -v 0.101887 -0.364419 -0.036122 -v -0.101886 -0.364419 -0.036123 -v -0.181295 -0.034063 0.249302 -v -0.181294 -0.034063 -0.110185 -v -0.105623 -0.367924 -0.034513 -v -0.105623 -0.367924 0.173630 -v 0.181502 -0.032429 0.253277 -v -0.181503 -0.032429 0.253276 -v -0.105091 -0.369558 0.176863 -v 0.105090 -0.369558 0.176864 -v 0.181250 -0.032380 -0.111996 -v 0.181249 -0.032380 0.251115 -v 0.104815 -0.369607 0.174680 -v 0.104816 -0.369607 -0.035562 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -g lantern_light_light_(null)_lantern_light_light_(null)_(null).001 -usemtl (null).001 -s off -f 1/1 2/2 3/3 4/4 -f 5/1 6/2 7/3 8/4 -f 9/1 10/2 11/3 12/4 -f 13/1 14/2 15/3 16/4 -o lantern_cage_cage_(null) -v 0.000000 0.177104 0.055271 -v 0.000000 0.117846 0.055271 -v 0.010103 0.117846 0.059456 -v 0.010103 0.177104 0.059456 -v 0.014288 0.117846 0.069559 -v 0.014288 0.177104 0.069559 -v 0.010103 0.117846 0.079662 -v 0.010103 0.177104 0.079662 -v 0.000000 0.117846 0.083847 -v 0.000000 0.177104 0.083847 -v -0.010103 0.117846 0.079662 -v -0.010103 0.177104 0.079662 -v -0.014288 0.117846 0.069559 -v -0.014288 0.177104 0.069559 -v -0.010103 0.177104 0.059456 -v -0.010103 0.117846 0.059456 +o cage_cage_lantern +v -0.009490 0.082036 0.058057 +v -0.009490 0.119436 0.058057 +v 0.009490 0.119436 0.058057 +v 0.009490 0.082036 0.058057 +v -0.009490 0.082036 0.077037 +v -0.009490 0.119436 0.077037 +v 0.009490 0.082036 0.077037 +v 0.009490 0.119436 0.077037 v -0.000001 -0.016654 0.499996 v -0.000001 -0.033108 0.464553 v -0.096440 -0.088787 0.464553 @@ -58,748 +22,517 @@ v 0.096439 -0.200145 0.464553 v 0.110688 -0.208372 0.499997 v 0.110688 -0.080560 0.499997 v 0.096439 -0.088787 0.464553 -v 0.158984 0.037323 -0.089425 -v 0.158983 0.037323 0.228543 -v 0.226693 0.007011 0.296252 -v 0.226694 0.007011 -0.157134 -v -0.158984 0.037323 0.228542 -v -0.226694 0.007011 0.296252 -v -0.158983 0.037323 -0.089425 -v -0.226693 0.007011 -0.157135 -v 0.226694 0.007011 -0.157134 -v -0.226693 0.007011 -0.157135 -v -0.077047 0.119547 -0.007488 -v -0.077047 0.119547 0.146606 -v 0.077047 0.119547 0.146606 -v 0.077047 0.119547 -0.007488 -v 0.090171 0.089235 0.159730 -v 0.090171 0.089235 -0.020612 -v 0.122642 0.063279 0.192201 -v 0.122642 0.063279 -0.053083 -v -0.090171 0.089235 0.159730 -v -0.122642 0.063279 0.192201 -v -0.090171 0.089235 -0.020612 -v -0.122642 0.063279 -0.053083 -v 0.226694 -0.015855 -0.157134 -v -0.226693 -0.015855 -0.157135 -v -0.226694 0.007011 0.296252 -v 0.226693 0.007011 0.296252 -v 0.199360 -0.015845 -0.129800 -v -0.199359 -0.015845 -0.129801 -v -0.226694 -0.015855 0.296252 -v 0.226693 -0.015855 0.296252 -v -0.115429 -0.386142 -0.045871 -v -0.175969 -0.037568 -0.124877 -v -0.101886 -0.364419 -0.050795 -v -0.199360 -0.015845 0.268918 -v 0.199359 -0.015845 0.268919 -v 0.115430 -0.386142 -0.045870 -v 0.115429 -0.386142 0.184989 -v -0.115430 -0.386142 0.184988 -v -0.119558 -0.367924 -0.034513 -v -0.195230 -0.034063 -0.110185 -v 0.181502 -0.032429 0.265160 -v 0.105090 -0.369558 0.188748 -v 0.119177 -0.369607 0.174680 -v 0.195611 -0.032380 0.251115 -v -0.000002 -0.287895 0.466067 -v -0.000002 0.218073 0.465044 -v -0.007374 0.217671 0.464262 -v -0.007374 -0.288165 0.465207 -v -0.013624 0.216527 0.462036 -v -0.013624 -0.288935 0.462759 -v -0.017799 0.214814 0.458703 -v -0.017799 -0.290086 0.459095 -v -0.019266 0.212794 0.454773 -v -0.019266 -0.291445 0.454773 -v -0.017799 0.210773 0.450842 -v -0.017799 -0.292804 0.450451 -v -0.013624 0.209061 0.447510 -v -0.013624 -0.293955 0.446786 -v -0.007374 0.207916 0.445283 -v -0.007374 -0.294725 0.444338 -v -0.000002 0.207514 0.444501 -v -0.000002 -0.294995 0.443479 -v 0.007372 0.207916 0.445283 -v 0.007372 -0.294725 0.444338 -v 0.013622 0.209061 0.447510 -v 0.013622 -0.293955 0.446786 -v 0.017798 0.210773 0.450842 -v 0.017798 -0.292804 0.450451 -v 0.019265 0.212794 0.454773 -v 0.019265 -0.291445 0.454773 -v 0.017798 0.214814 0.458703 -v 0.017798 -0.290086 0.459095 -v 0.013622 0.216527 0.462036 -v 0.013622 -0.288935 0.462759 -v 0.007372 -0.288165 0.465207 -v 0.007372 0.217671 0.464262 -v -0.017799 0.310983 0.430544 -v -0.013624 0.309271 0.427211 -v 0.000000 0.307724 0.424203 -v 0.007372 0.308126 0.424985 -v 0.017798 0.310983 0.430544 -v 0.019265 0.313004 0.434474 -v -0.017799 0.315024 0.438405 -v -0.019266 0.313004 0.434474 -v 0.013622 0.316737 0.441737 -v 0.007372 0.317881 0.443964 -v -0.007374 0.308126 0.424985 -v 0.013622 0.309271 0.427211 -v -0.007374 0.317881 0.443964 -v -0.013624 0.316737 0.441737 -v 0.017798 0.315024 0.438405 -v -0.000002 0.318283 0.444746 -v -0.013624 0.388798 0.384903 -v -0.017799 0.387085 0.381571 -v 0.017798 0.387085 0.381571 -v 0.013622 0.388798 0.384903 -v 0.000000 0.390344 0.387911 -v -0.007374 0.389942 0.387129 -v 0.017798 0.383044 0.373709 -v 0.019265 0.385065 0.377640 -v 0.007372 0.380187 0.368150 -v 0.013622 0.381332 0.370377 -v -0.007374 0.380187 0.368150 -v 0.000000 0.379785 0.367369 -v -0.017799 0.383044 0.373709 -v -0.013624 0.381332 0.370377 -v -0.019266 0.385065 0.377640 -v 0.007372 0.389942 0.387129 -v -0.017799 0.446615 0.312423 -v -0.019266 0.443434 0.309828 -v 0.013622 0.449312 0.314622 -v 0.007372 0.451113 0.316091 -v -0.007374 0.451113 0.316091 -v -0.013624 0.449312 0.314622 -v 0.019265 0.443434 0.309828 -v 0.017800 0.446615 0.312423 -v 0.013622 0.437556 0.305035 -v 0.017800 0.440253 0.307234 -v 0.000000 0.435122 0.303049 -v 0.007372 0.435754 0.303565 -v -0.013624 0.437556 0.305035 -v -0.007374 0.435754 0.303565 -v -0.017799 0.440253 0.307234 -v 0.000000 0.451746 0.316608 -v -0.019266 0.474239 0.220195 -v -0.017799 0.470651 0.218535 -v 0.007372 0.482901 0.224200 -v 0.000000 0.483614 0.224530 -v -0.013622 0.480868 0.223260 -v -0.017799 0.477827 0.221854 -v 0.017800 0.477827 0.221854 -v 0.013622 0.480868 0.223260 -v -0.007372 0.482901 0.224200 -v 0.017800 0.470651 0.218535 -v 0.019265 0.474239 0.220195 -v 0.007372 0.465577 0.216189 -v 0.013622 0.467610 0.217129 -v -0.007372 0.465577 0.216189 -v 0.000000 0.464864 0.215859 -v -0.013622 0.467610 0.217129 -v -0.017799 0.489040 0.116953 -v -0.013622 0.485781 0.116981 -v -0.017799 0.496728 0.116889 -v -0.019266 0.492884 0.116921 -v 0.013622 0.499987 0.116861 -v 0.007372 0.502165 0.116843 -v -0.007372 0.502165 0.116843 -v -0.013622 0.499987 0.116861 -v 0.019265 0.492884 0.116921 -v 0.017800 0.496728 0.116889 -v 0.013622 0.485781 0.116981 -v 0.017800 0.489040 0.116953 -v 0.000000 0.482839 0.117006 -v 0.007372 0.483604 0.116999 -v -0.007372 0.483604 0.116999 -v 0.000000 0.502929 0.116836 -v -0.013622 0.475053 0.002225 -v -0.007372 0.473314 0.003800 -v -0.019264 0.480724 -0.002915 -v -0.017799 0.477655 -0.000134 -v 0.007372 0.488135 -0.009631 -v 0.000000 0.488745 -0.010184 -v -0.013622 0.486396 -0.008055 -v -0.017799 0.483794 -0.005697 -v 0.017800 0.483794 -0.005697 -v 0.013622 0.486396 -0.008055 -v -0.007372 0.488135 -0.009631 -v 0.017800 0.477655 -0.000134 -v 0.019267 0.480724 -0.002915 -v 0.007372 0.473314 0.003800 -v 0.013622 0.475053 0.002225 -v 0.000000 0.472703 0.004353 -v -0.007372 0.434099 -0.054906 -v 0.000000 0.433597 -0.054213 -v -0.017799 0.437668 -0.059835 -v -0.013622 0.435528 -0.056881 -v -0.017799 0.442715 -0.066806 -v -0.019264 0.440191 -0.063321 -v 0.013622 0.444854 -0.069761 -v 0.007372 0.446284 -0.071735 -v -0.007372 0.446284 -0.071735 -v -0.013622 0.444854 -0.069761 -v 0.019267 0.440191 -0.063321 -v 0.017800 0.442715 -0.066806 -v 0.013622 0.435528 -0.056881 -v 0.017800 0.437668 -0.059835 -v 0.007372 0.434099 -0.054906 -v 0.000000 0.446785 -0.072428 -v 0.000000 0.381807 -0.097403 -v 0.007372 0.381993 -0.098294 -v -0.013622 0.382524 -0.100832 -v -0.007372 0.381993 -0.098294 -v -0.019264 0.384255 -0.109112 -v -0.017799 0.383318 -0.104631 -v 0.007372 0.386518 -0.119929 -v 0.000000 0.386704 -0.120821 -v -0.013622 0.385987 -0.117391 -v -0.017799 0.385192 -0.113592 -v 0.017800 0.385192 -0.113592 -v 0.013622 0.385987 -0.117391 -v -0.007372 0.386518 -0.119929 -v 0.017800 0.383318 -0.104631 -v 0.019267 0.384255 -0.109112 -v 0.013622 0.382524 -0.100832 -v 0.007372 0.303747 -0.111601 -v 0.013622 0.302855 -0.113989 -v -0.007372 0.303747 -0.111601 -v 0.000000 0.304060 -0.110763 -v -0.017799 0.301521 -0.117562 -v -0.013622 0.302855 -0.113989 -v -0.017799 0.298372 -0.125992 -v -0.019264 0.299947 -0.121777 -v 0.013624 0.297038 -0.129566 -v 0.007374 0.296146 -0.131953 -v -0.007372 0.296146 -0.131953 -v -0.013622 0.297038 -0.129566 -v 0.019267 0.299947 -0.121777 -v 0.017800 0.298372 -0.125992 -v 0.017800 0.301521 -0.117562 -v 0.000000 0.295833 -0.132791 -v 0.013622 0.238131 -0.077360 -v 0.017800 0.235622 -0.079859 -v 0.000000 0.240397 -0.075104 -v 0.007372 0.239808 -0.075690 -v -0.013622 0.238131 -0.077360 -v -0.007372 0.239808 -0.075690 -v -0.019264 0.232662 -0.082806 -v -0.017799 0.235622 -0.079859 -v 0.007372 0.225515 -0.089922 -v 0.000000 0.224926 -0.090509 -v -0.013622 0.227192 -0.088253 -v -0.017799 0.229701 -0.085754 -v 0.017800 0.229701 -0.085754 -v 0.013622 0.227192 -0.088253 -v -0.007372 0.225515 -0.089922 -v 0.019267 0.232662 -0.082806 -v 0.000000 0.186161 -0.029048 -v -0.007372 0.186872 -0.028711 -v 0.017800 0.199083 -0.022926 -v 0.019267 0.195507 -0.024621 -v 0.007372 0.204141 -0.020530 -v 0.013622 0.202115 -0.021490 -v -0.007372 0.204141 -0.020530 -v 0.000000 0.204852 -0.020193 -v -0.017799 0.199083 -0.022927 -v -0.013622 0.202115 -0.021490 -v -0.017799 0.191930 -0.026315 -v -0.019264 0.195507 -0.024621 -v 0.013622 0.188898 -0.027751 -v 0.007372 0.186872 -0.028711 -v -0.013622 0.188898 -0.027751 -v 0.017800 0.191930 -0.026315 -v -0.007372 0.168527 0.073660 -v -0.013622 0.170630 0.072983 -v 0.019265 0.177492 0.070776 -v 0.017800 0.173779 0.071971 -v 0.013622 0.184354 0.068569 -v 0.017800 0.181206 0.069582 -v 0.000000 0.187196 0.067655 -v 0.007372 0.186458 0.067893 -v -0.013622 0.184354 0.068569 -v -0.007372 0.186458 0.067893 -v -0.019266 0.177492 0.070776 -v -0.017799 0.181206 0.069582 -v 0.007372 0.168527 0.073660 -v 0.000000 0.167788 0.073897 -v -0.017799 0.173779 0.071971 -v 0.013622 0.170630 0.072983 -v -0.013622 0.192505 0.143491 -v -0.017799 0.194657 0.140550 -v 0.017800 0.194657 0.140550 -v 0.013622 0.192505 0.143491 -v 0.000000 0.190562 0.146147 -v -0.007372 0.191067 0.145457 -v 0.017800 0.199734 0.133611 -v 0.019265 0.197196 0.137081 -v 0.007372 0.203324 0.128705 -v 0.013622 0.201886 0.130670 -v -0.007372 0.203324 0.128705 -v 0.000000 0.203829 0.128014 -v -0.017799 0.199734 0.133611 -v -0.013622 0.201886 0.130670 -v -0.019266 0.197196 0.137081 -v 0.007372 0.191067 0.145457 -v -0.017799 0.244971 0.185447 -v -0.019266 0.246173 0.181058 -v 0.013622 0.243953 0.189167 -v 0.007372 0.243273 0.191653 -v -0.007372 0.243273 0.191653 -v -0.013622 0.243953 0.189167 -v 0.019265 0.246173 0.181058 -v 0.017800 0.244971 0.185447 -v 0.013622 0.248392 0.172948 -v 0.017800 0.247374 0.176669 -v 0.000000 0.249311 0.169589 -v 0.007372 0.249072 0.170462 -v -0.013622 0.248392 0.172948 -v -0.007372 0.249072 0.170462 -v -0.017799 0.247374 0.176669 -v 0.000000 0.243034 0.192526 -v -0.002343 0.321608 0.168880 -v -0.002165 0.321310 0.168447 -v 0.000898 0.322329 0.169924 -v 0.000000 0.322388 0.170010 -v -0.001657 0.322160 0.169679 -v -0.002165 0.321907 0.169312 -v 0.002165 0.321907 0.169312 -v 0.001657 0.322160 0.169679 -v -0.000897 0.322329 0.169924 -v 0.002165 0.321310 0.168447 -v 0.002344 0.321608 0.168880 -v 0.000898 0.320887 0.167835 -v 0.001657 0.321057 0.168080 -v -0.000897 0.320887 0.167835 -v 0.000000 0.320828 0.167749 -v -0.001657 0.321057 0.168080 -v 0.002292 -0.342753 0.478374 -v 0.001239 -0.342883 0.477962 -v -0.002294 -0.341909 0.481062 -v -0.001241 -0.341779 0.481474 -v 0.002994 -0.342103 0.480445 -v 0.003241 -0.342331 0.479718 -v -0.002996 -0.342560 0.478991 -v -0.003243 -0.342331 0.479718 -v -0.000002 -0.341734 0.481618 -v 0.001239 -0.341779 0.481474 -v -0.000002 -0.342928 0.477818 -v -0.001241 -0.342883 0.477962 -v 0.002994 -0.342560 0.478991 -v -0.002996 -0.342103 0.480445 -v 0.002292 -0.341909 0.481062 -v -0.002294 -0.342753 0.478374 -v -0.175969 -0.037568 -0.110205 -v -0.101886 -0.364419 -0.036123 -v 0.101887 -0.364419 -0.050794 -v 0.175970 -0.037568 -0.124876 -v 0.101887 -0.364419 -0.036122 -v 0.175970 -0.037568 -0.110204 -v -0.105623 -0.367924 -0.034513 -v -0.181294 -0.034063 -0.110185 -v -0.195231 -0.034063 0.249302 -v -0.119559 -0.367924 0.173630 -v -0.181295 -0.034063 0.249302 -v -0.105623 -0.367924 0.173630 -v 0.181502 -0.032429 0.253277 -v 0.105090 -0.369558 0.176864 -v -0.105091 -0.369558 0.188747 -v -0.181503 -0.032429 0.265159 -v -0.105091 -0.369558 0.176863 -v -0.181503 -0.032429 0.253276 -v 0.104815 -0.369607 0.174680 -v 0.181249 -0.032380 0.251115 -v 0.195612 -0.032380 -0.111996 -v 0.119178 -0.369607 -0.035562 -v 0.181250 -0.032380 -0.111996 -v 0.104816 -0.369607 -0.035562 -vt 0.423176 0.500000 -vt 0.576824 0.500000 -vt 0.576824 0.519761 -vt 0.423176 0.519761 -vt 0.576824 0.539523 -vt 0.423176 0.539523 -vt 0.576824 0.559284 -vt 0.423176 0.559284 -vt 0.576824 0.579046 -vt 0.423176 0.579046 -vt 0.423176 0.420954 -vt 0.576824 0.420954 -vt 0.576824 0.440716 -vt 0.423176 0.440716 -vt 0.576824 0.460477 -vt 0.423176 0.460477 -vt 0.423176 0.480239 -vt 0.576824 0.480239 -vt 0.421292 0.421292 -vt 0.578708 0.421292 -vt 0.578708 0.578708 -vt 0.421292 0.578708 -vt 0.500000 0.578708 -vt 0.555655 0.555655 -vt 0.578708 0.500000 -vt 0.555655 0.444345 -vt 0.500000 0.421292 -vt 0.444345 0.444345 -vt 0.421292 0.500000 -vt 0.444345 0.555655 -vt 0.568164 0.539354 -vt 0.568164 0.460646 -vt 0.431836 0.460646 -vt 0.431836 0.539354 -g lantern_cage_cage_(null)_lantern_cage_cage_(null)_(null).001 +v 0.158984 0.002217 -0.089425 +v 0.158983 0.002217 0.228543 +v 0.226693 -0.028095 0.296252 +v 0.226694 -0.028095 -0.157134 +v -0.158984 0.002217 0.228542 +v -0.226694 -0.028095 0.296252 +v -0.158983 0.002217 -0.089425 +v -0.226693 -0.028095 -0.157135 +v 0.226694 -0.028095 -0.157134 +v -0.226693 -0.028095 -0.157135 +v -0.077047 0.084441 -0.007488 +v -0.077047 0.084441 0.146606 +v 0.077047 0.084441 0.146606 +v 0.077047 0.084441 -0.007488 +v 0.090171 0.054129 0.159730 +v 0.090171 0.054129 -0.020612 +v 0.122642 0.028173 0.192201 +v 0.122642 0.028173 -0.053083 +v -0.090171 0.054129 0.159730 +v -0.122642 0.028173 0.192201 +v -0.090171 0.054129 -0.020612 +v -0.122642 0.028173 -0.053083 +v 0.226694 -0.050961 -0.157134 +v -0.226693 -0.050961 -0.157135 +v -0.226694 -0.028095 0.296252 +v 0.226693 -0.028095 0.296252 +v 0.199360 -0.050951 -0.129800 +v -0.199359 -0.050951 -0.129801 +v -0.226694 -0.050961 0.296252 +v 0.226693 -0.050961 0.296252 +v -0.115429 -0.421248 -0.045871 +v -0.175969 -0.072674 -0.124877 +v -0.101886 -0.399525 -0.050795 +v -0.199360 -0.050951 0.268918 +v 0.199359 -0.050951 0.268919 +v 0.115430 -0.421248 -0.045870 +v 0.115429 -0.421248 0.184989 +v -0.115430 -0.421248 0.184988 +v -0.119558 -0.403030 -0.034513 +v -0.195230 -0.069169 -0.110185 +v 0.181502 -0.067535 0.265160 +v 0.105090 -0.404664 0.188748 +v 0.119177 -0.404713 0.174680 +v 0.195611 -0.067486 0.251115 +v -0.175969 -0.072674 -0.110205 +v -0.101886 -0.399525 -0.036123 +v 0.101887 -0.399525 -0.050794 +v 0.175970 -0.072674 -0.124876 +v 0.101887 -0.399525 -0.036122 +v 0.175970 -0.072674 -0.110204 +v -0.105623 -0.403030 -0.034513 +v -0.181294 -0.069169 -0.110185 +v -0.195231 -0.069169 0.249302 +v -0.119559 -0.403030 0.173630 +v -0.181295 -0.069169 0.249302 +v -0.105623 -0.403030 0.173630 +v 0.181502 -0.067535 0.253277 +v 0.105090 -0.404664 0.176864 +v -0.105091 -0.404664 0.188747 +v -0.181503 -0.067535 0.265159 +v -0.105091 -0.404664 0.176863 +v -0.181503 -0.067535 0.253276 +v 0.104815 -0.404713 0.174680 +v 0.181249 -0.067486 0.251115 +v 0.195612 -0.067486 -0.111996 +v 0.119178 -0.404713 -0.035562 +v 0.181250 -0.067486 -0.111996 +v 0.104816 -0.404713 -0.035562 +v 0.024036 -0.379102 0.464368 +v 0.022613 -0.347764 0.427958 +v 0.022828 0.281333 0.417164 +v 0.024036 0.285310 0.464553 +v -0.024563 -0.379102 0.464368 +v -0.024563 0.285310 0.464553 +v -0.022923 0.281333 0.417164 +v -0.023138 -0.347764 0.427958 +v -0.023138 0.370374 0.386313 +v 0.022613 0.370374 0.386313 +v -0.023138 0.420515 0.328229 +v 0.022613 0.420515 0.328229 +v 0.024036 0.396431 0.426749 +v -0.024563 0.396431 0.426749 +v -0.023138 0.459717 0.208985 +v 0.022613 0.459717 0.208985 +v 0.024036 0.456542 0.356701 +v -0.024563 0.456541 0.356701 +v -0.023138 0.455639 0.110627 +v 0.022613 0.455639 0.110627 +v 0.024036 0.499961 0.218019 +v -0.024563 0.499961 0.218019 +v -0.023138 0.414646 0.006123 +v 0.022613 0.414646 0.006123 +v 0.024036 0.490391 0.094478 +v -0.024563 0.490391 0.094478 +v -0.023138 0.367613 -0.049844 +v 0.022613 0.367613 -0.049844 +v 0.024036 0.444420 -0.016903 +v -0.024563 0.444420 -0.016903 +v -0.023138 0.303173 -0.077175 +v 0.022613 0.303173 -0.077175 +v 0.024036 0.386794 -0.081861 +v -0.024563 0.386794 -0.081861 +v -0.023138 0.243299 -0.074574 +v 0.022613 0.243299 -0.074574 +v 0.024036 0.307408 -0.112372 +v -0.024563 0.307408 -0.112372 +v -0.022280 0.195459 -0.046776 +v 0.021754 0.195459 -0.046776 +v 0.024036 0.236493 -0.107810 +v -0.024563 0.236493 -0.107810 +v -0.022280 0.151222 0.006275 +v 0.021754 0.151222 0.006275 +v 0.024036 0.178015 -0.074400 +v -0.024563 0.178015 -0.074400 +v -0.022280 0.136838 0.088345 +v 0.021754 0.136838 0.088345 +v 0.024036 0.128623 -0.010815 +v -0.024563 0.128623 -0.010815 +v -0.022280 0.154924 0.159690 +v 0.021754 0.154924 0.159690 +v 0.024036 0.111217 0.084747 +v -0.024563 0.111217 0.084747 +v -0.022280 0.189186 0.194160 +v 0.021754 0.189186 0.194160 +v 0.024036 0.134656 0.169193 +v -0.024563 0.134656 0.169193 +v -0.018717 0.230427 0.198469 +v 0.018192 0.230427 0.198469 +v 0.024036 0.180818 0.214230 +v -0.024563 0.180818 0.214230 +v -0.013320 0.274655 0.184457 +v 0.012795 0.274655 0.184457 +v 0.020105 0.238584 0.216373 +v -0.020631 0.238584 0.216373 +v -0.007343 0.289257 0.172023 +v 0.006818 0.289257 0.172023 +v 0.014148 0.284098 0.196570 +v -0.014674 0.284098 0.196570 +v -0.002547 0.304419 0.152245 +v 0.002021 0.304419 0.152245 +v 0.007551 0.302322 0.175854 +v -0.008078 0.302322 0.175854 +v -0.010476 -0.484434 0.480376 +v 0.009949 -0.484434 0.480376 +v 0.009351 -0.441188 0.444021 +v -0.009876 -0.441188 0.444021 +v 0.002258 0.307357 0.153237 +v -0.002784 0.307357 0.153237 +v -0.022597 0.209701 0.218785 +v 0.022071 0.209701 0.218785 +v 0.019973 0.209806 0.198056 +v -0.020498 0.209806 0.198056 +v -0.017653 0.261341 0.209084 +v 0.017127 0.261341 0.209084 +v 0.015494 0.253847 0.192769 +v -0.016019 0.253847 0.192769 +v -0.022280 0.169812 0.180343 +v -0.024563 0.154601 0.196851 +v 0.024036 0.154601 0.196851 +v 0.021754 0.169812 0.180343 +v -0.022280 0.140843 0.124017 +v -0.024563 0.118604 0.130440 +v 0.024036 0.118604 0.130440 +v 0.021754 0.140843 0.124017 +v -0.022280 0.142075 0.033632 +v -0.022280 0.138248 0.060988 +v -0.024563 0.117502 0.021039 +v -0.024563 0.113150 0.052893 +v 0.024036 0.117502 0.021039 +v 0.024036 0.113150 0.052893 +v 0.021754 0.142075 0.033632 +v 0.021754 0.138248 0.060988 +v -0.024563 0.149141 -0.046089 +v 0.021754 0.169859 -0.024429 +v 0.024036 0.149141 -0.046089 +v -0.022280 0.169859 -0.024429 +v -0.024563 0.205861 -0.093890 +v -0.022709 0.217986 -0.063460 +v 0.024036 0.205861 -0.093890 +v 0.022184 0.217986 -0.063460 +v 0.024036 0.271951 -0.112876 +v -0.023138 0.273236 -0.077964 +v -0.024563 0.271951 -0.112876 +v 0.022613 0.273236 -0.077964 +v 0.024036 0.350583 -0.102687 +v -0.024563 0.350583 -0.102687 +v -0.023138 0.336089 -0.067688 +v 0.022613 0.336089 -0.067688 +v 0.024036 0.419669 -0.054024 +v -0.023138 0.395191 -0.025342 +v -0.024563 0.419669 -0.054024 +v 0.022613 0.395191 -0.025342 +v 0.024036 0.480386 0.053966 +v 0.024036 0.464096 0.017323 +v -0.024563 0.480386 0.053966 +v -0.024563 0.464096 0.017323 +v -0.023138 0.445843 0.073375 +v -0.023138 0.431212 0.039023 +v 0.022613 0.445843 0.073375 +v 0.022613 0.431212 0.039023 +v -0.024563 0.500833 0.176839 +v -0.024563 0.497643 0.135658 +v -0.023138 0.461259 0.176199 +v -0.023138 0.459319 0.143413 +v 0.022613 0.461259 0.176199 +v 0.022613 0.459319 0.143413 +v 0.024036 0.500833 0.176839 +v 0.024036 0.497643 0.135658 +v -0.024563 0.474980 0.317082 +v -0.024563 0.490081 0.270452 +v -0.023138 0.436168 0.296448 +v -0.023138 0.451099 0.255513 +v 0.022613 0.436168 0.296448 +v 0.022613 0.451099 0.255513 +v 0.024036 0.474980 0.317082 +v 0.024036 0.490082 0.270452 +v -0.024563 0.417193 0.406220 +v -0.024563 0.436408 0.383177 +v -0.023138 0.385356 0.372034 +v -0.023138 0.401943 0.354099 +v 0.022613 0.385356 0.372034 +v 0.022613 0.401943 0.354099 +v 0.024036 0.417193 0.406220 +v 0.024036 0.436409 0.383177 +v -0.024563 0.322350 0.459675 +v -0.024563 0.362292 0.448148 +v 0.022756 0.311013 0.411716 +v 0.022685 0.342628 0.402882 +v -0.022995 0.311013 0.411716 +v -0.023066 0.342628 0.402882 +v 0.024036 0.322350 0.459675 +v 0.024036 0.362292 0.448148 +vt 0.380302 0.380302 +vt 0.619698 0.380302 +vt 0.619698 0.619698 +vt 0.380302 0.619698 +vt 0.380302 0.539899 +vt 0.619698 0.539899 +vt 0.380302 0.500000 +vt 0.619698 0.500000 +vt 0.603662 0.440151 +vt 0.500000 0.380302 +vt 0.396338 0.440151 +vt 0.396338 0.559849 +vt 0.500000 0.619698 +vt 0.603662 0.559849 +vt 0.619698 0.460101 +vt 0.380302 0.460101 +g cage_cage_lantern_(null).001 usemtl (null).001 s off -f 17/5 18/6 19/7 20/8 -f 20/8 19/7 21/9 22/10 -f 22/10 21/9 23/11 24/12 -f 24/12 23/11 25/13 26/14 -f 26/15 25/16 27/17 28/18 -f 28/18 27/17 29/19 30/20 -f 18/6 17/5 31/21 32/22 -f 30/20 29/19 32/22 31/21 -f 33/23 34/24 35/25 36/26 -f 36/23 35/24 37/25 38/26 -f 38/23 37/24 39/25 40/26 -f 40/23 39/24 41/25 42/26 -f 43/23 44/24 34/25 33/26 -f 42/23 41/24 44/25 43/26 -f 45/23 46/24 47/25 48/26 -f 46/23 49/24 50/25 47/26 -f 49/23 51/24 52/25 50/26 -f 51/23 45/24 48/25 52/26 -f 52/23 48/24 53/25 54/26 -f 55/23 56/24 57/25 58/26 -f 58/23 57/24 59/25 60/26 -f 60/23 59/24 61/25 62/26 -f 62/23 61/24 46/25 45/26 -f 57/23 56/24 63/25 59/26 -f 59/23 63/24 64/25 61/26 -f 61/23 64/24 49/25 46/26 -f 56/23 55/24 65/25 63/26 -f 63/23 65/24 66/25 64/26 -f 64/23 66/24 51/25 49/26 -f 55/23 58/24 60/25 65/26 -f 65/23 60/24 62/25 66/26 -f 66/23 62/24 45/25 51/26 -f 54/23 53/24 67/25 68/26 -f 50/23 52/24 54/25 69/26 -f 47/23 50/24 69/25 70/26 -f 48/23 47/24 70/25 53/26 -f 68/23 67/24 71/25 72/26 -f 69/23 54/24 68/25 73/26 -f 70/23 69/24 73/25 74/26 -f 53/23 70/24 74/25 67/26 -f 75/23 72/24 76/25 77/26 -f 73/23 68/24 72/25 78/26 -f 74/23 73/24 78/25 79/26 -f 67/23 74/24 79/25 71/26 -f 80/23 81/24 82/25 75/26 -f 72/23 75/24 83/25 84/26 -f 81/23 79/24 85/25 86/26 -f 79/23 81/24 87/25 88/26 -f 89/23 90/24 91/25 92/26 -f 92/23 91/24 93/25 94/26 -f 94/23 93/24 95/25 96/26 -f 96/23 95/24 97/25 98/26 -f 98/23 97/24 99/25 100/26 -f 100/23 99/24 101/25 102/26 -f 102/23 101/24 103/25 104/26 -f 104/23 103/24 105/25 106/26 -f 106/23 105/24 107/25 108/26 -f 108/23 107/24 109/25 110/26 -f 110/23 109/24 111/25 112/26 -f 112/23 111/24 113/25 114/26 -f 114/23 113/24 115/25 116/26 -f 116/23 115/24 117/25 118/26 -f 119/23 120/24 90/25 89/26 -f 118/23 117/24 120/25 119/26 -f 101/23 99/24 121/25 122/26 -f 107/23 105/24 123/25 124/26 -f 113/23 111/24 125/25 126/26 -f 97/23 95/24 127/25 128/26 -f 120/23 117/24 129/25 130/26 -f 103/23 101/24 122/25 131/26 -f 109/23 107/24 124/25 132/26 -f 93/23 91/24 133/25 134/26 -f 115/23 113/24 126/25 135/26 -f 99/23 97/24 128/25 121/26 -f 90/23 120/24 130/25 136/26 -f 91/23 90/24 136/25 133/26 -f 105/23 103/24 131/25 123/26 -f 111/23 109/24 132/25 125/26 -f 95/23 93/24 134/25 127/26 -f 117/23 115/24 135/25 129/26 -f 127/23 134/24 137/25 138/26 -f 129/23 135/24 139/25 140/26 -f 133/23 136/24 141/25 142/26 -f 126/23 125/24 143/25 144/26 -f 132/23 124/24 145/25 146/26 -f 123/23 131/24 147/25 148/26 -f 122/23 121/24 149/25 150/26 -f 128/23 127/24 138/25 151/26 -f 130/23 129/24 140/25 152/26 -f 134/23 133/24 142/25 137/26 -f 135/23 126/24 144/25 139/26 -f 125/23 132/24 146/25 143/26 -f 124/23 123/24 148/25 145/26 -f 131/23 122/24 150/25 147/26 -f 121/23 128/24 151/25 149/26 -f 136/23 130/24 152/25 141/26 -f 151/23 138/24 153/25 154/26 -f 152/23 140/24 155/25 156/26 -f 137/23 142/24 157/25 158/26 -f 139/23 144/24 159/25 160/26 -f 143/23 146/24 161/25 162/26 -f 145/23 148/24 163/25 164/26 -f 147/23 150/24 165/25 166/26 -f 149/23 151/24 154/25 167/26 -f 141/23 152/24 156/25 168/26 -f 138/23 137/24 158/25 153/26 -f 140/23 139/24 160/25 155/26 -f 142/23 141/24 168/25 157/26 -f 144/23 143/24 162/25 159/26 -f 146/23 145/24 164/25 161/26 -f 148/23 147/24 166/25 163/26 -f 150/23 149/24 167/25 165/26 -f 167/23 154/24 169/25 170/26 -f 168/23 156/24 171/25 172/26 -f 153/23 158/24 173/25 174/26 -f 155/23 160/24 175/25 176/26 -f 157/23 168/24 172/25 177/26 -f 159/23 162/24 178/25 179/26 -f 161/23 164/24 180/25 181/26 -f 163/23 166/24 182/25 183/26 -f 165/23 167/24 170/25 184/26 -f 154/23 153/24 174/25 169/26 -f 156/23 155/24 176/25 171/26 -f 158/23 157/24 177/25 173/26 -f 160/23 159/24 179/25 175/26 -f 162/23 161/24 181/25 178/26 -f 164/23 163/24 183/25 180/26 -f 166/23 165/24 184/25 182/26 -f 184/23 170/24 185/25 186/26 -f 169/23 174/24 187/25 188/26 -f 171/23 176/24 189/25 190/26 -f 173/23 177/24 191/25 192/26 -f 175/23 179/24 193/25 194/26 -f 178/23 181/24 195/25 196/26 -f 180/23 183/24 197/25 198/26 -f 182/23 184/24 186/25 199/26 -f 170/23 169/24 188/25 185/26 -f 172/23 171/24 190/25 200/26 -f 174/23 173/24 192/25 187/26 -f 176/23 175/24 194/25 189/26 -f 177/23 172/24 200/25 191/26 -f 179/23 178/24 196/25 193/26 -f 181/23 180/24 198/25 195/26 -f 183/23 182/24 199/25 197/26 -f 199/23 186/24 201/25 202/26 -f 185/23 188/24 203/25 204/26 -f 200/23 190/24 205/25 206/26 -f 187/23 192/24 207/25 208/26 -f 189/23 194/24 209/25 210/26 -f 191/23 200/24 206/25 211/26 -f 193/23 196/24 212/25 213/26 -f 195/23 198/24 214/25 215/26 -f 197/23 199/24 202/25 216/26 -f 186/23 185/24 204/25 201/26 -f 188/23 187/24 208/25 203/26 -f 190/23 189/24 210/25 205/26 -f 192/23 191/24 211/25 207/26 -f 194/23 193/24 213/25 209/26 -f 196/23 195/24 215/25 212/26 -f 198/23 197/24 216/25 214/26 -f 216/23 202/24 217/25 218/26 -f 201/23 204/24 219/25 220/26 -f 203/23 208/24 221/25 222/26 -f 205/23 210/24 223/25 224/26 -f 207/23 211/24 225/25 226/26 -f 209/23 213/24 227/25 228/26 -f 212/23 215/24 229/25 230/26 -f 214/23 216/24 218/25 231/26 -f 202/23 201/24 220/25 217/26 -f 204/23 203/24 222/25 219/26 -f 206/23 205/24 224/25 232/26 -f 208/23 207/24 226/25 221/26 -f 210/23 209/24 228/25 223/26 -f 211/23 206/24 232/25 225/26 -f 213/23 212/24 230/25 227/26 -f 215/23 214/24 231/25 229/26 -f 231/23 218/24 233/25 234/26 -f 217/23 220/24 235/25 236/26 -f 219/23 222/24 237/25 238/26 -f 232/23 224/24 239/25 240/26 -f 221/23 226/24 241/25 242/26 -f 223/23 228/24 243/25 244/26 -f 225/23 232/24 240/25 245/26 -f 227/23 230/24 246/25 247/26 -f 229/23 231/24 234/25 248/26 -f 218/23 217/24 236/25 233/26 -f 220/23 219/24 238/25 235/26 -f 222/23 221/24 242/25 237/26 -f 224/23 223/24 244/25 239/26 -f 226/23 225/24 245/25 241/26 -f 228/23 227/24 247/25 243/26 -f 230/23 229/24 248/25 246/26 -f 248/23 234/24 249/25 250/26 -f 233/23 236/24 251/25 252/26 -f 235/23 238/24 253/25 254/26 -f 237/23 242/24 255/25 256/26 -f 239/23 244/24 257/25 258/26 -f 241/23 245/24 259/25 260/26 -f 243/23 247/24 261/25 262/26 -f 246/23 248/24 250/25 263/26 -f 234/23 233/24 252/25 249/26 -f 236/23 235/24 254/25 251/26 -f 238/23 237/24 256/25 253/26 -f 240/23 239/24 258/25 264/26 -f 242/23 241/24 260/25 255/26 -f 244/23 243/24 262/25 257/26 -f 245/23 240/24 264/25 259/26 -f 247/23 246/24 263/25 261/26 -f 263/23 250/24 265/25 266/26 -f 249/23 252/24 267/25 268/26 -f 251/23 254/24 269/25 270/26 -f 253/23 256/24 271/25 272/26 -f 264/23 258/24 273/25 274/26 -f 255/23 260/24 275/25 276/26 -f 257/23 262/24 277/25 278/26 -f 259/23 264/24 274/25 279/26 -f 261/23 263/24 266/25 280/26 -f 250/23 249/24 268/25 265/26 -f 252/23 251/24 270/25 267/26 -f 254/23 253/24 272/25 269/26 -f 256/23 255/24 276/25 271/26 -f 258/23 257/24 278/25 273/26 -f 260/23 259/24 279/25 275/26 -f 262/23 261/24 280/25 277/26 -f 279/23 274/24 281/25 282/26 -f 280/23 266/24 283/25 284/26 -f 265/23 268/24 285/25 286/26 -f 267/23 270/24 287/25 288/26 -f 269/23 272/24 289/25 290/26 -f 271/23 276/24 291/25 292/26 -f 273/23 278/24 293/25 294/26 -f 275/23 279/24 282/25 295/26 -f 277/23 280/24 284/25 296/26 -f 266/23 265/24 286/25 283/26 -f 268/23 267/24 288/25 285/26 -f 270/23 269/24 290/25 287/26 -f 272/23 271/24 292/25 289/26 -f 274/23 273/24 294/25 281/26 -f 276/23 275/24 295/25 291/26 -f 278/23 277/24 296/25 293/26 -f 295/23 282/24 297/25 298/26 -f 296/23 284/24 299/25 300/26 -f 283/23 286/24 301/25 302/26 -f 285/23 288/24 303/25 304/26 -f 287/23 290/24 305/25 306/26 -f 289/23 292/24 307/25 308/26 -f 281/23 294/24 309/25 310/26 -f 291/23 295/24 298/25 311/26 -f 293/23 296/24 300/25 312/26 -f 282/23 281/24 310/25 297/26 -f 284/23 283/24 302/25 299/26 -f 286/23 285/24 304/25 301/26 -f 288/23 287/24 306/25 303/26 -f 290/23 289/24 308/25 305/26 -f 292/23 291/24 311/25 307/26 -f 294/23 293/24 312/25 309/26 -f 311/23 298/24 313/25 314/26 -f 312/23 300/24 315/25 316/26 -f 297/23 310/24 317/25 318/26 -f 299/23 302/24 319/25 320/26 -f 301/23 304/24 321/25 322/26 -f 303/23 306/24 323/25 324/26 -f 305/23 308/24 325/25 326/26 -f 307/23 311/24 314/25 327/26 -f 309/23 312/24 316/25 328/26 -f 298/23 297/24 318/25 313/26 -f 300/23 299/24 320/25 315/26 -f 302/23 301/24 322/25 319/26 -f 304/23 303/24 324/25 321/26 -f 306/23 305/24 326/25 323/26 -f 308/23 307/24 327/25 325/26 -f 310/23 309/24 328/25 317/26 -f 327/23 314/24 329/25 330/26 -f 328/23 316/24 331/25 332/26 -f 313/23 318/24 333/25 334/26 -f 315/23 320/24 335/25 336/26 -f 319/23 322/24 337/25 338/26 -f 321/23 324/24 339/25 340/26 -f 323/23 326/24 341/25 342/26 -f 325/23 327/24 330/25 343/26 -f 317/23 328/24 332/25 344/26 -f 314/23 313/24 334/25 329/26 -f 316/23 315/24 336/25 331/26 -f 318/23 317/24 344/25 333/26 -f 320/23 319/24 338/25 335/26 -f 322/23 321/24 340/25 337/26 -f 324/23 323/24 342/25 339/26 -f 326/23 325/24 343/25 341/26 -f 343/23 330/24 345/25 346/26 -f 344/23 332/24 347/25 348/26 -f 329/23 334/24 349/25 350/26 -f 331/23 336/24 351/25 352/26 -f 333/23 344/24 348/25 353/26 -f 335/23 338/24 354/25 355/26 -f 337/23 340/24 356/25 357/26 -f 339/23 342/24 358/25 359/26 -f 341/23 343/24 346/25 360/26 -f 330/23 329/24 350/25 345/26 -f 332/23 331/24 352/25 347/26 -f 334/23 333/24 353/25 349/26 -f 336/23 335/24 355/25 351/26 -f 338/23 337/24 357/25 354/26 -f 340/23 339/24 359/25 356/26 -f 342/23 341/24 360/25 358/26 -f 108/23 110/24 361/25 362/26 -f 92/23 94/24 363/25 364/26 -f 114/23 116/24 365/25 366/26 -f 98/23 100/24 367/25 368/26 -f 119/23 89/24 369/25 370/26 -f 89/23 92/24 364/25 369/26 -f 104/23 106/24 371/25 372/26 -f 110/23 112/24 373/25 361/26 -f 94/23 96/24 374/25 363/26 -f 116/23 118/24 375/25 365/26 -f 100/23 102/24 376/25 367/26 -f 106/23 108/24 362/25 371/26 -f 112/23 114/24 366/25 373/26 -f 96/23 98/24 368/25 374/26 -f 118/23 119/24 370/25 375/26 -f 102/23 104/24 372/25 376/26 -f 77/23 76/24 377/25 378/26 -f 71/23 80/24 379/25 380/26 -f 80/23 75/24 77/25 379/26 -f 72/23 71/24 380/25 76/26 -f 380/23 379/24 381/25 382/26 -f 379/23 77/24 378/25 381/26 -f 76/23 380/24 382/25 377/26 -f 84/23 83/24 383/25 384/26 -f 78/23 72/24 84/25 385/26 -f 82/23 78/24 385/25 386/26 -f 75/23 82/24 386/25 83/26 -f 385/23 84/24 384/25 387/26 -f 386/23 385/24 387/25 388/26 -f 83/23 386/24 388/25 383/26 -f 86/23 85/24 389/25 390/26 -f 78/23 82/24 391/25 392/26 -f 79/23 78/24 392/25 85/26 -f 82/23 81/24 86/25 391/26 -f 392/23 391/24 393/25 394/26 -f 85/23 392/24 394/25 389/26 -f 391/23 86/24 390/25 393/26 -f 88/23 87/24 395/25 396/26 -f 71/23 79/24 88/25 397/26 -f 80/23 71/24 397/25 398/26 -f 81/23 80/24 398/25 87/26 -f 397/23 88/24 396/25 399/26 -f 398/23 397/24 399/25 400/26 -f 87/23 398/24 400/25 395/26 -f 23/27 21/28 19/29 18/30 32/31 29/32 27/33 25/34 -f 41/27 39/35 37/36 35/31 34/37 44/38 -f 28/27 30/28 31/29 17/30 20/31 22/32 24/33 26/34 -f 40/27 42/35 43/36 33/31 36/37 38/38 +f 1/1 2/2 3/3 4/4 +f 2/3 1/4 5/1 6/2 +f 7/1 8/2 6/3 5/4 +f 4/1 3/2 8/3 7/4 +f 9/1 10/2 11/3 12/4 +f 12/1 11/2 13/3 14/4 +f 14/1 13/2 15/3 16/4 +f 16/1 15/2 17/3 18/4 +f 19/1 20/2 10/3 9/4 +f 18/1 17/2 20/3 19/4 +f 21/1 22/2 23/3 24/4 +f 22/1 25/2 26/3 23/4 +f 25/1 27/2 28/3 26/4 +f 27/1 21/2 24/3 28/4 +f 28/1 24/2 29/3 30/4 +f 31/1 32/2 33/3 34/4 +f 34/1 33/2 35/3 36/4 +f 36/1 35/2 37/3 38/4 +f 38/1 37/2 22/3 21/4 +f 33/1 32/2 39/3 35/4 +f 35/1 39/2 40/3 37/4 +f 37/1 40/2 25/3 22/4 +f 32/1 31/2 41/3 39/4 +f 39/1 41/2 42/3 40/4 +f 40/1 42/2 27/3 25/4 +f 31/1 34/2 36/3 41/4 +f 41/1 36/2 38/3 42/4 +f 42/1 38/2 21/3 27/4 +f 30/1 29/2 43/3 44/4 +f 26/1 28/2 30/3 45/4 +f 23/1 26/2 45/3 46/4 +f 24/1 23/2 46/3 29/4 +f 44/1 43/2 47/3 48/4 +f 45/1 30/2 44/3 49/4 +f 46/1 45/2 49/3 50/4 +f 29/1 46/2 50/3 43/4 +f 51/1 48/2 52/3 53/4 +f 49/1 44/2 48/3 54/4 +f 50/1 49/2 54/3 55/4 +f 43/1 50/2 55/3 47/4 +f 56/1 57/2 58/3 51/4 +f 48/1 51/2 59/3 60/4 +f 57/1 55/2 61/3 62/4 +f 55/1 57/2 63/3 64/4 +f 53/1 52/2 65/3 66/4 +f 47/1 56/2 67/3 68/4 +f 56/1 51/2 53/3 67/4 +f 48/1 47/2 68/3 52/4 +f 68/1 67/2 69/3 70/4 +f 67/1 53/2 66/3 69/4 +f 52/1 68/2 70/3 65/4 +f 60/1 59/2 71/3 72/4 +f 54/1 48/2 60/3 73/4 +f 58/1 54/2 73/3 74/4 +f 51/1 58/2 74/3 59/4 +f 73/1 60/2 72/3 75/4 +f 74/1 73/2 75/3 76/4 +f 59/1 74/2 76/3 71/4 +f 62/1 61/2 77/3 78/4 +f 54/1 58/2 79/3 80/4 +f 55/1 54/2 80/3 61/4 +f 58/1 57/2 62/3 79/4 +f 80/1 79/2 81/3 82/4 +f 61/1 80/2 82/3 77/4 +f 79/1 62/2 78/3 81/4 +f 64/1 63/2 83/3 84/4 +f 47/1 55/2 64/3 85/4 +f 56/1 47/2 85/3 86/4 +f 57/1 56/2 86/3 63/4 +f 85/1 64/2 84/3 87/4 +f 86/1 85/2 87/3 88/4 +f 63/1 86/2 88/3 83/4 +f 89/1 90/2 91/3 92/4 +f 93/1 94/2 95/3 96/4 +f 248/5 250/6 97/3 98/4 +f 89/1 92/2 94/3 93/4 +f 91/1 90/2 96/3 95/4 +f 242/5 240/6 99/3 100/4 +f 246/5 252/6 101/3 102/4 +f 250/5 246/6 102/3 97/4 +f 252/5 248/6 98/3 101/4 +f 234/5 232/6 103/3 104/4 +f 238/5 244/6 105/3 106/4 +f 240/5 238/6 106/3 99/4 +f 244/5 242/6 100/3 105/4 +f 226/5 224/6 107/3 108/4 +f 230/5 236/6 109/3 110/4 +f 232/5 230/6 110/3 103/4 +f 236/5 234/6 104/3 109/4 +f 220/5 218/6 111/3 112/4 +f 222/5 228/6 113/3 114/4 +f 224/5 222/6 114/3 107/4 +f 228/5 226/6 108/3 113/4 +f 212/7 210/8 115/3 116/4 +f 216/5 214/6 117/3 118/4 +f 218/5 216/6 118/3 111/4 +f 214/5 220/6 112/3 117/4 +f 208/7 207/8 119/3 120/4 +f 211/7 209/8 121/3 122/4 +f 210/7 211/8 122/3 115/4 +f 209/7 212/8 116/3 121/4 +f 204/7 202/8 123/3 124/4 +f 206/7 205/8 125/3 126/4 +f 207/7 206/8 126/3 119/4 +f 205/7 208/8 120/3 125/4 +f 200/7 198/8 127/3 128/4 +f 203/7 201/8 129/3 130/4 +f 202/7 203/8 130/3 123/4 +f 201/7 204/8 124/3 129/4 +f 194/7 196/8 131/3 132/4 +f 197/7 199/8 133/3 134/4 +f 198/7 197/8 134/3 127/4 +f 199/7 200/8 128/3 133/4 +f 192/5 186/6 135/3 136/4 +f 193/7 195/8 137/3 138/4 +f 196/7 193/8 138/3 131/4 +f 195/7 194/8 132/3 137/4 +f 184/7 181/8 139/3 140/4 +f 188/5 190/6 141/3 142/4 +f 186/5 188/6 142/3 135/4 +f 190/5 192/6 136/3 141/4 +f 180/7 177/8 143/3 144/4 +f 182/7 183/8 145/3 146/4 +f 181/7 182/8 146/3 139/4 +f 183/7 184/8 140/3 145/4 +f 171/7 172/8 147/3 148/4 +f 178/7 179/8 149/3 150/4 +f 177/7 178/8 150/3 143/4 +f 179/7 180/8 144/3 149/4 +f 175/7 176/8 151/3 152/4 +f 169/7 170/8 153/3 154/4 +f 172/7 169/8 154/3 147/4 +f 170/7 171/8 148/3 153/4 +f 152/1 151/2 155/3 156/4 +f 173/7 174/8 157/3 158/4 +f 176/7 173/8 158/3 151/4 +f 174/7 175/8 152/3 157/4 +f 156/1 155/2 159/3 160/4 +f 158/1 157/2 161/3 162/4 +f 151/1 158/2 162/3 155/4 +f 157/1 152/2 156/3 161/4 +f 89/1 93/2 163/3 164/4 +f 96/1 90/2 165/3 166/4 +f 93/1 96/2 166/3 163/4 +f 90/1 89/2 164/3 165/4 +f 165/1 164/2 163/3 166/4 +f 167/1 160/2 159/3 168/4 +f 162/1 161/2 167/3 168/4 +f 155/1 162/2 168/3 159/4 +f 161/1 156/2 160/3 167/4 +f 13/9 11/10 10/11 20/12 17/13 15/14 +f 144/1 143/2 172/8 171/7 +f 150/1 149/2 170/8 169/7 +f 143/1 150/2 169/8 172/7 +f 149/1 144/2 171/8 170/7 +f 148/1 147/2 176/8 175/7 +f 154/1 153/2 174/8 173/7 +f 147/1 154/2 173/8 176/7 +f 153/1 148/2 175/8 174/7 +f 140/1 139/2 177/8 180/7 +f 146/1 145/2 179/8 178/7 +f 139/1 146/2 178/8 177/7 +f 145/1 140/2 180/8 179/7 +f 136/1 135/2 181/8 184/7 +f 142/1 141/2 183/8 182/7 +f 135/1 142/2 182/8 181/7 +f 141/1 136/2 184/8 183/7 +f 132/1 131/2 185/15 191/16 +f 191/16 185/15 186/6 192/5 +f 138/1 137/2 189/15 187/16 +f 187/16 189/15 190/6 188/5 +f 131/1 138/2 187/15 185/16 +f 185/16 187/15 188/6 186/5 +f 137/1 132/2 191/15 189/16 +f 189/16 191/15 192/6 190/5 +f 128/1 127/2 196/8 194/7 +f 134/1 133/2 195/8 193/7 +f 127/1 134/2 193/8 196/7 +f 133/1 128/2 194/8 195/7 +f 124/1 123/2 198/8 200/7 +f 130/1 129/2 199/8 197/7 +f 123/1 130/2 197/8 198/7 +f 129/1 124/2 200/8 199/7 +f 120/1 119/2 202/8 204/7 +f 126/1 125/2 201/8 203/7 +f 119/1 126/2 203/8 202/7 +f 125/1 120/2 204/8 201/7 +f 116/1 115/2 207/8 208/7 +f 122/1 121/2 205/8 206/7 +f 115/1 122/2 206/8 207/7 +f 121/1 116/2 208/8 205/7 +f 112/1 111/2 210/8 212/7 +f 118/1 117/2 209/8 211/7 +f 111/1 118/2 211/8 210/7 +f 117/1 112/2 212/8 209/7 +f 108/1 107/2 217/15 219/16 +f 219/16 217/15 218/6 220/5 +f 114/1 113/2 213/15 215/16 +f 215/16 213/15 214/6 216/5 +f 107/1 114/2 215/15 217/16 +f 217/16 215/15 216/6 218/5 +f 113/1 108/2 219/15 213/16 +f 213/16 219/15 220/6 214/5 +f 104/1 103/2 223/15 225/16 +f 225/16 223/15 224/6 226/5 +f 110/1 109/2 227/15 221/16 +f 221/16 227/15 228/6 222/5 +f 103/1 110/2 221/15 223/16 +f 223/16 221/15 222/6 224/5 +f 109/1 104/2 225/15 227/16 +f 227/16 225/15 226/6 228/5 +f 100/1 99/2 231/15 233/16 +f 233/16 231/15 232/6 234/5 +f 106/1 105/2 235/15 229/16 +f 229/16 235/15 236/6 230/5 +f 99/1 106/2 229/15 231/16 +f 231/16 229/15 230/6 232/5 +f 105/1 100/2 233/15 235/16 +f 235/16 233/15 234/6 236/5 +f 98/1 97/2 239/15 241/16 +f 241/16 239/15 240/6 242/5 +f 102/1 101/2 243/15 237/16 +f 237/16 243/15 244/6 238/5 +f 97/1 102/2 237/15 239/16 +f 239/16 237/15 238/6 240/5 +f 101/1 98/2 241/15 243/16 +f 243/16 241/15 242/6 244/5 +f 91/1 95/2 249/15 247/16 +f 247/16 249/15 250/6 248/5 +f 94/1 92/2 251/15 245/16 +f 245/16 251/15 252/6 246/5 +f 95/1 94/2 245/15 249/16 +f 249/16 245/15 246/6 250/5 +f 92/1 91/2 247/15 251/16 +f 251/16 247/15 248/6 252/5 +o light +v -0.181503 -0.067535 0.253276 +v -0.105091 -0.404664 0.176863 +v 0.105090 -0.404664 0.176864 +v 0.181502 -0.067535 0.253277 +v -0.105623 -0.403030 -0.034513 +v -0.105623 -0.403030 0.173630 +v -0.181295 -0.069169 0.249302 +v -0.181294 -0.069169 -0.110185 +v 0.104816 -0.404713 -0.035562 +v 0.181250 -0.067486 -0.111996 +v 0.181249 -0.067486 0.251115 +v 0.104815 -0.404713 0.174680 +v 0.101887 -0.399525 -0.036122 +v -0.101886 -0.399525 -0.036123 +v -0.175969 -0.072674 -0.110205 +v 0.175970 -0.072674 -0.110204 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +g light_light_(null).001 +usemtl (null).001 +s off +f 253/17 254/18 255/19 256/20 +f 257/17 258/18 259/19 260/20 +f 261/17 262/18 263/19 264/20 +f 265/17 266/18 267/19 268/20 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_sink.obj b/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_sink.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet.obj new file mode 100644 index 00000000..5dc068dd --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet.obj @@ -0,0 +1,62 @@ +# Blender v2.73 (sub 0) OBJ File: 'medicine-cabinet.blend' +# www.blender.org +o Cylinder +v -0.312500 -0.187500 0.500000 +v -0.312500 -0.187500 0.312500 +v 0.312500 -0.187500 0.312500 +v 0.312500 -0.187500 0.500000 +v -0.312500 0.500000 0.500000 +v -0.312500 0.500000 0.312500 +v 0.312500 0.500000 0.312500 +v 0.312500 0.500000 0.500000 +v -0.312500 0.437500 0.312500 +v 0.312500 0.437500 0.312500 +v -0.312500 -0.125000 0.312500 +v 0.312500 -0.125000 0.312500 +v -0.250000 0.437500 0.312500 +v -0.250000 -0.125000 0.312500 +v 0.250000 0.437500 0.312500 +v 0.250000 -0.125000 0.312500 +vt 0.875000 0.562500 +vt 0.875000 0.750000 +vt 0.187500 0.750000 +vt 0.187500 0.562500 +vt 0.812500 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.937500 +vt 0.812500 0.937500 +vt 0.875000 0.812500 +vt 0.875000 1.000000 +vt 0.187500 0.812500 +vt 0.187500 0.312500 +vt 0.812500 0.312500 +vt 0.250000 0.250000 +vt 0.250000 0.062500 +vt 0.875000 0.062500 +vt 0.875000 0.250000 +vt 0.812500 0.812500 +vt 0.812500 0.375000 +vt 0.187500 0.375000 +vt 0.750000 0.937500 +vt 0.750000 0.375000 +vt 0.250000 0.937500 +vt 0.250000 0.375000 +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 1.000000 0.000000 +g Cylinder_Cylinder_wood +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 6/5/2 7/6/2 10/7/2 9/8/2 +f 7/9/3 8/10/3 4/6/3 3/11/3 +f 8/5/4 5/6/4 1/12/4 4/13/4 +f 1/14/5 2/15/5 3/16/5 4/17/5 +f 8/18/6 7/5/6 6/6/6 5/11/6 +f 3/12/2 2/13/2 11/19/2 12/20/2 +f 13/21/2 14/22/2 11/19/2 9/8/2 +f 15/23/2 10/7/2 12/20/2 16/24/2 +g Cylinder_Cylinder_mirror +f 14/22/2 13/21/2 15/23/2 16/24/2 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet_open.obj new file mode 100644 index 00000000..5a0d026e --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet_open.obj @@ -0,0 +1,100 @@ +# Blender v2.73 (sub 0) OBJ File: 'medicine-cabinet-open.blend' +# www.blender.org +o Cylinder +v -0.312500 -0.187500 0.500000 +v 0.312500 -0.187500 0.500000 +v -0.312500 0.500000 0.500000 +v 0.312500 0.500000 0.500000 +v -0.312500 0.500000 0.375000 +v -0.312500 -0.187500 0.375000 +v 0.312500 0.500000 0.375000 +v 0.312500 -0.187500 0.375000 +v -0.312500 -0.187500 -0.250000 +v -0.312500 0.500000 -0.250000 +v -0.312500 0.437500 0.375000 +v -0.312500 0.437500 -0.250000 +v -0.312500 -0.125000 0.375000 +v -0.312500 -0.125000 -0.250000 +v -0.312500 0.437500 0.312500 +v -0.312500 -0.125000 0.312500 +v -0.312500 0.437500 -0.187500 +v -0.312500 -0.125000 -0.187500 +v -0.250000 0.500000 0.375000 +v -0.250000 -0.187500 0.375000 +v -0.250000 0.500000 -0.250000 +v -0.250000 -0.187500 -0.250000 +v 0.250000 0.437500 0.375000 +v 0.250000 -0.125000 0.375000 +v -0.250000 0.125000 0.375000 +v 0.250000 0.125000 0.375000 +v 0.250000 0.187500 0.375000 +v -0.250000 0.187500 0.375000 +v -0.250000 -0.125000 0.375000 +v -0.250000 0.437500 0.375000 +v 0.312500 0.437500 0.375000 +v 0.312500 -0.125000 0.375000 +vt 0.875000 0.875000 +vt 0.875000 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.875000 +vt 0.812500 1.000000 +vt 0.187500 0.312500 +vt 0.812500 0.312500 +vt 0.812500 0.375000 +vt 0.187500 0.375000 +vt 0.187500 0.937500 +vt 0.812500 0.937500 +vt 0.250000 0.125000 +vt 0.250000 0.062500 +vt 0.875000 0.062500 +vt 0.875000 0.125000 +vt 0.812500 0.812500 +vt 0.187500 0.812500 +vt 0.250000 0.250000 +vt 0.875000 0.250000 +vt 0.875000 0.562500 +vt 0.875000 0.687500 +vt 0.187500 0.687500 +vt 0.187500 0.562500 +vt 0.750000 0.937500 +vt 0.750000 0.375000 +vt 0.250000 0.937500 +vt 0.250000 0.375000 +vt 0.875000 0.750000 +vt 0.187500 0.750000 +vt 0.750000 0.312500 +vt 0.750000 1.000000 +vt 0.250000 0.687500 +vt 0.250000 0.625000 +vt 0.750000 0.625000 +vt 0.750000 0.687500 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +g Cylinder_Cylinder_wood +s off +f 7/1/1 4/2/1 2/3/1 8/4/1 +f 4/5/2 3/3/2 1/6/2 2/7/2 +f 9/6/3 6/7/3 13/8/3 14/9/3 +f 21/3/4 10/10/4 5/11/4 19/5/4 +f 20/12/5 6/13/5 9/14/5 22/15/5 +f 5/5/3 10/3/3 12/10/3 11/11/3 +f 4/16/4 7/11/4 5/10/4 3/17/4 +f 1/18/5 6/12/5 8/15/5 2/19/5 +f 3/20/3 5/21/3 6/22/3 1/23/3 +f 22/7/1 21/5/1 19/3/1 20/6/1 +f 15/24/3 16/25/3 13/8/3 11/11/3 +f 17/26/3 12/10/3 14/9/3 18/27/3 +f 10/21/6 21/28/6 22/29/6 9/22/6 +f 8/6/6 20/30/6 29/25/6 32/9/6 +f 19/31/6 7/3/6 31/10/6 30/24/6 +f 23/26/6 31/10/6 32/9/6 24/27/6 +f 27/32/6 26/33/6 25/34/6 28/35/6 +g Cylinder_Cylinder_mirror +f 16/25/3 15/24/3 17/26/3 18/27/3 +g Cylinder_Cylinder_inside +f 23/26/6 27/32/6 28/35/6 30/24/6 +f 25/34/6 26/33/6 24/27/6 29/25/6 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_basic.obj b/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_basic.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_upscale.obj b/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_upscale.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp.obj index 1a5e0132..7360e278 100644 --- a/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp.obj @@ -1,4 +1,4 @@ -# Blender v2.73 (sub 0) OBJ File: 'oil-lantern-no-wick.blend' +# Blender v2.73 (sub 0) OBJ File: 'oil-lantern.blend' # www.blender.org o Cylinder v 0.300118 -0.338925 0.000000 @@ -55,6 +55,7 @@ v 0.254801 -0.374688 0.024849 v 0.241009 -0.370738 0.000000 v 0.254801 -0.374688 -0.024849 v 0.282385 -0.382588 -0.024849 +v 0.000000 -0.283905 -0.000000 v -0.075943 -0.335938 -0.131538 v -0.131538 -0.335938 -0.075943 v -0.151887 -0.335938 0.000000 @@ -69,16 +70,37 @@ v 0.075943 -0.335938 -0.131538 v 0.000000 -0.382812 -0.067500 v -0.033750 -0.382812 -0.058457 v -0.058457 -0.382812 -0.033750 +v -0.018984 -0.291253 -0.032882 v -0.067500 -0.382812 0.000000 v -0.058457 -0.382812 0.033750 +v -0.032882 -0.291253 -0.018984 v -0.033750 -0.382812 0.058457 v 0.000000 -0.382812 0.067500 +v -0.037969 -0.291253 0.000000 v 0.033750 -0.382812 0.058457 +v -0.032882 -0.291253 0.018984 v 0.058457 -0.382812 0.033750 +v -0.018984 -0.291253 0.032882 v 0.067500 -0.382812 0.000000 +v 0.000000 -0.291253 0.037969 v 0.058457 -0.382812 -0.033750 +v 0.018984 -0.291253 0.032882 v 0.033750 -0.382812 -0.058457 +v 0.032882 -0.291253 0.018984 +v 0.037969 -0.291253 0.000000 +v 0.032882 -0.291253 -0.018984 v 0.000000 -0.335938 -0.151887 +v 0.018984 -0.291253 -0.032882 +v 0.000000 -0.291253 -0.037969 +v -0.065764 -0.312500 -0.037969 +v -0.075937 -0.312500 0.000000 +v -0.065764 -0.312500 0.037969 +v -0.037969 -0.312500 0.065764 +v 0.000000 -0.312500 0.075938 +v 0.037969 -0.312500 0.065764 +v 0.065764 -0.312500 0.037969 +v 0.075938 -0.312500 0.000000 +v 0.065764 -0.312500 -0.037969 v -0.064969 -0.359375 -0.112529 v -0.112529 -0.359375 -0.064969 v -0.129938 -0.359375 0.000000 @@ -90,7 +112,11 @@ v 0.112529 -0.359375 0.064969 v 0.129937 -0.359375 0.000000 v 0.112529 -0.359375 -0.064969 v 0.064969 -0.359375 -0.112529 +v 0.037969 -0.312500 -0.065764 v 0.000000 -0.359375 -0.129937 +v 0.000000 -0.312500 -0.075938 +v -0.037969 -0.312500 -0.065764 +v 0.000000 -0.007812 0.000000 v 0.000000 0.250000 0.000000 v -0.025313 0.250000 -0.043843 v -0.043843 0.250000 -0.025312 @@ -195,6 +221,10 @@ v 0.096849 -0.431717 0.024849 v 0.095220 -0.417464 0.000000 v 0.096849 -0.431717 -0.024849 v 0.100106 -0.460225 -0.024849 +v -0.081926 -0.104724 -0.045599 +v -0.081926 -0.292224 -0.045599 +v 0.080453 -0.104724 0.048151 +v 0.080453 -0.292224 0.048151 v -0.300118 -0.338925 -0.000000 v -0.285864 -0.340554 -0.024849 v -0.257356 -0.343812 -0.024849 @@ -275,6 +305,10 @@ v 0.000000 0.179688 0.067500 v -0.033750 0.179688 0.058457 v -0.058457 0.179688 0.033750 v -0.067500 0.179688 0.000000 +v 0.081926 -0.104724 0.045599 +v 0.081926 -0.292224 0.045599 +v -0.080453 -0.104724 -0.048151 +v -0.080453 -0.292224 -0.048151 v -0.075938 -0.312500 -0.131528 v 0.037969 0.039062 -0.065764 v 0.065764 0.039062 -0.037969 @@ -365,6 +399,18 @@ v 0.067500 0.226562 -0.116913 v 0.000000 0.226562 -0.135000 v 0.000000 -0.031250 -0.168750 v 0.084375 -0.031250 -0.146142 +v -0.075938 -0.007812 -0.131528 +v -0.131528 -0.007812 -0.075937 +v -0.151875 -0.007812 0.000000 +v -0.131528 -0.007812 0.075938 +v -0.075937 -0.007812 0.131528 +v 0.000000 -0.007812 0.151875 +v 0.075937 -0.007812 0.131528 +v 0.131528 -0.007812 0.075938 +v 0.151875 -0.007812 0.000000 +v 0.131528 -0.007812 -0.075938 +v 0.075937 -0.007812 -0.131528 +v 0.000000 -0.007812 -0.151875 v 0.000000 -0.242188 -0.178125 v 0.091815 -0.101562 -0.159028 v 0.159028 -0.101562 -0.091815 @@ -411,6 +457,266 @@ v -0.146142 -0.031250 0.084375 v -0.168750 -0.031250 0.000000 v -0.146142 -0.031250 -0.084375 v -0.084375 -0.031250 -0.146142 +v -0.075938 -0.312500 -0.131528 +v -0.131528 -0.312500 -0.075937 +v -0.151875 -0.312500 0.000000 +v -0.131528 -0.312500 0.075938 +v -0.075937 -0.312500 0.131528 +v 0.000000 -0.312500 0.151875 +v 0.075938 -0.312500 0.131528 +v 0.131528 -0.312500 0.075938 +v 0.151875 -0.312500 0.000000 +v 0.131528 -0.312500 -0.075938 +v 0.000000 -0.312500 -0.151875 +v 0.075937 -0.312500 -0.131528 +vt 0.535355 0.640672 +vt 0.562500 0.625000 +vt 0.546828 0.652144 +vt 0.531156 0.625000 +vt 0.531156 0.679289 +vt 0.562500 0.656344 +vt 0.562500 0.687687 +vt 0.535355 0.609328 +vt 0.546828 0.597856 +vt 0.562500 0.593656 +vt 0.578172 0.652144 +vt 0.593843 0.679289 +vt 0.578172 0.597856 +vt 0.589644 0.640672 +vt 0.616789 0.656344 +vt 0.589644 0.609328 +vt 0.593843 0.625000 +vt 0.187500 0.187500 +vt 0.187500 0.125000 +vt 0.250000 0.125000 +vt 0.250000 0.187500 +vt 0.312500 0.125000 +vt 0.312500 0.187500 +vt 0.375000 0.125000 +vt 0.375000 0.187500 +vt 0.437500 0.125000 +vt 0.437500 0.187500 +vt 0.500000 0.125000 +vt 0.500000 0.187500 +vt 0.562500 0.125000 +vt 0.562500 0.187500 +vt 0.625187 0.625000 +vt 0.625000 0.125000 +vt 0.625000 0.187500 +vt 0.687500 0.125000 +vt 0.687500 0.187500 +vt 0.616789 0.593656 +vt 0.750000 0.187500 +vt 0.750000 0.125000 +vt 0.812500 0.125000 +vt 0.812500 0.187500 +vt 0.593843 0.570711 +vt 0.062500 0.187500 +vt 0.062500 0.125000 +vt 0.125000 0.125000 +vt 0.125000 0.187500 +vt 0.562500 0.562313 +vt 0.531156 0.570711 +vt 0.187500 0.375000 +vt 0.250000 0.375000 +vt 0.312500 0.375000 +vt 0.508211 0.593656 +vt 0.499813 0.625000 +vt 0.508211 0.656344 +vt 0.375000 0.375000 +vt 0.437500 0.375000 +vt 0.500000 0.375000 +vt 0.562500 0.375000 +vt 0.625000 0.375000 +vt 0.687500 0.375000 +vt 0.750000 0.375000 +vt 0.812500 0.375000 +vt 0.062500 0.375000 +vt 0.125000 0.375000 +vt 0.187500 0.437500 +vt 0.250000 0.437500 +vt 0.312500 0.437500 +vt 0.375000 0.437500 +vt 0.437500 0.437500 +vt 0.500000 0.437500 +vt 0.562500 0.437500 +vt 0.625000 0.437500 +vt 0.687500 0.437500 +vt 0.750000 0.437500 +vt 0.812500 0.437500 +vt 0.062500 0.437500 +vt 0.125000 0.437500 +vt 0.499812 0.733577 +vt 0.562500 0.750375 +vt 0.625187 0.733577 +vt 0.671077 0.687687 +vt 0.687874 0.625000 +vt 0.671077 0.562313 +vt 0.625187 0.516423 +vt 0.562500 0.499625 +vt 0.499813 0.516423 +vt 0.453922 0.562313 +vt 0.437125 0.625000 +vt 0.453922 0.687687 +vt 0.125000 0.062500 +vt 0.187500 0.062500 +vt 0.687500 0.062500 +vt 0.750000 0.062500 +vt 0.062500 0.062500 +vt 0.812500 0.062500 +vt 0.625000 0.062500 +vt 0.562500 0.062500 +vt 0.500000 0.062500 +vt 0.437500 0.062500 +vt 0.375000 0.062500 +vt 0.312500 0.062500 +vt 0.250000 0.062500 +vt 0.454874 0.417800 +vt 0.476899 0.500000 +vt 0.312500 0.500000 +vt 0.394700 0.357626 +vt 0.312500 0.335601 +vt 0.230300 0.357626 +vt 0.170126 0.417801 +vt 0.148101 0.500000 +vt 0.170126 0.582200 +vt 0.230301 0.642374 +vt 0.312500 0.664399 +vt 0.394700 0.642374 +vt 0.454874 0.582200 +vt 0.500000 0.250000 +vt 0.312500 0.250000 +vt 0.312500 0.312500 +vt 0.500000 0.312500 +vt 0.187500 0.687500 +vt 0.312500 0.687500 +vt 0.312500 0.750000 +vt 0.187500 0.750000 +vt 0.312500 0.812500 +vt 0.187500 0.812500 +vt 0.187500 0.250000 +vt 0.312500 0.875000 +vt 0.187500 0.875000 +vt 0.187500 0.625000 +vt 0.312500 0.625000 +vt 0.187500 0.562500 +vt 0.312500 0.562500 +vt 0.187500 0.500000 +vt 0.187500 0.312500 +vt 0.062500 0.250000 +vt 0.125000 0.250000 +vt 0.125000 0.312500 +vt 0.062500 0.312500 +vt 0.125000 0.500000 +vt 0.062500 0.500000 +vt 0.125000 0.562500 +vt 0.062500 0.562500 +vt 0.125000 0.625000 +vt 0.062500 0.625000 +vt 0.125000 0.687500 +vt 0.062500 0.687500 +vt 0.062500 0.812500 +vt 0.125000 0.812500 +vt 0.125000 0.875000 +vt 0.062500 0.875000 +vt 0.062500 0.750000 +vt 0.125000 0.750000 +vt 0.500000 0.500000 +vt 0.500000 0.562500 +vt 0.500000 0.625000 +vt 0.500000 0.687500 +vt 0.500000 0.812500 +vt 0.500000 0.875000 +vt 0.500000 0.750000 +vt 0.469286 0.721980 +vt 0.493540 0.812500 +vt 0.403020 0.655714 +vt 0.312500 0.631459 +vt 0.221980 0.655714 +vt 0.155714 0.721980 +vt 0.131460 0.812500 +vt 0.155714 0.903020 +vt 0.221980 0.969286 +vt 0.312500 0.993540 +vt 0.403020 0.969286 +vt 0.469286 0.903020 +vt 0.625000 0.625000 +vt 0.437500 0.625000 +vt 0.437500 0.562500 +vt 0.625000 0.562500 +vt 0.687009 0.921604 +vt 0.640896 0.875491 +vt 0.750000 0.812500 +vt 0.750000 0.938483 +vt 0.812991 0.921604 +vt 0.859104 0.875491 +vt 0.875983 0.812500 +vt 0.859104 0.749509 +vt 0.812991 0.703396 +vt 0.750000 0.686517 +vt 0.687009 0.703396 +vt 0.640896 0.749509 +vt 0.624017 0.812500 +vt 0.000000 0.625000 +vt 0.000000 0.562500 +vt 0.000000 0.500000 +vt 0.000000 0.437500 +vt 0.000000 0.375000 +vt 0.000000 0.312500 +vt 0.000000 0.250000 +vt 0.000000 0.187500 +vt 0.000000 0.125000 +vt 0.375000 0.625000 +vt 0.250000 0.625000 +vt 0.250000 0.562500 +vt 0.375000 0.562500 +vt 0.250000 0.500000 +vt 0.375000 0.500000 +vt 0.250000 0.312500 +vt 0.375000 0.312500 +vt 0.250000 0.250000 +vt 0.375000 0.250000 +vt 0.437500 0.500000 +vt 0.437500 0.312500 +vt 0.437500 0.250000 +vt 1.000000 0.312500 +vt 0.937500 0.312500 +vt 0.937500 0.250000 +vt 1.000000 0.250000 +vt 0.625000 0.500000 +vt 0.937500 0.187500 +vt 1.000000 0.187500 +vt 0.625000 0.312500 +vt 1.000000 0.125000 +vt 0.937500 0.125000 +vt 0.937500 0.062500 +vt 1.000000 0.062500 +vt 0.625000 0.250000 +vt 1.000000 0.375000 +vt 0.937500 0.375000 +vt 1.000000 0.437500 +vt 0.937500 0.437500 +vt 1.000000 0.500000 +vt 0.937500 0.500000 +vt 1.000000 0.562500 +vt 0.937500 0.562500 +vt 1.000000 0.625000 +vt 0.937500 0.625000 +vt 0.812500 0.250000 +vt 0.750000 0.250000 +vt 0.812500 0.312500 +vt 0.750000 0.312500 +vt 0.812500 0.500000 +vt 0.750000 0.500000 +vt 0.812500 0.562500 +vt 0.750000 0.562500 +vt 0.812500 0.625000 +vt 0.750000 0.625000 +vt 0.000000 0.062500 +vt 0.000000 0.000000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 vt 0.750000 0.875000 vt 0.750000 1.000000 vt 0.687500 1.000000 @@ -421,10 +727,8 @@ vt 0.937500 0.875000 vt 0.937500 1.000000 vt 0.875000 1.000000 vt 0.875000 0.875000 -vt 0.125000 0.875000 vt 0.125000 1.000000 vt 0.062500 1.000000 -vt 0.062500 0.875000 vt 0.625000 1.000000 vt 0.625000 0.875000 vt 0.875000 0.812500 @@ -434,7 +738,6 @@ vt 0.625000 0.812500 vt 0.562500 0.875000 vt 0.562500 0.812500 vt 0.687500 0.812500 -vt 0.750000 0.812500 vt 0.875000 0.750000 vt 0.812500 0.750000 vt 0.937500 0.750000 @@ -449,40 +752,14 @@ vt 0.625000 0.687500 vt 0.562500 0.687500 vt 0.687500 0.687500 vt 0.750000 0.687500 -vt 0.812500 0.062500 -vt 0.812500 0.125000 -vt 0.750000 0.125000 -vt 0.750000 0.062500 -vt 0.687500 0.125000 -vt 0.687500 0.062500 -vt 0.625000 0.125000 -vt 0.625000 0.062500 -vt 0.562500 0.125000 -vt 0.562500 0.062500 -vt 0.937500 0.062500 -vt 0.937500 0.125000 vt 0.875000 0.125000 vt 0.875000 0.062500 -vt 0.812500 0.187500 -vt 0.750000 0.187500 -vt 0.687500 0.187500 -vt 0.625000 0.187500 -vt 0.562500 0.187500 -vt 0.937500 0.187500 vt 0.875000 0.187500 -vt 0.812500 0.250000 -vt 0.750000 0.250000 vt 0.687500 0.250000 -vt 0.625000 0.250000 vt 0.562500 0.250000 -vt 0.937500 0.250000 vt 0.875000 0.250000 -vt 0.812500 0.312500 -vt 0.750000 0.312500 vt 0.687500 0.312500 -vt 0.625000 0.312500 vt 0.562500 0.312500 -vt 0.937500 0.312500 vt 0.875000 0.312500 vt 0.562500 1.000000 vt 0.875000 -0.000000 @@ -495,69 +772,20 @@ vt 0.562500 -0.000000 vt 0.250000 0.875000 vt 0.250000 1.000000 vt 0.187500 1.000000 -vt 0.187500 0.875000 -vt 0.312500 0.875000 vt 0.312500 1.000000 vt 0.437500 0.875000 vt 0.437500 1.000000 vt 0.375000 1.000000 vt 0.375000 0.875000 vt 0.375000 0.812500 -vt 0.312500 0.812500 vt 0.437500 0.812500 -vt 0.125000 0.812500 -vt 0.062500 0.812500 -vt 0.187500 0.812500 vt 0.250000 0.812500 vt 0.375000 0.750000 -vt 0.312500 0.750000 vt 0.437500 0.750000 -vt 0.125000 0.750000 -vt 0.062500 0.750000 -vt 0.187500 0.750000 vt 0.250000 0.750000 -vt 0.312500 0.687500 vt 0.375000 0.687500 vt 0.437500 0.687500 -vt 0.125000 0.687500 -vt 0.062500 0.687500 -vt 0.187500 0.687500 vt 0.250000 0.687500 -vt 0.312500 0.062500 -vt 0.312500 0.125000 -vt 0.250000 0.125000 -vt 0.250000 0.062500 -vt 0.187500 0.125000 -vt 0.187500 0.062500 -vt 0.125000 0.125000 -vt 0.125000 0.062500 -vt 0.062500 0.125000 -vt 0.062500 0.062500 -vt 0.437500 0.062500 -vt 0.437500 0.125000 -vt 0.375000 0.125000 -vt 0.375000 0.062500 -vt 0.312500 0.187500 -vt 0.250000 0.187500 -vt 0.187500 0.187500 -vt 0.125000 0.187500 -vt 0.062500 0.187500 -vt 0.437500 0.187500 -vt 0.375000 0.187500 -vt 0.312500 0.250000 -vt 0.250000 0.250000 -vt 0.187500 0.250000 -vt 0.125000 0.250000 -vt 0.062500 0.250000 -vt 0.437500 0.250000 -vt 0.375000 0.250000 -vt 0.312500 0.312500 -vt 0.250000 0.312500 -vt 0.187500 0.312500 -vt 0.125000 0.312500 -vt 0.062500 0.312500 -vt 0.437500 0.312500 -vt 0.375000 0.312500 vt 0.375000 -0.000000 vt 0.437500 -0.000000 vt 0.250000 -0.000000 @@ -565,316 +793,26 @@ vt 0.312500 -0.000000 vt 0.125000 -0.000000 vt 0.187500 -0.000000 vt 0.062500 -0.000000 -vt 0.500000 0.312500 -vt 0.500000 0.437500 -vt 0.375000 0.437500 -vt 0.625000 0.437500 -vt 0.750000 0.437500 vt 0.875000 0.437500 -vt 0.250000 0.437500 -vt 0.125000 0.437500 -vt 0.500000 0.187500 vt 0.875000 0.562500 -vt 0.750000 0.562500 -vt 0.625000 0.562500 -vt 0.500000 0.562500 -vt 0.375000 0.562500 -vt 0.250000 0.562500 -vt 0.125000 0.562500 -vt 0.500000 0.062500 -vt 0.750000 0.625000 -vt 0.625000 0.625000 -vt 0.500000 0.625000 -vt 0.375000 0.625000 -vt 0.250000 0.625000 -vt 0.125000 0.625000 vt 0.875000 0.625000 -vt 0.500000 0.125000 -vt 0.187500 0.375000 -vt 0.250000 0.375000 -vt 0.312500 0.375000 -vt 0.375000 0.375000 -vt 0.437500 0.375000 -vt 0.500000 0.375000 -vt 0.562500 0.375000 -vt 0.625000 0.375000 -vt 0.687500 0.375000 -vt 0.750000 0.375000 -vt 0.812500 0.375000 -vt 0.062500 0.375000 -vt 0.125000 0.375000 -vt 0.187500 0.437500 -vt 0.312500 0.437500 -vt 0.437500 0.437500 -vt 0.562500 0.437500 -vt 0.687500 0.437500 -vt 0.812500 0.437500 -vt 0.062500 0.437500 -vt 0.355300 0.107626 -vt 0.437500 0.085601 -vt 0.295126 0.167800 -vt 0.273101 0.250000 -vt 0.295126 0.332200 -vt 0.355301 0.392374 -vt 0.437500 0.414399 -vt 0.519700 0.392374 -vt 0.579874 0.332199 -vt 0.601899 0.250000 -vt 0.579874 0.167800 -vt 0.519700 0.107626 -vt 0.125000 0.500000 -vt 0.187500 0.500000 -vt 0.312500 0.500000 -vt 0.375000 0.500000 -vt 0.250000 0.500000 -vt 0.500000 0.812500 -vt 0.500000 0.687500 -vt 0.187500 0.937500 -vt 0.250000 0.937500 -vt 0.312500 0.937500 -vt 0.375000 0.937500 -vt 0.437500 0.937500 -vt 0.500000 0.875000 -vt 0.500000 0.937500 -vt 0.562500 0.937500 -vt 0.625000 0.937500 -vt 0.750000 0.937500 -vt 0.812500 0.937500 -vt 0.125000 0.937500 -vt 0.687500 0.937500 -vt 0.062500 0.937500 -vt 0.437500 0.500000 -vt 0.500000 0.500000 -vt 0.562500 0.500000 -vt 0.625000 0.500000 -vt 0.750000 0.500000 -vt 0.812500 0.500000 -vt 0.687500 0.500000 -vt 0.062500 0.500000 -vt 0.562500 0.562500 -vt 0.921604 0.312991 -vt 0.875491 0.359104 -vt 0.938483 0.250000 -vt 0.921604 0.187009 -vt 0.875491 0.140896 -vt 0.812500 0.124017 -vt 0.749509 0.140896 -vt 0.703396 0.187009 -vt 0.686517 0.250000 -vt 0.703396 0.312991 -vt 0.749509 0.359104 -vt 0.812500 0.375983 -vt 0.500000 1.000000 -vt 0.562500 0.625000 -vt 0.500000 0.750000 -vt 0.437500 0.625000 -vt 0.312500 0.625000 -vt 0.187500 0.625000 -vt 0.062500 0.625000 -vt 0.437500 0.562500 -vt 0.312500 0.562500 -vt 0.187500 0.562500 -vt 0.062500 0.562500 -vt 0.500000 0.000000 -vt 0.500000 0.250000 -vn 0.139000 0.529700 0.836700 -vn 0.022000 0.540500 0.841000 -vn -0.014600 -0.468800 0.883200 -vn -0.111700 -0.428400 0.896600 -vn 0.256500 0.966500 0.000000 -vn 0.040600 0.999200 0.000000 -vn -0.111700 -0.428400 -0.896600 -vn -0.014600 -0.468800 -0.883200 -vn 0.022000 0.540500 -0.841000 -vn 0.139000 0.529700 -0.836700 -vn 0.248800 -0.968500 0.000000 -vn 0.031200 -0.999500 -0.000000 -vn 0.014600 -0.468800 0.883200 -vn 0.111700 -0.428400 0.896600 -vn -0.031200 -0.999500 -0.000000 -vn -0.248800 -0.968500 0.000000 -vn 0.338500 0.425800 -0.839100 -vn 0.622200 0.782800 0.000000 -vn -0.280200 -0.352500 -0.892900 -vn -0.622200 -0.782800 0.000000 -vn -0.280200 -0.352500 0.892900 -vn 0.338500 0.425800 0.839100 -vn 0.475700 0.263900 -0.839100 -vn 0.874400 0.485100 0.000000 -vn -0.393700 -0.218400 -0.892900 -vn -0.874400 -0.485100 0.000000 -vn -0.393700 -0.218400 0.892900 -vn 0.475700 0.263900 0.839100 -vn 0.977400 0.211200 0.000000 -vn 0.510400 0.113600 -0.852400 -vn -0.466900 -0.100900 -0.878500 -vn -0.976100 -0.217200 0.000000 -vn -0.466900 -0.100900 0.878500 -vn 0.510400 0.113600 0.852400 -vn 0.152600 -0.988300 0.000000 -vn 0.485100 -0.874400 0.000000 -vn 0.263900 -0.475700 0.839100 -vn 0.083800 -0.528800 0.844600 -vn -0.218400 0.393700 0.892900 -vn -0.070400 0.455900 0.887200 -vn -0.485100 0.874400 0.000000 -vn -0.156600 0.987600 0.000000 -vn -0.218400 0.393700 -0.892900 -vn -0.070400 0.455900 -0.887200 -vn 0.263900 -0.475700 -0.839100 -vn 0.083800 -0.528800 -0.844600 -vn 0.782800 -0.622200 0.000000 -vn 0.425800 -0.338500 0.839100 -vn -0.352500 0.280200 0.892900 -vn -0.782800 0.622200 0.000000 -vn -0.352500 0.280200 -0.892900 -vn 0.425800 -0.338500 -0.839100 -vn 0.961300 -0.275300 0.000000 -vn 0.522900 -0.149800 0.839100 -vn -0.432900 0.124000 0.892900 -vn -0.961300 0.275300 0.000000 -vn -0.432900 0.124000 -0.892900 -vn 0.522900 -0.149800 -0.839100 -vn 0.999700 0.022300 0.000000 -vn 0.524400 0.008500 0.851400 -vn -0.475500 -0.010600 0.879600 -vn -0.999800 -0.016200 0.000000 -vn -0.475500 -0.010600 -0.879600 -vn 0.524400 0.008500 -0.851400 -vn 0.000000 -0.474300 -0.880400 -vn 0.000000 0.528700 -0.848800 -vn 0.000000 -0.474300 0.880400 -vn 0.000000 -1.000000 -0.000000 +vn -0.317300 0.930400 -0.183200 vn 0.000000 1.000000 0.000000 -vn 0.000000 0.528700 0.848800 -vn -0.139000 0.529700 -0.836700 -vn -0.022000 0.540500 -0.841000 -vn 0.014600 -0.468800 -0.883200 -vn 0.111700 -0.428400 -0.896600 -vn -0.256500 0.966500 0.000000 -vn -0.040600 0.999200 -0.000000 -vn -0.022000 0.540500 0.841000 -vn -0.139000 0.529700 0.836700 -vn -0.338500 0.425800 0.839100 -vn -0.622200 0.782800 0.000000 -vn 0.280200 -0.352500 0.892900 -vn 0.622200 -0.782800 0.000000 -vn 0.280200 -0.352500 -0.892900 -vn -0.338500 0.425800 -0.839100 -vn -0.475700 0.263900 0.839100 -vn -0.874400 0.485100 0.000000 -vn 0.393700 -0.218400 0.892900 -vn 0.874400 -0.485100 0.000000 -vn 0.393700 -0.218400 -0.892900 -vn -0.475700 0.263900 -0.839100 -vn -0.977400 0.211200 0.000000 -vn -0.510400 0.113600 0.852400 -vn 0.466900 -0.100900 0.878500 -vn 0.976100 -0.217200 0.000000 -vn 0.466900 -0.100900 -0.878500 -vn -0.510400 0.113600 -0.852400 -vn -0.152600 -0.988300 0.000000 -vn -0.485100 -0.874400 0.000000 -vn -0.263900 -0.475700 -0.839100 -vn -0.083800 -0.528800 -0.844600 -vn 0.218400 0.393700 -0.892900 -vn 0.070400 0.455900 -0.887200 -vn 0.485100 0.874400 0.000000 -vn 0.156600 0.987600 0.000000 -vn 0.218400 0.393700 0.892900 -vn 0.070400 0.455900 0.887200 -vn -0.263900 -0.475700 0.839100 -vn -0.083800 -0.528800 0.844600 -vn -0.782800 -0.622200 0.000000 -vn -0.425800 -0.338500 -0.839100 -vn 0.352500 0.280200 -0.892900 -vn 0.782800 0.622200 0.000000 -vn 0.352500 0.280200 0.892900 -vn -0.425800 -0.338500 0.839100 -vn -0.961300 -0.275300 0.000000 -vn -0.522900 -0.149800 -0.839100 -vn 0.432900 0.124000 -0.892900 -vn 0.961300 0.275300 0.000000 -vn 0.432900 0.124000 0.892900 -vn -0.522900 -0.149800 0.839100 -vn -0.999700 0.022300 0.000000 -vn -0.524400 0.008500 -0.851400 -vn 0.475500 -0.010600 -0.879600 -vn 0.999800 -0.016200 0.000000 -vn 0.475500 -0.010600 0.879600 -vn -0.524400 0.008500 0.851400 -vn 0.999300 -0.038200 0.000000 -vn 0.991500 0.129800 0.000000 -vn 0.858700 0.129800 0.495700 -vn 0.865400 -0.038200 0.499600 -vn 0.865400 -0.038200 -0.499600 -vn 0.858700 0.129800 -0.495700 -vn 0.499600 -0.038200 -0.865400 -vn 0.495700 0.129800 -0.858700 -vn 0.000000 -0.038200 -0.999300 -vn 0.000000 0.129800 -0.991500 -vn -0.499600 -0.038200 0.865400 -vn -0.495700 0.129800 0.858700 -vn -0.858700 0.129800 0.495700 -vn -0.865400 -0.038200 0.499600 -vn -0.991500 0.129800 0.000000 -vn -0.999300 -0.038200 0.000000 -vn -0.858700 0.129800 -0.495700 -vn -0.865400 -0.038200 -0.499600 -vn -0.499600 -0.038200 -0.865400 -vn -0.495700 0.129800 -0.858700 -vn 0.000000 -0.038200 0.999300 -vn 0.000000 0.129800 0.991500 -vn 0.499600 -0.038200 0.865400 -vn 0.495700 0.129800 0.858700 -vn -0.485600 -0.238200 0.841100 -vn -0.841100 -0.238200 0.485600 -vn -0.971200 -0.238200 0.000000 -vn -0.841100 -0.238200 -0.485600 -vn -0.485600 -0.238200 -0.841100 -vn 0.000000 -0.238200 -0.971200 -vn 0.000000 -0.238200 0.971200 -vn 0.485600 -0.238200 0.841100 -vn 0.841100 -0.238200 0.485600 -vn 0.971200 -0.238200 0.000000 -vn 0.841100 -0.238200 -0.485600 -vn 0.485600 -0.238200 -0.841100 -vn 0.000000 0.392300 -0.919800 -vn 0.459900 0.392300 -0.796600 -vn 0.796600 0.392300 -0.459900 -vn 0.919800 0.392300 0.000000 -vn 0.796600 0.392300 0.459900 -vn 0.459900 0.392300 0.796600 -vn 0.000000 0.392300 0.919800 -vn -0.459900 0.392300 0.796600 -vn -0.796600 0.392300 -0.459900 -vn -0.459900 0.392300 -0.796600 -vn -0.919800 0.392300 0.000000 -vn -0.796600 0.392300 0.459900 -vn 0.000000 -0.182800 -0.983100 -vn 0.491600 -0.182800 -0.851400 -vn 0.851400 -0.182800 -0.491600 -vn 0.983100 -0.182800 0.000000 -vn 0.851400 -0.182800 0.491600 -vn 0.491600 -0.182800 0.851400 -vn 0.000000 -0.182800 0.983100 -vn -0.491600 -0.182800 0.851400 -vn -0.851400 -0.182800 -0.491600 -vn -0.491600 -0.182800 -0.851400 -vn -0.983100 -0.182800 0.000000 -vn -0.851400 -0.182800 0.491600 -vn -0.473200 0.322800 0.819600 -vn -0.819600 0.322800 0.473200 -vn -0.946400 0.322800 0.000000 -vn -0.819600 0.322800 -0.473200 -vn -0.473200 0.322800 -0.819600 -vn 0.000000 0.322800 -0.946400 -vn 0.000000 0.322800 0.946400 -vn 0.473200 0.322800 0.819600 -vn 0.819600 0.322800 0.473200 -vn 0.946400 0.322800 0.000000 -vn 0.819600 0.322800 -0.473200 -vn 0.473200 0.322800 -0.819600 +vn -0.183200 0.930400 -0.317300 +vn -0.366400 0.930400 0.000000 +vn -0.106100 0.977200 -0.183800 +vn 0.000000 0.930400 -0.366400 +vn 0.000000 0.977200 -0.212200 +vn -0.317300 0.930400 0.183200 +vn -0.183200 0.930400 0.317300 +vn 0.000000 0.930400 0.366400 +vn 0.183200 0.930400 -0.317300 +vn 0.106100 0.977200 -0.183800 +vn 0.183200 0.930400 0.317300 +vn 0.317300 0.930400 -0.183200 +vn 0.183800 0.977200 -0.106100 +vn 0.317300 0.930400 0.183200 +vn 0.366400 0.930400 0.000000 vn 0.502500 -0.814400 -0.290100 vn 0.811900 -0.348000 -0.468700 vn 0.937500 -0.348000 0.000000 @@ -889,19 +827,27 @@ vn -0.468700 -0.348000 0.811900 vn -0.290100 -0.814400 0.502500 vn -0.811900 -0.348000 0.468700 vn -0.502500 -0.814400 0.290100 +vn 0.212200 0.977200 0.000000 vn -0.937500 -0.348000 0.000000 vn -0.580300 -0.814400 0.000000 vn -0.811900 -0.348000 -0.468700 vn -0.502500 -0.814400 -0.290100 +vn 0.183800 0.977200 0.106100 vn -0.290100 -0.814400 -0.502500 vn -0.468700 -0.348000 -0.811900 vn 0.000000 -0.348000 -0.937500 vn 0.000000 -0.814400 -0.580300 +vn 0.106100 0.977200 0.183800 vn 0.468700 -0.348000 -0.811900 vn 0.290100 -0.814400 -0.502500 +vn 0.000000 0.977200 0.212200 +vn -0.106100 0.977200 0.183800 vn 0.680800 -0.618000 -0.393000 vn 0.786100 -0.618000 0.000000 vn 0.680800 -0.618000 0.393000 +vn -0.183800 0.977200 0.106100 +vn -0.212200 0.977200 0.000000 +vn -0.183800 0.977200 -0.106100 vn 0.393000 -0.618000 0.680800 vn 0.000000 -0.618000 0.786100 vn -0.393000 -0.618000 0.680800 @@ -923,8 +869,21 @@ vn -0.682100 0.616100 -0.393800 vn -0.393800 0.616100 -0.682100 vn 0.000000 0.616100 -0.787600 vn 0.393800 0.616100 -0.682100 +vn -0.378500 0.653400 -0.655600 +vn 0.000000 0.653400 -0.757000 +vn 0.378500 0.653400 -0.655600 +vn 0.655600 0.653400 -0.378500 +vn 0.757000 0.653400 0.000000 +vn 0.655600 0.653400 0.378500 +vn 0.378500 0.653400 0.655600 +vn 0.000000 0.653400 0.757000 +vn -0.378500 0.653400 0.655600 +vn -0.655600 0.653400 0.378500 +vn -0.757000 0.653400 0.000000 +vn -0.655600 0.653400 -0.378500 vn -0.378600 -0.653200 -0.655700 vn 0.000000 -0.653200 -0.757100 +vn 0.000000 -1.000000 0.000000 vn -0.655700 -0.653200 -0.378600 vn -0.757100 -0.653200 0.000000 vn -0.655700 -0.653200 0.378600 @@ -1079,417 +1038,668 @@ vn 0.661500 0.645400 -0.381900 vn 0.571700 -0.751200 -0.330000 vn 0.381900 0.645400 -0.661500 vn 0.330000 -0.751200 -0.571700 +vn -0.500000 0.000000 0.866000 +vn 0.500000 0.000000 -0.866000 +vn 0.139000 0.529700 0.836700 +vn 0.022000 0.540500 0.841000 +vn -0.014600 -0.468800 0.883200 +vn -0.111700 -0.428400 0.896600 +vn 0.256500 0.966500 0.000000 +vn 0.040600 0.999200 0.000000 +vn -0.111700 -0.428400 -0.896600 +vn -0.014600 -0.468800 -0.883200 +vn 0.022000 0.540500 -0.841000 +vn 0.139000 0.529700 -0.836700 +vn 0.248800 -0.968500 0.000000 +vn 0.031200 -0.999500 -0.000000 +vn 0.014600 -0.468800 0.883200 +vn 0.111700 -0.428400 0.896600 +vn -0.031200 -0.999500 -0.000000 +vn -0.248800 -0.968500 0.000000 +vn 0.338500 0.425800 -0.839100 +vn 0.622200 0.782800 0.000000 +vn -0.280200 -0.352500 -0.892900 +vn -0.622200 -0.782800 0.000000 +vn -0.280200 -0.352500 0.892900 +vn 0.338500 0.425800 0.839100 +vn 0.475700 0.263900 -0.839100 +vn 0.874400 0.485100 0.000000 +vn -0.393700 -0.218400 -0.892900 +vn -0.874400 -0.485100 0.000000 +vn -0.393700 -0.218400 0.892900 +vn 0.475700 0.263900 0.839100 +vn 0.977400 0.211200 0.000000 +vn 0.510400 0.113600 -0.852400 +vn -0.466900 -0.100900 -0.878500 +vn -0.976100 -0.217200 0.000000 +vn -0.466900 -0.100900 0.878500 +vn 0.510400 0.113600 0.852400 +vn 0.152600 -0.988300 0.000000 +vn 0.485100 -0.874400 0.000000 +vn 0.263900 -0.475700 0.839100 +vn 0.083800 -0.528800 0.844600 +vn -0.218400 0.393700 0.892900 +vn -0.070400 0.455900 0.887200 +vn -0.485100 0.874400 0.000000 +vn -0.156600 0.987600 0.000000 +vn -0.218400 0.393700 -0.892900 +vn -0.070400 0.455900 -0.887200 +vn 0.263900 -0.475700 -0.839100 +vn 0.083800 -0.528800 -0.844600 +vn 0.782800 -0.622200 0.000000 +vn 0.425800 -0.338500 0.839100 +vn -0.352500 0.280200 0.892900 +vn -0.782800 0.622200 0.000000 +vn -0.352500 0.280200 -0.892900 +vn 0.425800 -0.338500 -0.839100 +vn 0.961300 -0.275300 0.000000 +vn 0.522900 -0.149800 0.839100 +vn -0.432900 0.124000 0.892900 +vn -0.961300 0.275300 0.000000 +vn -0.432900 0.124000 -0.892900 +vn 0.522900 -0.149800 -0.839100 +vn 0.999700 0.022300 0.000000 +vn 0.524400 0.008500 0.851400 +vn -0.475500 -0.010600 0.879600 +vn -0.999800 -0.016200 0.000000 +vn -0.475500 -0.010600 -0.879600 +vn 0.524400 0.008500 -0.851400 +vn 0.000000 -0.474300 -0.880400 +vn 0.000000 0.528700 -0.848800 +vn 0.000000 -0.474300 0.880400 +vn 0.000000 0.528700 0.848800 +vn -0.139000 0.529700 -0.836700 +vn -0.022000 0.540500 -0.841000 +vn 0.014600 -0.468800 -0.883200 +vn 0.111700 -0.428400 -0.896600 +vn -0.256500 0.966500 0.000000 +vn -0.040600 0.999200 -0.000000 +vn -0.022000 0.540500 0.841000 +vn -0.139000 0.529700 0.836700 +vn -0.338500 0.425800 0.839100 +vn -0.622200 0.782800 0.000000 +vn 0.280200 -0.352500 0.892900 +vn 0.622200 -0.782800 0.000000 +vn 0.280200 -0.352500 -0.892900 +vn -0.338500 0.425800 -0.839100 +vn -0.475700 0.263900 0.839100 +vn -0.874400 0.485100 0.000000 +vn 0.393700 -0.218400 0.892900 +vn 0.874400 -0.485100 0.000000 +vn 0.393700 -0.218400 -0.892900 +vn -0.475700 0.263900 -0.839100 +vn -0.977400 0.211200 0.000000 +vn -0.510400 0.113600 0.852400 +vn 0.466900 -0.100900 0.878500 +vn 0.976100 -0.217200 0.000000 +vn 0.466900 -0.100900 -0.878500 +vn -0.510400 0.113600 -0.852400 +vn -0.152600 -0.988300 0.000000 +vn -0.485100 -0.874400 0.000000 +vn -0.263900 -0.475700 -0.839100 +vn -0.083800 -0.528800 -0.844600 +vn 0.218400 0.393700 -0.892900 +vn 0.070400 0.455900 -0.887200 +vn 0.485100 0.874400 0.000000 +vn 0.156600 0.987600 0.000000 +vn 0.218400 0.393700 0.892900 +vn 0.070400 0.455900 0.887200 +vn -0.263900 -0.475700 0.839100 +vn -0.083800 -0.528800 0.844600 +vn -0.782800 -0.622200 0.000000 +vn -0.425800 -0.338500 -0.839100 +vn 0.352500 0.280200 -0.892900 +vn 0.782800 0.622200 0.000000 +vn 0.352500 0.280200 0.892900 +vn -0.425800 -0.338500 0.839100 +vn -0.961300 -0.275300 0.000000 +vn -0.522900 -0.149800 -0.839100 +vn 0.432900 0.124000 -0.892900 +vn 0.961300 0.275300 0.000000 +vn 0.432900 0.124000 0.892900 +vn -0.522900 -0.149800 0.839100 +vn -0.999700 0.022300 0.000000 +vn -0.524400 0.008500 -0.851400 +vn 0.475500 -0.010600 -0.879600 +vn 0.999800 -0.016200 0.000000 +vn 0.475500 -0.010600 0.879600 +vn -0.524400 0.008500 0.851400 +vn 0.999300 -0.038200 0.000000 +vn 0.991500 0.129800 0.000000 +vn 0.858700 0.129800 0.495700 +vn 0.865400 -0.038200 0.499600 +vn 0.865400 -0.038200 -0.499600 +vn 0.858700 0.129800 -0.495700 +vn 0.499600 -0.038200 -0.865400 +vn 0.495700 0.129800 -0.858700 +vn 0.000000 -0.038200 -0.999300 +vn 0.000000 0.129800 -0.991500 +vn -0.499600 -0.038200 0.865400 +vn -0.495700 0.129800 0.858700 +vn -0.858700 0.129800 0.495700 +vn -0.865400 -0.038200 0.499600 +vn -0.991500 0.129800 0.000000 +vn -0.999300 -0.038200 0.000000 +vn -0.858700 0.129800 -0.495700 +vn -0.865400 -0.038200 -0.499600 +vn -0.499600 -0.038200 -0.865400 +vn -0.495700 0.129800 -0.858700 +vn 0.000000 -0.038200 0.999300 +vn 0.000000 0.129800 0.991500 +vn 0.499600 -0.038200 0.865400 +vn 0.495700 0.129800 0.858700 +vn -0.000000 -0.349800 -0.936800 +vn 0.000000 -0.238200 -0.971200 +vn 0.485600 -0.238200 -0.841100 +vn 0.468400 -0.349800 -0.811300 +vn 0.841100 -0.238200 -0.485600 +vn 0.811300 -0.349800 -0.468400 +vn 0.971200 -0.238200 0.000000 +vn 0.936800 -0.349800 0.000000 +vn 0.841100 -0.238200 0.485600 +vn 0.811300 -0.349800 0.468400 +vn 0.485600 -0.238200 0.841100 +vn 0.468400 -0.349800 0.811300 +vn 0.000000 -0.238200 0.971200 +vn 0.000000 -0.349800 0.936800 +vn -0.485600 -0.238200 0.841100 +vn -0.468400 -0.349800 0.811300 +vn -0.811300 -0.349800 -0.468400 +vn -0.841100 -0.238200 -0.485600 +vn -0.485600 -0.238200 -0.841100 +vn -0.468400 -0.349800 -0.811300 +vn -0.936800 -0.349800 0.000000 +vn -0.971200 -0.238200 0.000000 +vn -0.811300 -0.349800 0.468400 +vn -0.841100 -0.238200 0.485600 +vn 0.000000 0.392300 -0.919800 +vn 0.459900 0.392300 -0.796600 +vn 0.796600 0.392300 -0.459900 +vn 0.919800 0.392300 0.000000 +vn 0.796600 0.392300 0.459900 +vn 0.459900 0.392300 0.796600 +vn 0.000000 0.392300 0.919800 +vn -0.459900 0.392300 0.796600 +vn -0.796600 0.392300 -0.459900 +vn -0.459900 0.392300 -0.796600 +vn -0.919800 0.392300 0.000000 +vn -0.796600 0.392300 0.459900 +vn -0.405800 0.584300 0.702800 +vn -0.702800 0.584300 0.405800 +vn -0.811500 0.584300 0.000000 +vn -0.702800 0.584300 -0.405800 +vn -0.405800 0.584300 -0.702800 +vn -0.000000 0.584300 -0.811500 +vn 0.000000 0.584300 0.811500 +vn 0.405800 0.584300 0.702800 +vn 0.702800 0.584300 0.405800 +vn 0.811500 0.584300 0.000000 +vn 0.702800 0.584300 -0.405800 +vn 0.405800 0.584300 -0.702800 +g Cylinder_Cylinder_brass +s 1 +f 73/1/1 55/2/2 70/3/3 +f 76/4/4 55/2/2 73/1/1 +f 115/5/5 70/3/3 91/6/6 114/7/7 +f 78/8/8 55/2/2 76/4/4 +f 80/9/9 55/2/2 78/8/8 +f 82/10/10 55/2/2 80/9/9 +f 114/7/7 91/6/6 90/11/11 112/12/12 +f 84/13/13 55/2/2 82/10/10 +f 112/12/12 90/11/11 88/14/14 100/15/15 +f 86/16/16 55/2/2 84/13/13 +f 87/17/17 55/2/2 86/16/16 +f 88/14/14 55/2/2 87/17/17 +f 90/11/11 55/2/2 88/14/14 +f 91/6/6 55/2/2 90/11/11 +f 70/3/3 55/2/2 91/6/6 +f 110/18/18 65/19/19 64/20/20 109/21/21 +f 109/21/21 64/20/20 63/22/22 108/23/23 +f 108/23/23 63/22/22 62/24/24 107/25/25 +f 107/25/25 62/24/24 61/26/26 106/27/27 +f 106/27/27 61/26/26 60/28/28 105/29/29 +f 105/29/29 60/28/28 59/30/30 104/31/31 +f 100/15/15 88/14/14 87/17/17 99/32/32 +f 104/31/31 59/30/30 58/33/33 103/34/34 +f 103/34/34 58/33/33 57/35/35 102/36/36 +f 99/32/32 87/17/17 86/16/16 98/37/37 +f 101/38/38 56/39/39 89/40/40 113/41/41 +f 98/37/37 86/16/16 84/13/13 97/42/42 +f 113/43/41 89/44/40 66/45/43 111/46/44 +f 97/42/42 84/13/13 82/10/10 96/47/45 +f 102/36/36 57/35/35 56/39/39 101/38/38 +f 96/47/45 82/10/10 80/9/9 95/48/46 +f 111/46/44 66/45/43 65/19/19 110/18/18 +f 83/49/47 110/18/18 109/21/21 81/50/48 +f 81/50/48 109/21/21 108/23/23 79/51/49 +f 95/48/46 80/9/9 78/8/8 94/52/50 +f 94/52/50 78/8/8 76/4/4 93/53/51 +f 93/53/51 76/4/4 73/1/1 92/54/52 +f 92/54/52 73/1/1 70/3/3 115/5/5 +f 79/51/49 108/23/23 107/25/25 77/55/53 +f 77/55/53 107/25/25 106/27/27 75/56/54 +f 75/56/54 106/27/27 105/29/29 74/57/55 +f 74/57/55 105/29/29 104/31/31 72/58/56 +f 72/58/56 104/31/31 103/34/34 71/59/57 +f 71/59/57 103/34/34 102/36/36 69/60/58 +f 68/61/59 101/38/38 113/41/41 67/62/60 +f 67/63/60 113/43/41 111/46/44 85/64/61 +f 69/60/58 102/36/36 101/38/38 68/61/59 +f 85/64/61 111/46/44 110/18/18 83/49/47 +f 126/65/62 83/49/47 81/50/48 185/66/63 +f 185/66/63 81/50/48 79/51/49 125/67/64 +f 125/67/64 79/51/49 77/55/53 184/68/65 +f 184/68/65 77/55/53 75/56/54 183/69/66 +f 183/69/66 75/56/54 74/57/55 182/70/67 +f 182/70/67 74/57/55 72/58/56 181/71/68 +f 181/71/68 72/58/56 71/59/57 180/72/69 +f 180/72/69 71/59/57 69/60/58 179/73/70 +f 177/74/71 68/61/59 67/62/60 178/75/72 +f 178/76/72 67/63/60 85/64/61 186/77/73 +f 179/73/70 69/60/58 68/61/59 177/74/71 +f 186/77/73 85/64/61 83/49/47 126/65/62 +f 309/78/74 115/5/5 114/7/7 200/79/75 +f 200/79/75 114/7/7 112/12/12 199/80/76 +f 199/80/76 112/12/12 100/15/15 201/81/77 +f 201/81/77 100/15/15 99/32/32 202/82/78 +f 202/82/78 99/32/32 98/37/37 203/83/79 +f 203/83/79 98/37/37 97/42/42 204/84/80 +f 204/84/80 97/42/42 96/47/45 205/85/81 +f 205/85/81 96/47/45 95/48/46 206/86/82 +f 206/86/82 95/48/46 94/52/50 207/87/83 +f 207/87/83 94/52/50 93/53/51 208/88/84 +f 208/88/84 93/53/51 92/54/52 292/89/85 +f 292/89/85 92/54/52 115/5/5 309/78/74 +f 66/45/43 199/90/76 201/91/77 65/19/19 +f 57/35/35 292/92/85 309/93/74 56/39/39 +f 89/44/40 200/94/75 199/90/76 66/45/43 +f 56/39/39 309/93/74 200/95/75 89/40/40 +f 58/33/33 208/96/84 292/92/85 57/35/35 +f 59/30/30 207/97/83 208/96/84 58/33/33 +f 60/28/28 206/98/82 207/97/83 59/30/30 +f 61/26/26 205/99/81 206/98/82 60/28/28 +f 62/24/24 204/100/80 205/99/81 61/26/26 +f 63/22/22 203/101/79 204/100/80 62/24/24 +f 64/20/20 202/102/78 203/101/79 63/22/22 +f 65/19/19 201/91/77 202/102/78 64/20/20 +g Cylinder_Cylinder_base +f 187/103/86 198/104/87 127/105/88 +f 188/106/89 187/103/86 127/105/88 +f 189/107/90 188/106/89 127/105/88 +f 190/108/91 189/107/90 127/105/88 +f 191/109/92 190/108/91 127/105/88 +f 192/110/93 191/109/92 127/105/88 +f 193/111/94 192/110/93 127/105/88 +f 194/112/95 193/111/94 127/105/88 +f 195/113/96 194/112/95 127/105/88 +f 196/114/97 195/113/96 127/105/88 +f 197/115/98 196/114/97 127/105/88 +f 198/104/87 197/115/98 127/105/88 +f 140/23/99 186/29/73 126/116/62 139/117/100 +f 136/51/101 125/57/64 184/70/65 135/67/102 +f 138/118/103 185/119/63 125/57/64 136/51/101 +f 139/117/100 126/116/62 185/119/63 138/118/103 +f 167/120/104 131/121/105 130/122/106 166/123/107 +f 164/19/108 142/22/109 140/23/99 176/18/110 +f 166/123/107 130/122/106 129/124/111 165/125/112 +f 176/18/110 140/23/99 139/117/100 175/126/113 +f 165/125/112 129/124/111 142/127/109 164/128/108 +f 168/129/114 132/130/115 131/121/105 167/120/104 +f 169/131/116 133/132/117 132/130/115 168/129/114 +f 170/133/118 134/105/119 133/132/117 169/131/116 +f 171/65/120 135/67/102 134/105/119 170/133/118 +f 173/49/121 136/51/101 135/67/102 171/65/120 +f 174/134/122 138/118/103 136/51/101 173/49/121 +f 175/126/113 139/117/100 138/118/103 174/134/122 +f 196/135/97 162/136/123 161/137/124 195/138/96 +f 195/138/96 161/137/124 158/64/125 194/63/95 +f 194/63/95 158/64/125 156/77/126 193/76/94 +f 193/76/94 156/77/126 154/139/127 192/140/93 +f 192/140/93 154/139/127 152/141/128 191/142/92 +f 191/142/92 152/141/128 150/143/129 190/144/91 +f 190/144/91 150/143/129 148/145/130 189/146/90 +f 187/147/86 144/148/131 128/149/132 198/150/87 +f 197/43/98 163/46/133 162/136/123 196/135/97 +f 188/151/89 146/152/134 144/148/131 187/147/86 +f 198/44/87 128/45/132 163/46/133 197/43/98 +f 189/146/90 148/145/130 146/152/134 188/151/89 +f 148/145/130 167/120/104 166/123/107 146/152/134 +f 128/45/132 164/19/108 176/18/110 163/46/133 +f 146/152/134 166/123/107 165/125/112 144/148/131 +f 163/46/133 176/18/110 175/126/113 162/136/123 +f 144/148/131 165/125/112 164/128/108 128/149/132 +f 150/143/129 168/129/114 167/120/104 148/145/130 +f 152/141/128 169/131/116 168/129/114 150/143/129 +f 154/139/127 170/133/118 169/131/116 152/141/128 +f 156/77/126 171/65/120 170/133/118 154/139/127 +f 158/64/125 173/49/121 171/65/120 156/77/126 +f 161/137/124 174/134/122 173/49/121 158/64/125 +f 162/136/123 175/126/113 174/134/122 161/137/124 +f 135/67/102 184/70/65 183/153/66 134/105/119 +f 134/105/119 183/153/66 182/154/67 133/132/117 +f 133/132/117 182/154/67 181/155/68 132/130/115 +f 132/130/115 181/155/68 180/156/69 131/121/105 +f 129/124/111 177/157/71 178/158/72 142/127/109 +f 130/122/106 179/159/70 177/157/71 129/124/111 +f 142/22/109 178/28/72 186/29/73 140/23/99 +f 131/121/105 180/156/69 179/159/70 130/122/106 +g Cylinder_Cylinder_top +f 384/160/86 370/161/87 116/124/88 +f 383/162/89 384/160/86 116/124/88 +f 381/163/90 383/162/89 116/124/88 +f 380/164/91 381/163/90 116/124/88 +f 379/165/92 380/164/91 116/124/88 +f 378/166/93 379/165/92 116/124/88 +f 377/167/94 378/166/93 116/124/88 +f 376/168/95 377/167/94 116/124/88 +f 375/169/96 376/168/95 116/124/88 +f 374/170/97 375/169/96 116/124/88 +f 373/171/98 374/170/97 116/124/88 +f 370/161/87 373/171/98 116/124/88 +f 382/172/135 360/173/136 325/174/137 361/175/138 +f 143/176/139 145/177/140 117/178/2 +f 141/179/141 143/176/139 117/178/2 +f 137/180/142 141/179/141 117/178/2 +f 124/181/143 137/180/142 117/178/2 +f 123/182/144 124/181/143 117/178/2 +f 122/183/145 123/182/144 117/178/2 +f 121/184/146 122/183/145 117/178/2 +f 120/185/147 121/184/146 117/178/2 +f 119/186/148 120/185/147 117/178/2 +f 118/187/149 119/186/148 117/178/2 +f 147/188/150 118/187/149 117/178/2 +f 395/131/151 396/129/152 147/189/150 145/190/140 +f 394/131/153 395/131/151 145/190/140 143/190/139 +f 393/133/154 394/131/153 143/190/139 141/191/141 +f 392/65/155 393/133/154 141/191/141 137/192/142 +f 391/49/156 392/65/155 137/192/142 124/193/143 +f 390/49/157 391/49/156 124/193/143 123/193/144 +f 389/134/158 390/49/157 123/193/144 122/194/145 +f 388/126/159 389/134/158 122/194/145 121/195/146 +f 387/126/160 388/126/159 121/195/146 120/195/147 +f 386/18/161 387/126/160 120/195/147 119/196/148 +f 385/19/162 386/18/161 119/196/148 118/197/149 +f 324/198/163 295/199/164 149/200/165 296/201/166 +f 296/201/166 149/200/165 151/200/167 297/201/168 +f 297/201/168 151/200/167 153/202/169 298/203/170 +f 298/203/170 153/202/169 155/66/171 299/68/172 +f 299/68/172 155/66/171 157/50/173 300/55/174 +f 300/55/174 157/50/173 159/50/175 301/55/176 +f 301/55/176 159/50/175 160/204/177 302/205/178 +f 302/205/178 160/204/177 172/206/179 303/207/180 +f 303/207/180 172/206/179 291/206/181 304/207/182 +f 304/207/182 291/206/181 293/21/183 313/25/184 +f 315/24/185 294/20/186 295/102/164 324/100/163 +f 313/25/184 293/21/183 294/20/186 315/24/185 +f 360/173/136 324/198/163 296/201/166 325/174/137 +f 325/174/137 296/201/166 297/201/168 326/174/187 +f 326/174/187 297/201/168 298/203/170 327/208/188 +f 327/208/188 298/203/170 299/68/172 328/69/189 +f 328/69/189 299/68/172 300/55/174 329/56/190 +f 329/56/190 300/55/174 301/55/176 330/56/191 +f 330/56/191 301/55/176 302/205/178 331/209/192 +f 331/209/192 302/205/178 303/207/180 332/210/193 +f 332/210/193 303/207/180 304/207/182 333/210/194 +f 333/210/194 304/207/182 313/25/184 334/27/195 +f 335/26/196 315/24/185 324/100/163 360/99/136 +f 334/27/195 313/25/184 315/24/185 335/26/196 +f 379/211/92 342/212/197 343/213/198 380/214/91 +f 361/175/138 325/174/137 326/174/187 362/175/199 +f 362/175/199 326/174/187 327/208/188 363/215/200 +f 380/214/91 343/213/198 344/213/201 381/214/90 +f 363/215/200 327/208/188 328/69/189 364/72/202 +f 364/72/202 328/69/189 329/56/190 365/59/203 +f 365/59/203 329/56/190 330/56/191 366/59/204 +f 381/214/90 344/213/201 346/216/205 383/217/89 +f 366/59/204 330/56/191 331/209/192 367/218/206 +f 384/219/86 347/220/207 357/221/208 370/222/87 +f 367/218/206 331/209/192 332/210/193 368/223/209 +f 383/217/89 346/216/205 347/220/207 384/219/86 +f 368/223/209 332/210/193 333/210/194 369/223/210 +f 369/223/210 333/210/194 334/27/195 371/34/211 +f 372/33/212 335/26/196 360/99/136 382/96/135 +f 371/34/211 334/27/195 335/26/196 372/33/212 +f 378/224/93 341/225/213 342/212/197 379/211/92 +f 377/224/94 340/225/214 341/225/213 378/224/93 +f 376/226/95 339/227/215 340/225/214 377/224/94 +f 375/228/96 338/229/216 339/227/215 376/226/95 +f 374/230/97 337/231/217 338/229/216 375/228/96 +f 373/230/98 336/231/218 337/231/217 374/230/97 +f 370/232/87 357/233/208 336/231/218 373/230/98 +f 322/41/219 358/38/220 359/39/221 323/40/222 +f 323/40/222 359/39/221 345/93/223 321/95/224 +f 320/234/225 356/235/226 358/38/220 322/41/219 +f 319/234/227 355/235/228 356/235/226 320/234/225 +f 318/236/229 354/237/230 355/235/228 319/234/227 +f 317/62/231 353/61/232 354/237/230 318/236/229 +f 316/62/233 352/61/234 353/61/232 317/62/231 +f 314/75/235 351/74/236 352/61/234 316/62/233 +f 312/238/237 350/239/238 351/74/236 314/75/235 +f 311/240/239 349/241/240 350/239/238 312/238/237 +f 310/240/241 348/241/242 349/241/240 311/240/239 +f 321/242/224 345/243/223 348/241/242 310/240/241 +f 345/243/223 382/172/135 361/175/138 348/241/242 +f 348/241/242 361/175/138 362/175/199 349/241/240 +f 349/241/240 362/175/199 363/215/200 350/239/238 +f 350/239/238 363/215/200 364/72/202 351/74/236 +f 351/74/236 364/72/202 365/59/203 352/61/234 +f 352/61/234 365/59/203 366/59/204 353/61/232 +f 353/61/232 366/59/204 367/218/206 354/237/230 +f 354/237/230 367/218/206 368/223/209 355/235/228 +f 355/235/228 368/223/209 369/223/210 356/235/226 +f 356/235/226 369/223/210 371/34/211 358/38/220 +f 359/39/221 372/33/212 382/96/135 345/93/223 +f 358/38/220 371/34/211 372/33/212 359/39/221 +f 357/233/208 321/242/224 310/240/241 336/231/218 +f 336/231/218 310/240/241 311/240/239 337/231/217 +f 337/231/217 311/240/239 312/238/237 338/229/216 +f 338/229/216 312/238/237 314/75/235 339/227/215 +f 339/227/215 314/75/235 316/62/233 340/225/214 +f 340/225/214 316/62/233 317/62/231 341/225/213 +f 341/225/213 317/62/231 318/236/229 342/212/197 +f 145/177/140 147/188/150 117/178/2 +f 293/21/183 386/18/161 385/19/162 294/20/186 +f 294/20/186 385/19/162 396/91/152 295/102/164 +f 396/91/152 385/19/162 118/197/149 147/244/150 +f 291/206/181 387/126/160 386/18/161 293/21/183 +f 172/206/179 388/126/159 387/126/160 291/206/181 +f 160/204/177 389/134/158 388/126/159 172/206/179 +f 346/216/205 322/41/219 323/40/222 347/220/207 +f 159/50/175 390/49/157 389/134/158 160/204/177 +f 347/220/207 323/40/222 321/95/224 357/221/208 +f 157/50/173 391/49/156 390/49/157 159/50/175 +f 344/213/201 320/234/225 322/41/219 346/216/205 +f 155/66/171 392/65/155 391/49/156 157/50/173 +f 153/202/169 393/133/154 392/65/155 155/66/171 +f 151/200/167 394/131/153 393/133/154 153/202/169 +f 343/213/198 319/234/227 320/234/225 344/213/201 +f 149/200/165 395/131/151 394/131/153 151/200/167 +f 295/199/164 396/129/152 395/131/151 149/200/165 +f 342/212/197 318/236/229 319/234/227 343/213/198 +g Cylinder_Cylinder_wick +s off +f 224/245/243 223/246/243 221/247/243 222/248/243 +f 308/248/244 307/247/244 305/246/244 306/245/244 g Cylinder_Cylinder_handles s 1 -f 11/1/1 187/2/2 186/3/3 10/4/4 -f 12/5/5 188/6/6 187/2/2 11/1/1 -f 8/7/7 184/8/8 183/9/9 7/10/10 -f 7/10/10 183/9/9 188/6/6 12/5/5 -f 203/11/11 251/12/12 250/13/13 202/14/14 -f 10/4/4 186/3/3 185/15/15 9/16/16 -f 13/17/17 7/10/10 12/5/5 18/18/18 -f 14/19/19 8/7/7 7/10/10 13/17/17 -f 15/20/20 9/16/16 8/21/7 14/22/19 -f 16/23/21 10/4/4 9/16/16 15/20/20 -f 17/24/22 11/1/1 10/4/4 16/23/21 -f 18/18/18 12/5/5 11/1/1 17/24/22 -f 19/25/23 13/17/17 18/18/18 24/26/24 -f 20/27/25 14/19/19 13/17/17 19/25/23 -f 21/28/26 15/20/20 14/22/19 20/29/25 -f 22/30/27 16/23/21 15/20/20 21/28/26 -f 23/31/28 17/24/22 16/23/21 22/30/27 -f 24/26/24 18/18/18 17/24/22 23/31/28 -f 30/32/29 25/33/30 19/25/23 24/26/24 -f 26/34/31 20/27/25 19/25/23 25/33/30 -f 27/35/32 21/28/26 20/29/25 26/36/31 -f 28/37/33 22/30/27 21/28/26 27/35/32 -f 29/38/34 23/31/28 22/30/27 28/37/33 -f 30/32/29 24/26/24 23/31/28 29/38/34 -f 31/39/35 37/40/36 38/41/37 32/42/38 -f 32/42/38 38/41/37 39/43/39 33/44/40 -f 33/44/40 39/43/39 40/45/41 34/46/42 -f 34/46/42 40/45/41 41/47/43 35/48/44 -f 35/49/44 41/50/43 42/51/45 36/52/46 -f 36/52/46 42/51/45 37/40/36 31/39/35 -f 37/40/36 43/53/47 44/54/48 38/41/37 -f 38/41/37 44/54/48 45/55/49 39/43/39 -f 39/43/39 45/55/49 46/56/50 40/45/41 -f 40/45/41 46/56/50 47/57/51 41/47/43 -f 41/50/43 47/58/51 48/59/52 42/51/45 -f 42/51/45 48/59/52 43/53/47 37/40/36 -f 43/53/47 49/60/53 50/61/54 44/54/48 -f 44/54/48 50/61/54 51/62/55 45/55/49 -f 45/55/49 51/62/55 52/63/56 46/56/50 -f 46/56/50 52/63/56 53/64/57 47/57/51 -f 47/58/51 53/65/57 54/66/58 48/59/52 -f 48/59/52 54/66/58 49/60/53 43/53/47 -f 49/60/53 1/67/59 2/68/60 50/61/54 -f 50/61/54 2/68/60 3/69/61 51/62/55 -f 51/62/55 3/69/61 4/70/62 52/63/56 -f 52/63/56 4/70/62 5/71/63 53/64/57 -f 53/65/57 5/72/63 6/73/64 54/66/58 -f 54/66/58 6/73/64 1/67/59 49/60/53 -f 9/16/16 185/15/15 184/74/8 8/21/7 -f 6/73/64 25/33/30 30/32/29 1/67/59 -f 1/67/59 30/32/29 29/38/34 2/68/60 -f 2/68/60 29/38/34 28/37/33 3/69/61 -f 3/69/61 28/37/33 27/35/32 4/70/62 -f 4/70/62 27/35/32 26/36/31 5/71/63 -f 5/72/63 26/34/31 25/33/30 6/73/64 -f 35/49/44 36/52/46 194/75/65 193/76/66 -f 31/39/35 32/42/38 190/77/67 189/78/68 -f 36/52/46 31/39/35 189/78/68 194/75/65 -f 33/44/40 34/46/42 192/79/69 191/80/70 -f 34/46/42 35/48/44 193/81/66 192/79/69 -f 32/42/38 33/44/40 191/80/70 190/77/67 -f 205/82/71 253/83/72 252/84/73 204/85/74 -f 206/86/75 254/87/76 253/83/72 205/82/71 -f 202/88/14 250/89/13 249/90/77 201/91/78 -f 201/91/78 249/90/77 254/87/76 206/86/75 -f 204/85/74 252/84/73 251/12/12 203/11/11 -f 207/92/79 201/91/78 206/86/75 212/93/80 -f 208/94/81 202/88/14 201/91/78 207/92/79 -f 209/95/82 203/11/11 202/14/14 208/96/81 -f 210/97/83 204/85/74 203/11/11 209/95/82 -f 211/98/84 205/82/71 204/85/74 210/97/83 -f 212/93/80 206/86/75 205/82/71 211/98/84 -f 213/99/85 207/92/79 212/93/80 218/100/86 -f 214/101/87 208/94/81 207/92/79 213/99/85 -f 215/102/88 209/95/82 208/96/81 214/103/87 -f 216/104/89 210/97/83 209/95/82 215/102/88 -f 217/105/90 211/98/84 210/97/83 216/104/89 -f 218/100/86 212/93/80 211/98/84 217/105/90 -f 224/106/91 219/107/92 213/99/85 218/100/86 -f 220/108/93 214/101/87 213/99/85 219/107/92 -f 221/109/94 215/102/88 214/103/87 220/110/93 -f 222/111/95 216/104/89 215/102/88 221/109/94 -f 223/112/96 217/105/90 216/104/89 222/111/95 -f 224/106/91 218/100/86 217/105/90 223/112/96 -f 225/113/97 231/114/98 232/115/99 226/116/100 -f 226/116/100 232/115/99 233/117/101 227/118/102 -f 227/118/102 233/117/101 234/119/103 228/120/104 -f 228/120/104 234/119/103 235/121/105 229/122/106 -f 229/123/106 235/124/105 236/125/107 230/126/108 -f 230/126/108 236/125/107 231/114/98 225/113/97 -f 231/114/98 237/127/109 238/128/110 232/115/99 -f 232/115/99 238/128/110 239/129/111 233/117/101 -f 233/117/101 239/129/111 240/130/112 234/119/103 -f 234/119/103 240/130/112 241/131/113 235/121/105 -f 235/124/105 241/132/113 242/133/114 236/125/107 -f 236/125/107 242/133/114 237/127/109 231/114/98 -f 237/127/109 243/134/115 244/135/116 238/128/110 -f 238/128/110 244/135/116 245/136/117 239/129/111 -f 239/129/111 245/136/117 246/137/118 240/130/112 -f 240/130/112 246/137/118 247/138/119 241/131/113 -f 241/132/113 247/139/119 248/140/120 242/133/114 -f 242/133/114 248/140/120 243/134/115 237/127/109 -f 243/134/115 195/141/121 196/142/122 244/135/116 -f 244/135/116 196/142/122 197/143/123 245/136/117 -f 245/136/117 197/143/123 198/144/124 246/137/118 -f 246/137/118 198/144/124 199/145/125 247/138/119 -f 247/139/119 199/146/125 200/147/126 248/140/120 -f 248/140/120 200/147/126 195/141/121 243/134/115 -f 200/147/126 219/107/92 224/106/91 195/141/121 -f 195/141/121 224/106/91 223/112/96 196/142/122 -f 196/142/122 223/112/96 222/111/95 197/143/123 -f 197/143/123 222/111/95 221/109/94 198/144/124 -f 198/144/124 221/109/94 220/110/93 199/145/125 -f 199/146/125 220/108/93 219/107/92 200/147/126 -f 229/123/106 230/126/108 260/148/67 259/149/70 -f 225/113/97 226/116/100 256/150/65 255/151/68 -f 230/126/108 225/113/97 255/151/68 260/148/67 -f 227/118/102 228/120/104 258/152/69 257/153/66 -f 228/120/104 229/122/106 259/154/70 258/152/69 -f 226/116/100 227/118/102 257/153/66 256/150/65 +f 11/249/245 213/250/246 212/251/247 10/252/248 +f 12/253/249 214/254/250 213/250/246 11/249/245 +f 8/255/251 210/256/252 209/257/253 7/258/254 +f 7/258/254 209/257/253 214/254/250 12/253/249 +f 233/149/255 281/259/256 280/260/257 232/150/258 +f 10/252/248 212/251/247 211/261/259 9/262/260 +f 13/263/261 7/258/254 12/253/249 18/264/262 +f 14/265/263 8/255/251 7/258/254 13/263/261 +f 15/266/264 9/262/260 8/267/251 14/268/263 +f 16/269/265 10/252/248 9/262/260 15/266/264 +f 17/178/266 11/249/245 10/252/248 16/269/265 +f 18/264/262 12/253/249 11/249/245 17/178/266 +f 19/270/267 13/263/261 18/264/262 24/271/268 +f 20/272/269 14/265/263 13/263/261 19/270/267 +f 21/273/270 15/266/264 14/268/263 20/274/269 +f 22/275/271 16/269/265 15/266/264 21/273/270 +f 23/276/272 17/178/266 16/269/265 22/275/271 +f 24/271/268 18/264/262 17/178/266 23/276/272 +f 30/277/273 25/278/274 19/270/267 24/271/268 +f 26/279/275 20/272/269 19/270/267 25/278/274 +f 27/280/276 21/273/270 20/274/269 26/281/275 +f 28/282/277 22/275/271 21/273/270 27/280/276 +f 29/283/278 23/276/272 22/275/271 28/282/277 +f 30/277/273 24/271/268 23/276/272 29/283/278 +f 31/95/279 37/40/280 38/39/281 32/93/282 +f 32/93/282 38/39/281 39/35/283 33/92/284 +f 33/92/284 39/35/283 40/33/285 34/96/286 +f 34/96/286 40/33/285 41/30/287 35/97/288 +f 35/221/288 41/220/287 42/284/289 36/285/290 +f 36/285/290 42/284/289 37/40/280 31/95/279 +f 37/40/280 43/41/291 44/38/292 38/39/281 +f 38/39/281 44/38/292 45/36/293 39/35/283 +f 39/35/283 45/36/293 46/34/294 40/33/285 +f 40/33/285 46/34/294 47/31/295 41/30/287 +f 41/220/287 47/216/295 48/286/296 42/284/289 +f 42/284/289 48/286/296 43/41/291 37/40/280 +f 43/41/291 49/234/297 50/235/298 44/38/292 +f 44/38/292 50/235/298 51/287/299 45/36/293 +f 45/36/293 51/287/299 52/223/300 46/34/294 +f 46/34/294 52/223/300 53/288/301 47/31/295 +f 47/216/295 53/213/301 54/289/302 48/286/296 +f 48/286/296 54/289/302 49/234/297 43/41/291 +f 49/234/297 1/236/303 2/237/304 50/235/298 +f 50/235/298 2/237/304 3/290/305 51/287/299 +f 51/287/299 3/290/305 4/218/306 52/223/300 +f 52/223/300 4/218/306 5/291/307 53/288/301 +f 53/213/301 5/212/307 6/292/308 54/289/302 +f 54/289/302 6/292/308 1/236/303 49/234/297 +f 9/262/260 211/261/259 210/293/252 8/267/251 +f 6/292/308 25/278/274 30/277/273 1/236/303 +f 1/236/303 30/277/273 29/283/278 2/237/304 +f 2/237/304 29/283/278 28/282/277 3/290/305 +f 3/290/305 28/282/277 27/280/276 4/218/306 +f 4/218/306 27/280/276 26/281/275 5/291/307 +f 5/212/307 26/279/275 25/278/274 6/292/308 +f 35/221/288 36/285/290 220/294/309 219/295/310 +f 31/95/279 32/93/282 216/296/311 215/297/88 +f 36/285/290 31/95/279 215/297/88 220/294/309 +f 33/92/284 34/96/286 218/298/2 217/299/312 +f 34/96/286 35/97/288 219/300/310 218/298/2 +f 32/93/282 33/92/284 217/299/312 216/296/311 +f 235/301/313 283/302/314 282/303/315 234/128/316 +f 236/127/317 284/304/318 283/302/314 235/301/313 +f 232/305/258 280/306/257 279/307/319 231/308/320 +f 231/308/320 279/307/319 284/304/318 236/127/317 +f 234/128/316 282/303/315 281/259/256 233/149/255 +f 237/309/321 231/308/320 236/127/317 242/124/322 +f 238/310/323 232/305/258 231/308/320 237/309/321 +f 239/148/324 233/149/255 232/150/258 238/147/323 +f 240/125/325 234/128/316 233/149/255 239/148/324 +f 241/311/326 235/301/313 234/128/316 240/125/325 +f 242/124/322 236/127/317 235/301/313 241/311/326 +f 243/312/327 237/309/321 242/124/322 248/122/328 +f 244/313/329 238/310/323 237/309/321 243/312/327 +f 245/152/330 239/148/324 238/147/323 244/151/329 +f 246/123/331 240/125/325 239/148/324 245/152/330 +f 247/314/332 241/311/326 240/125/325 246/123/331 +f 248/122/328 242/124/322 241/311/326 247/314/332 +f 254/121/333 249/315/334 243/312/327 248/122/328 +f 250/316/335 244/313/329 243/312/327 249/315/334 +f 251/145/336 245/152/330 244/151/329 250/146/335 +f 252/120/337 246/123/331 245/152/330 251/145/336 +f 253/317/338 247/314/332 246/123/331 252/120/337 +f 254/121/333 248/122/328 247/314/332 253/317/338 +f 255/101/339 261/22/340 262/20/341 256/102/342 +f 256/102/342 262/20/341 263/19/343 257/91/344 +f 257/91/344 263/19/343 264/45/345 258/90/346 +f 258/90/346 264/45/345 265/44/347 259/94/348 +f 259/99/348 265/26/347 266/24/349 260/100/350 +f 260/100/350 266/24/349 261/22/340 255/101/339 +f 261/22/340 267/23/351 268/21/352 262/20/341 +f 262/20/341 268/21/352 269/18/353 263/19/343 +f 263/19/343 269/18/353 270/46/354 264/45/345 +f 264/45/345 270/46/354 271/43/355 265/44/347 +f 265/26/347 271/27/355 272/25/356 266/24/349 +f 266/24/349 272/25/356 267/23/351 261/22/340 +f 267/23/351 273/117/357 274/206/358 268/21/352 +f 268/21/352 274/206/358 275/126/359 269/18/353 +f 269/18/353 275/126/359 276/136/360 270/46/354 +f 270/46/354 276/136/360 277/135/361 271/43/355 +f 271/27/355 277/210/361 278/207/362 272/25/356 +f 272/25/356 278/207/362 273/117/357 267/23/351 +f 273/117/357 225/118/363 226/204/364 274/206/358 +f 274/206/358 226/204/364 227/134/365 275/126/359 +f 275/126/359 227/134/365 228/137/366 276/136/360 +f 276/136/360 228/137/366 229/138/367 277/135/361 +f 277/210/361 229/209/367 230/205/368 278/207/362 +f 278/207/362 230/205/368 225/118/363 273/117/357 +f 230/205/368 249/315/334 254/121/333 225/118/363 +f 225/118/363 254/121/333 253/317/338 226/204/364 +f 226/204/364 253/317/338 252/120/337 227/134/365 +f 227/134/365 252/120/337 251/145/336 228/137/366 +f 228/137/366 251/145/336 250/146/335 229/138/367 +f 229/209/367 250/316/335 249/315/334 230/205/368 +f 259/99/348 260/100/350 290/318/311 289/319/312 +f 255/101/339 256/102/342 286/320/309 285/321/88 +f 260/100/350 255/101/339 285/321/88 290/318/311 +f 257/91/344 258/90/346 288/322/2 287/323/310 +f 258/90/346 259/94/348 289/324/312 288/322/2 +f 256/102/342 257/91/344 287/323/310 286/320/309 g Cylinder_Cylinder_glass -f 392/155/127 368/156/128 369/157/129 393/147/130 -f 391/70/131 367/158/132 368/156/128 392/155/127 -f 390/68/133 366/159/134 367/158/132 391/70/131 -f 389/73/135 377/160/136 366/159/134 390/68/133 -f 396/68/137 372/159/138 373/158/139 397/70/140 -f 397/70/140 373/158/139 374/156/141 398/155/142 -f 398/155/142 374/156/141 375/157/143 399/147/144 -f 400/142/145 376/161/146 377/162/136 389/144/135 -f 399/147/144 375/157/143 376/161/146 400/142/145 -f 395/73/147 371/160/148 372/159/138 396/68/137 -f 394/142/149 370/161/150 371/162/148 395/144/147 -f 393/147/130 369/157/129 370/161/150 394/142/149 -f 384/54/151 396/68/137 397/70/140 385/56/152 -f 385/56/152 397/70/140 398/155/142 386/163/153 -f 386/163/153 398/155/142 399/147/144 387/133/154 -f 388/128/155 400/142/145 389/144/135 365/130/156 -f 387/133/154 399/147/144 400/142/145 388/128/155 -f 383/59/157 395/73/147 396/68/137 384/54/151 -f 382/128/158 394/142/149 395/144/147 383/130/157 -f 381/133/159 393/147/130 394/142/149 382/128/158 -f 380/163/160 392/155/127 393/147/130 381/133/159 -f 379/56/161 391/70/131 392/155/127 380/163/160 -f 378/54/162 390/68/133 391/70/131 379/56/161 -f 365/59/156 389/73/135 390/68/133 378/54/162 -f 377/160/136 363/164/163 364/165/164 366/159/134 -f 366/159/134 364/165/164 401/166/165 367/158/132 -f 367/158/132 401/166/165 402/167/166 368/156/128 -f 368/156/128 402/167/166 403/168/167 369/157/129 -f 369/157/129 403/168/167 404/169/168 370/161/150 -f 370/161/150 404/169/168 405/170/169 371/162/148 -f 371/160/148 405/164/169 406/165/170 372/159/138 -f 375/157/143 409/168/171 410/169/172 376/161/146 -f 376/161/146 410/169/172 363/170/163 377/162/136 -f 374/156/141 408/167/173 409/168/171 375/157/143 -f 373/158/139 407/166/174 408/167/173 374/156/141 -f 372/159/138 406/165/170 407/166/174 373/158/139 -f 174/52/175 365/59/156 378/54/162 173/42/176 -f 173/42/176 378/54/162 379/56/161 175/46/177 -f 175/46/177 379/56/161 380/163/160 176/171/178 -f 176/171/178 380/163/160 381/133/159 177/126/179 -f 177/126/179 381/133/159 382/128/158 178/116/180 -f 178/116/180 382/128/158 383/130/157 179/120/181 -f 179/52/181 383/59/157 384/54/151 180/42/182 -f 262/126/183 387/133/154 388/128/155 275/116/184 -f 275/116/184 388/128/155 365/130/156 174/120/175 -f 182/171/185 386/163/153 387/133/154 262/126/183 -f 181/46/186 385/56/152 386/163/153 182/171/185 -f 180/42/182 384/54/151 385/56/152 181/46/186 -f 406/165/170 345/172/187 346/173/188 407/166/174 -f 407/166/174 346/173/188 347/174/189 408/167/173 -f 408/167/173 347/174/189 349/175/190 409/168/171 -f 410/169/172 350/176/191 336/177/192 363/170/163 -f 409/168/171 349/175/190 350/176/191 410/169/172 -f 405/164/169 344/178/193 345/172/187 406/165/170 -f 404/169/168 343/176/194 344/177/193 405/170/169 -f 403/168/167 342/175/195 343/176/194 404/169/168 -f 402/167/166 341/174/196 342/175/195 403/168/167 -f 401/166/165 340/173/197 341/174/196 402/167/166 -f 364/165/164 339/172/198 340/173/197 401/166/165 -f 363/164/163 336/178/192 339/172/198 364/165/164 -g Cylinder_Cylinder_brass -f 88/129/199 64/117/200 63/115/201 87/128/202 -f 87/128/202 63/115/201 62/114/203 86/127/204 -f 86/127/204 62/114/203 61/125/205 85/133/206 -f 85/133/206 61/125/205 60/124/207 84/132/208 -f 84/132/208 60/124/207 59/179/209 83/163/210 -f 83/163/210 59/179/209 58/47/211 82/57/212 -f 82/57/212 58/47/211 57/45/213 81/56/214 -f 81/56/214 57/45/213 56/43/215 80/55/216 -f 79/54/217 55/41/218 78/40/219 90/53/220 -f 90/131/220 78/121/219 65/119/221 89/130/222 -f 80/55/216 56/43/215 55/41/218 79/54/217 -f 89/130/222 65/119/221 64/117/200 88/129/199 -f 76/180/223 88/129/199 87/128/202 75/181/224 -f 75/181/224 87/128/202 86/127/204 74/182/225 -f 74/182/225 86/127/204 85/133/206 73/183/226 -f 73/183/226 85/133/206 84/132/208 72/184/227 -f 72/184/227 84/132/208 83/163/210 71/185/228 -f 71/185/228 83/163/210 82/57/212 70/186/229 -f 70/186/229 82/57/212 81/56/214 69/187/230 -f 69/187/230 81/56/214 80/55/216 68/188/231 -f 67/189/232 79/54/217 90/53/220 66/190/233 -f 66/191/233 90/131/220 89/130/222 77/192/234 -f 68/188/231 80/55/216 79/54/217 67/189/232 -f 77/192/234 89/130/222 88/129/199 76/180/223 -f 100/193/235 76/180/223 75/181/224 159/161/236 -f 159/161/236 75/181/224 74/182/225 99/194/237 -f 99/194/237 74/182/225 73/183/226 158/157/238 -f 158/157/238 73/183/226 72/184/227 157/195/239 -f 157/195/239 72/184/227 71/185/228 156/156/240 -f 156/156/240 71/185/228 70/186/229 155/196/241 -f 155/196/241 70/186/229 69/187/230 154/158/242 -f 154/158/242 69/187/230 68/188/231 153/197/243 -f 151/159/244 67/189/232 66/190/233 152/198/245 -f 152/199/245 66/191/233 77/192/234 160/162/246 -f 153/197/243 68/188/231 67/189/232 151/159/244 -f 160/162/246 77/192/234 76/180/223 100/193/235 -f 65/119/221 173/120/176 175/118/177 64/117/200 -f 56/43/215 262/44/183 275/42/184 55/41/218 -f 78/121/219 174/122/175 173/120/176 65/119/221 -f 55/41/218 275/42/184 174/39/175 78/40/219 -f 57/45/213 182/46/185 262/44/183 56/43/215 -f 58/47/211 181/48/186 182/46/185 57/45/213 -f 59/179/209 180/171/182 181/48/186 58/47/211 -f 60/124/207 179/123/181 180/171/182 59/179/209 -f 61/125/205 178/126/180 179/123/181 60/124/207 -f 62/114/203 177/113/179 178/126/180 61/125/205 -f 63/115/201 176/116/178 177/113/179 62/114/203 -f 64/117/200 175/118/177 176/116/178 63/115/201 -g Cylinder_Cylinder_base -f 161/200/247 172/201/248 101/139/68 -f 162/202/249 161/200/247 101/139/68 -f 163/203/250 162/202/249 101/139/68 -f 164/204/251 163/203/250 101/139/68 -f 165/205/252 164/204/251 101/139/68 -f 166/206/253 165/205/252 101/139/68 -f 167/207/254 166/206/253 101/139/68 -f 168/208/255 167/207/254 101/139/68 -f 169/209/256 168/208/255 101/139/68 -f 170/210/257 169/209/256 101/139/68 -f 171/211/258 170/210/257 101/139/68 -f 172/201/248 171/211/258 101/139/68 -f 114/109/259 160/212/246 100/213/235 113/111/260 -f 110/106/261 99/214/237 158/215/238 109/107/262 -f 112/112/263 159/216/236 99/214/237 110/106/261 -f 113/111/260 100/213/235 159/216/236 112/112/263 -f 141/20/264 105/35/265 104/37/266 140/23/267 -f 138/96/268 116/110/269 114/109/259 150/95/270 -f 140/23/267 104/37/266 103/38/271 139/24/272 -f 150/95/270 114/109/259 113/111/260 149/97/273 -f 139/24/272 103/38/271 116/32/269 138/18/268 -f 142/22/274 106/36/275 105/35/265 141/20/264 -f 143/217/276 107/218/277 106/36/275 142/22/274 -f 144/94/278 108/108/279 107/218/277 143/217/276 -f 145/92/280 109/107/262 108/108/279 144/94/278 -f 147/93/281 110/106/261 109/107/262 145/92/280 -f 148/98/282 112/112/263 110/106/261 147/93/281 -f 149/97/273 113/111/260 112/112/263 148/98/282 -f 170/219/257 136/85/283 135/82/284 169/220/256 -f 169/220/256 135/82/284 132/86/285 168/221/255 -f 168/221/255 132/86/285 130/91/286 167/222/254 -f 167/222/254 130/91/286 128/88/287 166/223/253 -f 166/223/253 128/88/287 126/224/288 165/225/252 -f 165/225/252 126/224/288 124/21/289 164/226/251 -f 164/226/251 124/21/289 122/16/290 163/227/250 -f 161/228/247 118/1/291 102/5/292 172/229/248 -f 171/230/258 137/11/293 136/85/283 170/219/257 -f 162/231/249 120/4/294 118/1/291 161/228/247 -f 172/232/248 102/14/292 137/11/293 171/230/258 -f 163/227/250 122/16/290 120/4/294 162/231/249 -f 122/16/290 141/20/264 140/23/267 120/4/294 -f 102/14/292 138/96/268 150/95/270 137/11/293 -f 120/4/294 140/23/267 139/24/272 118/1/291 -f 137/11/293 150/95/270 149/97/273 136/85/283 -f 118/1/291 139/24/272 138/18/268 102/5/292 -f 124/21/289 142/22/274 141/20/264 122/16/290 -f 126/224/288 143/217/276 142/22/274 124/21/289 -f 128/88/287 144/94/278 143/217/276 126/224/288 -f 130/91/286 145/92/280 144/94/278 128/88/287 -f 132/86/285 147/93/281 145/92/280 130/91/286 -f 135/82/284 148/98/282 147/93/281 132/86/285 -f 136/85/283 149/97/273 148/98/282 135/82/284 -f 109/107/262 158/215/238 157/233/239 108/108/279 -f 108/108/279 157/233/239 156/234/240 107/218/277 -f 107/218/277 156/234/240 155/235/241 106/36/275 -f 106/36/275 155/235/241 154/236/242 105/35/265 -f 103/38/271 151/237/244 152/238/245 116/32/269 -f 104/37/266 153/239/243 151/237/244 103/38/271 -f 116/110/269 152/240/245 160/212/246 114/109/259 -f 105/35/265 154/236/242 153/239/243 104/37/266 -g Cylinder_Cylinder_top -f 348/187/295 326/166/296 291/241/297 327/186/298 -f 117/242/299 119/243/300 91/60/69 -f 115/244/301 117/242/299 91/60/69 -f 111/245/302 115/244/301 91/60/69 -f 98/246/303 111/245/302 91/60/69 -f 97/247/304 98/246/303 91/60/69 -f 96/248/305 97/247/304 91/60/69 -f 95/249/306 96/248/305 91/60/69 -f 94/250/307 95/249/306 91/60/69 -f 93/251/308 94/250/307 91/60/69 -f 92/252/309 93/251/308 91/60/69 -f 121/253/310 92/252/309 91/60/69 -f 361/22/311 362/20/312 121/15/310 119/74/300 -f 360/22/313 361/22/311 119/74/300 117/74/299 -f 359/217/314 360/22/313 117/74/299 115/254/301 -f 358/94/315 359/217/314 115/254/301 111/89/302 -f 357/92/316 358/94/315 111/89/302 98/90/303 -f 356/92/317 357/92/316 98/90/303 97/90/304 -f 355/93/318 356/92/317 97/90/304 96/87/305 -f 354/98/319 355/93/318 96/87/305 95/83/306 -f 353/98/320 354/98/319 95/83/306 94/83/307 -f 352/97/321 353/98/320 94/83/307 93/84/308 -f 351/95/322 352/97/321 93/84/308 92/12/309 -f 290/173/323 265/28/324 123/29/325 266/255/326 -f 266/255/326 123/29/325 125/29/327 267/255/328 -f 267/255/328 125/29/327 127/256/329 268/174/330 -f 268/174/330 127/256/329 129/101/331 269/257/332 -f 269/257/332 129/101/331 131/99/333 270/175/334 -f 270/175/334 131/99/333 133/99/335 271/175/336 -f 271/175/336 133/99/335 134/100/337 272/258/338 -f 272/258/338 134/100/337 146/105/339 273/176/340 -f 273/176/340 146/105/339 261/105/341 274/176/342 -f 274/176/342 261/105/341 263/104/343 279/259/344 -f 281/177/345 264/102/346 265/103/324 290/260/323 -f 279/259/344 263/104/343 264/102/346 281/177/345 -f 326/166/296 290/173/323 266/255/326 291/241/297 -f 291/241/297 266/255/326 267/255/328 292/241/347 -f 292/241/347 267/255/328 268/174/330 293/167/348 -f 293/167/348 268/174/330 269/257/332 294/261/349 -f 294/261/349 269/257/332 270/175/334 295/168/350 -f 295/168/350 270/175/334 271/175/336 296/168/351 -f 296/168/351 271/175/336 272/258/338 297/262/352 -f 297/262/352 272/258/338 273/176/340 298/169/353 -f 298/169/353 273/176/340 274/176/342 299/169/354 -f 299/169/354 274/176/342 279/259/344 300/263/355 -f 301/170/356 281/177/345 290/260/323 326/264/296 -f 300/263/355 279/259/344 281/177/345 301/170/356 -f 345/151/187 308/113/357 309/116/358 346/150/188 -f 327/186/298 291/241/297 292/241/347 328/186/359 -f 328/186/359 292/241/347 293/167/348 329/185/360 -f 346/150/188 309/116/358 310/116/361 347/150/189 -f 329/185/360 293/167/348 294/261/349 330/184/362 -f 330/184/362 294/261/349 295/168/350 331/183/363 -f 331/183/363 295/168/350 296/168/351 332/183/364 -f 347/150/189 310/116/361 312/118/365 349/153/190 -f 332/183/364 296/168/351 297/262/352 333/182/366 -f 350/152/191 313/120/367 323/122/368 336/154/192 -f 333/182/366 297/262/352 298/169/353 334/181/369 -f 349/153/190 312/118/365 313/120/367 350/152/191 -f 334/181/369 298/169/353 299/169/354 335/181/370 -f 335/181/370 299/169/354 300/263/355 337/180/371 -f 338/192/372 301/170/356 326/264/296 348/191/295 -f 337/180/371 300/263/355 301/170/356 338/192/372 -f 344/148/193 307/126/373 308/113/357 345/151/187 -f 343/148/194 306/126/374 307/126/373 344/148/193 -f 342/149/195 305/123/375 306/126/374 343/148/194 -f 341/265/196 304/171/376 305/123/375 342/149/195 -f 340/81/197 303/48/377 304/171/376 341/265/196 -f 339/81/198 302/48/378 303/48/377 340/81/197 -f 336/79/192 323/46/368 302/48/378 339/81/198 -f 288/129/379 324/136/380 325/137/381 289/130/382 -f 289/130/382 325/137/381 311/138/383 287/131/384 -f 286/128/385 322/135/386 324/136/380 288/129/379 -f 285/128/387 321/135/388 322/135/386 286/128/385 -f 284/127/389 320/134/390 321/135/388 285/128/387 -f 283/133/391 319/140/392 320/134/390 284/127/389 -f 282/133/393 318/140/394 319/140/392 283/133/391 -f 280/132/395 317/139/396 318/140/394 282/133/393 -f 278/163/397 316/266/398 317/139/396 280/132/395 -f 277/57/399 315/64/400 316/266/398 278/163/397 -f 276/57/401 314/64/402 315/64/400 277/57/399 -f 287/56/384 311/63/383 314/64/402 276/57/401 -f 311/63/383 348/187/295 327/186/298 314/64/402 -f 314/64/402 327/186/298 328/186/359 315/64/400 -f 315/64/400 328/186/359 329/185/360 316/266/398 -f 316/266/398 329/185/360 330/184/362 317/139/396 -f 317/139/396 330/184/362 331/183/363 318/140/394 -f 318/140/394 331/183/363 332/183/364 319/140/392 -f 319/140/392 332/183/364 333/182/366 320/134/390 -f 320/134/390 333/182/366 334/181/369 321/135/388 -f 321/135/388 334/181/369 335/181/370 322/135/386 -f 322/135/386 335/181/370 337/180/371 324/136/380 -f 325/137/381 338/192/372 348/191/295 311/138/383 -f 324/136/380 337/180/371 338/192/372 325/137/381 -f 323/46/368 287/56/384 276/57/401 302/48/378 -f 302/48/378 276/57/401 277/57/399 303/48/377 -f 303/48/377 277/57/399 278/163/397 304/171/376 -f 304/171/376 278/163/397 280/132/395 305/123/375 -f 305/123/375 280/132/395 282/133/393 306/126/374 -f 306/126/374 282/133/393 283/133/391 307/126/373 -f 307/126/373 283/133/391 284/127/389 308/113/357 -f 119/243/300 121/253/310 91/60/69 -f 263/104/343 352/97/321 351/95/322 264/102/346 -f 264/102/346 351/95/322 362/96/312 265/103/324 -f 362/96/312 351/95/322 92/12/309 121/13/310 -f 261/105/341 353/98/320 352/97/321 263/104/343 -f 146/105/339 354/98/319 353/98/320 261/105/341 -f 134/100/337 355/93/318 354/98/319 146/105/339 -f 312/118/365 288/129/379 289/130/382 313/120/367 -f 133/99/335 356/92/317 355/93/318 134/100/337 -f 313/120/367 289/130/382 287/131/384 323/122/368 -f 131/99/333 357/92/316 356/92/317 133/99/335 -f 310/116/361 286/128/385 288/129/379 312/118/365 -f 129/101/331 358/94/315 357/92/316 131/99/333 -f 127/256/329 359/217/314 358/94/315 129/101/331 -f 125/29/327 360/22/313 359/217/314 127/256/329 -f 309/116/358 285/128/387 286/128/385 310/116/361 -f 123/29/325 361/22/311 360/22/313 125/29/327 -f 265/28/324 362/20/312 361/22/311 123/29/325 -f 308/113/357 284/127/389 285/128/387 309/116/358 +f 438/119/369 414/70/370 415/68/371 439/205/372 +f 437/218/373 413/72/374 414/70/370 438/119/369 +f 436/237/375 412/74/376 413/72/374 437/218/373 +f 435/292/377 423/325/378 412/74/376 436/237/375 +f 442/237/379 418/74/380 419/72/381 443/218/382 +f 443/218/382 419/72/381 420/70/383 444/119/384 +f 444/119/384 420/70/383 421/68/385 445/205/386 +f 446/204/387 422/66/388 423/77/378 435/137/377 +f 445/205/386 421/68/385 422/66/388 446/204/387 +f 441/292/389 417/325/390 418/74/380 442/237/379 +f 440/204/391 416/66/392 417/77/390 441/137/389 +f 439/205/372 415/68/371 416/66/392 440/204/391 +f 467/285/393 411/286/394 424/38/395 468/93/396 +f 468/93/396 424/38/395 425/34/397 466/96/398 +f 466/96/398 425/34/397 426/29/399 465/98/400 +f 465/98/400 426/29/399 427/25/401 464/100/402 +f 464/100/402 427/25/401 428/21/403 463/102/404 +f 463/102/404 428/21/403 429/46/405 462/90/406 +f 462/285/406 429/286/405 430/38/407 461/93/408 +f 458/100/409 433/25/410 434/21/411 457/102/412 +f 457/102/412 434/21/411 411/46/394 467/90/393 +f 459/98/413 432/29/414 433/25/410 458/100/409 +f 460/96/415 431/34/416 432/29/414 459/98/413 +f 461/93/408 430/38/407 431/34/416 460/96/415 +f 430/38/407 442/237/379 443/218/382 431/34/416 +f 431/34/416 443/218/382 444/119/384 432/29/414 +f 432/29/414 444/119/384 445/205/386 433/25/410 +f 434/21/411 446/204/387 435/137/377 411/46/394 +f 433/25/410 445/205/386 446/204/387 434/21/411 +f 429/286/405 441/292/389 442/237/379 430/38/407 +f 428/21/403 440/204/391 441/137/389 429/46/405 +f 427/25/401 439/205/372 440/204/391 428/21/403 +f 426/29/399 438/119/369 439/205/372 427/25/401 +f 425/34/397 437/218/373 438/119/369 426/29/399 +f 424/38/395 436/237/375 437/218/373 425/34/397 +f 411/286/394 435/292/377 436/237/375 424/38/395 +f 423/325/378 397/326/417 398/241/418 412/74/376 +f 412/74/376 398/241/418 447/175/419 413/72/374 +f 413/72/374 447/175/419 448/154/420 414/70/370 +f 414/70/370 448/154/420 449/201/421 415/68/371 +f 415/68/371 449/201/421 450/200/422 416/66/392 +f 416/66/392 450/200/422 451/141/423 417/77/390 +f 417/325/390 451/326/423 452/241/424 418/74/380 +f 421/68/385 455/201/425 456/200/426 422/66/388 +f 422/66/388 456/200/426 397/141/417 423/77/378 +f 420/70/383 454/154/427 455/201/425 421/68/385 +f 419/72/381 453/175/428 454/154/427 420/70/383 +f 418/74/380 452/241/424 453/175/428 419/72/381 +f 452/241/424 403/243/429 402/172/430 453/175/428 +f 453/175/428 402/172/430 401/155/431 454/154/427 +f 454/154/427 401/155/431 400/198/432 455/201/425 +f 456/200/426 399/199/433 410/143/434 397/141/417 +f 455/201/425 400/198/432 399/199/433 456/200/426 +f 451/326/423 404/327/435 403/243/429 452/241/424 +f 450/200/422 405/199/436 404/143/435 451/141/423 +f 449/201/421 406/198/437 405/199/436 450/200/422 +f 448/154/420 407/155/438 406/198/437 449/201/421 +f 447/175/419 408/172/439 407/155/438 448/154/420 +f 398/241/418 409/243/440 408/172/439 447/175/419 +f 397/326/417 410/327/434 409/243/440 398/241/418 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_openframe_bookshelf.obj b/mods/homedecor_modpack/homedecor/models/homedecor_openframe_bookshelf.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_painting.obj b/mods/homedecor_modpack/homedecor/models/homedecor_painting.obj new file mode 100644 index 00000000..bcf4c1e2 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_painting.obj @@ -0,0 +1,111 @@ +# Blender v2.73 (sub 0) OBJ File: 'painting.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.437500 +v 0.500000 -0.500000 0.437500 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.437500 +v 0.500000 0.500000 0.437500 +v 0.500000 0.500000 0.500000 +v -0.500000 0.468750 0.437500 +v 0.500000 0.468750 0.437500 +v -0.500000 -0.468750 0.437500 +v 0.500000 -0.468750 0.437500 +v -0.468750 0.468750 0.437500 +v -0.468750 -0.468750 0.437500 +v 0.468750 0.468750 0.437500 +v 0.468750 -0.468750 0.437500 +v -0.468750 0.468750 0.468750 +v -0.468750 -0.468750 0.468750 +v 0.468750 0.468750 0.468750 +v 0.468750 -0.468750 0.468750 +v -0.468750 0.468750 0.500000 +v -0.468750 -0.468750 0.500000 +v 0.468750 0.468750 0.500000 +v 0.468750 -0.468750 0.500000 +v -0.500000 -0.468750 0.500000 +v 0.500000 -0.468750 0.500000 +v -0.500000 0.468750 0.500000 +v 0.500000 0.468750 0.500000 +vt 0.250000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 -3.000000 +vt 0.250000 -3.000000 +vt 0.000000 1.000000 +vt 0.000000 -3.000000 +vt 0.250000 1.062500 +vt 0.500000 1.062500 +vt 0.500000 -2.937500 +vt 0.250000 -2.937500 +vt 0.000000 -2.937500 +vt 0.000000 1.062500 +vt 0.375000 1.000000 +vt 0.375000 -3.000000 +vt 0.125000 1.000000 +vt 0.125000 -3.000000 +vt 0.250000 0.875000 +vt 0.250000 -2.875000 +vt 0.375000 -2.875000 +vt 0.375000 0.875000 +vt 0.125000 0.875000 +vt 0.000000 0.875000 +vt 0.000000 -2.875000 +vt 0.125000 -2.875000 +vt 0.750000 -2.875000 +vt 0.500000 -2.875000 +vt 0.500000 0.875000 +vt 0.750000 0.875000 +vt 1.000000 -2.875000 +vt 1.000000 0.875000 +vt 1.000000 -2.812500 +vt 1.000000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 -2.812500 +vt 0.625000 -3.000000 +vt 0.625000 1.000000 +vt 0.750000 1.000000 +vt 0.750000 -3.000000 +vt 1.000000 1.000000 +vt 1.000000 -3.000000 +vt 0.875000 -3.000000 +vt 0.875000 1.000000 +vt 0.500000 -2.812500 +vt 0.500000 0.937500 +vt 0.875000 0.875000 +vt 0.875000 -2.875000 +vt 0.625000 -2.875000 +vt 0.625000 0.875000 +vt 0.031250 0.031250 +vt 0.968750 0.031250 +vt 0.968750 0.968750 +vt 0.031250 0.968750 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +g Cylinder_Cylinder_wood +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 7/1/2 8/5/2 4/6/2 3/4/2 +f 1/7/3 2/8/3 3/9/3 4/10/3 +f 8/11/4 7/10/4 6/7/4 5/12/4 +f 6/3/5 7/2/5 10/13/5 9/14/5 +f 3/15/5 2/16/5 11/4/5 12/1/5 +f 13/17/5 14/18/5 11/19/5 9/20/5 +f 15/21/5 10/22/5 12/23/5 16/24/5 +f 16/25/1 20/26/1 19/27/1 15/28/1 +f 14/29/2 13/30/2 17/28/2 18/25/2 +f 16/31/4 14/32/4 18/33/4 20/34/4 +f 1/35/6 4/36/6 26/37/6 25/38/6 +f 8/39/6 5/40/6 27/41/6 28/42/6 +f 19/43/3 17/44/3 13/33/3 15/34/3 +f 22/25/6 21/28/6 27/45/6 25/46/6 +f 24/47/6 26/26/6 28/27/6 23/48/6 +g Cylinder_Cylinder_canvas +f 22/49/6 24/50/6 23/51/6 21/52/6 +g Cylinder_Cylinder_picture +f 18/50/5 17/51/5 19/52/5 20/49/5 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_paper_towel.obj b/mods/homedecor_modpack/homedecor/models/homedecor_paper_towel.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_piano.obj b/mods/homedecor_modpack/homedecor/models/homedecor_piano.obj index 77eff8ca..5441f0c8 100644 --- a/mods/homedecor_modpack/homedecor/models/homedecor_piano.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_piano.obj @@ -1,6 +1,6 @@ # Blender v2.73 (sub 0) OBJ File: 'piano.blend' # www.blender.org -o keys_Cube.003 +o body_Cube.001 v -1.437500 0.062500 -0.062500 v 0.437500 0.062500 -0.062500 v -1.437500 0.187500 0.187500 @@ -10,27 +10,6 @@ v 0.437500 0.187500 0.187500 v -0.500000 0.187500 -0.062500 v -0.500000 0.062500 -0.062500 v -0.500000 0.187500 0.187500 -vt 0.031250 0.625000 -vt 0.031250 0.437500 -vt 0.968750 0.437500 -vt 0.968750 0.625000 -vt 0.968750 0.781250 -vt 0.031250 0.781250 -vt 0.031250 0.656250 -vt 0.968750 0.656250 -vt 0.031250 0.312500 -vt 0.968750 0.312500 -vt 0.031250 0.968750 -vt 0.968750 0.968750 -vn 0.000000 1.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -g keys_Cube.003_None -s off -f 9/1/1 7/2/1 4/3/1 3/4/1 -f 7/5/2 5/6/2 2/7/2 8/8/2 -f 4/3/2 7/2/2 8/9/2 1/10/2 -f 6/11/1 5/6/1 7/5/1 9/12/1 -o pedals_Cube.002 v -0.609375 -0.437500 0.000000 v -0.609375 -0.437500 0.187500 v -0.484375 -0.437500 0.187500 @@ -55,41 +34,6 @@ v -0.359375 -0.460938 0.187500 v -0.656250 -0.437500 0.187500 v -0.656250 -0.437500 0.000000 v -0.406250 -0.437500 0.000000 -vt 0.187500 1.000000 -vt 0.187500 0.312500 -vt 0.250000 0.312500 -vt 0.250000 1.000000 -vt 0.437500 0.312500 -vt 0.250000 0.250000 -vt 0.437500 0.250000 -vt 0.437500 1.000000 -vt 0.500000 0.312500 -vt 0.500000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.312500 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -g pedals_Cube.002_None_homedecor_tile_brass2.png -s off -f 10/13/3 11/14/3 29/15/3 28/16/3 -f 32/17/4 10/15/4 28/18/4 26/19/4 -f 31/20/5 32/17/5 26/21/5 23/22/5 -f 23/23/6 26/24/6 28/14/6 29/13/6 -f 12/16/7 13/15/7 14/17/7 15/20/7 -f 27/14/6 25/13/6 17/23/6 16/24/6 -f 11/17/7 10/20/7 32/16/7 31/15/7 -f 21/16/7 22/15/7 33/17/7 24/20/7 -f 20/23/6 19/24/6 18/14/6 30/13/6 -f 15/20/5 14/17/5 25/21/5 27/22/5 -f 24/20/5 33/17/5 19/21/5 20/22/5 -f 33/17/4 22/15/4 18/18/4 19/19/4 -f 22/13/3 21/14/3 30/15/3 18/16/3 -f 14/18/4 13/19/4 17/17/4 25/15/4 -f 13/13/3 12/14/3 16/15/3 17/16/3 -o body_Cube.001 v -1.500000 -0.500000 0.500000 v -1.500000 -0.500000 0.187500 v 0.500000 -0.500000 0.187500 @@ -168,6 +112,14 @@ v -0.500000 -0.375000 0.187500 v -0.500000 0.375000 0.187500 v -0.500000 0.500000 0.500000 v -0.500000 0.187500 0.156250 +vt 0.968750 0.781250 +vt 0.031250 0.781250 +vt 0.031250 0.656250 +vt 0.968750 0.656250 +vt 0.968750 0.437500 +vt 0.031250 0.437500 +vt 0.031250 0.312500 +vt 0.968750 0.312500 vt 1.000000 1.000000 vt 0.687500 1.000000 vt 0.687500 0.000000 @@ -271,63 +223,96 @@ vt 0.937500 0.093750 vt 0.937500 0.343750 vt 0.000000 0.343750 vt 0.000000 0.093750 +vt 0.031250 0.625000 +vt 0.968750 0.625000 +vt 0.031250 0.968750 +vt 0.968750 0.968750 +vt 0.187500 0.312500 +vt 0.250000 0.312500 +vt 0.437500 0.312500 +vt 0.437500 0.250000 +vt 0.437500 1.000000 +vt 0.500000 0.312500 +vt 0.500000 1.000000 +vt 0.000000 0.312500 +vn 0.000000 0.000000 -1.000000 vn -1.000000 0.000000 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 0.000000 1.000000 vn 0.000000 1.000000 0.000000 -g body_Cube.001_None_homedecor_piano_wood.png +g body_Cube.001_wood s off -f 38/25/8 39/26/8 35/27/8 34/28/8 -f 40/29/9 41/30/9 37/31/9 36/32/9 -f 101/33/10 109/34/10 96/35/10 39/36/10 -f 99/37/11 98/38/11 36/39/11 37/40/11 -f 68/41/12 66/42/12 62/43/12 65/44/12 -f 67/42/9 68/45/9 65/46/9 64/43/9 -f 52/47/10 53/48/10 50/49/10 49/50/10 -f 104/51/10 91/52/10 90/53/10 111/54/10 -f 51/55/8 52/56/8 49/57/8 48/58/8 -f 54/59/13 53/48/13 52/47/13 51/60/13 -f 59/61/10 60/33/10 56/62/10 55/63/10 -f 60/26/9 61/64/9 57/65/9 56/66/9 -f 61/30/13 60/33/13 59/61/13 58/67/13 -f 89/43/12 87/44/12 83/41/12 86/42/12 -f 73/68/10 74/69/10 70/70/10 69/71/10 -f 74/72/9 75/73/9 71/74/9 70/75/9 -f 75/76/13 74/69/13 73/68/13 72/77/13 -f 79/78/8 80/79/8 77/80/8 76/81/8 -f 80/82/10 81/83/10 78/84/10 77/85/10 -f 87/44/8 88/86/8 84/87/8 83/41/8 -f 82/88/13 81/83/13 80/82/13 79/89/13 -f 48/90/11 49/50/11 50/49/11 36/91/11 -f 44/92/10 67/87/10 64/86/10 63/93/10 -f 104/94/13 95/95/13 94/96/13 100/34/13 -f 58/78/8 59/79/8 55/80/8 45/81/8 -f 53/72/9 54/73/9 36/74/9 50/75/9 -f 66/87/8 44/41/8 63/44/8 62/86/8 -f 45/97/11 55/63/11 56/62/11 57/98/11 -f 43/46/9 89/43/9 86/42/9 85/45/9 -f 72/55/8 73/56/8 69/57/8 35/58/8 -f 88/86/10 43/93/10 85/92/10 84/87/10 -f 35/99/11 69/71/11 70/70/11 71/100/11 -f 81/26/9 82/64/9 42/65/9 78/66/9 -f 76/101/11 77/85/11 78/84/11 42/102/11 -f 91/103/9 92/104/9 47/105/9 90/106/9 -f 94/107/8 95/108/8 93/109/8 46/110/8 -f 110/30/13 101/33/13 39/36/13 38/25/13 -f 103/111/11 102/54/11 44/53/11 45/112/11 -f 94/113/10 82/114/10 79/115/10 96/116/10 -f 97/117/10 61/118/10 58/119/10 92/120/10 -f 107/34/10 57/35/10 54/25/10 108/30/10 -f 105/39/10 71/121/10 75/96/10 106/34/10 -f 110/31/12 38/28/12 34/25/12 99/30/12 -f 41/31/12 110/28/12 99/25/12 37/30/12 -f 48/122/10 105/38/10 106/35/10 51/123/10 -f 76/34/10 107/35/10 108/25/10 72/30/10 -f 42/124/11 43/125/11 102/126/11 103/127/11 -f 41/30/13 40/33/13 101/36/13 110/25/13 -f 91/52/13 104/51/13 100/35/13 92/123/13 -f 95/95/10 104/94/10 111/126/10 93/125/10 -f 34/37/11 35/38/11 98/39/11 99/40/11 -f 40/33/10 97/34/10 109/35/10 101/36/10 +f 7/1/1 5/2/1 2/3/1 8/4/1 +f 4/5/1 7/6/1 8/7/1 1/8/1 +f 38/9/2 39/10/2 35/11/2 34/12/2 +f 40/13/3 41/14/3 37/15/3 36/16/3 +f 101/17/1 109/18/1 96/19/1 39/20/1 +f 99/21/4 98/22/4 36/23/4 37/24/4 +f 68/25/5 66/26/5 62/27/5 65/28/5 +f 67/26/3 68/29/3 65/30/3 64/27/3 +f 52/31/1 53/32/1 50/33/1 49/34/1 +f 104/35/1 91/36/1 90/37/1 111/38/1 +f 51/39/2 52/40/2 49/41/2 48/42/2 +f 54/43/6 53/32/6 52/31/6 51/44/6 +f 59/45/1 60/17/1 56/46/1 55/47/1 +f 60/10/3 61/48/3 57/49/3 56/50/3 +f 61/14/6 60/17/6 59/45/6 58/51/6 +f 89/27/5 87/28/5 83/25/5 86/26/5 +f 73/52/1 74/53/1 70/54/1 69/55/1 +f 74/56/3 75/57/3 71/58/3 70/59/3 +f 75/60/6 74/53/6 73/52/6 72/61/6 +f 79/62/2 80/63/2 77/64/2 76/65/2 +f 80/66/1 81/67/1 78/68/1 77/69/1 +f 87/28/2 88/70/2 84/71/2 83/25/2 +f 82/72/6 81/67/6 80/66/6 79/73/6 +f 48/74/4 49/34/4 50/33/4 36/75/4 +f 44/76/1 67/71/1 64/70/1 63/77/1 +f 104/78/6 95/79/6 94/80/6 100/18/6 +f 58/62/2 59/63/2 55/64/2 45/65/2 +f 53/56/3 54/57/3 36/58/3 50/59/3 +f 66/71/2 44/25/2 63/28/2 62/70/2 +f 45/81/4 55/47/4 56/46/4 57/82/4 +f 43/30/3 89/27/3 86/26/3 85/29/3 +f 72/39/2 73/40/2 69/41/2 35/42/2 +f 88/70/1 43/77/1 85/76/1 84/71/1 +f 35/83/4 69/55/4 70/54/4 71/84/4 +f 81/10/3 82/48/3 42/49/3 78/50/3 +f 76/85/4 77/69/4 78/68/4 42/86/4 +f 91/87/3 92/88/3 47/89/3 90/90/3 +f 94/91/2 95/92/2 93/93/2 46/94/2 +f 110/14/6 101/17/6 39/20/6 38/9/6 +f 103/95/4 102/38/4 44/37/4 45/96/4 +f 94/97/1 82/98/1 79/99/1 96/100/1 +f 97/101/1 61/102/1 58/103/1 92/104/1 +f 107/18/1 57/19/1 54/9/1 108/14/1 +f 105/23/1 71/105/1 75/80/1 106/18/1 +f 110/15/5 38/12/5 34/9/5 99/14/5 +f 41/15/5 110/12/5 99/9/5 37/14/5 +f 48/106/1 105/22/1 106/19/1 51/107/1 +f 76/18/1 107/19/1 108/9/1 72/14/1 +f 42/108/4 43/109/4 102/110/4 103/111/4 +f 41/14/6 40/17/6 101/20/6 110/9/6 +f 91/36/6 104/35/6 100/19/6 92/107/6 +f 95/79/1 104/78/1 111/110/1 93/109/1 +f 34/21/4 35/22/4 98/23/4 99/24/4 +f 40/17/1 97/18/1 109/19/1 101/20/1 +g body_Cube.001_keyboard +f 9/112/6 7/6/6 4/5/6 3/113/6 +f 6/114/6 5/2/6 7/1/6 9/115/6 +g body_Cube.001_brass +f 10/43/3 11/116/3 29/117/3 28/44/3 +f 32/118/1 10/117/1 28/74/1 26/119/1 +f 31/120/2 32/118/2 26/121/2 23/122/2 +f 23/14/4 26/123/4 28/116/4 29/43/4 +f 12/44/6 13/117/6 14/118/6 15/120/6 +f 27/116/4 25/43/4 17/14/4 16/123/4 +f 11/118/6 10/120/6 32/44/6 31/117/6 +f 21/44/6 22/117/6 33/118/6 24/120/6 +f 20/14/4 19/123/4 18/116/4 30/43/4 +f 15/120/2 14/118/2 25/121/2 27/122/2 +f 24/120/2 33/118/2 19/121/2 20/122/2 +f 33/118/1 22/117/1 18/74/1 19/119/1 +f 22/43/3 21/116/3 30/117/3 18/44/3 +f 14/74/1 13/119/1 17/118/1 25/117/1 +f 13/43/3 12/116/3 16/117/3 17/44/3 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_picture_frame.obj b/mods/homedecor_modpack/homedecor/models/homedecor_picture_frame.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_plasma_ball.obj b/mods/homedecor_modpack/homedecor/models/homedecor_plasma_ball.obj new file mode 100644 index 00000000..777ca117 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_plasma_ball.obj @@ -0,0 +1,621 @@ +# Blender v2.73 (sub 0) OBJ File: 'plasma-ball.blend' +# www.blender.org +o base_Cylinder.007 +v -0.139130 -0.500000 0.139130 +v -0.139130 -0.500000 -0.139130 +v 0.139130 -0.500000 -0.139130 +v 0.139130 -0.500000 0.139130 +v -0.086956 -0.326087 0.086956 +v -0.086956 -0.326087 -0.086956 +v 0.086956 -0.326087 -0.086956 +v 0.086956 -0.326087 0.086956 +vt 0.000000 0.812500 +vt 0.000000 0.187500 +vt 0.566168 0.000000 +vt 0.566168 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.867665 0.000000 +vt 0.867665 1.000000 +vt 0.457709 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.625000 +vt 0.457710 0.625000 +vn -0.957800 0.287300 0.000000 +vn 0.000000 0.287300 -0.957800 +vn 0.957800 0.287300 0.000000 +vn 0.000000 0.287300 0.957800 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +g base_Cylinder.007_base +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 6/1/2 7/2/2 3/3/2 2/4/2 +f 7/1/3 8/2/3 4/3/3 3/4/3 +f 8/1/4 5/2/4 1/3/4 4/4/4 +f 1/5/5 2/6/5 3/7/5 4/8/5 +f 8/9/6 7/10/6 6/11/6 5/12/6 +o streamers_Cylinder.006 +v -0.170156 -0.006805 0.000468 +v -0.170156 -0.341022 0.000468 +v 0.170156 -0.006805 0.000468 +v 0.170156 -0.341022 0.000468 +v 0.170156 -0.006805 -0.000469 +v 0.170156 -0.341022 -0.000469 +v -0.170156 -0.006805 -0.000469 +v -0.170156 -0.341022 -0.000469 +v 0.085483 -0.006805 0.147126 +v 0.085483 -0.341022 0.147126 +v -0.084673 -0.006805 -0.147594 +v -0.084673 -0.341022 -0.147594 +v -0.085484 -0.006805 -0.147125 +v -0.085484 -0.341022 -0.147125 +v 0.084672 -0.006805 0.147594 +v 0.084672 -0.341022 0.147594 +v -0.085484 -0.341022 0.147125 +v -0.085484 -0.006805 0.147125 +v 0.084672 -0.341022 -0.147594 +v 0.084672 -0.006805 -0.147594 +v 0.085483 -0.341022 -0.147126 +v 0.085483 -0.006805 -0.147126 +v -0.084673 -0.341022 0.147594 +v -0.084673 -0.006805 0.147594 +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 -0.000000 1.000000 +vn -0.866000 -0.000000 0.500000 +vn 0.866000 -0.000000 -0.500000 +vn 0.866000 -0.000000 0.500000 +vn -0.866000 -0.000000 -0.500000 +g streamers_Cylinder.006_streamers +s off +f 9/13/7 11/14/7 12/15/7 10/16/7 +f 13/14/8 15/13/8 16/16/8 14/15/8 +f 17/13/9 19/14/9 20/15/9 18/16/9 +f 21/14/10 23/13/10 24/16/10 22/15/10 +f 28/14/11 26/13/11 25/16/11 27/15/11 +f 32/13/12 30/14/12 29/15/12 31/16/12 +o globe_Cylinder.005 +v -0.066554 -0.013239 0.000000 +v -0.122975 -0.050938 0.000000 +v -0.160675 -0.107360 0.000000 +v -0.173913 -0.173913 0.000000 +v -0.160675 -0.240467 0.000000 +v -0.122975 -0.296888 0.000000 +v -0.066554 -0.334588 0.000000 +v -0.061487 -0.013239 -0.025469 +v -0.113614 -0.050938 -0.047060 +v -0.148444 -0.107360 -0.061487 +v -0.160675 -0.173913 -0.066554 +v -0.148444 -0.240467 -0.061487 +v -0.113614 -0.296888 -0.047060 +v -0.061487 -0.334588 -0.025469 +v -0.047060 -0.013239 -0.047060 +v -0.086956 -0.050938 -0.086956 +v -0.113614 -0.107360 -0.113614 +v -0.122975 -0.173913 -0.122975 +v -0.113614 -0.240467 -0.113614 +v -0.086956 -0.296888 -0.086956 +v -0.047060 -0.334588 -0.047060 +v -0.025469 -0.013239 -0.061487 +v -0.047060 -0.050938 -0.113614 +v -0.061487 -0.107360 -0.148444 +v -0.066554 -0.173913 -0.160675 +v -0.061487 -0.240467 -0.148444 +v -0.047060 -0.296888 -0.113614 +v -0.025469 -0.334588 -0.061487 +v -0.000000 -0.013239 -0.066554 +v -0.000000 -0.050938 -0.122975 +v -0.000000 -0.107360 -0.160675 +v -0.000000 -0.173913 -0.173913 +v -0.000000 -0.240467 -0.160675 +v -0.000000 -0.296888 -0.122975 +v -0.000000 -0.334588 -0.066554 +v 0.025469 -0.013239 -0.061487 +v 0.047060 -0.050938 -0.113614 +v 0.061487 -0.107360 -0.148444 +v 0.066554 -0.173913 -0.160674 +v 0.061487 -0.240467 -0.148444 +v 0.047060 -0.296888 -0.113614 +v 0.025469 -0.334588 -0.061487 +v 0.047060 -0.013239 -0.047060 +v 0.086956 -0.050938 -0.086956 +v 0.113614 -0.107360 -0.113614 +v 0.122975 -0.173913 -0.122975 +v 0.113614 -0.240467 -0.113614 +v 0.086956 -0.296888 -0.086956 +v 0.047060 -0.334588 -0.047060 +v 0.061487 -0.013239 -0.025469 +v 0.113614 -0.050938 -0.047060 +v 0.148444 -0.107360 -0.061487 +v 0.160674 -0.173913 -0.066554 +v 0.148444 -0.240467 -0.061487 +v 0.113614 -0.296888 -0.047060 +v 0.061487 -0.334588 -0.025469 +v 0.066554 -0.013239 0.000000 +v 0.122975 -0.050938 0.000000 +v 0.160674 -0.107360 0.000000 +v 0.173913 -0.173913 0.000000 +v 0.160674 -0.240467 0.000000 +v 0.122975 -0.296888 0.000000 +v 0.066554 -0.334588 0.000000 +v 0.061487 -0.013239 0.025469 +v 0.113614 -0.050938 0.047061 +v 0.148444 -0.107360 0.061488 +v 0.160674 -0.173913 0.066554 +v 0.148444 -0.240467 0.061488 +v 0.113614 -0.296888 0.047061 +v 0.061487 -0.334588 0.025469 +v 0.047060 -0.013239 0.047060 +v 0.086956 -0.050938 0.086956 +v 0.113614 -0.107360 0.113614 +v 0.122975 -0.173913 0.122975 +v 0.113614 -0.240467 0.113614 +v 0.086956 -0.296888 0.086956 +v 0.047060 -0.334588 0.047060 +v 0.025469 -0.013239 0.061487 +v 0.047060 -0.050938 0.113614 +v 0.061487 -0.107360 0.148444 +v 0.066553 -0.173913 0.160675 +v 0.061487 -0.240467 0.148444 +v 0.047060 -0.296888 0.113614 +v 0.025469 -0.334588 0.061487 +v -0.000000 -0.013239 0.066554 +v -0.000000 -0.050938 0.122975 +v -0.000000 -0.107360 0.160674 +v -0.000000 -0.173913 0.173913 +v -0.000000 -0.240467 0.160674 +v -0.000000 -0.296888 0.122975 +v -0.000000 -0.334588 0.066554 +v -0.025469 -0.013239 0.061487 +v -0.047061 -0.050938 0.113614 +v -0.061488 -0.107360 0.148444 +v -0.066554 -0.173913 0.160674 +v -0.061488 -0.240467 0.148444 +v -0.047061 -0.296888 0.113614 +v -0.025469 -0.334588 0.061487 +v -0.047060 -0.013239 0.047060 +v -0.086956 -0.050938 0.086956 +v -0.113614 -0.107360 0.113614 +v -0.122975 -0.173913 0.122975 +v -0.113614 -0.240467 0.113614 +v -0.086956 -0.296888 0.086956 +v -0.047061 -0.334588 0.047060 +v -0.061487 -0.013239 0.025469 +v -0.113614 -0.050938 0.047060 +v -0.148444 -0.107360 0.061487 +v -0.160675 -0.173913 0.066553 +v -0.148444 -0.240467 0.061487 +v -0.113614 -0.296888 0.047060 +v -0.061487 -0.334588 0.025469 +v -0.015090 -0.003120 0.000000 +v -0.013941 -0.003120 -0.005775 +v -0.010670 -0.003120 -0.010670 +v -0.005775 -0.003120 -0.013941 +v -0.000000 -0.003120 -0.015090 +v 0.005775 -0.003120 -0.013941 +v 0.010670 -0.003120 -0.010670 +v 0.013941 -0.003120 -0.005775 +v 0.015090 -0.003120 0.000000 +v 0.013941 -0.003120 0.005775 +v 0.010670 -0.003120 0.010670 +v 0.005775 -0.003120 0.013941 +v -0.000000 -0.003120 0.015090 +v -0.005775 -0.003120 0.013941 +v -0.010670 -0.003120 0.010670 +v -0.013941 -0.003120 0.005775 +v -0.000000 -0.003120 -0.000000 +vt 0.750000 0.000033 +vt 0.750000 0.147616 +vt 0.687500 0.147616 +vt 0.687500 0.000033 +vt 0.750000 0.295200 +vt 0.687500 0.295200 +vt 0.750000 0.442784 +vt 0.687500 0.442784 +vt 0.750000 0.590367 +vt 0.687500 0.590367 +vt 0.750000 0.737951 +vt 0.687500 0.737951 +vt 0.750000 0.885534 +vt 0.687500 0.885535 +vt 0.625000 0.147616 +vt 0.625000 0.000033 +vt 0.625000 0.295200 +vt 0.625000 0.442784 +vt 0.625000 0.590367 +vt 0.625000 0.737951 +vt 0.625000 0.885535 +vt 0.562500 0.147616 +vt 0.562500 0.000033 +vt 0.562500 0.295200 +vt 0.562500 0.442784 +vt 0.562500 0.590367 +vt 0.562500 0.737951 +vt 0.562500 0.885535 +vt 0.500000 0.147616 +vt 0.500000 0.000033 +vt 0.500000 0.295200 +vt 0.500000 0.442784 +vt 0.500000 0.590367 +vt 0.500000 0.737951 +vt 0.500000 0.885535 +vt 0.437500 0.147616 +vt 0.437500 0.000033 +vt 0.437500 0.295200 +vt 0.437500 0.442784 +vt 0.437500 0.590367 +vt 0.437500 0.737951 +vt 0.437500 0.885535 +vt 0.375000 0.147616 +vt 0.375000 0.000033 +vt 0.375000 0.295200 +vt 0.375000 0.442784 +vt 0.375000 0.590367 +vt 0.375000 0.737951 +vt 0.375000 0.885535 +vt 0.312500 0.147616 +vt 0.312500 0.000033 +vt 0.312500 0.295200 +vt 0.312500 0.442784 +vt 0.312500 0.590367 +vt 0.312500 0.737951 +vt 0.312500 0.885535 +vt 0.250000 0.147616 +vt 0.250000 0.000033 +vt 0.250000 0.295200 +vt 0.250000 0.442784 +vt 0.250000 0.590367 +vt 0.250000 0.737951 +vt 0.250000 0.885534 +vt 0.187500 0.147616 +vt 0.187500 0.000033 +vt 0.187500 0.295200 +vt 0.187500 0.442784 +vt 0.187500 0.590367 +vt 0.187500 0.737951 +vt 0.187500 0.885534 +vt 0.125000 0.147616 +vt 0.125000 0.000033 +vt 0.125000 0.295200 +vt 0.125000 0.442784 +vt 0.125000 0.590367 +vt 0.125000 0.737951 +vt 0.125000 0.885534 +vt 0.062500 0.147616 +vt 0.062500 0.000033 +vt 0.062500 0.295200 +vt 0.062500 0.442784 +vt 0.062500 0.590367 +vt 0.062500 0.737951 +vt 0.062500 0.885534 +vt 0.000000 0.147616 +vt 0.000000 0.000033 +vt 0.000000 0.295200 +vt 0.000000 0.442784 +vt 0.000000 0.590367 +vt 0.000000 0.737951 +vt 0.000000 0.885534 +vt 1.000000 0.000033 +vt 1.000000 0.147616 +vt 0.937500 0.147616 +vt 0.937500 0.000033 +vt 1.000000 0.295200 +vt 0.937500 0.295200 +vt 1.000000 0.442784 +vt 0.937500 0.442784 +vt 1.000000 0.590367 +vt 0.937500 0.590367 +vt 1.000000 0.737951 +vt 0.937500 0.737951 +vt 1.000000 0.885534 +vt 0.937500 0.885534 +vt 0.875000 0.147616 +vt 0.875000 0.000033 +vt 0.875000 0.295200 +vt 0.875000 0.442784 +vt 0.875000 0.590367 +vt 0.875000 0.737951 +vt 0.875000 0.885534 +vt 0.812500 0.147616 +vt 0.812500 0.000033 +vt 0.812500 0.295200 +vt 0.812500 0.442784 +vt 0.812500 0.590367 +vt 0.812500 0.737951 +vt 0.812500 0.885534 +vt 0.578309 0.478593 +vt 0.583117 0.534519 +vt 0.470728 0.526112 +vt 0.469638 0.513432 +vt 0.565798 0.587997 +vt 0.466801 0.538237 +vt 0.528988 0.630886 +vt 0.458455 0.547962 +vt 0.478292 0.656657 +vt 0.446961 0.553805 +vt 0.421427 0.661385 +vt 0.434068 0.554877 +vt 0.367051 0.644352 +vt 0.421739 0.551015 +vt 0.309750 0.448887 +vt 0.346559 0.405998 +vt 0.417093 0.496972 +vt 0.408747 0.506697 +vt 0.323442 0.608150 +vt 0.411851 0.542807 +vt 0.397256 0.380228 +vt 0.428587 0.491129 +vt 0.297238 0.558291 +vt 0.405910 0.531502 +vt 0.454121 0.375499 +vt 0.441480 0.490057 +vt 0.292430 0.502365 +vt 0.404820 0.518822 +vt 0.508497 0.392532 +vt 0.453809 0.493919 +vt 0.552106 0.428734 +vt 0.463697 0.502127 +vt 0.437774 0.522467 +vn -0.555600 -0.831500 0.000000 +vn -0.718800 -0.695200 0.000000 +vn -0.664100 -0.695200 -0.275100 +vn -0.513300 -0.831500 -0.212600 +vn -0.927300 -0.374300 0.000000 +vn -0.856700 -0.374300 -0.354800 +vn -1.000000 0.000000 0.000000 +vn -0.923900 0.000000 -0.382700 +vn -0.927300 0.374300 0.000000 +vn -0.856700 0.374300 -0.354800 +vn -0.718800 0.695200 0.000000 +vn -0.664100 0.695200 -0.275100 +vn -0.402200 0.915500 0.000000 +vn -0.371600 0.915500 -0.153900 +vn -0.508300 -0.695200 -0.508300 +vn -0.392800 -0.831500 -0.392800 +vn -0.655700 -0.374300 -0.655700 +vn -0.707100 0.000000 -0.707100 +vn -0.655700 0.374300 -0.655700 +vn -0.508300 0.695200 -0.508300 +vn -0.284400 0.915500 -0.284400 +vn -0.275100 -0.695200 -0.664100 +vn -0.212600 -0.831500 -0.513300 +vn -0.354800 -0.374300 -0.856700 +vn -0.382700 0.000000 -0.923900 +vn -0.354800 0.374300 -0.856700 +vn -0.275100 0.695200 -0.664100 +vn -0.153900 0.915500 -0.371600 +vn 0.000000 -0.695200 -0.718800 +vn 0.000000 -0.831500 -0.555600 +vn 0.000000 -0.374300 -0.927300 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.374300 -0.927300 +vn 0.000000 0.695200 -0.718800 +vn 0.000000 0.915500 -0.402200 +vn 0.275100 -0.695200 -0.664100 +vn 0.212600 -0.831500 -0.513300 +vn 0.354800 -0.374300 -0.856700 +vn 0.382700 0.000000 -0.923900 +vn 0.354800 0.374300 -0.856700 +vn 0.275100 0.695200 -0.664100 +vn 0.153900 0.915500 -0.371600 +vn 0.508300 -0.695200 -0.508300 +vn 0.392800 -0.831500 -0.392800 +vn 0.655700 -0.374300 -0.655700 +vn 0.707100 0.000000 -0.707100 +vn 0.655700 0.374300 -0.655700 +vn 0.508300 0.695200 -0.508300 +vn 0.284400 0.915500 -0.284400 +vn 0.664100 -0.695200 -0.275100 +vn 0.513300 -0.831500 -0.212600 +vn 0.856700 -0.374300 -0.354800 +vn 0.923900 0.000000 -0.382700 +vn 0.856700 0.374300 -0.354800 +vn 0.664100 0.695200 -0.275100 +vn 0.371600 0.915500 -0.153900 +vn 0.718800 -0.695200 0.000000 +vn 0.555600 -0.831500 0.000000 +vn 0.927300 -0.374300 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.927300 0.374300 0.000000 +vn 0.718800 0.695200 0.000000 +vn 0.402200 0.915500 0.000000 +vn 0.664100 -0.695200 0.275100 +vn 0.513300 -0.831500 0.212600 +vn 0.856700 -0.374300 0.354800 +vn 0.923900 0.000000 0.382700 +vn 0.856700 0.374300 0.354800 +vn 0.664100 0.695200 0.275100 +vn 0.371600 0.915500 0.153900 +vn 0.508300 -0.695200 0.508300 +vn 0.392800 -0.831500 0.392800 +vn 0.655700 -0.374300 0.655700 +vn 0.707100 0.000000 0.707100 +vn 0.655700 0.374300 0.655700 +vn 0.508300 0.695200 0.508300 +vn 0.284400 0.915500 0.284400 +vn 0.275100 -0.695200 0.664100 +vn 0.212600 -0.831500 0.513300 +vn 0.354800 -0.374300 0.856700 +vn 0.382700 0.000000 0.923900 +vn 0.354800 0.374300 0.856700 +vn 0.275100 0.695200 0.664100 +vn 0.153900 0.915500 0.371600 +vn 0.000000 -0.695200 0.718800 +vn -0.000000 -0.831500 0.555600 +vn 0.000000 -0.374300 0.927300 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.374300 0.927300 +vn 0.000000 0.695200 0.718800 +vn 0.000000 0.915500 0.402200 +vn -0.275100 -0.695200 0.664100 +vn -0.212600 -0.831500 0.513300 +vn -0.354800 -0.374300 0.856700 +vn -0.382700 0.000000 0.923900 +vn -0.354800 0.374300 0.856700 +vn -0.275100 0.695200 0.664100 +vn -0.153900 0.915500 0.371600 +vn -0.508300 -0.695200 0.508300 +vn -0.392800 -0.831500 0.392800 +vn -0.655700 -0.374300 0.655700 +vn -0.707100 0.000000 0.707100 +vn -0.655700 0.374300 0.655700 +vn -0.508300 0.695200 0.508300 +vn -0.284400 0.915500 0.284400 +vn -0.664100 -0.695200 0.275100 +vn -0.513300 -0.831500 0.212600 +vn -0.856700 -0.374300 0.354800 +vn -0.923900 0.000000 0.382700 +vn -0.856700 0.374300 0.354800 +vn -0.664100 0.695200 0.275100 +vn -0.371600 0.915500 0.153900 +vn 0.108900 0.994000 0.000000 +vn 0.100600 0.994000 0.041700 +vn 0.100600 0.994000 -0.041700 +vn 0.077000 0.994000 -0.077000 +vn 0.041700 0.994000 -0.100600 +vn 0.000000 0.994000 -0.108900 +vn -0.041700 0.994000 -0.100600 +vn -0.077000 0.994000 0.077000 +vn -0.100600 0.994000 0.041700 +vn -0.077000 0.994000 -0.077000 +vn -0.041700 0.994000 0.100600 +vn -0.100600 0.994000 -0.041700 +vn 0.000000 0.994000 0.108900 +vn -0.108900 0.994000 0.000000 +vn 0.041700 0.994000 0.100600 +vn 0.077000 0.994000 0.077000 +vn 0.000000 1.000000 0.000000 +g globe_Cylinder.005_globe +s 1 +f 39/17/13 38/18/14 45/19/15 46/20/16 +f 38/18/14 37/21/17 44/22/18 45/19/15 +f 37/21/17 36/23/19 43/24/20 44/22/18 +f 36/23/19 35/25/21 42/26/22 43/24/20 +f 35/25/21 34/27/23 41/28/24 42/26/22 +f 34/27/23 33/29/25 40/30/26 41/28/24 +f 46/20/16 45/19/15 52/31/27 53/32/28 +f 45/19/15 44/22/18 51/33/29 52/31/27 +f 44/22/18 43/24/20 50/34/30 51/33/29 +f 43/24/20 42/26/22 49/35/31 50/34/30 +f 42/26/22 41/28/24 48/36/32 49/35/31 +f 41/28/24 40/30/26 47/37/33 48/36/32 +f 53/32/28 52/31/27 59/38/34 60/39/35 +f 52/31/27 51/33/29 58/40/36 59/38/34 +f 51/33/29 50/34/30 57/41/37 58/40/36 +f 50/34/30 49/35/31 56/42/38 57/41/37 +f 49/35/31 48/36/32 55/43/39 56/42/38 +f 48/36/32 47/37/33 54/44/40 55/43/39 +f 60/39/35 59/38/34 66/45/41 67/46/42 +f 59/38/34 58/40/36 65/47/43 66/45/41 +f 58/40/36 57/41/37 64/48/44 65/47/43 +f 57/41/37 56/42/38 63/49/45 64/48/44 +f 56/42/38 55/43/39 62/50/46 63/49/45 +f 55/43/39 54/44/40 61/51/47 62/50/46 +f 67/46/42 66/45/41 73/52/48 74/53/49 +f 66/45/41 65/47/43 72/54/50 73/52/48 +f 65/47/43 64/48/44 71/55/51 72/54/50 +f 64/48/44 63/49/45 70/56/52 71/55/51 +f 63/49/45 62/50/46 69/57/53 70/56/52 +f 62/50/46 61/51/47 68/58/54 69/57/53 +f 74/53/49 73/52/48 80/59/55 81/60/56 +f 73/52/48 72/54/50 79/61/57 80/59/55 +f 72/54/50 71/55/51 78/62/58 79/61/57 +f 71/55/51 70/56/52 77/63/59 78/62/58 +f 70/56/52 69/57/53 76/64/60 77/63/59 +f 69/57/53 68/58/54 75/65/61 76/64/60 +f 81/60/56 80/59/55 87/66/62 88/67/63 +f 80/59/55 79/61/57 86/68/64 87/66/62 +f 79/61/57 78/62/58 85/69/65 86/68/64 +f 78/62/58 77/63/59 84/70/66 85/69/65 +f 77/63/59 76/64/60 83/71/67 84/70/66 +f 76/64/60 75/65/61 82/72/68 83/71/67 +f 88/67/63 87/66/62 94/73/69 95/74/70 +f 87/66/62 86/68/64 93/75/71 94/73/69 +f 86/68/64 85/69/65 92/76/72 93/75/71 +f 85/69/65 84/70/66 91/77/73 92/76/72 +f 84/70/66 83/71/67 90/78/74 91/77/73 +f 83/71/67 82/72/68 89/79/75 90/78/74 +f 95/74/70 94/73/69 101/80/76 102/81/77 +f 94/73/69 93/75/71 100/82/78 101/80/76 +f 93/75/71 92/76/72 99/83/79 100/82/78 +f 92/76/72 91/77/73 98/84/80 99/83/79 +f 91/77/73 90/78/74 97/85/81 98/84/80 +f 90/78/74 89/79/75 96/86/82 97/85/81 +f 102/81/77 101/80/76 108/87/83 109/88/84 +f 101/80/76 100/82/78 107/89/85 108/87/83 +f 100/82/78 99/83/79 106/90/86 107/89/85 +f 99/83/79 98/84/80 105/91/87 106/90/86 +f 98/84/80 97/85/81 104/92/88 105/91/87 +f 97/85/81 96/86/82 103/93/89 104/92/88 +f 109/88/84 108/87/83 115/94/90 116/95/91 +f 108/87/83 107/89/85 114/96/92 115/94/90 +f 107/89/85 106/90/86 113/97/93 114/96/92 +f 106/90/86 105/91/87 112/98/94 113/97/93 +f 105/91/87 104/92/88 111/99/95 112/98/94 +f 104/92/88 103/93/89 110/100/96 111/99/95 +f 116/95/91 115/94/90 122/101/97 123/102/98 +f 115/94/90 114/96/92 121/103/99 122/101/97 +f 114/96/92 113/97/93 120/104/100 121/103/99 +f 113/97/93 112/98/94 119/105/101 120/104/100 +f 112/98/94 111/99/95 118/106/102 119/105/101 +f 111/99/95 110/100/96 117/107/103 118/106/102 +f 123/108/98 122/109/97 129/110/104 130/111/105 +f 122/109/97 121/112/99 128/113/106 129/110/104 +f 121/112/99 120/114/100 127/115/107 128/113/106 +f 120/114/100 119/116/101 126/117/108 127/115/107 +f 119/116/101 118/118/102 125/119/109 126/117/108 +f 118/118/102 117/120/103 124/121/110 125/119/109 +f 130/111/105 129/110/104 136/122/111 137/123/112 +f 129/110/104 128/113/106 135/124/113 136/122/111 +f 128/113/106 127/115/107 134/125/114 135/124/113 +f 127/115/107 126/117/108 133/126/115 134/125/114 +f 126/117/108 125/119/109 132/127/116 133/126/115 +f 125/119/109 124/121/110 131/128/117 132/127/116 +f 137/123/112 136/122/111 143/129/118 144/130/119 +f 136/122/111 135/124/113 142/131/120 143/129/118 +f 135/124/113 134/125/114 141/132/121 142/131/120 +f 134/125/114 133/126/115 140/133/122 141/132/121 +f 133/126/115 132/127/116 139/134/123 140/133/122 +f 132/127/116 131/128/117 138/135/124 139/134/123 +f 144/130/119 143/129/118 38/18/14 39/17/13 +f 143/129/118 142/131/120 37/21/17 38/18/14 +f 142/131/120 141/132/121 36/23/19 37/21/17 +f 141/132/121 140/133/122 35/25/21 36/23/19 +f 140/133/122 139/134/123 34/27/23 35/25/21 +f 139/134/123 138/135/124 33/29/25 34/27/23 +f 96/136/82 89/137/75 153/138/125 154/139/126 +f 89/137/75 82/140/68 152/141/127 153/138/125 +f 82/140/68 75/142/61 151/143/128 152/141/127 +f 75/142/61 68/144/54 150/145/129 151/143/128 +f 68/144/54 61/146/47 149/147/130 150/145/129 +f 61/146/47 54/148/40 148/149/131 149/147/130 +f 138/150/124 131/151/117 159/152/132 160/153/133 +f 54/148/40 47/154/33 147/155/134 148/149/131 +f 131/151/117 124/156/110 158/157/135 159/152/132 +f 47/154/33 40/158/26 146/159/136 147/155/134 +f 124/156/110 117/160/103 157/161/137 158/157/135 +f 33/162/25 138/150/124 160/153/133 145/163/138 +f 40/158/26 33/162/25 145/163/138 146/159/136 +f 117/160/103 110/164/96 156/165/139 157/161/137 +f 110/164/96 103/166/89 155/167/140 156/165/139 +f 103/166/89 96/136/82 154/139/126 155/167/140 +f 145/163/138 160/153/133 161/168/141 +f 160/153/133 159/152/132 161/168/141 +f 159/152/132 158/157/135 161/168/141 +f 158/157/135 157/161/137 161/168/141 +f 157/161/137 156/165/139 161/168/141 +f 156/165/139 155/167/140 161/168/141 +f 155/167/140 154/139/126 161/168/141 +f 154/139/126 153/138/125 161/168/141 +f 153/138/125 152/141/127 161/168/141 +f 152/141/127 151/143/128 161/168/141 +f 151/143/128 150/145/129 161/168/141 +f 150/145/129 149/147/130 161/168/141 +f 149/147/130 148/149/131 161/168/141 +f 148/149/131 147/155/134 161/168/141 +f 147/155/134 146/159/136 161/168/141 +f 146/159/136 145/163/138 161/168/141 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_round_pole.obj b/mods/homedecor_modpack/homedecor/models/homedecor_round_pole.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_slope.obj b/mods/homedecor_modpack/homedecor/models/homedecor_slope.obj old mode 100755 new mode 100644 index 97b8bb12..c3ab158c --- a/mods/homedecor_modpack/homedecor/models/homedecor_slope.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_slope.obj @@ -1,6 +1,5 @@ -# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope.blend' +# Blender v2.73 (sub 0) OBJ File: 'slope_test_slope_onetexture.blend' # www.blender.org -mtllib slope_test_slope.mtl o Cube_Cube.002 v 0.500000 0.500000 0.500000 v -0.500000 0.500000 0.500000 @@ -8,28 +7,20 @@ 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.546875 0.984375 -vt 0.296875 0.984375 -vt 0.296875 0.734375 -vt 0.546875 0.734375 -vt 0.578125 0.734375 -vt 0.828125 0.734375 -vt 0.828125 0.984375 -vt 0.578125 0.984375 -vt 0.546875 0.703125 -vt 0.296875 0.453125 -vt 0.546875 0.453125 -vt 0.578125 0.703125 -vt 0.578125 0.453125 -vt 0.828125 0.453125 -vt 0.265625 0.984375 -vt 0.015625 0.984375 -vt 0.015625 0.609375 -vt 0.265625 0.609375 -usemtl None +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 0.000000 0.707100 -0.707100 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +g Cube_Cube.002_Cube_Cube.002_front-back-bottom s off -f 1/1 2/2 3/3 4/4 -f 4/5 3/6 5/7 6/8 -f 2/9 5/10 3/11 -f 1/12 4/13 6/14 -f 2/15 1/16 6/17 5/18 +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 1/2/3 6/3/3 5/4/3 +g Cube_Cube.002_Cube_Cube.002_sides +f 2/1/4 5/3/4 3/4/4 +f 1/2/5 4/3/5 6/4/5 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_slope_inner_corner.obj b/mods/homedecor_modpack/homedecor/models/homedecor_slope_inner_corner.obj old mode 100755 new mode 100644 index 8cf7cd3d..6f273a41 --- a/mods/homedecor_modpack/homedecor/models/homedecor_slope_inner_corner.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_slope_inner_corner.obj @@ -1,6 +1,5 @@ -# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner.blend' +# Blender v2.73 (sub 0) OBJ File: 'slope_test_icorner_onetexture.blend' # www.blender.org -mtllib slope_test_icorner.mtl o Cube_Cube.000 v 0.500000 0.500000 0.500000 v -0.500000 0.500000 0.500000 @@ -11,38 +10,25 @@ 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.546875 0.984375 -vt 0.296875 0.984375 -vt 0.296875 0.734375 -vt 0.546875 0.734375 -vt 0.828125 0.421875 -vt 0.578125 0.171875 -vt 0.828125 0.171875 -vt 0.546875 0.703125 -vt 0.296875 0.703125 -vt 0.546875 0.328125 -vt 0.578125 0.703125 -vt 0.578125 0.453125 -vt 0.828125 0.453125 -vt 0.828125 0.984375 -vt 0.578125 0.984375 -vt 0.578125 0.734375 -vt 0.828125 0.734375 -vt 0.015625 0.734375 -vt 0.265625 0.734375 -vt 0.265625 0.984375 -vt 0.015625 0.984375 -vt 0.265625 0.703125 -vt 0.015625 0.703125 -vt 0.015625 0.328125 -usemtl None +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 +g Cube_Cube.000_Cube_Cube.000_None s off -f 6/1 1/2 7/3 8/4 -f 2/5 5/6 3/7 -f 2/8 1/9 5/10 -f 6/11 8/12 9/13 -f 9/14 8/15 7/16 3/17 -f 3/18 7/19 1/20 2/21 -f 1/22 6/23 9/24 +f 6/1/1 1/2/1 7/3/1 8/4/1 +f 2/1/2 5/3/2 3/4/2 +f 2/1/3 1/2/3 5/4/3 +f 6/2/4 8/3/4 9/4/4 +f 9/1/5 8/2/5 7/3/5 3/4/5 +f 3/3/6 7/4/6 1/1/6 2/2/6 +f 1/1/7 6/2/7 9/3/7 l 1 4 l 3 4 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_slope_outer_corner.obj b/mods/homedecor_modpack/homedecor/models/homedecor_slope_outer_corner.obj old mode 100755 new mode 100644 index 6d94562b..2408acf0 --- a/mods/homedecor_modpack/homedecor/models/homedecor_slope_outer_corner.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_slope_outer_corner.obj @@ -1,32 +1,24 @@ -# Blender v2.69 (sub 0) OBJ File: 'slope_test_ocorner.blend' +# Blender v2.73 (sub 0) OBJ File: 'slope_test_ocorner_onetexture.blend' # www.blender.org -mtllib slope_test_ocorner.mtl o Cube_Cube.002 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.578125 0.734375 -vt 0.828125 0.734375 -vt 0.828125 0.984375 -vt 0.578125 0.984375 -vt 0.296875 0.703125 -vt 0.296875 0.453125 -vt 0.546875 0.453125 -vt 0.546875 0.984375 -vt 0.296875 0.734375 -vt 0.546875 0.734375 -vt 0.265625 0.578125 -vt 0.015625 0.203125 -vt 0.265625 0.203125 -vt 0.015625 0.984375 -vt 0.015625 0.609375 -vt 0.265625 0.609375 -usemtl None +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 +g Cube_Cube.002_Cube_Cube.002_None s off -f 3/1 2/2 4/3 5/4 -f 1/5 3/6 5/7 -f 1/8 2/9 3/10 -f 1/11 4/12 2/13 -f 1/14 5/15 4/16 +f 3/1/1 2/2/1 4/3/1 5/4/1 +f 1/2/2 3/3/2 5/4/2 +f 1/1/3 2/3/3 3/4/3 +f 1/1/4 4/3/4 2/4/4 +f 1/2/5 5/3/5 4/4/5 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_small_rug.obj b/mods/homedecor_modpack/homedecor/models/homedecor_small_rug.obj new file mode 100644 index 00000000..16c689ff --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_small_rug.obj @@ -0,0 +1,241 @@ +# Blender v2.73 (sub 0) OBJ File: 'small-rug.blend' +# www.blender.org +o Cylinder +v -0.000000 -0.437500 0.000000 +v 0.323112 -0.437500 0.405968 +v -0.491090 -0.449921 -0.245545 +v -0.491090 -0.500000 0.245545 +v 0.245545 -0.449921 -0.491090 +v -0.245545 -0.500000 -0.491090 +v 0.491090 -0.449921 0.245545 +v 0.491090 -0.500000 -0.245545 +v -0.245545 -0.449921 0.491090 +v 0.245545 -0.500000 0.491090 +v -0.491090 -0.449921 0.245545 +v -0.491090 -0.500000 -0.245545 +v -0.245545 -0.449921 -0.491090 +v 0.245545 -0.500000 -0.491090 +v 0.491090 -0.449921 -0.245545 +v 0.491090 -0.500000 0.245545 +v 0.245545 -0.449921 0.491090 +v -0.245545 -0.500000 0.491090 +v -0.451076 -0.449921 -0.359013 +v -0.451076 -0.500000 0.359013 +v 0.359013 -0.449921 -0.451076 +v -0.359013 -0.500000 -0.451076 +v 0.451076 -0.449921 0.359013 +v 0.451076 -0.500000 -0.359013 +v -0.359013 -0.449921 0.451076 +v 0.359013 -0.500000 0.451076 +v 0.405968 -0.437500 -0.323112 +v -0.323112 -0.437500 -0.405968 +v -0.405968 -0.437500 0.323112 +v -0.323112 -0.437500 0.405968 +v 0.405968 -0.437500 0.323112 +v 0.323112 -0.437500 -0.405968 +v -0.405968 -0.437500 -0.323112 +v 0.220990 -0.437500 0.441981 +v 0.441981 -0.437500 -0.220990 +v -0.220990 -0.437500 -0.441981 +v -0.441981 -0.437500 0.220990 +v -0.220990 -0.437500 0.441981 +v 0.441981 -0.437500 0.220990 +v 0.220990 -0.437500 -0.441981 +v -0.441981 -0.437500 -0.220990 +v -0.000000 -0.500000 -0.000000 +v -0.451076 -0.449921 0.359013 +v -0.451076 -0.500000 -0.359013 +v -0.359013 -0.449921 -0.451076 +v 0.359013 -0.500000 -0.451076 +v 0.451076 -0.449921 -0.359013 +v 0.451076 -0.500000 0.359013 +v 0.359013 -0.449921 0.451076 +v -0.359013 -0.500000 0.451076 +vt 1.000000 0.125000 +vt 1.000000 0.250000 +vt 0.937500 0.250000 +vt 0.937500 0.125000 +vt 0.875000 1.000000 +vt 0.750000 1.000000 +vt 0.750000 0.937500 +vt 0.875000 0.937500 +vt 0.125000 0.000000 +vt 0.250000 0.000000 +vt 0.250000 0.062500 +vt 0.125000 0.062500 +vt 0.865527 0.959260 +vt 0.725000 0.950000 +vt 0.828974 0.913334 +vt 0.000000 0.750000 +vt 0.000000 0.625000 +vt 0.062500 0.625000 +vt 0.062500 0.750000 +vt 0.375000 0.000000 +vt 0.375000 0.062500 +vt 1.000000 0.375000 +vt 0.937500 0.375000 +vt 0.625000 1.000000 +vt 0.625000 0.937500 +vt -0.000000 0.125000 +vt 0.062500 0.125000 +vt 0.062500 0.687500 +vt -0.000000 0.687500 +vt 0.040740 0.134473 +vt 0.134473 0.040740 +vt 0.171026 0.086666 +vt 0.086666 0.171026 +vt 0.875000 0.000000 +vt 0.875000 0.062500 +vt 1.000000 0.875000 +vt 0.937500 0.875000 +vt 0.125000 1.000000 +vt 0.125000 0.937500 +vt 0.000000 1.000000 +vt 0.000000 0.937500 +vt 1.000000 1.000000 +vt 0.937500 1.000000 +vt 1.000000 0.000000 +vt 1.000000 0.062500 +vt -0.000000 0.000000 +vt 0.062500 0.000000 +vt 0.000000 0.875000 +vt 0.062500 0.875000 +vt 0.040740 0.865527 +vt 0.050000 0.725000 +vt 0.086666 0.828974 +vt 0.750000 0.000000 +vt 0.725000 0.050000 +vt 0.275000 0.050000 +vt 1.000000 0.750000 +vt 0.950000 0.725000 +vt 0.950000 0.275000 +vt 0.250000 1.000000 +vt 0.275000 0.950000 +vt 0.000000 0.250000 +vt 0.050000 0.275000 +vt 0.865527 0.040740 +vt 0.828974 0.086666 +vt 0.959260 0.865527 +vt 0.913334 0.828974 +vt 0.134473 0.959260 +vt 0.171026 0.913334 +vt 0.959260 0.134473 +vt 0.913334 0.171026 +vt 0.500000 0.500000 +vn 0.432600 0.587800 -0.683600 +vn 0.683600 0.587800 -0.432600 +vn 0.635200 -0.660500 -0.400200 +vn 0.400200 -0.660500 -0.635200 +vn 0.683600 0.587800 0.432600 +vn 0.432600 0.587800 0.683600 +vn 0.400200 -0.660500 0.635200 +vn 0.635200 -0.660500 0.400200 +vn -0.683600 0.587800 -0.432600 +vn -0.432600 0.587800 -0.683600 +vn -0.400200 -0.660500 -0.635200 +vn -0.635200 -0.660500 -0.400200 +vn 0.139800 0.590500 -0.794800 +vn 0.017200 0.991500 -0.128400 +vn 0.062900 0.992600 -0.104200 +vn -0.683600 0.587800 0.432600 +vn -0.794800 0.590500 0.139800 +vn -0.730800 -0.671000 0.125100 +vn -0.635200 -0.660500 0.400200 +vn -0.139800 0.590500 -0.794800 +vn -0.125100 -0.671000 -0.730800 +vn 0.794800 0.590500 -0.139800 +vn 0.730800 -0.671000 -0.125100 +vn 0.139800 0.590500 0.794800 +vn 0.125100 -0.671000 0.730800 +vn -0.794800 0.590500 -0.139800 +vn -0.730800 -0.671000 -0.125100 +vn -0.432600 0.587800 0.683600 +vn -0.062900 0.992600 0.104200 +vn -0.104200 0.992600 0.062900 +vn 0.125100 -0.671000 -0.730800 +vn 0.794800 0.590500 0.139800 +vn 0.730800 -0.671000 0.125100 +vn -0.139800 0.590500 0.794800 +vn -0.125100 -0.671000 0.730800 +vn -0.400200 -0.660500 0.635200 +vn -0.128400 0.991500 -0.017200 +vn -0.104200 0.992600 -0.062900 +vn 0.017200 0.991500 0.128400 +vn -0.017200 0.991500 0.128400 +vn 0.128400 0.991500 -0.017200 +vn 0.128400 0.991500 0.017200 +vn -0.017200 0.991500 -0.128400 +vn -0.128400 0.991500 0.017200 +vn 0.062900 0.992600 0.104200 +vn 0.104200 0.992600 -0.062900 +vn -0.062900 0.992600 -0.104200 +vn 0.104200 0.992600 0.062900 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +g Cylinder_Cylinder_top-sides +s 1 +f 21/1/1 47/2/2 24/3/3 46/4/4 +f 23/5/5 49/6/6 26/7/7 48/8/8 +f 19/9/9 45/10/10 22/11/11 44/12/12 +f 21/13/1 5/6/13 40/14/14 32/15/15 +f 43/16/16 11/17/17 4/18/18 20/19/19 +f 45/10/10 13/20/20 6/21/21 22/11/11 +f 47/2/2 15/22/22 8/23/23 24/3/3 +f 49/6/6 17/24/24 10/25/25 26/7/7 +f 3/26/26 12/27/27 4/28/18 11/29/17 +f 43/30/16 25/31/28 30/32/29 29/33/30 +f 5/34/13 14/35/31 6/21/21 13/20/20 +f 7/36/32 16/37/33 8/23/23 15/22/22 +f 17/24/24 9/38/34 18/39/35 10/25/25 +f 9/38/34 25/40/28 50/41/36 18/39/35 +f 7/36/32 23/42/5 48/43/8 16/37/33 +f 5/34/13 21/44/1 46/45/4 14/35/31 +f 3/26/26 19/46/9 44/47/12 12/27/27 +f 25/48/28 43/16/16 20/19/19 50/49/36 +f 19/50/9 3/16/26 41/51/37 33/52/38 +f 9/10/34 17/53/24 34/54/39 38/55/40 +f 7/2/32 15/56/22 35/57/41 39/58/42 +f 5/6/13 13/59/20 36/60/43 40/14/14 +f 3/16/26 11/61/17 37/62/44 41/51/37 +f 17/53/24 49/63/6 2/64/45 34/54/39 +f 15/56/22 47/65/2 27/66/46 35/57/41 +f 13/59/20 45/67/10 28/68/47 36/60/43 +f 49/63/6 23/69/5 31/70/48 2/64/45 +f 11/61/17 43/30/16 29/33/30 37/62/44 +f 25/31/28 9/10/34 38/55/40 30/32/29 +f 47/65/2 21/13/1 32/15/15 27/66/46 +f 23/69/5 7/2/32 39/58/42 31/70/48 +f 45/67/10 19/50/9 33/52/38 28/68/47 +f 30/32/29 38/55/40 1/71/49 +f 38/55/40 34/54/39 1/71/49 +f 34/54/39 2/64/45 1/71/49 +f 2/64/45 31/70/48 1/71/49 +f 31/70/48 39/58/42 1/71/49 +f 39/58/42 35/57/41 1/71/49 +f 35/57/41 27/66/46 1/71/49 +f 27/66/46 32/15/15 1/71/49 +f 32/15/15 40/14/14 1/71/49 +f 40/14/14 36/60/43 1/71/49 +f 36/60/43 28/68/47 1/71/49 +f 28/68/47 33/52/38 1/71/49 +f 33/52/38 41/51/37 1/71/49 +f 41/51/37 37/62/44 1/71/49 +f 37/62/44 29/33/30 1/71/49 +f 29/33/30 30/32/29 1/71/49 +g Cylinder_Cylinder_bottom +f 22/31/11 6/10/21 42/71/50 +f 4/16/18 12/61/27 42/71/50 +f 12/61/27 44/30/12 42/71/50 +f 44/30/12 22/31/11 42/71/50 +f 14/53/31 46/63/4 42/71/50 +f 46/63/4 24/69/3 42/71/50 +f 24/69/3 8/2/23 42/71/50 +f 8/2/23 16/56/33 42/71/50 +f 16/56/33 48/65/8 42/71/50 +f 48/65/8 26/13/7 42/71/50 +f 26/13/7 10/6/25 42/71/50 +f 20/50/19 4/16/18 42/71/50 +f 6/10/21 14/53/31 42/71/50 +f 10/6/25 18/59/35 42/71/50 +f 18/59/35 50/67/36 42/71/50 +f 50/67/36 20/50/19 42/71/50 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_soda_machine.obj b/mods/homedecor_modpack/homedecor/models/homedecor_soda_machine.obj new file mode 100644 index 00000000..66d651f6 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_soda_machine.obj @@ -0,0 +1,34 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib vending_machine.mtl +o Cube +v 0.499998 -0.499998 -0.499998 +v 0.499998 -0.499998 0.499998 +v -0.499998 -0.499998 0.499998 +v -0.499998 -0.499998 -0.499998 +v 0.499998 1.499994 -0.499998 +v 0.499998 1.499994 0.499998 +v -0.499998 1.499994 0.499998 +v -0.499998 1.499994 -0.499998 +vt 0.250050 0.250050 +vt 0.000100 0.250050 +vt 0.000100 0.000100 +vt 0.250050 0.000100 +vt 0.250050 0.749950 +vt 0.250050 0.999900 +vt 0.000100 0.999900 +vt 0.000100 0.749950 +vt 0.999900 0.250049 +vt 0.999900 0.749949 +vt 0.749950 0.749950 +vt 0.749950 0.250050 +vt 0.500000 0.749950 +vt 0.500000 0.250050 +usemtl Material +s off +f 1/1 2/2 3/3 4/4 +f 5/5 8/6 7/7 6/8 +f 1/1 5/5 6/8 2/2 +f 2/9 6/10 7/11 3/12 +f 3/12 7/11 8/13 4/14 +f 5/5 1/1 4/14 8/13 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_spiral_staircase.obj b/mods/homedecor_modpack/homedecor/models/homedecor_spiral_staircase.obj new file mode 100644 index 00000000..f729f652 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_spiral_staircase.obj @@ -0,0 +1,1440 @@ +# Blender v2.73 (sub 0) OBJ File: 'spiral-staircase.blend' +# www.blender.org +o Cylinder +v 0.500000 -0.500000 -0.437500 +v 0.500000 1.000000 -0.437500 +v 0.455806 -0.500000 -0.455806 +v 0.455806 1.000000 -0.455806 +v 0.437500 -0.500000 -0.500000 +v 0.437500 1.000000 -0.500000 +v 0.455806 -0.500000 -0.544194 +v 0.455806 1.000000 -0.544194 +v 0.500000 -0.500000 -0.562500 +v 0.500000 1.000000 -0.562500 +v 0.544194 -0.500000 -0.544194 +v 0.544194 1.000000 -0.544194 +v 0.562500 -0.500000 -0.500000 +v 0.562500 1.000000 -0.500000 +v 0.544194 -0.500000 -0.455806 +v 0.544194 1.000000 -0.455806 +v 1.423880 0.812500 -0.117317 +v 1.423880 0.718750 -0.117317 +v 0.500000 0.250000 0.500000 +v 0.500000 0.156250 0.500000 +v -0.207107 -0.218750 0.207107 +v -0.207107 -0.125000 0.207107 +v -0.423880 -0.406250 -0.117316 +v -0.423880 -0.312500 -0.117316 +v -0.500000 -0.593750 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 1.500000 1.000000 -0.500000 +v 1.500000 0.906250 -0.500000 +v 0.500000 0.156250 0.500000 +v 0.500000 0.250000 0.500000 +v 0.117317 -0.031250 0.423880 +v 0.117317 0.062500 0.423880 +v -0.207107 -0.218750 0.207107 +v -0.207107 -0.125000 0.207107 +v 1.207107 0.531250 0.207107 +v 1.207107 0.625000 0.207107 +v 0.882683 0.343750 0.423880 +v 0.882683 0.437500 0.423880 +v 1.207107 0.531250 0.207107 +v 1.207107 0.625000 0.207107 +v 1.423880 1.562500 -0.117317 +v 1.423880 1.468750 -0.117317 +v 0.500000 1.000000 0.500000 +v 0.500000 0.906250 0.500000 +v -0.207107 0.531250 0.207107 +v -0.207107 0.625000 0.207107 +v -0.423880 0.343750 -0.117316 +v -0.423880 0.437500 -0.117316 +v -0.500000 0.156250 -0.500000 +v -0.500000 0.250000 -0.500000 +v 1.500000 1.750000 -0.500000 +v 1.500000 1.656250 -0.500000 +v 0.500000 0.906250 0.500000 +v 0.500000 1.000000 0.500000 +v 0.117317 0.718750 0.423880 +v 0.117317 0.812500 0.423880 +v -0.207107 0.531250 0.207107 +v -0.207107 0.625000 0.207107 +v 1.207107 1.281250 0.207107 +v 1.207107 1.375000 0.207107 +v 0.882683 1.093750 0.423880 +v 0.882683 1.187500 0.423880 +v 1.207107 1.281250 0.207107 +v 1.207107 1.375000 0.207107 +v 1.381884 0.812500 -0.134712 +v 1.381884 0.718750 -0.134712 +v 0.500000 0.250000 0.454544 +v 0.500000 0.156250 0.454544 +v -0.174965 -0.218750 0.174965 +v -0.174965 -0.125000 0.174965 +v -0.381884 -0.406250 -0.134712 +v -0.381884 -0.312500 -0.134712 +v -0.454544 -0.593750 -0.500000 +v -0.454544 -0.500000 -0.500000 +v 1.454544 1.000000 -0.500000 +v 1.454544 0.906250 -0.500000 +v 0.500000 0.156250 0.454544 +v 0.500000 0.250000 0.454544 +v 0.134712 -0.031250 0.381884 +v 0.134712 0.062500 0.381884 +v -0.174965 -0.218750 0.174965 +v -0.174965 -0.125000 0.174965 +v 1.174965 0.531250 0.174965 +v 1.174965 0.625000 0.174965 +v 0.865288 0.343750 0.381884 +v 0.865288 0.437500 0.381884 +v 1.174965 0.531250 0.174965 +v 1.174965 0.625000 0.174965 +v 1.381884 1.562500 -0.134712 +v 1.381884 1.468750 -0.134712 +v 0.500000 1.000000 0.454544 +v 0.500000 0.906250 0.454544 +v -0.174965 0.531250 0.174965 +v -0.174965 0.625000 0.174965 +v -0.381884 0.343750 -0.134712 +v -0.381884 0.437500 -0.134712 +v -0.454544 0.156250 -0.500000 +v -0.454544 0.250000 -0.500000 +v 1.454544 1.750000 -0.500000 +v 1.454544 1.656250 -0.500000 +v 0.500000 0.906250 0.454544 +v 0.500000 1.000000 0.454544 +v 0.134712 0.718750 0.381884 +v 0.134712 0.812500 0.381884 +v -0.174965 0.531250 0.174965 +v -0.174965 0.625000 0.174965 +v 1.174965 1.281250 0.174965 +v 1.174965 1.375000 0.174965 +v 0.865288 1.093750 0.381884 +v 0.865288 1.187500 0.381884 +v 1.174965 1.281250 0.174965 +v 1.174965 1.375000 0.174965 +v 1.393354 1.490807 -0.141267 +v -0.416108 -0.336591 -0.134861 +v 1.393354 0.792536 -0.141267 +v 1.416144 1.490807 -0.134947 +v 1.416144 0.792536 -0.134947 +v -0.416108 0.361680 -0.134861 +v 1.385395 1.490807 -0.122052 +v 1.385395 0.792536 -0.122052 +v 1.405979 1.490807 -0.110406 +v -0.393318 -0.336591 -0.141181 +v 1.405979 0.792536 -0.110406 +v 0.865139 0.414229 0.416108 +v 0.865139 1.112499 0.416108 +v -0.393318 0.361680 -0.141181 +v 0.858819 0.414229 0.393318 +v 0.858819 1.112499 0.393318 +v 0.889680 0.414229 0.405943 +v -0.405943 -0.336591 -0.110320 +v 0.889680 1.112499 0.405943 +v 0.878034 0.414229 0.385359 +v 0.878034 1.112499 0.385359 +v -0.405943 0.361680 -0.110320 +v 0.141267 0.738201 0.393354 +v 0.141267 0.039931 0.393354 +v 0.134947 0.738201 0.416144 +v -0.385359 -0.336591 -0.121966 +v 0.134947 0.039931 0.416144 +v 0.122052 0.738201 0.385395 +v 0.122052 0.039931 0.385395 +v -0.385359 0.361680 -0.121966 +v 0.110406 0.738201 0.405979 +v 0.110406 0.039931 0.405979 +v 1.188038 1.303904 0.173330 +v 1.188038 0.605634 0.173330 +v 1.206674 1.303904 0.187892 +v 1.206674 0.605634 0.187892 +v 1.173331 1.303904 0.188037 +v 1.173331 0.605634 0.188037 +v 1.187890 1.303904 0.206674 +v 1.187890 0.605634 0.206674 +v 0.486718 0.225410 0.486106 +v 0.486718 0.923680 0.486106 +v 0.489601 0.225410 0.462632 +v 0.489601 0.923680 0.462632 +v 0.513281 0.225410 0.486107 +v -0.486107 -0.521644 -0.486719 +v 0.513281 0.923680 0.486107 +v 0.510400 0.225410 0.462633 +v 0.510400 0.923680 0.462633 +v -0.486107 0.176626 -0.486719 +v -0.173330 0.549256 0.188038 +v -0.173330 -0.149014 0.188038 +v -0.187892 0.549256 0.206674 +v -0.462633 -0.521644 -0.489600 +v -0.187892 -0.149014 0.206674 +v -0.188036 0.549256 0.173331 +v -0.188036 -0.149014 0.173331 +v -0.462633 0.176626 -0.489600 +v -0.206674 0.549256 0.187890 +v -0.206674 -0.149014 0.187890 +v 1.486105 0.626794 -0.486718 +v 1.486105 1.676627 -0.486718 +v 1.462632 0.626794 -0.489601 +v 1.462632 1.676627 -0.489601 +v 1.486106 1.676627 -0.499999 +v 1.486106 0.626794 -0.499999 +v 1.462632 1.676627 -0.500000 +v 1.462632 0.626794 -0.500000 +v -0.486106 0.176626 -0.500001 +v -0.486106 -0.521644 -0.500001 +v -0.462632 0.176626 -0.499999 +v -0.462632 -0.521644 -0.499999 +v 1.452126 0.673669 -0.500000 +v 1.462632 0.673669 -0.500000 +v 1.452126 0.626794 -0.500000 +v 1.462632 0.626794 -0.500000 +v 1.452126 0.673669 -0.496094 +v 1.462632 0.626794 -0.500000 +v 1.462632 0.673669 -0.496094 +v 1.452126 0.626794 -0.500000 +v 1.452126 0.626794 -0.496094 +v 1.462632 0.673669 -0.500000 +v 1.462632 0.626794 -0.496094 +v 1.452126 0.673669 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.406250 -0.500000 +v -0.174964 -0.500000 0.174965 +v -0.174964 -0.406250 0.174965 +v -0.381883 -0.500000 -0.134712 +v -0.381883 -0.406250 -0.134712 +v -0.454544 -0.500000 -0.500000 +v -0.454544 -0.406250 -0.500000 +v 0.500000 -0.125000 -0.500000 +v 0.500000 -0.031250 -0.500000 +v 0.500000 -0.125000 0.454544 +v 0.500000 -0.031250 0.454544 +v 0.134712 -0.125000 0.381883 +v 0.134712 -0.031250 0.381883 +v -0.174964 -0.125000 0.174964 +v -0.174964 -0.031250 0.174964 +v 0.500000 0.250000 -0.500000 +v 0.500000 0.343750 -0.500000 +v 1.174965 0.250000 0.174964 +v 1.174965 0.343750 0.174964 +v 0.865288 0.250000 0.381883 +v 0.865288 0.343750 0.381883 +v 0.500000 0.250000 0.454544 +v 0.500000 0.343750 0.454544 +v 0.500000 0.625000 -0.500000 +v 0.500000 0.718750 -0.500000 +v 1.454544 0.625000 -0.500000 +v 1.454544 0.718750 -0.500000 +v 1.381883 0.625000 -0.134712 +v 1.381883 0.718750 -0.134712 +v 1.174964 0.625000 0.174964 +v 1.174964 0.718750 0.174964 +v 0.500000 1.000000 -0.562500 +v 0.500000 2.500000 -0.562500 +v 0.544194 1.000000 -0.544194 +v 0.544194 2.500000 -0.544194 +v 0.562500 1.000000 -0.500000 +v 0.562500 2.500000 -0.500000 +v 0.544194 1.000000 -0.455806 +v 0.544194 2.500000 -0.455806 +v 0.500000 1.000000 -0.437500 +v 0.500000 2.500000 -0.437500 +v 0.455806 1.000000 -0.455806 +v 0.455806 2.500000 -0.455806 +v 0.437500 1.000000 -0.500000 +v 0.437500 2.500000 -0.500000 +v 0.455806 1.000000 -0.544194 +v 0.455806 2.500000 -0.544194 +v -0.423879 2.312500 -0.882684 +v -0.423879 2.218750 -0.882684 +v 0.500000 1.750000 -1.500000 +v 0.500000 1.656250 -1.500000 +v 1.207107 1.281250 -1.207107 +v 1.207107 1.375000 -1.207107 +v 1.423880 1.093750 -0.882683 +v 1.423880 1.187500 -0.882683 +v 1.500000 0.906250 -0.500000 +v 1.500000 1.000000 -0.500000 +v -0.500000 2.500000 -0.500000 +v -0.500000 2.406250 -0.500000 +v 0.500000 1.656250 -1.500000 +v 0.500000 1.750000 -1.500000 +v 0.882683 1.468750 -1.423880 +v 0.882683 1.562500 -1.423880 +v 1.207107 1.281250 -1.207107 +v 1.207107 1.375000 -1.207107 +v -0.207107 2.031250 -1.207107 +v -0.207107 2.125000 -1.207107 +v 0.117317 1.843750 -1.423880 +v 0.117317 1.937500 -1.423880 +v -0.207107 2.031250 -1.207107 +v -0.207107 2.125000 -1.207107 +v -0.423879 3.062500 -0.882684 +v -0.423879 2.968750 -0.882684 +v 0.500000 2.500000 -1.500000 +v 0.500000 2.406250 -1.500000 +v 1.207107 2.031250 -1.207107 +v 1.207107 2.125000 -1.207107 +v 1.423880 1.843750 -0.882683 +v 1.423880 1.937500 -0.882683 +v 1.500000 1.656250 -0.500000 +v 1.500000 1.750000 -0.500000 +v -0.500000 3.250000 -0.500000 +v -0.500000 3.156250 -0.500000 +v 0.500000 2.406250 -1.500000 +v 0.500000 2.500000 -1.500000 +v 0.882683 2.218750 -1.423880 +v 0.882683 2.312500 -1.423880 +v 1.207107 2.031250 -1.207107 +v 1.207107 2.125000 -1.207107 +v -0.207107 2.781250 -1.207107 +v -0.207107 2.875000 -1.207107 +v 0.117317 2.593750 -1.423880 +v 0.117317 2.687500 -1.423880 +v -0.207107 2.781250 -1.207107 +v -0.207107 2.875000 -1.207107 +v -0.381884 2.312500 -0.865288 +v -0.381884 2.218750 -0.865288 +v 0.500000 1.750000 -1.454544 +v 0.500000 1.656250 -1.454544 +v 1.174965 1.281250 -1.174965 +v 1.174965 1.375000 -1.174965 +v 1.381884 1.093750 -0.865288 +v 1.381884 1.187500 -0.865288 +v 1.454544 0.906250 -0.500000 +v 1.454544 1.000000 -0.500000 +v -0.454544 2.500000 -0.500000 +v -0.454544 2.406250 -0.500000 +v 0.500000 1.656250 -1.454544 +v 0.500000 1.750000 -1.454544 +v 0.865288 1.468750 -1.381884 +v 0.865288 1.562500 -1.381884 +v 1.174965 1.281250 -1.174965 +v 1.174965 1.375000 -1.174965 +v -0.174964 2.031250 -1.174965 +v -0.174964 2.125000 -1.174965 +v 0.134712 1.843750 -1.381884 +v 0.134712 1.937500 -1.381884 +v -0.174964 2.031250 -1.174965 +v -0.174964 2.125000 -1.174965 +v -0.381884 3.062500 -0.865288 +v -0.381884 2.968750 -0.865288 +v 0.500000 2.500000 -1.454544 +v 0.500000 2.406250 -1.454544 +v 1.174965 2.031250 -1.174965 +v 1.174965 2.125000 -1.174965 +v 1.381884 1.843750 -0.865288 +v 1.381884 1.937500 -0.865288 +v 1.454544 1.656250 -0.500000 +v 1.454544 1.750000 -0.500000 +v -0.454544 3.250000 -0.500000 +v -0.454544 3.156250 -0.500000 +v 0.500000 2.406250 -1.454544 +v 0.500000 2.500000 -1.454544 +v 0.865288 2.218750 -1.381884 +v 0.865288 2.312500 -1.381884 +v 1.174965 2.031250 -1.174965 +v 1.174965 2.125000 -1.174965 +v -0.174964 2.781250 -1.174965 +v -0.174964 2.875000 -1.174965 +v 0.134712 2.593750 -1.381884 +v 0.134712 2.687500 -1.381884 +v -0.174964 2.781250 -1.174965 +v -0.174964 2.875000 -1.174965 +v -0.393354 2.990807 -0.858733 +v 1.416108 1.163409 -0.865139 +v -0.393354 2.292536 -0.858733 +v -0.416144 2.990807 -0.865053 +v -0.416144 2.292536 -0.865053 +v 1.416108 1.861680 -0.865139 +v -0.385395 2.990807 -0.877948 +v -0.385395 2.292536 -0.877948 +v -0.405979 2.990807 -0.889594 +v 1.393318 1.163409 -0.858819 +v -0.405979 2.292536 -0.889594 +v 0.134861 1.914229 -1.416108 +v 0.134861 2.612500 -1.416108 +v 1.393318 1.861680 -0.858819 +v 0.141181 1.914229 -1.393318 +v 0.141181 2.612500 -1.393318 +v 0.110320 1.914229 -1.405943 +v 1.405943 1.163409 -0.889680 +v 0.110320 2.612500 -1.405943 +v 0.121966 1.914229 -1.385359 +v 0.121966 2.612500 -1.385359 +v 1.405943 1.861680 -0.889680 +v 0.858733 2.238201 -1.393354 +v 0.858733 1.539931 -1.393354 +v 0.865053 2.238201 -1.416144 +v 1.385359 1.163409 -0.878034 +v 0.865053 1.539931 -1.416144 +v 0.877948 2.238201 -1.385395 +v 0.877948 1.539931 -1.385395 +v 1.385359 1.861680 -0.878034 +v 0.889594 2.238201 -1.405979 +v 0.889594 1.539931 -1.405979 +v -0.188038 2.803904 -1.173331 +v -0.188038 2.105634 -1.173331 +v -0.206674 2.803904 -1.187892 +v -0.206674 2.105634 -1.187892 +v -0.173330 2.803904 -1.188037 +v -0.173330 2.105634 -1.188037 +v -0.187890 2.803904 -1.206674 +v -0.187890 2.105634 -1.206674 +v 0.513282 1.725410 -1.486106 +v 0.513282 2.423680 -1.486106 +v 0.510399 1.725410 -1.462632 +v 0.510399 2.423680 -1.462632 +v 0.486719 1.725410 -1.486107 +v 1.486107 0.978356 -0.513281 +v 0.486719 2.423680 -1.486107 +v 0.489601 1.725410 -1.462633 +v 0.489601 2.423680 -1.462633 +v 1.486107 1.676627 -0.513281 +v 1.173331 2.049256 -1.188038 +v 1.173331 1.350986 -1.188038 +v 1.187892 2.049256 -1.206674 +v 1.462633 0.978356 -0.510400 +v 1.187892 1.350986 -1.206674 +v 1.188036 2.049256 -1.173330 +v 1.188036 1.350986 -1.173330 +v 1.462633 1.676627 -0.510400 +v 1.206674 2.049256 -1.187890 +v 1.206674 1.350986 -1.187890 +v -0.486106 2.126793 -0.513282 +v -0.486106 3.176627 -0.513282 +v -0.462632 2.126793 -0.510399 +v -0.462632 3.176627 -0.510399 +v -0.486106 3.176627 -0.500001 +v -0.486106 2.126793 -0.500001 +v -0.462632 3.176627 -0.500000 +v -0.462632 2.126793 -0.500000 +v 1.486106 1.676627 -0.499999 +v 1.486106 0.978356 -0.499999 +v 1.462632 1.676627 -0.500000 +v 1.462632 0.978356 -0.500000 +v -0.452126 2.173668 -0.500000 +v -0.462632 2.173668 -0.500000 +v -0.452126 2.126793 -0.500000 +v -0.462632 2.126793 -0.500000 +v -0.452126 2.173668 -0.503906 +v -0.462632 2.126793 -0.500000 +v -0.462632 2.173668 -0.503906 +v -0.452126 2.126793 -0.500000 +v -0.452126 2.126793 -0.503906 +v -0.462632 2.173668 -0.500000 +v -0.462632 2.126793 -0.503906 +v -0.452126 2.173668 -0.500000 +v 0.500000 1.000000 -0.500000 +v 0.500000 1.093750 -0.500000 +v 1.174964 1.000000 -1.174964 +v 1.174964 1.093750 -1.174964 +v 1.381883 1.000000 -0.865288 +v 1.381883 1.093750 -0.865288 +v 1.454544 1.000000 -0.500000 +v 1.454544 1.093750 -0.500000 +v 0.500000 1.375000 -0.500000 +v 0.500000 1.468750 -0.500000 +v 0.500000 1.375000 -1.454544 +v 0.500000 1.468750 -1.454544 +v 0.865288 1.375000 -1.381883 +v 0.865288 1.468750 -1.381883 +v 1.174964 1.375000 -1.174964 +v 1.174964 1.468750 -1.174964 +v 0.500000 1.750000 -0.500000 +v 0.500000 1.843750 -0.500000 +v -0.174964 1.750000 -1.174964 +v -0.174964 1.843750 -1.174964 +v 0.134712 1.750000 -1.381883 +v 0.134712 1.843750 -1.381883 +v 0.500000 1.750000 -1.454544 +v 0.500000 1.843750 -1.454544 +v 0.500000 2.125000 -0.500000 +v 0.500000 2.218750 -0.500000 +v -0.454544 2.125000 -0.500000 +v -0.454544 2.218750 -0.500000 +v -0.381883 2.125000 -0.865288 +v -0.381883 2.218750 -0.865288 +v -0.174964 2.125000 -1.174964 +v -0.174964 2.218750 -1.174964 +vt 0.755440 0.425359 +vt 0.755440 0.000000 +vt 0.774542 0.000000 +vt 0.774542 0.425359 +vt 0.583371 0.400524 +vt 0.583371 0.825882 +vt 0.564867 0.825882 +vt 0.564867 0.400524 +vt 0.545260 0.825882 +vt 0.545260 0.400524 +vt 0.793643 0.000000 +vt 0.793643 0.425359 +vt 0.812745 0.000000 +vt 0.812745 0.425359 +vt 0.291737 0.401496 +vt 0.291737 0.826854 +vt 0.271999 0.826854 +vt 0.271999 0.401496 +vt 0.494730 0.766874 +vt 0.480280 0.781096 +vt 0.459844 0.780902 +vt 0.445393 0.766405 +vt 0.445393 0.746098 +vt 0.459844 0.731876 +vt 0.480280 0.732070 +vt 0.494730 0.746567 +vt 0.736338 0.425359 +vt 0.736338 0.000000 +vt 0.253689 0.826854 +vt 0.253689 0.401496 +vt 0.529689 0.731876 +vt 0.544169 0.746128 +vt 0.544169 0.766442 +vt 0.529689 0.780919 +vt 0.509210 0.781079 +vt 0.494730 0.766827 +vt 0.494730 0.746513 +vt 0.509210 0.732036 +vt 0.904401 0.434474 +vt 0.929778 0.425359 +vt 0.924746 0.566871 +vt 0.899369 0.575986 +vt 0.929778 0.735522 +vt 0.904401 0.744637 +vt 0.903288 0.008862 +vt 0.928757 0.000000 +vt 0.924561 0.147827 +vt 0.899091 0.156688 +vt 0.928757 0.319018 +vt 0.903288 0.327880 +vt 0.984512 0.139544 +vt 0.959166 0.148743 +vt 0.964454 0.009199 +vt 0.989799 0.000000 +vt 0.989799 0.307304 +vt 0.964454 0.316503 +vt 0.869425 0.319020 +vt 0.843956 0.327882 +vt 0.839759 0.156690 +vt 0.865229 0.147828 +vt 0.843956 0.008862 +vt 0.869425 0.000000 +vt 0.933790 0.009115 +vt 0.959166 0.000000 +vt 0.954134 0.141512 +vt 0.928757 0.150627 +vt 0.959166 0.310163 +vt 0.933790 0.319278 +vt 0.873900 0.434221 +vt 0.899369 0.425359 +vt 0.895172 0.573186 +vt 0.869703 0.582047 +vt 0.899369 0.744377 +vt 0.873900 0.753239 +vt 0.955123 0.564903 +vt 0.929778 0.574102 +vt 0.935065 0.434558 +vt 0.960411 0.425359 +vt 0.960411 0.732663 +vt 0.935066 0.741862 +vt 0.899091 0.319020 +vt 0.873622 0.327882 +vt 0.869425 0.156690 +vt 0.894895 0.147828 +vt 0.873622 0.008862 +vt 0.899091 0.000000 +vt 0.586630 0.991029 +vt 0.583473 0.842126 +vt 0.608903 0.851097 +vt 0.612059 1.000000 +vt 0.586630 0.675892 +vt 0.612059 0.684863 +vt 0.777462 0.731425 +vt 0.769679 0.589583 +vt 0.795238 0.598190 +vt 0.803021 0.740033 +vt 0.769679 0.425359 +vt 0.795238 0.433966 +vt 0.985821 0.600254 +vt 0.989204 0.747672 +vt 0.963794 0.738648 +vt 0.960411 0.591231 +vt 0.989204 0.434383 +vt 0.963794 0.425359 +vt 0.861921 0.433966 +vt 0.861921 0.598190 +vt 0.836362 0.589583 +vt 0.836362 0.425359 +vt 0.869703 0.740034 +vt 0.844144 0.731427 +vt 0.615216 0.991029 +vt 0.612059 0.842126 +vt 0.637489 0.851097 +vt 0.640645 1.000000 +vt 0.615216 0.675892 +vt 0.640645 0.684863 +vt 0.761897 0.433966 +vt 0.769679 0.575809 +vt 0.744120 0.567202 +vt 0.769679 0.740033 +vt 0.744120 0.731425 +vt 0.732954 0.849963 +vt 0.736338 0.997380 +vt 0.710928 0.988356 +vt 0.707544 0.840939 +vt 0.736338 0.684091 +vt 0.710928 0.675067 +vt 0.810803 0.731427 +vt 0.810803 0.567203 +vt 0.836362 0.575810 +vt 0.836362 0.740034 +vt 0.803021 0.425359 +vt 0.828580 0.433966 +vt 0.291737 0.764230 +vt 0.306563 0.764230 +vt 0.306563 0.790815 +vt 0.291737 0.790815 +vt 0.342703 0.568727 +vt 0.362317 0.568941 +vt 0.393670 0.730515 +vt 0.375408 0.737645 +vt 0.151370 0.568769 +vt 0.170774 0.567980 +vt 0.201790 0.725295 +vt 0.184246 0.733399 +vt 0.685371 0.168918 +vt 0.704985 0.168704 +vt 0.736338 0.329597 +vt 0.718358 0.337122 +vt 0.083405 0.401496 +vt 0.100950 0.409600 +vt 0.069934 0.566915 +vt 0.050530 0.566126 +vt 0.350678 0.737645 +vt 0.370325 0.737645 +vt 0.370325 0.764230 +vt 0.350678 0.764230 +vt 0.583473 0.168610 +vt 0.603081 0.168827 +vt 0.634422 0.330834 +vt 0.616152 0.337946 +vt 0.718076 0.000000 +vt 0.736338 0.007130 +vt 0.494730 0.567430 +vt 0.514176 0.566696 +vt 0.545260 0.723818 +vt 0.527642 0.731876 +vt 0.183482 0.401496 +vt 0.201790 0.408142 +vt 0.476417 0.400524 +vt 0.494730 0.407224 +vt 0.463646 0.566696 +vt 0.444200 0.567430 +vt 0.375690 0.400524 +vt 0.393670 0.408048 +vt 0.291737 0.568727 +vt 0.311351 0.568941 +vt 0.342703 0.730515 +vt 0.324441 0.737645 +vt 0.685371 0.506864 +vt 0.704985 0.506650 +vt 0.736338 0.667543 +vt 0.718358 0.675067 +vt 0.238307 0.786569 +vt 0.223219 0.786569 +vt 0.223219 0.759984 +vt 0.238307 0.759984 +vt 0.769830 0.793202 +vt 0.755937 0.793202 +vt 0.755937 0.766618 +vt 0.769830 0.766618 +vt 0.667101 0.337946 +vt 0.685371 0.345057 +vt 0.654029 0.507065 +vt 0.634422 0.507282 +vt 0.331031 0.737645 +vt 0.331031 0.764230 +vt 0.494730 0.723818 +vt 0.477112 0.731876 +vt 0.326211 0.764230 +vt 0.340103 0.764230 +vt 0.340103 0.790815 +vt 0.326211 0.790815 +vt 0.718076 0.337946 +vt 0.736338 0.345076 +vt 0.324724 0.400524 +vt 0.342703 0.408048 +vt 0.736338 0.740033 +vt 0.755937 0.740033 +vt 0.736338 0.766618 +vt 0.223219 0.733399 +vt 0.238307 0.733399 +vt 0.426582 0.400524 +vt 0.444200 0.408582 +vt 0.413116 0.565704 +vt 0.393670 0.564969 +vt 0.685371 0.668379 +vt 0.667412 0.675892 +vt 0.634422 0.345057 +vt 0.603081 0.507065 +vt 0.583473 0.507282 +vt 0.384218 0.764230 +vt 0.384218 0.790815 +vt 0.370325 0.790815 +vt 0.364571 0.764230 +vt 0.364571 0.790815 +vt 0.350678 0.790815 +vt 0.795072 0.766618 +vt 0.775504 0.766618 +vt 0.775504 0.740033 +vt 0.795072 0.740033 +vt 0.444200 0.725176 +vt 0.425887 0.731876 +vt 0.389925 0.737645 +vt 0.389925 0.764230 +vt 0.100950 0.566126 +vt 0.120354 0.566915 +vt 0.151370 0.726753 +vt 0.133061 0.733400 +vt 0.634422 0.668379 +vt 0.616463 0.675892 +vt 0.667412 0.000000 +vt 0.685371 0.007513 +vt 0.654029 0.168827 +vt 0.634422 0.168610 +vt 0.311384 0.764230 +vt 0.291737 0.737645 +vt 0.311384 0.737645 +vt 0.032912 0.401496 +vt 0.050530 0.409554 +vt 0.019446 0.566676 +vt 0.000000 0.565941 +vt 0.201790 0.568769 +vt 0.221194 0.567980 +vt 0.252210 0.725295 +vt 0.234666 0.733399 +vt 0.311384 0.790815 +vt 0.050530 0.726148 +vt 0.032217 0.732848 +vt 0.685371 0.330834 +vt 0.133826 0.401496 +vt 0.151370 0.409600 +vt 0.100950 0.726753 +vt 0.082641 0.733399 +vt 0.233902 0.401496 +vt 0.252210 0.408142 +vt 0.526947 0.400524 +vt 0.545260 0.407224 +vt 0.616463 0.000000 +vt 0.634422 0.007513 +vt 0.100950 0.733399 +vt 0.110801 0.733399 +vt 0.110801 0.931410 +vt 0.100950 0.931410 +vt 0.021214 0.930858 +vt 0.010607 0.930859 +vt 0.010607 0.732848 +vt 0.021214 0.732848 +vt 0.156792 0.931410 +vt 0.156792 0.733399 +vt 0.165097 0.733399 +vt 0.165097 0.931410 +vt 0.184960 0.931410 +vt 0.184960 0.733399 +vt 0.193265 0.733399 +vt 0.193265 0.931410 +vt 0.147895 0.931410 +vt 0.147895 0.733399 +vt 0.000000 0.930859 +vt 0.000000 0.732848 +vt 0.120365 0.733399 +vt 0.120365 0.931410 +vt 0.129679 0.733399 +vt 0.138905 0.733399 +vt 0.138905 0.931410 +vt 0.129679 0.931410 +vt 0.408029 0.731876 +vt 0.418304 0.731876 +vt 0.418304 0.929886 +vt 0.408029 0.929886 +vt 0.031431 0.930858 +vt 0.031431 0.732848 +vt 0.040013 0.732848 +vt 0.040013 0.930858 +vt 0.091314 0.733399 +vt 0.091314 0.931410 +vt 0.050530 0.733399 +vt 0.060698 0.733399 +vt 0.060698 0.931410 +vt 0.050530 0.931410 +vt 0.201790 0.733399 +vt 0.201790 0.931410 +vt 0.090840 0.733399 +vt 0.090840 0.931410 +vt 0.080990 0.931410 +vt 0.080990 0.733399 +vt 0.210687 0.733399 +vt 0.210687 0.931410 +vt 0.429819 0.929886 +vt 0.429819 0.731876 +vt 0.401125 0.929886 +vt 0.401125 0.731876 +vt 0.070844 0.931410 +vt 0.070844 0.733400 +vt 0.173215 0.931410 +vt 0.173215 0.733399 +vt 0.393670 0.929886 +vt 0.393670 0.731876 +vt 0.252210 0.931410 +vt 0.244155 0.931410 +vt 0.244155 0.733399 +vt 0.252210 0.733399 +vt 0.238428 0.931410 +vt 0.238428 0.733399 +vt 0.218742 0.931410 +vt 0.218742 0.733399 +vt 0.223219 0.931410 +vt 0.040322 0.732848 +vt 0.050530 0.732848 +vt 0.050530 0.930858 +vt 0.040322 0.930858 +vt 0.176841 0.733399 +vt 0.176841 0.931410 +vt 0.436602 0.731876 +vt 0.436602 0.929886 +vt 0.444200 0.731876 +vt 0.444200 0.929886 +vt 0.999350 0.723063 +vt 0.989204 0.723063 +vt 0.989204 0.425359 +vt 0.999350 0.425359 +vt 0.995516 0.297704 +vt 0.995516 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.297704 +vt 0.989799 0.297704 +vt 0.697398 0.675067 +vt 0.707544 0.675067 +vt 0.707544 0.972771 +vt 0.697398 0.972771 +vt 0.385464 0.764230 +vt 0.389958 0.764230 +vt 0.389958 0.774104 +vt 0.384218 0.774104 +vt 0.370325 0.774104 +vt 0.364585 0.774104 +vt 0.369080 0.764230 +vt 0.344644 0.764230 +vt 0.344644 0.777523 +vt 0.340103 0.777523 +vt 0.311384 0.777523 +vt 0.306843 0.777523 +vt 0.306843 0.764230 +vt 0.346137 0.764230 +vt 0.350678 0.777523 +vt 0.346137 0.777523 +vt 0.695714 0.688360 +vt 0.697402 0.688360 +vt 0.697402 0.692779 +vt 0.695714 0.692779 +vt 0.695714 0.675067 +vt 0.697398 0.697187 +vt 0.695710 0.697187 +vt 0.038060 0.191342 +vt 0.000000 0.000000 +vt 0.500000 0.000000 +vt 0.146447 0.353554 +vt 0.038060 0.808658 +vt 0.146447 0.646446 +vt 0.500000 1.000000 +vt 0.000000 1.000000 +vt 0.667659 0.962991 +vt 0.640645 0.962991 +vt 0.640645 0.675892 +vt 0.667659 0.675892 +vt 0.694674 0.675892 +vt 0.694673 0.801164 +vt 0.667659 0.801164 +vt 0.694674 0.954012 +vt 0.667659 0.954012 +vt 0.839759 0.000000 +vt 0.839759 0.406024 +vt 0.812745 0.406024 +vt 0.308658 0.461940 +vt 0.500000 0.500000 +vt 0.308658 0.538060 +vt 0.691342 0.461940 +vt 0.853554 0.353553 +vt 0.691342 0.538060 +vt 0.853554 0.646447 +vt 0.961940 0.191342 +vt 0.961940 0.808658 +vt 1.000000 1.000000 +vn 0.000000 -0.630200 0.776400 +vn 0.000000 0.630200 0.776400 +vn -0.549000 0.630200 0.549000 +vn -0.549000 -0.630200 0.549000 +vn -0.776400 0.630200 0.000000 +vn -0.776400 -0.630200 0.000000 +vn -0.549000 0.630200 -0.549000 +vn -0.549000 -0.630200 -0.549000 +vn 0.000000 0.630200 -0.776400 +vn 0.000000 -0.630200 -0.776400 +vn 0.549000 0.630200 -0.549000 +vn 0.549000 -0.630200 -0.549000 +vn 0.776400 0.630200 0.000000 +vn 0.776400 -0.630200 0.000000 +vn 0.549000 0.630200 0.549000 +vn 0.549000 -0.630200 0.549000 +vn -0.074700 -0.413700 0.907300 +vn -0.093700 0.711900 0.696000 +vn -0.790400 0.610100 0.055100 +vn -0.597800 -0.610100 0.520000 +vn -0.694400 0.413700 -0.588700 +vn -0.558400 -0.711900 -0.425900 +vn 0.907300 -0.413700 0.074700 +vn 0.696000 0.711900 0.093700 +vn 0.055100 0.610100 0.790400 +vn 0.520000 -0.610100 0.597800 +vn -0.588700 0.413700 0.694400 +vn -0.425900 -0.711900 0.558400 +vn 0.790400 -0.610100 0.055100 +vn 0.597800 0.610100 0.520000 +vn 0.074700 0.413700 0.907300 +vn 0.093700 -0.711900 0.696000 +vn 0.694400 -0.413700 -0.588700 +vn 0.558400 0.711900 -0.425900 +vn 0.588700 -0.413700 0.694400 +vn 0.425900 0.711900 0.558400 +vn -0.520000 0.610100 0.597800 +vn -0.055100 -0.610100 0.790400 +vn -0.907300 0.413700 0.074700 +vn -0.696000 -0.711900 0.093700 +vn 0.886800 -0.429800 0.169900 +vn 0.742000 -0.665300 0.081800 +vn 0.466800 0.665300 -0.582500 +vn 0.713200 0.698000 -0.063900 +vn 0.549500 -0.698000 -0.459200 +vn 0.506900 0.429800 -0.747200 +vn 0.169900 -0.429800 -0.886800 +vn 0.081800 -0.665300 -0.742000 +vn -0.582500 0.665300 -0.466800 +vn -0.063900 0.698000 -0.713200 +vn -0.459200 -0.698000 -0.549500 +vn -0.747200 0.429800 -0.506900 +vn -0.466800 -0.665300 -0.582500 +vn -0.713200 -0.698000 -0.063900 +vn -0.886800 0.429800 0.169900 +vn -0.742000 0.665300 0.081800 +vn -0.506900 -0.429800 -0.747200 +vn -0.549500 0.698000 -0.459200 +vn 0.747200 -0.429800 -0.506900 +vn 0.582500 -0.665300 -0.466800 +vn -0.081800 0.665300 -0.742000 +vn 0.459200 0.698000 -0.549500 +vn 0.063900 -0.698000 -0.713200 +vn -0.169900 0.429800 -0.886800 +vn 0.438400 0.000000 -0.898800 +vn -0.898800 0.000000 -0.438400 +vn -0.438400 0.000000 0.898800 +vn 0.945500 0.000000 0.325600 +vn 0.325600 0.000000 -0.945500 +vn -0.325600 0.000000 -0.945500 +vn 0.898800 0.000000 -0.438400 +vn -0.325600 0.000000 0.945500 +vn -0.945500 0.000000 0.325600 +vn 0.438400 0.000000 0.898800 +vn 0.325600 0.000000 0.945500 +vn -0.438400 0.000000 -0.898800 +vn -0.749000 0.000000 0.662600 +vn 0.748900 0.000000 0.662700 +vn -0.662600 0.000000 -0.749000 +vn 0.662700 0.000000 -0.748900 +vn 0.061100 0.000000 -0.998100 +vn 0.998100 0.000000 -0.061000 +vn 0.607900 -0.584000 0.537900 +vn -0.662700 0.000000 0.748900 +vn -0.543900 -0.571200 0.614700 +vn -0.998100 0.000000 -0.061100 +vn 0.061000 0.000000 0.998100 +vn -0.577300 -0.577300 -0.577300 +vn -0.707100 0.000000 -0.707100 +vn 0.577300 -0.577300 -0.577300 +vn 0.707100 0.000000 -0.707100 +vn -0.061100 0.000000 0.998100 +vn -0.061000 0.000000 -0.998100 +vn -0.608000 -0.584000 0.537800 +vn 0.543800 -0.571200 0.614800 +vn 0.662600 0.000000 0.749000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.707100 -0.707100 +vn 0.000000 -0.707100 -0.707100 +vn -0.577300 0.577300 -0.577300 +vn 0.000000 0.707100 0.707100 +vn -0.577300 0.577300 0.577300 +vn -0.577300 -0.577300 0.577300 +vn 0.000000 -0.707100 0.707100 +vn -0.689400 -0.665700 0.285500 +vn -0.636300 -0.567700 -0.522200 +vn 0.773400 -0.546900 -0.320400 +vn -0.080700 -0.567700 0.819200 +vn -0.689400 0.665700 0.285500 +vn -0.080700 0.567700 0.819200 +vn 0.773400 0.546900 -0.320400 +vn -0.636300 0.567700 -0.522200 +vn -0.285500 -0.665700 0.689400 +vn -0.819200 -0.567700 0.080700 +vn 0.320400 -0.546900 -0.773400 +vn 0.522200 -0.567700 0.636300 +vn -0.285500 0.665700 0.689400 +vn 0.522200 0.567700 0.636300 +vn 0.320400 0.546900 -0.773400 +vn -0.819200 0.567700 0.080700 +vn 0.285500 -0.665700 0.689400 +vn -0.522200 -0.567700 0.636300 +vn -0.320400 -0.546900 -0.773400 +vn 0.819200 -0.567700 0.080700 +vn 0.285500 0.665700 0.689400 +vn 0.819200 0.567700 0.080700 +vn -0.320400 0.546900 -0.773400 +vn -0.522200 0.567700 0.636300 +vn 0.689400 -0.665700 0.285500 +vn 0.080700 -0.567700 0.819200 +vn -0.773400 -0.546900 -0.320400 +vn 0.636300 -0.567700 -0.522200 +vn 0.689400 0.665700 0.285500 +vn 0.636300 0.567700 -0.522200 +vn -0.773400 0.546900 -0.320400 +vn 0.080700 0.567700 0.819200 +vn 0.074700 -0.413700 -0.907300 +vn 0.093700 0.711900 -0.696000 +vn 0.790400 0.610100 -0.055100 +vn 0.597800 -0.610100 -0.520000 +vn 0.694400 0.413700 0.588700 +vn 0.558400 -0.711900 0.425900 +vn -0.907300 -0.413700 -0.074700 +vn -0.696000 0.711900 -0.093700 +vn -0.055100 0.610100 -0.790400 +vn -0.520000 -0.610100 -0.597800 +vn 0.588700 0.413700 -0.694400 +vn 0.425900 -0.711900 -0.558400 +vn -0.790400 -0.610100 -0.055100 +vn -0.597800 0.610100 -0.520000 +vn -0.074700 0.413700 -0.907300 +vn -0.093700 -0.711900 -0.696000 +vn -0.694400 -0.413700 0.588700 +vn -0.558400 0.711900 0.425900 +vn -0.588700 -0.413700 -0.694400 +vn -0.425900 0.711900 -0.558400 +vn 0.520000 0.610100 -0.597800 +vn 0.055100 -0.610100 -0.790400 +vn 0.907300 0.413700 -0.074700 +vn 0.696000 -0.711900 -0.093700 +vn -0.886800 -0.429800 -0.169900 +vn -0.742000 -0.665300 -0.081800 +vn -0.466800 0.665300 0.582500 +vn -0.713200 0.698000 0.063900 +vn -0.549500 -0.698000 0.459200 +vn -0.506900 0.429800 0.747200 +vn -0.169900 -0.429800 0.886800 +vn -0.081800 -0.665300 0.742000 +vn 0.582500 0.665300 0.466800 +vn 0.063900 0.698000 0.713200 +vn 0.459200 -0.698000 0.549500 +vn 0.747200 0.429800 0.506900 +vn 0.466800 -0.665300 0.582500 +vn 0.713200 -0.698000 0.063900 +vn 0.886800 0.429800 -0.169900 +vn 0.742000 0.665300 -0.081800 +vn 0.506900 -0.429800 0.747200 +vn 0.549500 0.698000 0.459200 +vn -0.747200 -0.429800 0.506900 +vn -0.582500 -0.665300 0.466800 +vn 0.081800 0.665300 0.742000 +vn -0.459200 0.698000 0.549500 +vn -0.063900 -0.698000 0.713200 +vn 0.169900 0.429800 0.886800 +vn 0.898800 0.000000 0.438400 +vn -0.945500 0.000000 -0.325600 +vn -0.898800 0.000000 0.438400 +vn 0.945500 0.000000 -0.325600 +vn 0.749000 0.000000 -0.662600 +vn -0.748900 0.000000 -0.662700 +vn -0.998100 0.000000 0.061000 +vn -0.607900 -0.584000 -0.537900 +vn 0.543900 -0.571200 -0.614700 +vn 0.998100 0.000000 0.061100 +vn 0.577300 -0.577300 0.577300 +vn 0.707100 0.000000 0.707100 +vn -0.707100 0.000000 0.707100 +vn 0.608000 -0.584000 -0.537800 +vn -0.543800 -0.571200 -0.614800 +vn 0.000000 0.000000 -1.000000 +vn 0.577300 0.577300 0.577300 +vn 0.577300 0.577300 -0.577300 +vn 0.689400 -0.665700 -0.285500 +vn 0.636300 -0.567700 0.522200 +vn -0.773400 -0.546900 0.320400 +vn 0.080700 -0.567700 -0.819200 +vn 0.689400 0.665700 -0.285500 +vn 0.080700 0.567700 -0.819200 +vn -0.773400 0.546900 0.320400 +vn 0.636300 0.567700 0.522200 +vn 0.285500 -0.665700 -0.689400 +vn 0.819200 -0.567700 -0.080700 +vn -0.320400 -0.546900 0.773400 +vn -0.522200 -0.567700 -0.636300 +vn 0.285500 0.665700 -0.689400 +vn -0.522200 0.567700 -0.636300 +vn -0.320400 0.546900 0.773400 +vn 0.819200 0.567700 -0.080700 +vn -0.285500 -0.665700 -0.689400 +vn 0.522200 -0.567700 -0.636300 +vn 0.320400 -0.546900 0.773400 +vn -0.819200 -0.567700 -0.080700 +vn -0.285500 0.665700 -0.689400 +vn -0.819200 0.567700 -0.080700 +vn 0.320400 0.546900 0.773400 +vn 0.522200 0.567700 -0.636300 +vn -0.689400 -0.665700 -0.285500 +vn -0.080700 -0.567700 -0.819200 +vn 0.773400 -0.546900 0.320400 +vn -0.636300 -0.567700 0.522200 +vn -0.689400 0.665700 -0.285500 +vn -0.636300 0.567700 0.522200 +vn 0.773400 0.546900 0.320400 +vn -0.080700 0.567700 -0.819200 +g Cylinder_Cylinder_None +s 1 +f 1/1/1 2/2/2 4/3/3 3/4/4 +f 3/5/4 4/6/3 6/7/5 5/8/6 +f 5/8/6 6/7/5 8/9/7 7/10/8 +f 7/4/8 8/3/7 10/11/9 9/12/10 +f 9/12/10 10/11/9 12/13/11 11/14/12 +f 11/15/12 12/16/11 14/17/13 13/18/14 +f 4/19/3 2/20/2 16/21/15 14/22/13 12/23/11 10/24/9 8/25/7 6/26/5 +f 15/27/16 16/28/15 2/2/2 1/1/1 +f 13/18/14 14/17/13 16/29/15 15/30/16 +f 1/31/1 3/32/4 5/33/6 7/34/8 9/35/10 11/36/12 13/37/14 15/38/16 +f 21/39/17 22/40/18 24/41/19 23/42/20 +f 23/42/20 24/41/19 26/43/21 25/44/22 +f 35/45/23 36/46/24 38/47/25 37/48/26 +f 37/48/26 38/47/25 19/49/27 20/50/28 +f 18/51/29 17/52/30 40/53/31 39/54/32 +f 28/55/33 27/56/34 17/52/30 18/51/29 +f 29/57/35 30/58/36 32/59/37 31/60/38 +f 31/60/38 32/59/37 34/61/39 33/62/40 +f 45/63/17 46/64/18 48/65/19 47/66/20 +f 47/66/20 48/65/19 50/67/21 49/68/22 +f 59/69/23 60/70/24 62/71/25 61/72/26 +f 61/72/26 62/71/25 43/73/27 44/74/28 +f 42/75/29 41/76/30 64/77/31 63/78/32 +f 52/79/33 51/80/34 41/76/30 42/75/29 +f 53/81/35 54/82/36 56/83/37 55/84/38 +f 55/84/38 56/83/37 58/85/39 57/86/40 +f 69/87/41 71/88/42 72/89/43 70/90/44 +f 71/88/42 73/91/45 74/92/46 72/89/43 +f 83/93/47 85/94/48 86/95/49 84/96/50 +f 85/94/48 68/97/51 67/98/52 86/95/49 +f 66/99/53 87/100/54 88/101/55 65/102/56 +f 76/103/57 66/99/53 65/102/56 75/104/58 +f 77/105/59 79/106/60 80/107/61 78/108/62 +f 79/106/60 81/109/63 82/110/64 80/107/61 +f 93/111/41 95/112/42 96/113/43 94/114/44 +f 95/112/42 97/115/45 98/116/46 96/113/43 +f 107/117/47 109/118/48 110/119/49 108/27/50 +f 109/118/48 92/120/51 91/121/52 110/119/49 +f 90/122/53 111/123/54 112/124/55 89/125/56 +f 100/126/57 90/122/53 89/125/56 99/127/58 +f 101/128/59 103/129/60 104/130/61 102/131/62 +f 103/129/60 105/132/63 106/133/64 104/130/61 +f 58/134/39 106/135/64 105/136/63 57/137/40 +f 31/138/38 79/139/60 77/140/59 29/141/35 +f 48/142/19 96/143/43 98/144/46 50/145/21 +f 37/146/26 85/147/48 83/148/47 35/149/23 +f 51/150/34 99/151/58 89/152/56 41/153/30 +f 26/154/21 74/155/46 73/156/45 25/157/22 +f 62/158/25 110/159/49 91/160/52 43/161/27 +f 20/162/28 68/163/51 85/147/48 37/146/26 +f 18/164/29 66/165/53 76/166/57 28/167/33 +f 46/168/18 94/169/44 96/143/43 48/142/19 +f 63/170/32 111/171/54 90/172/53 42/173/29 +f 33/174/40 81/175/63 79/139/60 31/138/38 +f 55/176/38 103/177/60 101/178/59 53/179/35 +f 61/180/26 109/181/48 107/182/47 59/183/23 +f 35/184/23 83/185/47 84/186/50 36/187/24 +f 21/188/17 69/189/41 70/190/44 22/191/18 +f 30/192/36 78/193/62 80/194/61 32/195/37 +f 50/196/21 98/154/46 97/157/45 49/197/22 +f 42/173/29 90/172/53 100/198/57 52/199/33 +f 40/200/31 88/201/55 87/202/54 39/203/32 +f 44/204/28 92/205/51 109/181/48 61/180/26 +f 57/206/40 105/207/63 103/177/60 55/176/38 +f 19/208/27 67/209/52 68/190/51 20/210/28 +f 59/211/23 107/212/47 108/187/50 60/186/24 +f 25/213/22 73/214/45 71/215/42 23/216/20 +f 32/195/37 80/194/61 82/217/64 34/218/39 +f 54/161/36 102/219/62 104/220/61 56/221/37 +f 45/156/17 93/222/41 94/223/44 46/224/18 +f 64/157/31 112/225/55 111/226/54 63/227/32 +f 29/228/35 77/229/59 78/230/62 30/231/36 +f 23/216/20 71/215/42 69/232/41 21/233/17 +f 43/155/27 91/234/52 92/235/51 44/156/28 +f 17/236/30 65/237/56 88/238/55 40/239/31 +f 56/221/37 104/220/61 106/240/64 58/241/39 +f 36/242/24 84/243/50 86/244/49 38/245/25 +f 28/246/33 76/134/57 75/247/58 27/248/34 +f 49/249/22 97/250/45 95/251/42 47/252/20 +f 24/253/19 72/254/43 74/255/46 26/256/21 +f 34/246/39 82/200/64 81/203/63 33/257/40 +f 53/229/35 101/190/59 102/209/62 54/230/36 +f 47/252/20 95/251/42 93/258/41 45/259/17 +f 38/245/25 86/244/49 67/260/52 19/192/27 +f 27/261/34 75/262/58 65/237/56 17/236/30 +f 41/153/30 89/152/56 112/263/55 64/264/31 +f 22/265/18 70/266/44 72/254/43 24/253/19 +f 52/197/33 100/246/57 99/248/58 51/196/34 +f 39/267/32 87/268/54 66/165/53 18/164/29 +f 60/269/24 108/270/50 110/159/49 62/158/25 +f 122/271/65 114/272/66 118/273/66 126/274/65 +f 124/275/67 129/276/68 131/277/68 125/278/67 +f 127/279/66 128/280/66 133/281/69 132/282/69 +f 141/283/70 140/284/70 135/285/71 136/286/71 +f 138/287/68 142/288/68 134/280/72 130/279/72 +f 144/276/73 139/289/74 137/290/74 143/277/73 +f 136/291/71 135/292/71 137/273/74 139/272/74 +f 141/293/70 144/294/73 143/295/73 140/296/70 +f 114/297/66 130/298/72 134/299/72 118/300/66 +f 122/301/65 126/302/65 142/303/68 138/304/68 +f 132/292/69 133/291/69 131/293/68 129/296/68 +f 127/305/66 124/271/67 125/274/67 128/306/66 +f 123/307/75 117/308/71 116/309/71 121/310/75 +f 120/311/73 119/312/73 113/286/76 115/285/76 +f 115/313/76 113/314/76 116/315/71 117/316/71 +f 120/311/73 123/317/75 121/318/75 119/312/73 +f 153/319/77 157/299/78 159/298/78 154/320/77 +f 155/295/79 156/294/79 161/288/80 160/287/80 +f 169/297/81 168/300/81 163/321/82 164/322/82 +f 166/316/83 170/315/78 162/323/84 158/324/85 +f 172/325/86 167/282/87 165/281/87 171/326/86 +f 164/322/82 163/321/82 165/327/87 167/328/87 +f 169/329/81 172/330/86 171/331/86 168/332/81 +f 182/330/88 158/333/85 162/334/84 181/331/89 +f 184/335/90 183/336/91 170/211/78 166/337/83 +f 160/275/80 161/278/80 159/302/78 157/301/78 +f 155/338/79 153/339/77 154/340/77 156/341/79 +f 152/342/92 148/284/82 147/283/82 151/343/92 +f 150/344/86 149/345/86 145/319/93 146/320/93 +f 146/336/93 145/335/93 147/318/82 148/317/82 +f 150/344/86 152/346/92 151/347/92 149/345/86 +f 175/348/94 173/349/95 174/350/96 176/351/77 +f 175/352/94 176/353/77 179/354/89 180/355/88 +f 173/54/95 178/353/90 177/352/91 174/356/96 +f 182/309/88 181/308/89 183/324/91 184/323/90 +f 179/357/89 177/358/91 178/359/90 180/360/88 +f 175/361/94 180/362/88 178/363/90 173/364/95 +f 158/365/85 182/366/88 184/225/90 166/367/83 +f 186/201/97 185/368/97 187/369/97 188/370/97 +f 194/246/98 190/371/99 192/372/88 196/373/100 +f 191/374/101 189/157/102 193/375/103 195/376/104 +f 190/377/99 195/378/104 193/379/103 192/380/88 +f 192/378/88 193/377/103 189/381/102 196/357/100 +f 196/380/100 189/379/102 191/382/101 194/383/98 +f 201/384/105 203/385/106 197/386/107 +f 199/387/108 201/384/105 197/386/107 +f 202/388/109 200/389/110 198/390/111 +f 204/391/112 202/388/109 198/390/111 +f 197/392/107 198/393/111 200/394/110 199/395/108 +f 199/395/108 200/396/110 202/397/109 201/398/105 +f 201/398/105 202/397/109 204/399/112 203/400/106 +f 197/401/107 203/402/106 204/403/112 198/13/111 +f 209/404/113 211/387/114 205/386/115 +f 207/405/116 209/404/113 205/386/115 +f 210/406/117 208/405/118 206/390/119 +f 212/389/120 210/406/117 206/390/119 +f 205/392/115 206/393/119 208/394/118 207/395/116 +f 207/395/116 208/396/118 210/397/117 209/398/113 +f 209/398/113 210/397/117 212/399/120 211/400/114 +f 205/401/115 211/402/114 212/403/120 206/13/119 +f 217/407/121 219/405/122 213/386/123 +f 215/408/124 217/407/121 213/386/123 +f 218/409/125 216/410/126 214/390/127 +f 220/405/128 218/409/125 214/390/127 +f 213/392/123 214/393/127 216/394/126 215/395/124 +f 215/395/124 216/396/126 218/397/125 217/398/121 +f 217/398/121 218/397/125 220/399/128 219/400/122 +f 213/401/123 219/402/122 220/403/128 214/13/127 +f 225/411/129 227/408/130 221/386/131 +f 223/354/132 225/411/129 221/386/131 +f 226/412/133 224/413/134 222/390/135 +f 228/410/136 226/412/133 222/390/135 +f 221/392/131 222/393/135 224/394/134 223/395/132 +f 223/395/132 224/396/134 226/397/133 225/398/129 +f 225/398/129 226/397/133 228/399/136 227/400/130 +f 221/401/131 227/402/130 228/403/136 222/13/135 +f 229/1/10 230/2/9 232/3/11 231/4/12 +f 231/5/12 232/6/11 234/7/13 233/8/14 +f 233/8/14 234/7/13 236/9/15 235/10/16 +f 235/4/16 236/3/15 238/11/2 237/12/1 +f 237/12/1 238/11/2 240/13/3 239/14/4 +f 239/15/4 240/16/3 242/17/5 241/18/6 +f 232/19/11 230/20/9 244/21/7 242/22/5 240/23/3 238/24/2 236/25/15 234/26/13 +f 243/27/8 244/28/7 230/2/9 229/1/10 +f 241/18/6 242/17/5 244/29/7 243/30/8 +f 229/31/10 231/32/12 233/33/14 235/34/16 237/35/1 239/36/4 241/37/6 243/38/8 +f 249/39/137 250/40/138 252/41/139 251/42/140 +f 251/42/140 252/41/139 254/43/141 253/44/142 +f 263/45/143 264/46/144 266/47/145 265/48/146 +f 265/48/146 266/47/145 247/49/147 248/50/148 +f 246/51/149 245/52/150 268/53/151 267/54/152 +f 256/55/153 255/56/154 245/52/150 246/51/149 +f 257/57/155 258/58/156 260/59/157 259/60/158 +f 259/60/158 260/59/157 262/61/159 261/62/160 +f 273/63/137 274/64/138 276/65/139 275/66/140 +f 275/66/140 276/65/139 278/67/141 277/68/142 +f 287/69/143 288/70/144 290/71/145 289/72/146 +f 289/72/146 290/71/145 271/73/147 272/74/148 +f 270/75/149 269/76/150 292/77/151 291/78/152 +f 280/79/153 279/80/154 269/76/150 270/75/149 +f 281/81/155 282/82/156 284/83/157 283/84/158 +f 283/84/158 284/83/157 286/85/159 285/86/160 +f 297/87/161 299/88/162 300/89/163 298/90/164 +f 299/88/162 301/91/165 302/92/166 300/89/163 +f 311/93/167 313/94/168 314/95/169 312/96/170 +f 313/94/168 296/97/171 295/98/172 314/95/169 +f 294/99/173 315/100/174 316/101/175 293/102/176 +f 304/103/177 294/99/173 293/102/176 303/104/178 +f 305/105/179 307/106/180 308/107/181 306/108/182 +f 307/106/180 309/109/183 310/110/184 308/107/181 +f 321/111/161 323/112/162 324/113/163 322/114/164 +f 323/112/162 325/115/165 326/116/166 324/113/163 +f 335/117/167 337/118/168 338/119/169 336/27/170 +f 337/118/168 320/120/171 319/121/172 338/119/169 +f 318/122/173 339/123/174 340/124/175 317/125/176 +f 328/126/177 318/122/173 317/125/176 327/127/178 +f 329/128/179 331/129/180 332/130/181 330/131/182 +f 331/129/180 333/132/183 334/133/184 332/130/181 +f 286/134/159 334/135/184 333/136/183 285/137/160 +f 259/138/158 307/139/180 305/140/179 257/141/155 +f 276/142/139 324/143/163 326/144/166 278/145/141 +f 265/146/146 313/147/168 311/148/167 263/149/143 +f 279/150/154 327/151/178 317/152/176 269/153/150 +f 254/154/141 302/155/166 301/156/165 253/157/142 +f 290/158/145 338/159/169 319/160/172 271/161/147 +f 248/162/148 296/163/171 313/147/168 265/146/146 +f 246/164/149 294/165/173 304/166/177 256/167/153 +f 274/168/138 322/169/164 324/143/163 276/142/139 +f 291/170/152 339/171/174 318/172/173 270/173/149 +f 261/174/160 309/175/183 307/139/180 259/138/158 +f 283/176/158 331/177/180 329/178/179 281/179/155 +f 289/180/146 337/181/168 335/182/167 287/183/143 +f 263/184/143 311/185/167 312/186/170 264/187/144 +f 249/188/137 297/189/161 298/190/164 250/191/138 +f 258/192/156 306/193/182 308/194/181 260/195/157 +f 278/196/141 326/154/166 325/157/165 277/197/142 +f 270/173/149 318/172/173 328/198/177 280/199/153 +f 268/200/151 316/201/175 315/202/174 267/203/152 +f 272/204/148 320/205/171 337/181/168 289/180/146 +f 285/206/160 333/207/183 331/177/180 283/176/158 +f 247/208/147 295/209/172 296/190/171 248/210/148 +f 287/211/143 335/212/167 336/187/170 288/186/144 +f 253/213/142 301/214/165 299/215/162 251/216/140 +f 260/195/157 308/194/181 310/217/184 262/218/159 +f 282/161/156 330/219/182 332/220/181 284/221/157 +f 273/156/137 321/222/161 322/223/164 274/224/138 +f 292/157/151 340/225/175 339/226/174 291/227/152 +f 257/228/155 305/229/179 306/230/182 258/231/156 +f 251/216/140 299/215/162 297/232/161 249/233/137 +f 271/155/147 319/234/172 320/235/171 272/156/148 +f 245/236/150 293/237/176 316/238/175 268/239/151 +f 284/221/157 332/220/181 334/240/184 286/241/159 +f 264/242/144 312/243/170 314/244/169 266/245/145 +f 256/246/153 304/134/177 303/247/178 255/248/154 +f 277/249/142 325/250/165 323/251/162 275/252/140 +f 252/253/139 300/254/163 302/255/166 254/256/141 +f 262/246/159 310/200/184 309/203/183 261/257/160 +f 281/229/155 329/190/179 330/209/182 282/230/156 +f 275/252/140 323/251/162 321/258/161 273/259/137 +f 266/245/145 314/244/169 295/260/172 247/192/147 +f 255/261/154 303/262/178 293/237/176 245/236/150 +f 269/153/150 317/152/176 340/263/175 292/264/151 +f 250/265/138 298/266/164 300/254/163 252/253/139 +f 280/197/153 328/246/177 327/248/178 279/196/154 +f 267/267/152 315/268/174 294/165/173 246/164/149 +f 288/269/144 336/270/170 338/159/169 290/158/145 +f 350/271/67 342/272/185 346/273/185 354/274/67 +f 352/275/65 357/276/186 359/277/186 353/278/65 +f 355/279/185 356/280/185 361/281/72 360/282/72 +f 369/283/75 368/284/75 363/285/187 364/286/187 +f 366/287/186 370/288/186 362/280/69 358/279/69 +f 372/276/188 367/289/76 365/290/76 371/277/188 +f 364/291/187 363/292/187 365/273/76 367/272/76 +f 369/293/75 372/294/188 371/295/188 368/296/75 +f 342/297/185 358/298/69 362/299/69 346/300/185 +f 350/301/67 354/302/67 370/303/186 366/304/186 +f 360/292/72 361/291/72 359/293/186 357/296/186 +f 355/305/185 352/271/65 353/274/65 356/306/185 +f 351/307/70 345/308/187 344/309/187 349/310/70 +f 348/311/188 347/312/188 341/286/74 343/285/74 +f 343/313/74 341/314/74 344/315/187 345/316/187 +f 348/311/188 351/317/70 349/318/70 347/312/188 +f 381/319/189 385/299/190 387/298/190 382/320/189 +f 383/295/96 384/294/96 389/288/84 388/287/84 +f 397/297/92 396/300/92 391/321/191 392/322/191 +f 394/316/192 398/315/190 390/323/80 386/324/193 +f 400/325/194 395/282/93 393/281/93 399/326/194 +f 392/322/191 391/321/191 393/327/93 395/328/93 +f 397/329/92 400/330/194 399/331/194 396/332/92 +f 410/330/195 386/333/193 390/334/80 409/331/196 +f 412/335/103 411/336/197 398/211/190 394/337/192 +f 388/275/84 389/278/84 387/302/190 385/301/190 +f 383/338/96 381/339/189 382/340/189 384/341/96 +f 380/342/81 376/284/191 375/283/191 379/343/81 +f 378/344/194 377/345/194 373/319/87 374/320/87 +f 374/336/87 373/335/87 375/318/191 376/317/191 +f 378/344/194 380/346/81 379/347/81 377/345/194 +f 403/348/198 401/349/199 402/350/79 404/351/189 +f 403/352/198 404/353/189 407/354/196 408/355/195 +f 401/54/199 406/353/103 405/352/197 402/356/79 +f 410/309/195 409/308/196 411/324/197 412/323/103 +f 407/357/196 405/358/197 406/359/103 408/360/195 +f 403/361/198 408/362/195 406/363/103 401/364/199 +f 386/365/193 410/366/195 412/225/103 394/367/192 +f 414/201/200 413/368/200 415/369/200 416/370/200 +f 422/246/101 418/371/104 420/372/195 424/373/201 +f 419/374/98 417/157/202 421/375/90 423/376/99 +f 418/377/104 423/378/99 421/379/90 420/380/195 +f 420/378/195 421/377/90 417/381/202 424/357/201 +f 424/380/201 417/379/202 419/382/98 422/383/101 +f 429/384/203 431/385/204 425/386/205 +f 427/387/206 429/384/203 425/386/205 +f 430/388/207 428/389/208 426/390/209 +f 432/391/210 430/388/207 426/390/209 +f 425/392/205 426/393/209 428/394/208 427/395/206 +f 427/395/206 428/396/208 430/397/207 429/398/203 +f 429/398/203 430/397/207 432/399/210 431/400/204 +f 425/401/205 431/402/204 432/403/210 426/13/209 +f 437/404/211 439/387/212 433/386/213 +f 435/405/214 437/404/211 433/386/213 +f 438/406/215 436/405/216 434/390/217 +f 440/389/218 438/406/215 434/390/217 +f 433/392/213 434/393/217 436/394/216 435/395/214 +f 435/395/214 436/396/216 438/397/215 437/398/211 +f 437/398/211 438/397/215 440/399/218 439/400/212 +f 433/401/213 439/402/212 440/403/218 434/13/217 +f 445/407/219 447/405/220 441/386/221 +f 443/408/222 445/407/219 441/386/221 +f 446/409/223 444/410/224 442/390/225 +f 448/405/226 446/409/223 442/390/225 +f 441/392/221 442/393/225 444/394/224 443/395/222 +f 443/395/222 444/396/224 446/397/223 445/398/219 +f 445/398/219 446/397/223 448/399/226 447/400/220 +f 441/401/221 447/402/220 448/403/226 442/13/225 +f 453/411/227 455/408/228 449/386/229 +f 451/354/230 453/411/227 449/386/229 +f 454/412/231 452/413/232 450/390/233 +f 456/410/234 454/412/231 450/390/233 +f 449/392/229 450/393/233 452/394/232 451/395/230 +f 451/395/230 452/396/232 454/397/231 453/398/227 +f 453/398/227 454/397/231 456/399/234 455/400/228 +f 449/401/229 455/402/228 456/403/234 450/13/233 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_standing_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_standing_lamp.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_table_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_table_lamp.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_table_small_round.obj b/mods/homedecor_modpack/homedecor/models/homedecor_table_small_round.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_table_small_square.obj b/mods/homedecor_modpack/homedecor/models/homedecor_table_small_square.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_toilet_paper.obj b/mods/homedecor_modpack/homedecor/models/homedecor_toilet_paper.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_trash_can.obj b/mods/homedecor_modpack/homedecor/models/homedecor_trash_can.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wall_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wall_lamp.obj index ff0d88e8..58965c02 100644 --- a/mods/homedecor_modpack/homedecor/models/homedecor_wall_lamp.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_wall_lamp.obj @@ -1,7 +1,189 @@ -# Blender v2.69 (sub 0) OBJ File: '' +# Blender v2.72 (sub 0) OBJ File: '' # www.blender.org mtllib homedecor_wall_lamp.mtl -o Cube_Lamp +o boulons_Cube_Lamp.003 +v -0.091794 -0.383579 0.447287 +v -0.091793 -0.383579 0.425256 +v -0.072714 -0.372564 0.425256 +v -0.072714 -0.372564 0.447287 +v -0.091794 -0.108200 0.447287 +v -0.091793 -0.108200 0.425256 +v -0.072714 -0.097185 0.425256 +v -0.072714 -0.097185 0.447287 +v 0.091793 -0.064139 0.447287 +v 0.091793 -0.064139 0.425257 +v 0.072714 -0.075155 0.425257 +v 0.072714 -0.075155 0.447287 +v 0.091793 -0.339519 0.447287 +v 0.091793 -0.339519 0.425257 +v 0.072714 -0.350534 0.425257 +v 0.072714 -0.350534 0.447287 +v -0.110873 -0.097185 0.447287 +v -0.110873 -0.097185 0.425256 +v 0.072714 -0.097185 0.425257 +v 0.072714 -0.097185 0.447287 +v -0.072714 -0.075155 0.425256 +v -0.072714 -0.075155 0.447287 +v -0.110873 -0.075155 0.447287 +v -0.110873 -0.075155 0.425256 +v 0.091793 -0.108200 0.425257 +v 0.091793 -0.108200 0.447287 +v -0.091793 -0.064139 0.425256 +v -0.091794 -0.064139 0.447287 +v 0.110872 -0.097185 0.425257 +v 0.110872 -0.097185 0.447287 +v 0.110872 -0.075155 0.447287 +v 0.110872 -0.075155 0.425257 +v -0.110873 -0.372564 0.447287 +v -0.110873 -0.372564 0.425256 +v 0.072714 -0.372564 0.425257 +v 0.072714 -0.372564 0.447287 +v -0.072714 -0.350534 0.425256 +v -0.072714 -0.350534 0.447287 +v -0.110873 -0.350534 0.447287 +v -0.110873 -0.350534 0.425256 +v 0.091793 -0.383579 0.425257 +v 0.091793 -0.383579 0.447287 +v -0.091793 -0.339519 0.425256 +v -0.091794 -0.339519 0.447287 +v 0.110872 -0.372564 0.425257 +v 0.110872 -0.372564 0.447288 +v 0.110872 -0.350534 0.447288 +v 0.110872 -0.350534 0.425257 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.500000 1.000000 +vt 0.933013 0.750000 +vt 0.933013 0.250000 +vt 0.500000 0.000000 +vt 0.066987 0.250000 +vt 0.066987 0.750000 +g boulons_Cube_Lamp.003_Lamp +usemtl Lamp +s off +f 1/1 2/2 3/3 4/4 +f 5/1 6/2 7/3 8/4 +f 9/1 10/2 11/3 12/4 +f 13/1 14/2 15/3 16/4 +f 17/1 18/2 6/3 5/4 +f 12/1 11/2 19/3 20/4 +f 8/1 7/2 21/3 22/4 +f 23/1 24/2 18/3 17/4 +f 20/1 19/2 25/3 26/4 +f 22/1 21/2 27/3 28/4 +f 28/1 27/2 24/3 23/4 +f 26/1 25/2 29/3 30/4 +f 31/1 32/2 10/3 9/4 +f 30/1 29/2 32/3 31/4 +f 33/1 34/2 2/3 1/4 +f 16/1 15/2 35/3 36/4 +f 4/1 3/2 37/3 38/4 +f 39/1 40/2 34/3 33/4 +f 36/1 35/2 41/3 42/4 +f 38/1 37/2 43/3 44/4 +f 44/1 43/2 40/3 39/4 +f 42/1 41/2 45/3 46/4 +f 47/1 48/2 14/3 13/4 +f 46/1 45/2 48/3 47/4 +f 34/5 40/6 43/7 37/8 3/9 2/10 +f 45/5 41/6 35/7 15/8 14/9 48/10 +f 18/5 24/6 27/7 21/8 7/9 6/10 +f 29/5 25/6 19/7 11/8 10/9 32/10 +o wood_Cube_Lamp.002 +v 0.000000 -0.417543 0.199446 +v 0.000000 -0.048534 0.199446 +v -0.027261 -0.048534 0.188153 +v -0.027261 -0.417543 0.188153 +v -0.038553 -0.048534 0.160893 +v -0.038553 -0.417543 0.160893 +v -0.027261 -0.048534 0.133632 +v -0.027261 -0.417543 0.133632 +v 0.000000 -0.048534 0.122340 +v 0.000000 -0.417543 0.122340 +v 0.027261 -0.048534 0.133632 +v 0.027261 -0.417543 0.133632 +v 0.038553 -0.048534 0.160893 +v 0.038553 -0.417543 0.160893 +v 0.027261 -0.417543 0.188153 +v 0.027261 -0.048534 0.188154 +v 0.000000 -0.435907 0.160893 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.110396 0.000000 +vt 0.110396 1.000000 +vt 0.188459 0.000000 +vt 0.188459 1.000000 +vt 0.565373 1.000000 +vt 0.565373 0.000000 +vt 0.675768 0.000000 +vt 0.675768 1.000000 +vt 0.753830 0.000000 +vt 0.753830 1.000000 +vt 0.376917 1.000000 +vt 0.376916 0.000000 +vt 0.487311 0.000000 +vt 0.487311 1.000000 +vt 0.266525 0.000000 +vt 0.266521 1.000000 +vt 0.753831 0.056545 +vt 0.825931 0.000000 +vt 0.850586 0.096524 +vt 0.753830 0.136506 +vt 0.825932 0.193048 +vt 0.927899 0.193048 +vt 1.000000 0.136505 +vt 1.000000 0.056542 +vt 0.927899 0.000003 +g wood_Cube_Lamp.002_Lamp +usemtl Lamp +s off +f 49/11 50/12 51/13 52/14 +f 52/14 51/13 53/15 54/16 +f 54/17 53/18 55/19 56/20 +f 56/20 55/19 57/21 58/22 +f 58/23 57/24 59/25 60/26 +f 60/26 59/25 61/18 62/17 +f 63/27 64/28 50/16 49/15 +f 62/24 61/23 64/28 63/27 +f 63/29 49/30 65/31 +f 62/32 63/29 65/31 +f 60/33 62/32 65/31 +f 58/34 60/33 65/31 +f 56/35 58/34 65/31 +f 54/36 56/35 65/31 +f 52/37 54/36 65/31 +f 49/30 52/37 65/31 +o light_Cube_Lamp.001 +v -0.079662 0.050537 0.215785 +v -0.079662 0.050537 0.106001 +v -0.079662 0.292408 0.215785 +v -0.079662 0.292408 0.106001 +v 0.079659 0.050537 0.106001 +v 0.079659 0.292408 0.106001 +v 0.079659 0.292408 0.215785 +v 0.079659 0.050537 0.215785 +v -0.054893 0.050537 0.081232 +v 0.054891 0.050537 0.081232 +v -0.054893 0.292408 0.081232 +v 0.054891 0.292408 0.081232 +v 0.054891 0.050537 0.240553 +v 0.054891 0.292408 0.240553 +v -0.054893 0.292408 0.240553 +v -0.054893 0.050537 0.240553 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +g light_Cube_Lamp.001_Lamp +usemtl Lamp +s off +f 67/38 66/39 68/40 69/41 +f 70/38 71/39 72/40 73/41 +f 75/38 74/39 76/40 77/41 +f 78/38 79/39 80/40 81/41 +o cage_Cube_Lamp v -0.109953 0.342520 0.050939 v -0.109953 0.342519 0.270846 v -0.039583 0.388416 0.200476 @@ -78,429 +260,82 @@ v 0.046179 -0.048431 0.207072 v 0.046179 -0.048431 0.114713 v -0.046181 -0.048431 0.114712 v -0.046181 -0.048431 0.207072 -v 0.000000 -0.417543 0.199446 -v 0.000000 -0.048534 0.199446 -v -0.027261 -0.048534 0.188153 -v -0.027261 -0.417543 0.188153 -v -0.038553 -0.048534 0.160893 -v -0.038553 -0.417543 0.160893 -v -0.027261 -0.048534 0.133632 -v -0.027261 -0.417543 0.133632 -v 0.000000 -0.048534 0.122340 -v 0.000000 -0.417543 0.122340 -v 0.027261 -0.048534 0.133632 -v 0.027261 -0.417543 0.133632 -v 0.038553 -0.048534 0.160893 -v 0.038553 -0.417543 0.160893 -v 0.027261 -0.417543 0.188153 -v 0.027261 -0.048534 0.188154 -v 0.000000 -0.490977 0.160893 -v -0.091794 -0.383579 0.447287 -v -0.091793 -0.383579 0.425256 -v -0.072714 -0.372564 0.425256 -v -0.072714 -0.372564 0.447287 -v -0.091794 -0.108200 0.447287 -v -0.091793 -0.108200 0.425256 -v -0.072714 -0.097185 0.425256 -v -0.072714 -0.097185 0.447287 -v 0.091793 -0.064139 0.447287 -v 0.091793 -0.064139 0.425257 -v 0.072714 -0.075155 0.425257 -v 0.072714 -0.075155 0.447287 -v 0.091793 -0.339519 0.447287 -v 0.091793 -0.339519 0.425257 -v 0.072714 -0.350534 0.425257 -v 0.072714 -0.350534 0.447287 -v -0.110873 -0.097185 0.447287 -v -0.110873 -0.097185 0.425256 -v 0.072714 -0.097185 0.425257 -v 0.072714 -0.097185 0.447287 -v -0.072714 -0.075155 0.425256 -v -0.072714 -0.075155 0.447287 -v -0.110873 -0.075155 0.447287 -v -0.110873 -0.075155 0.425256 -v 0.091793 -0.108200 0.425257 -v 0.091793 -0.108200 0.447287 -v -0.091793 -0.064139 0.425256 -v -0.091794 -0.064139 0.447287 -v 0.110872 -0.097185 0.425257 -v 0.110872 -0.097185 0.447287 -v 0.110872 -0.075155 0.447287 -v 0.110872 -0.075155 0.425257 -v -0.110873 -0.372564 0.447287 -v -0.110873 -0.372564 0.425256 -v 0.072714 -0.372564 0.425257 -v 0.072714 -0.372564 0.447287 -v -0.072714 -0.350534 0.425256 -v -0.072714 -0.350534 0.447287 -v -0.110873 -0.350534 0.447287 -v -0.110873 -0.350534 0.425256 -v 0.091793 -0.383579 0.425257 -v 0.091793 -0.383579 0.447287 -v -0.091793 -0.339519 0.425256 -v -0.091794 -0.339519 0.447287 -v 0.110872 -0.372564 0.425257 -v 0.110872 -0.372564 0.447288 -v 0.110872 -0.350534 0.447288 -v 0.110872 -0.350534 0.425257 v 0.000000 0.498568 0.160893 -vt 0.731468 0.552151 -vt 0.731468 0.847665 -vt 0.636904 0.753100 -vt 0.636904 0.646716 -vt 0.435955 0.552151 -vt 0.530519 0.646716 -vt 0.435955 0.847665 -vt 0.530519 0.753100 -vt 0.764539 0.019533 -vt 0.980914 0.019533 -vt 0.933408 0.064226 -vt 0.810023 0.064226 -vt 0.501251 0.366042 -vt 0.501251 0.322512 -vt 0.670058 0.322512 -vt 0.670058 0.366042 -vt 0.501251 0.260951 -vt 0.670058 0.260951 -vt 0.501251 0.427602 -vt 0.670058 0.427603 -vt 0.501251 0.471132 -vt 0.670058 0.471132 -vt 0.184057 0.301527 -vt 0.244719 0.301527 -vt 0.344538 0.442691 -vt 0.084239 0.442691 -vt 0.244719 0.215736 -vt 0.344538 0.074572 -vt 0.184057 0.215736 -vt 0.084238 0.074572 -vt 0.344538 0.499884 -vt 0.084239 0.499885 -vt 0.401731 0.074572 -vt 0.401731 0.442690 -vt 0.027045 0.442691 -vt 0.027045 0.074573 -vt 0.084238 0.017379 -vt 0.344537 0.017378 -vt 0.740546 0.533749 -vt 0.426525 0.533750 -vt 0.486764 0.484899 -vt 0.680307 0.484899 -vt 0.426524 0.019030 -vt 0.486764 0.094096 -vt 0.980914 0.456437 -vt 0.933407 0.411744 -vt 0.764539 0.456437 -vt 0.810023 0.411744 -vt 0.768080 0.492394 -vt 0.977751 0.492393 -vt 0.977751 0.954331 -vt 0.768080 0.954331 -vt 0.764491 0.456437 -vt 0.809979 0.411744 -vt 0.933364 0.411744 -vt 0.980865 0.456437 -vt 0.933364 0.064226 -vt 0.980865 0.019533 -vt 0.764490 0.019532 -vt 0.809979 0.064225 -vt 0.764291 0.019533 -vt 0.980665 0.019533 -vt 0.933184 0.064226 -vt 0.809799 0.064226 -vt 0.426526 0.533750 -vt 0.486765 0.484899 -vt 0.680307 0.484897 -vt 0.740547 0.533747 -vt 0.980665 0.456437 -vt 0.933184 0.411744 -vt 0.764291 0.456437 -vt 0.809799 0.411744 -vt 0.764359 0.456437 -vt 0.809860 0.411744 -vt 0.933245 0.411744 -vt 0.980733 0.456437 -vt 0.933245 0.064225 -vt 0.980733 0.019532 -vt 0.764358 0.019532 -vt 0.809860 0.064225 -vt 0.740546 0.019030 -vt 0.680306 0.094096 -vt 0.740544 0.019030 -vt 0.680307 0.094096 -vt 0.740546 0.533750 -vt 0.426524 0.533750 -vt 0.680308 0.484899 -vt 0.426525 0.019031 -vt 0.740545 0.019030 -vt 0.680308 0.094096 -vt 0.486765 0.094096 -vt 0.740541 0.019030 -vt 0.680304 0.094096 -vt 0.486762 0.094098 -vt 0.426524 0.019033 -vt 0.426526 0.533749 -vt 0.740548 0.533750 -vt 0.571092 0.983144 -vt 0.571092 0.930254 -vt 0.623982 0.930254 -vt 0.623982 0.983144 -vt 0.623631 0.871004 -vt 0.623631 0.923894 -vt 0.570741 0.923894 -vt 0.570741 0.871004 -vt 0.517851 0.923894 -vt 0.517851 0.871004 -vt 0.464961 0.923894 -vt 0.464961 0.871004 -vt 0.518203 0.983144 -vt 0.518203 0.930254 -vt 0.465313 0.983144 -vt 0.465313 0.930254 -vt 0.523461 0.109163 -vt 0.562026 0.147728 -vt 0.562026 0.203581 -vt 0.523461 0.242146 -vt 0.656445 0.242146 -vt 0.617880 0.203581 -vt 0.656446 0.109163 -vt 0.617880 0.147728 -vt 0.314034 0.517433 -vt 0.314032 0.989912 -vt 0.276251 0.989912 -vt 0.276252 0.517433 -vt 0.238470 0.989912 -vt 0.238471 0.517433 -vt 0.200688 0.989912 -vt 0.200689 0.517433 -vt 0.162907 0.989913 -vt 0.162907 0.517432 -vt 0.125126 0.989912 -vt 0.125125 0.517432 -vt 0.087344 0.989912 -vt 0.087343 0.517433 -vt 0.049562 0.517433 -vt 0.049563 0.989913 -vt 0.011782 0.989913 -vt 0.011780 0.517433 -vt 0.443683 0.902365 -vt 0.443683 0.950025 -vt 0.386153 0.926195 -vt 0.409982 0.868665 -vt 0.362323 0.868665 -vt 0.328623 0.902365 -vt 0.328623 0.950025 -vt 0.362323 0.983725 -vt 0.409982 0.983725 -vt 0.919562 0.338531 -vt 0.899973 0.338531 -vt 0.899973 0.318943 -vt 0.919562 0.318943 -vt 0.851311 0.337174 -vt 0.870900 0.337174 -vt 0.870900 0.356762 -vt 0.851311 0.356763 -vt 0.891476 0.395939 -vt 0.871887 0.395939 -vt 0.871887 0.376350 -vt 0.891476 0.376350 -vt 0.850326 0.395939 -vt 0.830737 0.395939 -vt 0.830736 0.376350 -vt 0.850325 0.376350 -vt 0.851311 0.317584 -vt 0.870900 0.317585 -vt 0.871886 0.356761 -vt 0.891475 0.356761 -vt 0.870900 0.376351 -vt 0.851312 0.376351 -vt 0.851311 0.297995 -vt 0.870901 0.297996 -vt 0.871886 0.337172 -vt 0.891475 0.337172 -vt 0.870901 0.395938 -vt 0.851313 0.395939 -vt 0.851312 0.278406 -vt 0.870901 0.278406 -vt 0.871886 0.317583 -vt 0.891475 0.317583 -vt 0.891475 0.297994 -vt 0.871886 0.297994 -vt 0.871887 0.278406 -vt 0.891475 0.278406 -vt 0.919562 0.358120 -vt 0.899973 0.358120 -vt 0.830736 0.356761 -vt 0.850324 0.356761 -vt 0.899973 0.299354 -vt 0.919562 0.299354 -vt 0.919563 0.377709 -vt 0.899974 0.377709 -vt 0.830735 0.337173 -vt 0.850324 0.337172 -vt 0.899973 0.279765 -vt 0.919562 0.279765 -vt 0.919563 0.397298 -vt 0.899974 0.397298 -vt 0.830735 0.317584 -vt 0.850324 0.317584 -vt 0.850324 0.297995 -vt 0.830735 0.297995 -vt 0.830735 0.278406 -vt 0.850324 0.278406 -vt 0.638622 0.865041 -vt 0.748599 0.865041 -vt 0.693610 0.920030 -vt 0.638622 0.975019 -vt 0.748599 0.975019 -vt 0.423279 0.604113 -vt 0.423261 0.657003 -vt 0.377448 0.683432 -vt 0.331654 0.656971 -vt 0.331672 0.604082 -vt 0.377485 0.577652 -vt 0.332019 0.724467 -vt 0.377823 0.698022 -vt 0.423627 0.724467 -vt 0.423626 0.777357 -vt 0.377823 0.803802 -vt 0.332019 0.777357 -vt 0.838006 0.229942 -vt 0.857595 0.229942 -vt 0.867390 0.246907 -vt 0.857595 0.263871 -vt 0.838006 0.263871 -vt 0.828212 0.246907 -vt 0.835549 0.204692 -vt 0.825755 0.187728 -vt 0.835549 0.170764 -vt 0.855138 0.170764 -vt 0.864932 0.187728 -vt 0.855138 0.204692 -vt 0.894531 0.262544 -vt 0.884737 0.245580 -vt 0.894531 0.228615 -vt 0.914120 0.228615 -vt 0.923914 0.245580 -vt 0.914120 0.262544 -vt 0.896170 0.168617 -vt 0.915759 0.168617 -vt 0.925553 0.185582 -vt 0.915758 0.202546 -vt 0.896170 0.202546 -vt 0.886375 0.185582 +vt 0.377885 0.378926 +vt 0.622115 0.378926 +vt 0.622115 0.623155 +vt 0.377885 0.623155 +vt 0.500000 0.622746 +vt 0.605754 0.561689 +vt 0.605754 0.439574 +vt 0.500000 0.378517 +vt 0.394246 0.439574 +vt 0.394246 0.561689 +g cage_Cube_Lamp_Lamp usemtl Lamp s off -f 1/1 2/2 3/3 4/4 -f 5/5 1/1 4/4 6/6 -f 7/7 5/5 6/6 8/8 -f 2/2 7/7 8/8 3/3 -f 9/9 10/10 11/11 12/12 -f 13/13 14/14 15/15 16/16 -f 14/14 17/17 18/18 15/15 -f 19/19 13/13 16/16 20/20 -f 17/21 19/19 20/20 18/22 -f 16/23 15/24 21/25 22/26 -f 15/24 18/27 23/28 21/25 -f 20/29 16/23 22/26 24/30 -f 18/27 20/29 24/30 23/28 -f 22/26 21/25 25/31 26/32 -f 21/25 23/28 27/33 25/34 -f 24/30 22/26 26/35 28/36 -f 23/28 24/30 28/37 27/38 -f 2/39 1/40 29/41 30/42 -f 1/40 31/43 9/44 29/41 -f 30/45 32/46 11/11 10/10 -f 29/47 9/9 12/12 33/48 -f 30/45 29/47 33/48 32/46 -f 12/49 11/50 32/51 33/52 -f 34/50 35/51 36/52 37/49 -f 38/53 36/54 35/55 39/56 -f 39/56 35/55 34/57 40/58 -f 38/53 41/59 37/60 36/54 -f 42/61 43/62 44/63 45/64 -f 40/58 34/57 37/60 41/59 -f 7/65 38/66 39/67 5/68 -f 46/69 47/70 44/63 43/62 -f 48/71 42/61 45/64 49/72 -f 46/69 48/71 49/72 47/70 -f 45/49 44/50 47/51 49/52 -f 50/50 51/51 52/52 53/49 -f 54/73 52/74 51/75 55/76 -f 55/76 51/75 50/77 56/78 -f 54/73 57/79 53/80 52/74 -f 58/81 56/82 57/44 59/43 -f 56/78 50/77 53/80 57/79 -f 31/43 59/83 10/84 9/44 -f 2/39 30/42 10/84 59/83 -f 1/85 5/86 48/66 46/87 -f 60/88 31/89 43/90 42/91 -f 60/92 40/93 41/94 58/95 -f 7/65 58/95 41/94 38/66 -f 5/68 39/67 40/93 60/92 -f 5/86 60/88 42/91 48/66 -f 1/85 46/87 43/90 31/89 -f 2/96 59/43 57/44 54/41 -f 7/97 55/42 56/82 58/81 -f 2/96 54/41 55/42 7/97 -f 61/98 62/99 63/100 64/101 -f 64/102 63/103 65/104 66/105 -f 66/105 65/104 67/106 68/107 -f 68/107 67/106 69/108 70/109 -f 71/110 72/111 62/99 61/98 -f 70/112 69/113 72/111 71/110 -f 58/114 73/115 74/116 60/117 -f 31/118 60/117 74/116 75/119 -f 59/120 31/118 75/119 76/121 -f 59/120 76/121 73/115 58/114 -f 77/122 78/123 79/124 80/125 -f 80/125 79/124 81/126 82/127 -f 82/127 81/126 83/128 84/129 -f 84/129 83/128 85/130 86/131 -f 86/131 85/130 87/132 88/133 -f 88/133 87/132 89/134 90/135 -f 91/136 92/137 78/138 77/139 -f 90/135 89/134 92/137 91/136 -f 73/115 76/121 75/119 74/116 -f 91/140 77/141 93/142 -f 90/143 91/140 93/142 -f 88/144 90/143 93/142 -f 86/145 88/144 93/142 -f 84/146 86/145 93/142 -f 82/147 84/146 93/142 -f 80/148 82/147 93/142 -f 77/141 80/148 93/142 -f 94/149 95/150 96/151 97/152 -f 98/153 99/154 100/155 101/156 -f 102/157 103/158 104/159 105/160 -f 106/161 107/162 108/163 109/164 -f 110/165 111/166 99/154 98/153 -f 105/160 104/159 112/167 113/168 -f 101/156 100/155 114/169 115/170 -f 116/171 117/172 111/166 110/165 -f 113/168 112/167 118/173 119/174 -f 115/170 114/169 120/175 121/176 -f 121/177 120/178 117/172 116/171 -f 119/174 118/173 122/179 123/180 -f 124/181 125/182 103/183 102/184 -f 123/180 122/179 125/182 124/181 -f 126/185 127/186 95/150 94/149 -f 109/164 108/163 128/187 129/188 -f 97/152 96/151 130/189 131/190 -f 132/191 133/192 127/186 126/185 -f 129/188 128/187 134/193 135/194 -f 131/190 130/189 136/195 137/196 -f 137/197 136/198 133/192 132/191 -f 135/194 134/193 138/199 139/200 -f 140/201 141/202 107/203 106/204 -f 139/200 138/199 141/202 140/201 -f 4/205 3/206 142/207 -f 6/208 4/205 142/207 -f 8/209 6/208 142/207 -f 3/206 8/209 142/207 -f 61/210 64/211 66/212 68/213 70/214 71/215 -f 69/216 67/217 65/218 63/219 62/220 72/221 -f 127/222 133/223 136/224 130/225 96/226 95/227 -f 122/228 118/229 112/230 104/231 103/232 125/233 -f 138/234 134/235 128/236 108/237 107/238 141/239 -f 111/240 117/241 120/242 114/243 100/244 99/245 +f 82/42 83/43 84/44 85/45 +f 86/42 82/43 85/44 87/45 +f 88/42 86/43 87/44 89/45 +f 83/42 88/43 89/44 84/45 +f 90/42 91/43 92/44 93/45 +f 94/42 95/43 96/44 97/45 +f 95/42 98/43 99/44 96/45 +f 100/42 94/43 97/44 101/45 +f 98/42 100/43 101/44 99/45 +f 97/42 96/43 102/44 103/45 +f 96/42 99/43 104/44 102/45 +f 101/42 97/43 103/44 105/45 +f 99/42 101/43 105/44 104/45 +f 103/42 102/43 106/44 107/45 +f 102/42 104/43 108/44 106/45 +f 105/42 103/43 107/44 109/45 +f 104/42 105/43 109/44 108/45 +f 83/42 82/43 110/44 111/45 +f 82/42 112/43 90/44 110/45 +f 111/42 113/43 92/44 91/45 +f 110/42 90/43 93/44 114/45 +f 111/42 110/43 114/44 113/45 +f 119/42 117/43 116/44 120/45 +f 120/42 116/43 115/44 121/45 +f 119/42 122/43 118/44 117/45 +f 123/42 124/43 125/44 126/45 +f 121/42 115/43 118/44 122/45 +f 88/42 119/43 120/44 86/45 +f 127/42 128/43 125/44 124/45 +f 129/42 123/43 126/44 130/45 +f 127/42 129/43 130/44 128/45 +f 135/42 133/43 132/44 136/45 +f 136/42 132/43 131/44 137/45 +f 135/42 138/43 134/44 133/45 +f 139/42 137/43 138/44 140/45 +f 137/42 131/43 134/44 138/45 +f 112/42 140/43 91/44 90/45 +f 83/42 111/43 91/44 140/45 +f 82/42 86/43 129/44 127/45 +f 141/42 112/43 124/44 123/45 +f 141/42 121/43 122/44 139/45 +f 88/42 139/43 122/44 119/45 +f 86/42 120/43 121/44 141/45 +f 86/42 141/43 123/44 129/45 +f 82/42 127/43 124/44 112/45 +f 83/42 140/43 138/44 135/45 +f 88/42 136/43 137/44 139/45 +f 83/42 135/43 136/44 88/45 +f 142/42 143/43 144/44 145/45 +f 145/45 144/44 146/44 147/45 +f 147/45 146/44 148/44 149/45 +f 149/45 148/44 150/43 151/42 +f 152/45 153/44 143/43 142/42 +f 151/42 150/43 153/44 152/45 +f 139/42 154/43 155/44 141/45 +f 112/42 141/43 155/44 156/45 +f 140/42 112/43 156/44 157/45 +f 140/42 157/43 154/44 139/45 +f 154/42 157/43 156/44 155/45 +f 85/42 84/43 158/44 +f 87/42 85/43 158/44 +f 89/42 87/43 158/44 +f 84/42 89/43 158/44 +f 142/46 145/47 147/48 149/49 151/50 152/51 +f 150/46 148/47 146/48 144/49 143/50 153/51 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_window_shutter.obj b/mods/homedecor_modpack/homedecor/models/homedecor_window_shutter.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wine_rack.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wine_rack.obj old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/homedecor/nightstands.lua b/mods/homedecor_modpack/homedecor/nightstands.lua index 7a03c049..47b9e4cf 100755 --- a/mods/homedecor_modpack/homedecor/nightstands.lua +++ b/mods/homedecor_modpack/homedecor/nightstands.lua @@ -5,10 +5,10 @@ for _, w in ipairs(woods) do homedecor.register("nightstand_"..w.."_one_drawer", { description = S("Nightstand with One Drawer ("..w..")"), - tiles = { 'homedecor_nightstand_'..w..'_top.png', - 'homedecor_nightstand_'..w..'_bottom.png', - 'homedecor_nightstand_'..w..'_right.png', - 'homedecor_nightstand_'..w..'_left.png', + tiles = { 'homedecor_nightstand_'..w..'_tb.png', + 'homedecor_nightstand_'..w..'_tb.png^[transformFY', + 'homedecor_nightstand_'..w..'_lr.png^[transformFX', + 'homedecor_nightstand_'..w..'_lr.png', 'homedecor_nightstand_'..w..'_back.png', 'homedecor_nightstand_'..w..'_1_drawer_front.png'}, node_box = { @@ -33,10 +33,10 @@ homedecor.register("nightstand_"..w.."_one_drawer", { homedecor.register("nightstand_"..w.."_two_drawers", { description = S("Nightstand with Two Drawers ("..w..")"), - tiles = { 'homedecor_nightstand_'..w..'_top.png', - 'homedecor_nightstand_'..w..'_bottom.png', - 'homedecor_nightstand_'..w..'_right.png', - 'homedecor_nightstand_'..w..'_left.png', + tiles = { 'homedecor_nightstand_'..w..'_tb.png', + 'homedecor_nightstand_'..w..'_tb.png^[transformFY', + 'homedecor_nightstand_'..w..'_lr.png^[transformFX', + 'homedecor_nightstand_'..w..'_lr.png', 'homedecor_nightstand_'..w..'_back.png', 'homedecor_nightstand_'..w..'_2_drawer_front.png'}, node_box = { diff --git a/mods/homedecor_modpack/homedecor/shutters.lua b/mods/homedecor_modpack/homedecor/shutters.lua index 64b6c9cc..05a359fc 100755 --- a/mods/homedecor_modpack/homedecor/shutters.lua +++ b/mods/homedecor_modpack/homedecor/shutters.lua @@ -3,36 +3,40 @@ local S = homedecor.gettext local shutters = { - {"oak", "Unpainted oak"}, - {"mahogany", "Mahogany"}, - {"red", "Red"}, - {"yellow", "Yellow"}, - {"forest_green", "Forest green"}, - {"light_blue", "Light blue"}, - {"violet", "Violet"}, - {"black", "Black"}, - {"dark_grey", "Dark grey"}, - {"grey", "Grey"}, - {"white", "White"}, + {"oak", "Unpainted oak", "#bf8a51:200" }, + {"mahogany", "Mahogany", "#822606:200" }, + {"red", "Red", "#d00000:150" }, + {"yellow", "Yellow", "#ffff00:150" }, + {"forest_green", "Forest green", "#006000:150" }, + {"light_blue", "Light blue", "#1963c7:150" }, + {"violet", "Violet", "#6000ff:150" }, + {"black", "Black", "#000000:200" }, + {"dark_grey", "Dark grey", "#202020:200" }, + {"grey", "Grey", "#c0c0c0:150" }, + {"white", "White", "#ffffff:150" }, } local shutter_cbox = { type = "wallmounted", wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, - wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 }, + wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 } } for i in ipairs(shutters) do local name = shutters[i][1] local desc = shutters[i][2] + local hue = shutters[i][3] + + local tile = "homedecor_window_shutter.png^[colorize:"..hue + local inv = "homedecor_window_shutter_inv.png^[colorize:"..hue homedecor.register("shutter_"..name, { mesh = "homedecor_window_shutter.obj", - tiles = { "homedecor_window_shutter_"..name..".png" }, + tiles = { tile }, description = S("Wooden Shutter ("..desc..")"), - inventory_image = "homedecor_window_shutter_"..name.."_inv.png", - wield_image = "homedecor_window_shutter_"..name.."_inv.png", + inventory_image = inv, + wield_image = inv, paramtype2 = "wallmounted", groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), @@ -45,3 +49,4 @@ for i in ipairs(shutters) do end minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") + diff --git a/mods/homedecor_modpack/homedecor/slopes.lua b/mods/homedecor_modpack/homedecor/slopes.lua index 4181949b..11b743f3 100755 --- a/mods/homedecor_modpack/homedecor/slopes.lua +++ b/mods/homedecor_modpack/homedecor/slopes.lua @@ -34,11 +34,18 @@ local icorner_cbox = { } homedecor.register_outer_corner = function(modname, subname, groups, slope_image, description) + + local tiles = slope_image + + if type(slope_image) ~= "table" then + tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } + end + minetest.register_node(modname..":shingle_outer_corner_" .. subname, { description = S(description.. " (outer corner)"), drawtype = "mesh", mesh = "homedecor_slope_outer_corner.obj", - tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }, + tiles = tiles, paramtype = "light", paramtype2 = "facedir", selection_box = ocorner_cbox, @@ -50,11 +57,18 @@ homedecor.register_outer_corner = function(modname, subname, groups, slope_image end homedecor.register_inner_corner = function(modname, subname, groups, slope_image, description) + + local tiles = slope_image + + if type(slope_image) ~= "table" then + tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } + end + minetest.register_node(modname..":shingle_inner_corner_" .. subname, { description = S(description.. " (inner corner)"), drawtype = "mesh", mesh = "homedecor_slope_inner_corner.obj", - tiles = { "homedecor_slope_inner_corner_"..slope_image..".png" }, + tiles = tiles, paramtype = "light", paramtype2 = "facedir", collision_box = icorner_cbox, @@ -65,11 +79,18 @@ homedecor.register_inner_corner = function(modname, subname, groups, slope_image end homedecor.register_slope = function(modname, subname, recipeitem, groups, slope_image, description) + + local tiles = slope_image + + if type(slope_image) ~= "table" then + tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } + end + minetest.register_node(modname..":shingle_side_" .. subname, { description = S(description), drawtype = "mesh", mesh = "homedecor_slope.obj", - tiles = { "homedecor_slope_"..slope_image..".png" }, + tiles = tiles, paramtype = "light", paramtype2 = "facedir", selection_box = slope_cbox, @@ -198,50 +219,65 @@ end -- corners -homedecor.register_roof("homedecor", "wood", - { snappy = 3 }, +homedecor.register_roof( + "homedecor", "wood", + { snappy = 3 }, + { "homedecor_shingles_wood.png" }, "Wood Shingles" ) -homedecor.register_roof("homedecor", "asphalt", - { snappy = 3 }, +homedecor.register_roof( + "homedecor", "asphalt", + { snappy = 3 }, + { "homedecor_shingles_asphalt.png" }, "Asphalt Shingles" ) -homedecor.register_roof("homedecor", "terracotta", - { snappy = 3 }, +homedecor.register_roof( + "homedecor", "terracotta", + { snappy = 3 }, + { "homedecor_shingles_terracotta.png" }, "Terracotta Shingles" ) -- register just the slopes -homedecor.register_slope("homedecor", "wood", +homedecor.register_slope( + "homedecor", + "wood", "homedecor:shingles_wood", { snappy = 3 }, - "wood", + { "homedecor_shingles_wood.png" }, "Wood Shingles" ) -homedecor.register_slope("homedecor", "asphalt", +homedecor.register_slope( + "homedecor", + "asphalt", "homedecor:shingles_asphalt", { snappy = 3 }, - "asphalt", + { "homedecor_shingles_asphalt.png" }, "Asphalt Shingles" ) -homedecor.register_slope("homedecor", "terracotta", +homedecor.register_slope( + "homedecor", + "terracotta", "homedecor:shingles_terracotta", { snappy = 3 }, - "terracotta", + { "homedecor_shingles_terracotta.png" }, "Terracotta Shingles" ) -homedecor.register_slope("homedecor", "glass", +homedecor.register_slope( + "homedecor", + "glass", "homedecor:shingles_glass", { snappy = 3 }, - "glass", + { "homedecor_shingles_glass.png", "homedecor_shingles_wood.png" }, "Glass Shingles" ) + diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_faucet.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_faucet.ogg new file mode 100644 index 00000000..8c790749 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/sounds/homedecor_faucet.ogg differ diff --git a/mods/homedecor_modpack/homedecor/sounds/insert_coin.ogg b/mods/homedecor_modpack/homedecor/sounds/insert_coin.ogg new file mode 100644 index 00000000..2ee99d5f Binary files /dev/null and b/mods/homedecor_modpack/homedecor/sounds/insert_coin.ogg differ diff --git a/mods/homedecor_modpack/homedecor/tables.lua b/mods/homedecor_modpack/homedecor/tables.lua index 987b37b4..a22a9d72 100755 --- a/mods/homedecor_modpack/homedecor/tables.lua +++ b/mods/homedecor_modpack/homedecor/tables.lua @@ -197,7 +197,7 @@ homedecor.register("desk", { description = "Desk", mesh = "homedecor_desk.obj", tiles = { - "homedecor_generic_wood_beech.png", + homedecor.plain_wood, "homedecor_desk_drawers.png", "homedecor_generic_metal_black.png", }, diff --git a/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_brass_inv.png index 9dc9638c..16801db2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_brass_inv.png and b/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_brass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_inv.png b/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_inv.png index d7b27eca..e177b53c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_inv.png and b/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_chains_inv.png b/mods/homedecor_modpack/homedecor/textures/forniture_chains_inv.png index 57c21283..4fd4900d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_chains_inv.png and b/mods/homedecor_modpack/homedecor/textures/forniture_chains_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_coal.png b/mods/homedecor_modpack/homedecor/textures/forniture_coal.png index d1c1e2eb..7da54a0a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_coal.png and b/mods/homedecor_modpack/homedecor/textures/forniture_coal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_papyrus.png b/mods/homedecor_modpack/homedecor/textures/forniture_papyrus.png deleted file mode 100644 index 50802ab2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_papyrus.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_papyrus_s1.png b/mods/homedecor_modpack/homedecor/textures/forniture_papyrus_s1.png deleted file mode 100644 index 2be35588..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_papyrus_s1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_papyrus_s2.png b/mods/homedecor_modpack/homedecor/textures/forniture_papyrus_s2.png deleted file mode 100644 index c26353e0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_papyrus_s2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_torch_flame.png b/mods/homedecor_modpack/homedecor/textures/forniture_torch_flame.png index c1a2b112..b280b000 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/forniture_torch_flame.png and b/mods/homedecor_modpack/homedecor/textures/forniture_torch_flame.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac.png new file mode 100644 index 00000000..3c5b80d9 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_ac.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac_back.png deleted file mode 100644 index 9a1e976a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac_front.png deleted file mode 100644 index f377bb58..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac_sides.png deleted file mode 100644 index f95b9d13..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png deleted file mode 100644 index af0f3da6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ac_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_back.png index 5101ea3b..0de135b2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_face.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_face.png index 1952d98e..ff0d0ece 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_face.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_face.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png index dccf1a56..990c4a7f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png index 1aaf995f..b3787839 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_brass_inv.png index 0ea5bca2..03e70df0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_brass_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_brass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_white_dark_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_white_dark_inv.png index 1b8bf287..c650a953 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_white_dark_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_white_dark_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wood_inv.png index e4fac51a..06531e50 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wood_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wood_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wrought_iron_inv.png index 140fb0b6..452932f7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wrought_iron_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png index f5cd422c..d6897bac 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png index 45e2c747..d857abec 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png index 48da6e00..32fdfca4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png index 2c0667db..45ecb599 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_sink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_sink_inv.png index 3cd63c44..44918f3a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_sink_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_sink_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_1.png deleted file mode 100644 index 2bb992bf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_2.png deleted file mode 100644 index 2268be8c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_3.png deleted file mode 100644 index c57533b6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_3.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_4.png deleted file mode 100644 index f70fa657..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_4.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_bg.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_bg.png new file mode 100644 index 00000000..1a204571 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_bg.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png deleted file mode 100644 index e4785006..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_fg.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_fg.png new file mode 100644 index 00000000..b741d563 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_fg.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png deleted file mode 100644 index ad7c15be..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png deleted file mode 100644 index 69b17538..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png deleted file mode 100644 index 8c485227..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_tan.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png deleted file mode 100644 index b49948dc..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_yellow.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png deleted file mode 100644 index 33d61df7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_blue_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png index da22974a..34516552 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png deleted file mode 100644 index 5a7da3c6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_brown_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png deleted file mode 100644 index db27f736..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_darkgrey_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png index 7ff2ff5d..b334e40c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png deleted file mode 100644 index e3c19af2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_green_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_inv.png new file mode 100644 index 00000000..c670b452 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_blue_inv.png deleted file mode 100644 index 981c5999..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_blue_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_brown_inv.png deleted file mode 100644 index 0e976a29..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_brown_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png deleted file mode 100644 index d3f80486..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_green_inv.png deleted file mode 100644 index c87713dd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_green_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_inv.png new file mode 100644 index 00000000..5f8c93e9 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_orange_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_orange_inv.png deleted file mode 100644 index 86f1aaf2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_orange_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png new file mode 100644 index 00000000..7a3d6e0d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_pink_inv.png deleted file mode 100644 index b045c262..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_pink_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_red_inv.png deleted file mode 100644 index 6ae61d06..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_red_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_violet_inv.png deleted file mode 100644 index cddbc702..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_violet_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png deleted file mode 100644 index f62ea75f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png deleted file mode 100644 index bf2dff81..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_orange_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_overlay_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_overlay_inv.png new file mode 100644 index 00000000..b3d53ba0 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_overlay_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png deleted file mode 100644 index d261a724..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_pink_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png deleted file mode 100644 index 166bf4ee..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_red_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png deleted file mode 100644 index 9e4f963b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_violet_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png deleted file mode 100644 index 8ab16537..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_yellow_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug.png index e5539b79..2a809246 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug_inv.png index 26b89f68..1887d5db 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_front.png deleted file mode 100644 index 1e2e6f73..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_inv.png index 84307de1..3090df12 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_right.png deleted file mode 100644 index 0c7a8e64..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png index 5c372808..0baeb9ba 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png index ab74b31b..97abc604 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue.png deleted file mode 100644 index 19139838..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png deleted file mode 100644 index 3ba26df5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_blue_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown.png deleted file mode 100644 index 54db053f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_inv.png deleted file mode 100644 index 385895f9..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_brown_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover.png new file mode 100644 index 00000000..f5c50832 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover_trim.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover_trim.png new file mode 100644 index 00000000..54253856 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover_trim.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_edges.png new file mode 100644 index 00000000..5b489440 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_edges.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green.png deleted file mode 100644 index 22c7d804..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png deleted file mode 100644 index 22a2c052..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_green_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey.png deleted file mode 100644 index d3f8f276..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_inv.png deleted file mode 100644 index 725da19f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_grey_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_inv.png new file mode 100644 index 00000000..b8dd2438 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue.png deleted file mode 100644 index 7881d982..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_brown.png deleted file mode 100644 index 7a065e1e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_brown.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green.png deleted file mode 100644 index aacecd04..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_grey.png deleted file mode 100644 index 05f8b729..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_grey.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red.png deleted file mode 100644 index 7ea535c7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_violet.png deleted file mode 100644 index 4f8cdd01..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_open_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_pages.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_pages.png new file mode 100644 index 00000000..d4bad778 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_pages.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red.png deleted file mode 100644 index 91a06c88..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png deleted file mode 100644 index 65969b26..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_red_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_trim_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_trim_inv.png new file mode 100644 index 00000000..7096703a Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_book_trim_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet.png deleted file mode 100644 index e21c419e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_inv.png deleted file mode 100644 index dc472daf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_book_violet_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown2.png index b04eef3a..ab3364fb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown3.png index 3b27d681..614a0421 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown3.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown3.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown4.png index 741d9205..d9c578ab 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown4.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown4.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png b/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png index 82692aac..c2e06ffb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_calendar.png b/mods/homedecor_modpack/homedecor/textures/homedecor_calendar.png index 250dee31..0407a758 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_calendar.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_calendar.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_calendar_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_calendar_inv.png index ea3e9dbc..8d705f6a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_calendar_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_calendar_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_flame.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_flame.png index bb866dd6..a34b9a5e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_flame.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_flame.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_sides.png index 0b4bee77..d709a8cf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png index e4cb0fa6..f87b383e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png deleted file mode 100644 index 6d7d407d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png deleted file mode 100644 index 6d7d407d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png deleted file mode 100644 index df353d91..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardboard_box_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png index a14917b2..6a57cd51 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png index ac590f90..410349d1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png index 1df87fe3..265f2c8d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png index 14e01720..85b2c548 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png index 4c590475..9a1ad87e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_tb.png index 71726f0a..80161e6b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_tb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/female1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female1.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1.png diff --git a/mods/homedecor_modpack/homedecor/textures/female1_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female1_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/female2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female2.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2.png diff --git a/mods/homedecor_modpack/homedecor/textures/female2_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female2_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/female3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female3.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3.png diff --git a/mods/homedecor_modpack/homedecor/textures/female3_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female3_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/female4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female4.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4.png diff --git a/mods/homedecor_modpack/homedecor/textures/female4_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female4_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/female5.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female5.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5.png diff --git a/mods/homedecor_modpack/homedecor/textures/female5_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/female5_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/male1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male1.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1.png diff --git a/mods/homedecor_modpack/homedecor/textures/male1_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male1_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/male2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male2.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2.png diff --git a/mods/homedecor_modpack/homedecor/textures/male2_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male2_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/male3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male3.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3.png diff --git a/mods/homedecor_modpack/homedecor/textures/male3_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male3_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/male4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male4.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4.png diff --git a/mods/homedecor_modpack/homedecor/textures/male4_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male4_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/male5.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male5.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5.png diff --git a/mods/homedecor_modpack/homedecor/textures/male5_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5_preview.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/male5_preview.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5_preview.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_inv.png index bf65e1e6..9d4018e7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png deleted file mode 100644 index 9e8cdc6d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_case.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_case.png index 8143ed10..ebc35417 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_case.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_case.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_cup.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_cup.png index 5ee1c510..3422deeb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_cup.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_cup.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_decanter.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_decanter.png index 2fc1569c..f7a5f864 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_decanter.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_decanter.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_inv.png index 03fe6fe0..57fe7df5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coin.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coin.png new file mode 100644 index 00000000..84b0932b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_coin.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_copper_pans_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_copper_pans_inv.png index 0016384f..08e21d27 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_copper_pans_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_copper_pans_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain.png new file mode 100644 index 00000000..97ef90d0 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_blue.png deleted file mode 100644 index eab2ed60..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_green.png deleted file mode 100644 index 05debd85..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open.png new file mode 100644 index 00000000..8a71ae24 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_blue.png deleted file mode 100644 index ceaab8ea..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_green.png deleted file mode 100644 index a149844a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_pink.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_pink.png deleted file mode 100644 index 5074bea1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_pink.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_red.png deleted file mode 100644 index a62eb0b1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_violet.png deleted file mode 100644 index c51a04df..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_white.png deleted file mode 100644 index acfecbd4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open_white.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_pink.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_pink.png deleted file mode 100644 index 0b2b67d2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_pink.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_red.png deleted file mode 100644 index 779050f0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_violet.png deleted file mode 100644 index 3b3cfc79..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_white.png deleted file mode 100644 index b9e251c6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_white.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_brass_inv.png index ff6911ac..a2ffacf0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_brass_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_brass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png index d544c748..914fc7f5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set.png index e107dc75..57b27bf8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_inv.png index 7e4a0a3a..9dcd1df3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair.png b/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair.png index a68fe65f..47b7752e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair_striped_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair_striped_blue.png index 4a133aa5..ac24eda3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair_striped_blue.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair_striped_blue.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png index 1eea06b9..fb59d07b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_blue.png deleted file mode 100644 index 6943807c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_green.png deleted file mode 100644 index d4599338..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_blue.png deleted file mode 100644 index 120a280a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_green.png deleted file mode 100644 index 59651eb7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_red.png deleted file mode 100644 index 5db1dc10..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_violet.png deleted file mode 100644 index b5b7b359..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_inv_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_metal_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_metal_inv.png new file mode 100644 index 00000000..bd59d296 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_metal_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_red.png deleted file mode 100644 index 460039e2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_stem_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_stem_inv.png new file mode 100644 index 00000000..293db542 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_stem_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_violet.png deleted file mode 100644 index b2f8bcbb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png index a3511f3f..81d2a73e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png index 2eb8a1bf..f94875fb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png index 7362346e..f87065e4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png index cdd43459..e2f51f7b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png index 2ae813e9..9355e850 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png index 856526e4..9f89482d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png index a76ddfd2..ddc5d228 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png index 80b5210b..a7ec3f3c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png index 9cae490b..4e5ea5a7 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png index 65387889..fb5cd19d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png index 7f2605a7..7c3a0a2b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png index e6676c2e..892f3067 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png index 97b56134..ca0ca15d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png index ce18333c..36271dd5 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png index 52916b78..0f087718 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png index 85c6198d..5e4707cc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png index 9d35964f..202e600f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png index a6c1e74a..61c50ad2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png index beaabbd3..ee8ca2be 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png index 43331df6..646e17cf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png index e5a04d34..2d5902ad 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png index fb348853..12fb2c64 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png index 1dac4652..e39b46a9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png index ee0e6c8d..083b4c06 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png index f9241083..8e98d916 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_front.png index b155633c..642eaa97 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_earth.png b/mods/homedecor_modpack/homedecor/textures/homedecor_earth.png index 8c5a0fe8..511b3e9f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_earth.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_earth.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_brass.png index ca011585..bb4bf108 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_brass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_brass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_fb.png deleted file mode 100644 index 8d446f38..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_fb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_lr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_lr.png deleted file mode 100644 index fa492753..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_lr.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png new file mode 100644 index 00000000..b544fa55 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_bottom.png deleted file mode 100644 index 16d04e16..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_tb.png new file mode 100644 index 00000000..ff4dd2ed Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_top.png deleted file mode 100644 index fa048ad5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png index 36c4b7f7..f2fd501d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_back.png deleted file mode 100644 index b8770a73..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_back_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_back_lighted.png deleted file mode 100644 index 772ed350..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_back_lighted.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_bottom.png deleted file mode 100644 index 0eb0753b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_filter.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_filter.png new file mode 100644 index 00000000..2d5b1872 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_filter.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes.png new file mode 100644 index 00000000..0db50a79 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes_lighted.png new file mode 100644 index 00000000..baf4d886 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes_lighted.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_front.png deleted file mode 100644 index 6b8d6f3d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_front_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_front_lighted.png deleted file mode 100644 index e01c71d3..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_front_lighted.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel.png new file mode 100644 index 00000000..13249e84 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel_lighted.png new file mode 100644 index 00000000..c17846bf Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel_lighted.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_left.png deleted file mode 100644 index 6f96c7d1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_left_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_left_lighted.png deleted file mode 100644 index aa53183c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_left_lighted.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_right.png deleted file mode 100644 index 730e33e4..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_right_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_right_lighted.png deleted file mode 100644 index cac03c50..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_right_lighted.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides.png new file mode 100644 index 00000000..21b02f62 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides_lighted.png new file mode 100644 index 00000000..6fe49aa6 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides_lighted.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_top.png deleted file mode 100644 index c8c91670..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top.png new file mode 100644 index 00000000..aac2972b Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top_lighted.png new file mode 100644 index 00000000..b69ff103 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top_lighted.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png index fdd6792f..612cc230 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png index f36c07ba..d36acaca 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png index 9d23cc47..8468daa0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_back.png deleted file mode 100644 index 3139da8c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_edges.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_bottom.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_edges.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_fb.png new file mode 100644 index 00000000..6cdc974a Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_fb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_front.png deleted file mode 100644 index 8f938bb6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_left.png deleted file mode 100644 index 000185ae..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_right.png deleted file mode 100644 index 000185ae..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_top.png deleted file mode 100644 index 000185ae..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png deleted file mode 100644 index e83883e2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_fb.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_front.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_fb.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_lr.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_left.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_lr.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png deleted file mode 100644 index bd80d4c0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_tb.png similarity index 55% rename from mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_tb.png index 324109de..8ced2b90 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png deleted file mode 100644 index 324109de..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_bottom.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_left.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_right.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_top.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_bottom.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_left.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_right.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_top.png deleted file mode 100644 index c22f319c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_black.png index a34fc849..c5437468 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_black.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_brass.png index 89a5c221..e2fb20db 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_brass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_brass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold2.png index d89473d4..e5499003 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_green.png deleted file mode 100644 index 90cde47c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_lines_overlay.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_lines_overlay.png index 401b03ee..1b7af734 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_lines_overlay.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_lines_overlay.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_neutral.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_neutral.png deleted file mode 100644 index d9d21221..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_neutral.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_red.png deleted file mode 100644 index ed579d94..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_white.png deleted file mode 100644 index 01cbd9a2..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_white.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_wrought_iron.png index f57994e7..b98e3bc4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_wrought_iron.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_wrought_iron.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_black.png new file mode 100644 index 00000000..3aa3493d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_black.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_brown.png deleted file mode 100644 index f5d6484e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_brown.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_white.png deleted file mode 100644 index df946a74..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_white.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_quilted_paper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_quilted_paper.png index 5bf68160..c2de1d82 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_quilted_paper.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_quilted_paper.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_terrycloth.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_terrycloth.png index 840d7633..7265e3c1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_terrycloth.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_terrycloth.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_beech.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_beech.png deleted file mode 100644 index 7e44cea5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_beech.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_boards_overlay.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_boards_overlay.png new file mode 100644 index 00000000..20de5ac2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_boards_overlay.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_dark.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_dark.png deleted file mode 100644 index 88b835d0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_dark.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury.png new file mode 100644 index 00000000..a03d17c9 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_black.png deleted file mode 100644 index 89492de7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_black.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown1.png deleted file mode 100644 index 95fc8d59..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown1.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown2.png deleted file mode 100644 index b281909e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown2.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown3.png deleted file mode 100644 index 40306608..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury_brown3.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_mahogany.png deleted file mode 100644 index 25ab29fb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_mahogany.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_neutral.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_old.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_neutral.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_old.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_plain.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_plain.png new file mode 100644 index 00000000..4df1e39c Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_plain.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_red.png index cf844c59..f2a3088a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_red.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_red.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_white.png deleted file mode 100644 index 1089b65e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_white.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png deleted file mode 100644 index adf946e0..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_wall_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_yellow_wall_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_yellow_wall_sides.png deleted file mode 100644 index 57820f10..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_yellow_wall_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png deleted file mode 100644 index 14355131..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_wall_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_yellow_wall_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_yellow_wall_sides.png deleted file mode 100644 index 4b28a27c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_yellow_wall_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png deleted file mode 100644 index dd9311c8..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_gold_block.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png index 6b269ccb..de61fbcd 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face_edge.png b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face_edge.png index 2ad43818..7991f3b6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face_edge.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face_edge.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_inv.png index e86e3610..26b25e96 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ground_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ground_lantern_inv.png index 21f01617..3e94072d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_ground_lantern_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_ground_lantern_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_hanging_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_hanging_lantern_inv.png index 29dc90d2..a5e9a58c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_hanging_lantern_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_hanging_lantern_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png index 7c4e7a90..b4a09d12 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bevel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bevel.png new file mode 100644 index 00000000..137eb3ee Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bevel.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bottom.png deleted file mode 100644 index cd5c4715..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_sides.png deleted file mode 100644 index 08da10d7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink_top.png index 82d185c4..a4f75441 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice.png new file mode 100644 index 00000000..dacc2517 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_vegetal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_vegetal.png new file mode 100644 index 00000000..b188ec6a Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_vegetal.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light.png index 0d97ab10..ca304e94 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_light.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_light.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_marble.png b/mods/homedecor_modpack/homedecor/textures/homedecor_marble.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/forniture_marble.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_marble.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_marble_light.png b/mods/homedecor_modpack/homedecor/textures/homedecor_marble_light.png deleted file mode 100644 index 768fa025..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_marble_light.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png deleted file mode 100644 index e6b41cca..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_back.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_front.png deleted file mode 100644 index c76f5c11..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inside.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inside.png new file mode 100644 index 00000000..c5cb3e0d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inside.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inv.png index 6aa39d00..d3664bdb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_mirror.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_mirror.png new file mode 100644 index 00000000..9bc2dfbf Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_mirror.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_open_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_open_front.png deleted file mode 100644 index 8e0e0866..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_open_front.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_open_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_open_right.png deleted file mode 100644 index 51641223..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_open_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png deleted file mode 100644 index 4092b2f8..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_sides.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png deleted file mode 100644 index dd1f8504..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_tb.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png index a040d45b..a746efaf 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png index c27b60e1..17b016a9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_back.png index d7a4017c..45a9b7ac 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_bottom.png deleted file mode 100644 index 06b95802..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_left.png deleted file mode 100644 index 5b765cbf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_lr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_lr.png new file mode 100644 index 00000000..aae8c58f Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_lr.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_right.png deleted file mode 100644 index e66e5b92..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_tb.png similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_top.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_tb.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png index 5eaad8bc..30fcd1e6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png index fa28b738..07f4c456 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_bottom.png deleted file mode 100644 index 762b492d..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_bottom.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_left.png deleted file mode 100644 index 1edc06e6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_left.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_lr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_lr.png new file mode 100644 index 00000000..12f15554 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_lr.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_right.png deleted file mode 100644 index c16430ed..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_right.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_tb.png new file mode 100644 index 00000000..f61e63e3 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_tb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_top.png deleted file mode 100644 index 019cf93b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_basic.png b/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_basic.png index c77fd8cd..a12d1d99 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_basic.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_basic.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_upscale.png b/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_upscale.png index 1d86be2c..cf21dd5b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_upscale.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_upscale.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_base.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_base.png deleted file mode 100644 index f10d6010..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_base.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_glass.png index 6657bd07..3d78e26b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_glass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_handles.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_handles.png deleted file mode 100644 index 19ea7a8f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_handles.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_top.png deleted file mode 100644 index 45cb0c7f..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_top.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_wick.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_wick.png index daa2f3de..a888d61d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_wick.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_wick.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf_books.png b/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf_books.png index f4619bbb..ab677ab8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf_books.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf_books.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting1.png index 63c17828..be637df9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting10.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting10.png index b7b3d573..4e1d5fe2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting10.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting10.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting11.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting11.png index e417aa72..5c9133dd 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting11.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting11.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting12.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting12.png index 66eadb7c..04d9e0ca 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting12.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting12.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting13.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting13.png index c2384d86..9a9f28c3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting13.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting13.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting14.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting14.png index 1b612ec0..b7e70808 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting14.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting14.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png index caaaf93b..3e6010f4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting16.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting16.png index c6537973..2e487ef8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting16.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting16.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting17.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting17.png index 7f1b836e..c4ba2818 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting17.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting17.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting18.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting18.png index 24176a21..04b7403f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting18.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting18.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting19.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting19.png index e5054b2b..65a3fb34 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting19.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting19.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting2.png index e29329b2..abb3fa03 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting20.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting20.png index ca5a3e2b..f5e6628f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting20.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting20.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting3.png index 9e756e4e..55d8b5c6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting3.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting3.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting4.png index b1ab638a..be4268c9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting4.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting4.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting5.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting5.png index aef95ff5..c5600de8 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting5.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting5.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting6.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting6.png index 2d3e0e4b..d296cb61 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting6.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting6.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png index 6734be9c..6f251b8a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting8.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting8.png index 0c13b613..5944044a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting8.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting8.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting9.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting9.png index 40e7dece..c8147c9c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting9.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting9.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png index ff5fab66..68dbbf50 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png deleted file mode 100644 index adbf8f32..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_edges.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png index 4f1d1d80..3ce526dc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png index a492cd0b..64534366 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png index 4bdef43e..cf746858 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png index 51494da5..e35af61a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png index 800e1f44..9e4489c0 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_edges.png deleted file mode 100644 index a134b745..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_edges.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png index ba3cb7e8..6c92937c 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png index ec13c2a9..689a3541 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_glass.png new file mode 100644 index 00000000..91f160ea Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_inv.png new file mode 100644 index 00000000..8ca81fd9 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_streamers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_streamers.png new file mode 100644 index 00000000..206f7f76 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_streamers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png index 8214a119..039118c1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png index 4ed31dd7..1cd04b6e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png index 3fe8b200..fe12d476 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png index 858ae631..33ce3d5d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png index 2bff66ab..28145d4f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_potting_soil.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potting_soil.png deleted file mode 100644 index f356278e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_potting_soil.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_controls.png b/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_controls.png index 7bacd018..28d088be 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_controls.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_controls.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png index 5aeb13b4..7bfe2bb9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png index 14c38c2a..ee6156a9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png index a7ccf64c..ee4d9d21 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rug_persian.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_persian.png new file mode 100644 index 00000000..ccbd7411 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_persian.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rug_small.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_small.png index 5a648d10..b2a441d6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_rug_small.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_small.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png index 75d361bc..c567eb3b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png index 180b504a..750d9dbc 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png index f094005e..46d1cf8e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post.png index 43904a3a..02b3cc93 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_back.png index 2a4e759f..a5200182 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_bottom.png index f576c4f6..8281d88e 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_front.png index 08118f9f..f3c7c6ac 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_side.png index b41ec7f1..05b5c851 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_side.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_side.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_top.png index a09e63d9..ebdb2410 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_back.png index 2c637a91..a0c6e59b 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png index 4a652753..20fdc2c1 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_front.png index fa9dad93..54471349 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_front.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_front.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_side.png index 2d4f4f52..a0a3656a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_side.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_side.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_top.png index 4d05458d..0cfcd1d9 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_top.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_top.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png index a064d984..d7fc7b7a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png deleted file mode 100644 index e02a78cf..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_asphalt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_glass.png deleted file mode 100644 index 358ea2d6..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_glass.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png deleted file mode 100644 index 0567e73e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_asphalt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png deleted file mode 100644 index c6c8da2e..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_terracotta.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png deleted file mode 100644 index 8dc79d70..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_inner_corner_wood.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png deleted file mode 100644 index b689cbb5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_asphalt.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png deleted file mode 100644 index 43def962..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_terracotta.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png deleted file mode 100644 index 53618558..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_outer_corner_wood.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_terracotta.png deleted file mode 100644 index 0c61791c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_terracotta.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png deleted file mode 100644 index 8001c627..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_slope_wood.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_soda_can.png b/mods/homedecor_modpack/homedecor/textures/homedecor_soda_can.png new file mode 100644 index 00000000..2797b6e2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_soda_can.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_soda_machine.png b/mods/homedecor_modpack/homedecor/textures/homedecor_soda_machine.png new file mode 100644 index 00000000..82f0ab90 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_soda_machine.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png index 9c57d02e..d41f2171 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png index af44eec8..67b586eb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sport_bench_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sport_bench_inv.png index 001d2934..f6bccfa4 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_sport_bench_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_sport_bench_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stained_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stained_glass.png new file mode 100644 index 00000000..43e86bc0 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_stained_glass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png deleted file mode 100644 index 180262b7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_blue_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_foot_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_foot_inv.png new file mode 100644 index 00000000..6606a2b2 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_foot_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_green_inv.png deleted file mode 100644 index 803ed183..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_green_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_inv.png deleted file mode 100644 index c0b0b569..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png deleted file mode 100644 index a3956919..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_pink_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png deleted file mode 100644 index 08b11c87..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_red_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png new file mode 100644 index 00000000..2190d2ad Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png deleted file mode 100644 index c1d8938c..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_violet_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_blue_inv.png deleted file mode 100644 index dae4c1cd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_blue_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_foot_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_foot_inv.png new file mode 100644 index 00000000..af5ff823 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_foot_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_green_inv.png deleted file mode 100644 index 7b888da9..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_green_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_inv.png deleted file mode 100644 index 7c43d96a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_pink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_pink_inv.png deleted file mode 100644 index b5d31abe..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_pink_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_red_inv.png deleted file mode 100644 index d510f994..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_red_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png new file mode 100644 index 00000000..ce657653 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_violet_inv.png deleted file mode 100644 index 49e646eb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_violet_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_brass.png index ab80ee76..219c5177 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_brass.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_brass.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_wrought_iron.png index 94e8bc1a..54d02eea 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_wrought_iron.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_wrought_iron.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png index 4286b492..077dd462 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_base.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_base.png index 643000c8..50bc8aee 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_base.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_base.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_cord.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_cord.png index 27c0edd1..7a089ed2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_cord.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_cord.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_dial.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_dial.png index c0d8622d..7189601a 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_dial.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_dial.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_handset.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_handset.png index 76099766..1c5c0d83 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_handset.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_handset.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_inv.png index 8ebb7b93..793533a2 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png b/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png deleted file mode 100644 index b7858341..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_titanium_dioxide.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png index 8233f928..28d857c6 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png index 161fbc03..a3237a01 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_towel_rod_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_towel_rod_inv.png index 404cd8c7..11b22ca3 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_towel_rod_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_towel_rod_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can.png index 176401e8..da5a3b0f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png index e76f1b91..23104ddb 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_inv.png index 7203765b..f257d702 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp.png deleted file mode 100644 index e38caba8..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp_inv.png index 6f1a4518..12a3d42f 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_back.png index 09a06140..292433de 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_back.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_back.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_inv.png index 54a586fc..cab42692 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png index 047e836f..b9c73f24 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png index f96356f1..270add64 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png index c8da5d7d..90c094ae 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_white_paint.png b/mods/homedecor_modpack/homedecor/textures/homedecor_white_paint.png deleted file mode 100644 index c77abc15..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_white_paint.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter.png new file mode 100644 index 00000000..4335eabc Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png deleted file mode 100644 index 896ccb99..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black_inv.png deleted file mode 100644 index cc29ebcd..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_black_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png deleted file mode 100644 index 82b0e9d7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey_inv.png deleted file mode 100644 index 52c4c784..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_dark_grey_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png deleted file mode 100644 index 6a21eee1..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green_inv.png deleted file mode 100644 index 51a261e8..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_forest_green_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png deleted file mode 100644 index e31677fe..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png deleted file mode 100644 index 7c20faef..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_grey_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png new file mode 100644 index 00000000..eecb908f Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png deleted file mode 100644 index 83f1d10a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue_inv.png deleted file mode 100644 index 9e2a87f3..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_light_blue_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png deleted file mode 100644 index 835be18b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany_inv.png deleted file mode 100644 index a31a97e7..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_mahogany_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png deleted file mode 100644 index 9559daf5..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak_inv.png deleted file mode 100644 index 952fb40a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_oak_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png deleted file mode 100644 index 9d9e47de..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red_inv.png deleted file mode 100644 index 9d731a7a..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_red_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png deleted file mode 100644 index abe15e80..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet_inv.png deleted file mode 100644 index 2323c848..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_violet_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png deleted file mode 100644 index 3d73b812..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png deleted file mode 100644 index c58d834b..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_white_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png deleted file mode 100644 index ab332a41..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow_inv.png deleted file mode 100644 index 5ed128fb..00000000 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_yellow_inv.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png index fb63e263..78b9568d 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png index 581efada..fc4ea6ba 100644 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png differ diff --git a/mods/homedecor_modpack/homedecor/wardrobe.lua b/mods/homedecor_modpack/homedecor/wardrobe.lua index dbf86679..d66a38a4 100644 --- a/mods/homedecor_modpack/homedecor/wardrobe.lua +++ b/mods/homedecor_modpack/homedecor/wardrobe.lua @@ -8,7 +8,7 @@ local wd_cbox = { homedecor.register("wardrobe", { mesh = "homedecor_bedroom_wardrobe.obj", tiles = { - "homedecor_generic_wood_beech.png", + homedecor.plain_wood, "homedecor_wardrobe_drawers.png", "homedecor_wardrobe_doors.png" }, @@ -19,6 +19,7 @@ homedecor.register("wardrobe", { collision_box = wd_cbox, sounds = default.node_sound_wood_defaults(), expand = { top="air" }, + on_rotate = screwdriver.rotate_simple, on_construct = function(pos) local meta = minetest.get_meta(pos) local skins = {"male1", "male2", "male3", "male4", "male5"} @@ -26,8 +27,8 @@ homedecor.register("wardrobe", { local clothes_strings = "" for i = 1,5 do clothes_strings = clothes_strings.. - "image_button_exit["..(i-1)..".5,0;1.1,2;"..skins[i].."_preview.png;"..skins[i]..";]".. - "image_button_exit["..(i-1)..".5,2;1.1,2;fe"..skins[i].."_preview.png;fe"..skins[i]..";]" + "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skins[i].."_preview.png;"..skins[i]..";]".. + "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skins[i].."_preview.png;fe"..skins[i]..";]" end meta:set_string("formspec", "size[5.5,8.5]"..default.gui_bg..default.gui_bg_img..default.gui_slots.. @@ -60,13 +61,25 @@ homedecor.register("wardrobe", { on_receive_fields = function(pos, formname, fields, sender) local meta = minetest.get_meta(pos) local skins = {"male1", "male2", "male3", "male4", "male5"} + local playerName = sender:get_player_name() + local armor_mod = minetest.get_modpath("3d_armor") for i = 1,5 do if fields[skins[i]] then - default.player_set_textures(sender, { skins[i]..".png" }) + if armor_mod then -- if 3D_armor's installed, let it set the skin + armor.textures[playerName].skin = "homedecor_clothes_"..skins[i]..".png" + armor:update_player_visuals(sender) + break + end + default.player_set_textures(sender, { "homedecor_clothes_"..skins[i]..".png" }) break elseif fields["fe"..skins[i]] then - default.player_set_textures(sender, { skin = "fe"..skins[i]..".png" }) + if armor_mod then + armor.textures[playerName].skin = "fe"..skins[i]..".png" + armor:update_player_visuals(sender) + break + end + default.player_set_textures(sender, { skin = "homedecor_clothes_fe"..skins[i]..".png" }) break end end diff --git a/mods/homedecor_modpack/homedecor/window_treatments.lua b/mods/homedecor_modpack/homedecor/window_treatments.lua index e2adbc99..9d4e90b8 100755 --- a/mods/homedecor_modpack/homedecor/window_treatments.lua +++ b/mods/homedecor_modpack/homedecor/window_treatments.lua @@ -99,23 +99,24 @@ homedecor.register("blinds_thin", { }) local curtaincolors = { - "red", - "green", - "blue", - "white", - "pink", - "violet" + { "red", "#ad2323e0:175" }, + { "green", "#27a927e0:175" }, + { "blue", "#2626c6e0:175" }, + { "white", "#ffffffe0:175" }, + { "pink", "#ff8fb7e0:175" }, + { "violet", "#7f29d7e0:175" }, } for c in ipairs(curtaincolors) do - local color = curtaincolors[c] - local color_d = S(curtaincolors[c]) + local color = curtaincolors[c][1] + local hue = curtaincolors[c][2] + local color_d = S(curtaincolors[c][1]) homedecor.register("curtain_"..color, { description = S("Curtains (%s)"):format(color_d), - tiles = { "homedecor_curtain_"..color..".png" }, - inventory_image = "homedecor_curtain_"..color..".png", - wield_image = "homedecor_curtain_"..color..".png", + tiles = { "homedecor_curtain.png^[colorize:"..hue }, + inventory_image = "homedecor_curtain.png^[colorize:"..hue, + wield_image = "homedecor_curtain.png^[colorize:"..hue, drawtype = 'signlike', use_texture_alpha = true, walkable = false, @@ -135,9 +136,9 @@ for c in ipairs(curtaincolors) do homedecor.register("curtain_open_"..color, { description = S("Curtains (%s)"):format(color_d), - tiles = { "homedecor_curtain_open_"..color..".png" }, - inventory_image = "homedecor_curtain_open_"..color..".png", - wield_image = "homedecor_curtain_open_"..color..".png", + tiles = { "homedecor_curtain_open.png^[colorize:"..hue }, + inventory_image = "homedecor_curtain_open.png^[colorize:"..hue, + wield_image = "homedecor_curtain_open.png^[colorize:"..hue, drawtype = 'signlike', use_texture_alpha = true, walkable = false, @@ -202,3 +203,17 @@ homedecor.register("window_flowerbox", { } } }) + +homedecor.register("stained_glass", { + description = "Stained Glass", + tiles = {"homedecor_stained_glass.png"}, + inventory_image = "homedecor_stained_glass.png", + groups = {snappy=3}, + use_texture_alpha = true, + light_source = 3, + sounds = default.node_sound_glass_defaults(), + node_box = { + type = "fixed", + fixed = { {-0.5, -0.5, 0.46875, 0.5, 0.5, 0.5} } + } +}) diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_books.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_books.png index 8afeff53..6f2be28b 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_books.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_books.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_inside_back.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_inside_back.png index 53174775..3fb49dac 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_inside_back.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_inside_back.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png index 7ae79c68..1cb38f1d 100644 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png differ diff --git a/mods/homedecor_modpack/inbox/init.lua b/mods/homedecor_modpack/inbox/init.lua index 0c6db754..940ec610 100755 --- a/mods/homedecor_modpack/inbox/init.lua +++ b/mods/homedecor_modpack/inbox/init.lua @@ -30,6 +30,7 @@ minetest.register_node("inbox:empty", { paramtype2 = "facedir", groups = {choppy=2,oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple, after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) local owner = placer:get_player_name() diff --git a/mods/homedecor_modpack/inbox/textures/inbox_red_metal.png b/mods/homedecor_modpack/inbox/textures/inbox_red_metal.png index ed579d94..684e3112 100644 Binary files a/mods/homedecor_modpack/inbox/textures/inbox_red_metal.png and b/mods/homedecor_modpack/inbox/textures/inbox_red_metal.png differ diff --git a/mods/homedecor_modpack/inbox/textures/mailbox_inv.png b/mods/homedecor_modpack/inbox/textures/mailbox_inv.png index 866b4d37..8adf3eaa 100644 Binary files a/mods/homedecor_modpack/inbox/textures/mailbox_inv.png and b/mods/homedecor_modpack/inbox/textures/mailbox_inv.png differ diff --git a/mods/homedecor_modpack/itemframes/init.lua b/mods/homedecor_modpack/itemframes/init.lua index 8fb8cdc0..04fad49d 100755 --- a/mods/homedecor_modpack/itemframes/init.lua +++ b/mods/homedecor_modpack/itemframes/init.lua @@ -111,6 +111,7 @@ minetest.register_node("itemframes:frame",{ groups = { choppy=2,dig_immediate=2 }, legacy_wallmounted = true, sounds = default.node_sound_defaults(), + on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) @@ -159,6 +160,7 @@ function itemframes.register_pedestal(subname, recipeitem, groups, images, descr paramtype = "light", groups = { cracky=3 }, sounds = default.node_sound_defaults(), + on_rotate = screwdriver.disallow, after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png index ddf416db..2c085846 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png differ diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png index 44b6c54f..40f5ac1f 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png differ diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png index e5927f8b..98eb4da6 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png differ diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png index 97de2a34..9a4d706e 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png differ diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png index e0d99f9c..8b094964 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png differ diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png index 706e3b2d..1c1af2c8 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png differ diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png index 1fc70e55..704f9c5e 100644 Binary files a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png and b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png differ diff --git a/mods/homedecor_modpack/lrfurn/longsofas.lua b/mods/homedecor_modpack/lrfurn/longsofas.lua index b90c1ae9..321a7ad8 100755 --- a/mods/homedecor_modpack/lrfurn/longsofas.lua +++ b/mods/homedecor_modpack/lrfurn/longsofas.lua @@ -41,6 +41,7 @@ for i in ipairs(longsofas_list) do sounds = default.node_sound_wood_defaults(), selection_box = longsofa_sbox, node_box = longsofa_cbox, + on_rotate = screwdriver.disallow, on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) diff --git a/mods/homedecor_modpack/lrfurn/sofas.lua b/mods/homedecor_modpack/lrfurn/sofas.lua index 3e86d65d..f16498e8 100755 --- a/mods/homedecor_modpack/lrfurn/sofas.lua +++ b/mods/homedecor_modpack/lrfurn/sofas.lua @@ -41,6 +41,7 @@ for i in ipairs(sofas_list) do sounds = default.node_sound_wood_defaults(), selection_box = sofa_sbox, node_box = sofa_cbox, + on_rotate = screwdriver.disallow, on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png index c6d0de01..de7f1141 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png index 9956364d..552a0428 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png index f9399ca3..e72944a6 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png index 2d9774c5..de765501 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png index fa421ad7..406c1146 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png index 0ebf1fb0..ac9e7e59 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png index c08e33c4..3077a097 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png index 5228bef0..098c5d72 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png index 02460670..27ff12a9 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png differ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png index 0beeca78..8c65423a 100644 Binary files a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png and b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png differ diff --git a/mods/homedecor_modpack/plasmascreen/init.lua b/mods/homedecor_modpack/plasmascreen/init.lua index 36f5a384..ab3e059a 100755 --- a/mods/homedecor_modpack/plasmascreen/init.lua +++ b/mods/homedecor_modpack/plasmascreen/init.lua @@ -114,6 +114,7 @@ minetest.register_node("plasmascreen:tv", { light_source = 10, selection_box = tv_cbox, collision_box = tv_cbox, + on_rotate = screwdriver.disallow, groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2}, after_place_node = function(pos, placer, itemstack) if not checkwall(pos) then diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_back.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_back.png index b275c441..a9c43759 100644 Binary files a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_back.png and b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_back.png differ diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case.png index f9604a4a..4fc269e5 100644 Binary files a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case.png and b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case.png differ diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case_off.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case_off.png index 02911fd6..f31329eb 100644 Binary files a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case_off.png and b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case_off.png differ diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_screen_off.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_screen_off.png index 8d83b2a5..56cc2039 100644 Binary files a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_screen_off.png and b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_screen_off.png differ diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_video.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_video.png index debc7a2b..d6e6298f 100644 Binary files a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_video.png and b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_video.png differ diff --git a/mods/homedecor_modpack/signs_lib/depends.txt b/mods/homedecor_modpack/signs_lib/depends.txt index c48fe0d0..c0dd3b07 100755 --- a/mods/homedecor_modpack/signs_lib/depends.txt +++ b/mods/homedecor_modpack/signs_lib/depends.txt @@ -1,3 +1,3 @@ default intllib? - +screwdriver? diff --git a/mods/homedecor_modpack/signs_lib/init.lua b/mods/homedecor_modpack/signs_lib/init.lua index 29d4784e..9bf36e23 100755 --- a/mods/homedecor_modpack/signs_lib/init.lua +++ b/mods/homedecor_modpack/signs_lib/init.lua @@ -12,6 +12,20 @@ signs_lib = {} +local screwdriver = screwdriver or {} +signs_lib.wallmounted_rotate = function(pos, node, user, mode, new_param2) + if mode ~= screwdriver.ROTATE_AXIS then return false end + minetest.swap_node(pos, {name = node.name, param2 = (node.param2 + 1) % 6}) + for _, v in ipairs(minetest.get_objects_inside_radius(pos, 0.5)) do + local e = v:get_luaentity() + if e and e.name == "signs:text" then + v:remove() + end + end + signs_lib.update_sign(pos) + return true +end + signs_lib.modpath = minetest.get_modpath("signs_lib") signs_lib.regular_wall_sign_model = { @@ -697,6 +711,7 @@ minetest.register_node(":default:sign_wall", { on_punch = function(pos, node, puncher) signs_lib.update_sign(pos) end, + on_rotate = signs_lib.wallmounted_rotate }) minetest.register_node(":signs:sign_yard", { @@ -831,6 +846,7 @@ minetest.register_node(":locked_sign:sign_wall_locked", { return pname == owner or pname == minetest.setting_get("name") or minetest.check_player_privs(pname, {sign_editor=true}) end, + on_rotate = signs_lib.wallmounted_rotate }) -- metal, colored signs diff --git a/mods/homedecor_modpack/signs_lib/textures/bg_signs_lib.jpg b/mods/homedecor_modpack/signs_lib/textures/bg_signs_lib.jpg old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_20.png b/mods/homedecor_modpack/signs_lib/textures/hdf_20.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_21.png b/mods/homedecor_modpack/signs_lib/textures/hdf_21.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_22.png b/mods/homedecor_modpack/signs_lib/textures/hdf_22.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_23.png b/mods/homedecor_modpack/signs_lib/textures/hdf_23.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_24.png b/mods/homedecor_modpack/signs_lib/textures/hdf_24.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_25.png b/mods/homedecor_modpack/signs_lib/textures/hdf_25.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_26.png b/mods/homedecor_modpack/signs_lib/textures/hdf_26.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_27.png b/mods/homedecor_modpack/signs_lib/textures/hdf_27.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_28.png b/mods/homedecor_modpack/signs_lib/textures/hdf_28.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_29.png b/mods/homedecor_modpack/signs_lib/textures/hdf_29.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2a.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2b.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2c.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2d.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2e.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2f.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_30.png b/mods/homedecor_modpack/signs_lib/textures/hdf_30.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_31.png b/mods/homedecor_modpack/signs_lib/textures/hdf_31.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_32.png b/mods/homedecor_modpack/signs_lib/textures/hdf_32.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_33.png b/mods/homedecor_modpack/signs_lib/textures/hdf_33.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_34.png b/mods/homedecor_modpack/signs_lib/textures/hdf_34.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_35.png b/mods/homedecor_modpack/signs_lib/textures/hdf_35.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_36.png b/mods/homedecor_modpack/signs_lib/textures/hdf_36.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_37.png b/mods/homedecor_modpack/signs_lib/textures/hdf_37.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_38.png b/mods/homedecor_modpack/signs_lib/textures/hdf_38.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_39.png b/mods/homedecor_modpack/signs_lib/textures/hdf_39.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3a.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3b.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3c.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3d.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3e.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3f.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_40.png b/mods/homedecor_modpack/signs_lib/textures/hdf_40.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_41.png b/mods/homedecor_modpack/signs_lib/textures/hdf_41.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_42.png b/mods/homedecor_modpack/signs_lib/textures/hdf_42.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_43.png b/mods/homedecor_modpack/signs_lib/textures/hdf_43.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_44.png b/mods/homedecor_modpack/signs_lib/textures/hdf_44.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_45.png b/mods/homedecor_modpack/signs_lib/textures/hdf_45.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_46.png b/mods/homedecor_modpack/signs_lib/textures/hdf_46.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_47.png b/mods/homedecor_modpack/signs_lib/textures/hdf_47.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_48.png b/mods/homedecor_modpack/signs_lib/textures/hdf_48.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_49.png b/mods/homedecor_modpack/signs_lib/textures/hdf_49.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4a.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4b.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4c.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4d.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4e.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4f.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_50.png b/mods/homedecor_modpack/signs_lib/textures/hdf_50.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_51.png b/mods/homedecor_modpack/signs_lib/textures/hdf_51.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_52.png b/mods/homedecor_modpack/signs_lib/textures/hdf_52.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_53.png b/mods/homedecor_modpack/signs_lib/textures/hdf_53.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_54.png b/mods/homedecor_modpack/signs_lib/textures/hdf_54.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_55.png b/mods/homedecor_modpack/signs_lib/textures/hdf_55.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_56.png b/mods/homedecor_modpack/signs_lib/textures/hdf_56.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_57.png b/mods/homedecor_modpack/signs_lib/textures/hdf_57.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_58.png b/mods/homedecor_modpack/signs_lib/textures/hdf_58.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_59.png b/mods/homedecor_modpack/signs_lib/textures/hdf_59.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5a.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5b.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5c.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5d.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5e.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5f.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_60.png b/mods/homedecor_modpack/signs_lib/textures/hdf_60.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_61.png b/mods/homedecor_modpack/signs_lib/textures/hdf_61.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_62.png b/mods/homedecor_modpack/signs_lib/textures/hdf_62.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_63.png b/mods/homedecor_modpack/signs_lib/textures/hdf_63.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_64.png b/mods/homedecor_modpack/signs_lib/textures/hdf_64.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_65.png b/mods/homedecor_modpack/signs_lib/textures/hdf_65.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_66.png b/mods/homedecor_modpack/signs_lib/textures/hdf_66.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_67.png b/mods/homedecor_modpack/signs_lib/textures/hdf_67.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_68.png b/mods/homedecor_modpack/signs_lib/textures/hdf_68.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_69.png b/mods/homedecor_modpack/signs_lib/textures/hdf_69.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6a.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6b.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6c.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6d.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6e.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6f.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_70.png b/mods/homedecor_modpack/signs_lib/textures/hdf_70.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_71.png b/mods/homedecor_modpack/signs_lib/textures/hdf_71.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_72.png b/mods/homedecor_modpack/signs_lib/textures/hdf_72.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_73.png b/mods/homedecor_modpack/signs_lib/textures/hdf_73.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_74.png b/mods/homedecor_modpack/signs_lib/textures/hdf_74.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_75.png b/mods/homedecor_modpack/signs_lib/textures/hdf_75.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_76.png b/mods/homedecor_modpack/signs_lib/textures/hdf_76.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_77.png b/mods/homedecor_modpack/signs_lib/textures/hdf_77.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_78.png b/mods/homedecor_modpack/signs_lib/textures/hdf_78.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_79.png b/mods/homedecor_modpack/signs_lib/textures/hdf_79.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7a.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7b.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7c.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7d.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7e.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_back.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_bottom.png b/mods/homedecor_modpack/signs_lib/textures/signs_bottom.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_green_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_green_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_green_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_green_inv.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_back.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_bottom.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_bottom.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_side.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_side.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_top.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_top.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_locked_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_locked_inv.png index b87a3559..3c0554ab 100644 Binary files a/mods/homedecor_modpack/signs_lib/textures/signs_locked_inv.png and b/mods/homedecor_modpack/signs_lib/textures/signs_locked_inv.png differ diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_metal_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_metal_back.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_metal_sides.png b/mods/homedecor_modpack/signs_lib/textures/signs_metal_sides.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_metal_tb.png b/mods/homedecor_modpack/signs_lib/textures/signs_metal_tb.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_back.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_bottom.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_bottom.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_side.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_side.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_top.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_top.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_red_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_red_inv.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_side.png b/mods/homedecor_modpack/signs_lib/textures/signs_side.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_top.png b/mods/homedecor_modpack/signs_lib/textures/signs_top.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign.png b/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign.png index 284fb8b5..2f1c168e 100644 Binary files a/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign.png and b/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign.png differ diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign_locked.png b/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign_locked.png index 2dd61b45..70611674 100644 Binary files a/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign_locked.png and b/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign_locked.png differ diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_black_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_black_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_black_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_black_inv.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_red_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_red_inv.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_yellow_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_yellow_front.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_yellow_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_yellow_inv.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_0.png b/mods/homedecor_modpack/signs_lib/textures/slc_0.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_1.png b/mods/homedecor_modpack/signs_lib/textures/slc_1.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_2.png b/mods/homedecor_modpack/signs_lib/textures/slc_2.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_3.png b/mods/homedecor_modpack/signs_lib/textures/slc_3.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_4.png b/mods/homedecor_modpack/signs_lib/textures/slc_4.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_5.png b/mods/homedecor_modpack/signs_lib/textures/slc_5.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_6.png b/mods/homedecor_modpack/signs_lib/textures/slc_6.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_7.png b/mods/homedecor_modpack/signs_lib/textures/slc_7.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_8.png b/mods/homedecor_modpack/signs_lib/textures/slc_8.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_9.png b/mods/homedecor_modpack/signs_lib/textures/slc_9.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_A.png b/mods/homedecor_modpack/signs_lib/textures/slc_A.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_B.png b/mods/homedecor_modpack/signs_lib/textures/slc_B.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_C.png b/mods/homedecor_modpack/signs_lib/textures/slc_C.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_D.png b/mods/homedecor_modpack/signs_lib/textures/slc_D.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_E.png b/mods/homedecor_modpack/signs_lib/textures/slc_E.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_F.png b/mods/homedecor_modpack/signs_lib/textures/slc_F.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_n.png b/mods/homedecor_modpack/signs_lib/textures/slc_n.png old mode 100755 new mode 100644