diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index fdaceae2..935f0abb 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -1043,48 +1043,39 @@ minetest.register_node("homedecor:cutlery_set", { } }) +local bottle_cbox = { + type = "fixed", + fixed = { + { -0.125, -0.5, -0.125, 0.125, 0, 0.125} + } +} + minetest.register_node("homedecor:bottle_brown", { - tiles = { - "homedecor_bottle_brown_top.png", - "homedecor_bottle_brown_sides.png" - }, + tiles = { "homedecor_bottle_brown.png" }, inventory_image = "homedecor_bottle_brown_inv.png", description = "Brown bottle", - drawtype = "nodebox", + drawtype = "mesh", + mesh = "homedecor_bottle.obj", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, - use_texture_alpha = true, groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.032, -0.50, -0.11, 0.032, -0.3, -0.046}, -- NodeBox1 - {-0.016, -0.30, -0.094, 0.016, -0.2, -0.062}, -- NodeBox2 - } - } + collision_box = bottle_cbox, + selection_box = bottle_cbox }) minetest.register_node("homedecor:bottle_green", { - tiles = { - "homedecor_bottle_green_top.png", - "homedecor_bottle_green_sides.png" - }, + tiles = { "homedecor_bottle_green.png" }, inventory_image = "homedecor_bottle_green_inv.png", description = "Green bottle", - drawtype = "nodebox", + drawtype = "mesh", + mesh = "homedecor_bottle.obj", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, - use_texture_alpha = true, groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.032, -0.50, -0.11, 0.032, -0.3, -0.046}, -- NodeBox1 - {-0.016, -0.30, -0.094, 0.016, -0.2, -0.062}, -- NodeBox2 - } - } + collision_box = bottle_cbox, + selection_box = bottle_cbox }) minetest.register_node("homedecor:coffee_maker", { diff --git a/homedecor/models/homedecor_bottle.obj b/homedecor/models/homedecor_bottle.obj new file mode 100644 index 00000000..03ecf93b --- /dev/null +++ b/homedecor/models/homedecor_bottle.obj @@ -0,0 +1,594 @@ +# Blender v2.69 (sub 0) OBJ File: 'bottle.blend' +# www.blender.org +o bottle.1_Cylinder.007 +v 0.102226 -0.050066 0.174666 +v -0.057098 -0.499974 -0.020782 +v -0.025270 0.000014 -0.009198 +v -0.044782 -0.499974 -0.041094 +v -0.019820 0.000014 -0.018187 +v -0.025650 -0.499974 -0.055150 +v -0.011352 0.000014 -0.024408 +v -0.002612 -0.499974 -0.060811 +v -0.001156 0.000014 -0.026913 +v 0.020824 -0.499974 -0.057213 +v 0.009216 0.000014 -0.025321 +v 0.041089 -0.499974 -0.044905 +v 0.018185 0.000014 -0.019874 +v 0.055099 -0.499974 -0.025761 +v 0.024386 0.000014 -0.011401 +v 0.060720 -0.499974 -0.002694 +v 0.026873 0.000014 -0.001192 +v 0.057097 -0.499974 0.020782 +v 0.025270 0.000014 0.009198 +v 0.044782 -0.499974 0.041094 +v 0.019820 0.000014 0.018188 +v 0.025649 -0.499974 0.055151 +v 0.011352 0.000014 0.024409 +v 0.002612 -0.499974 0.060811 +v 0.001156 0.000014 0.026914 +v -0.020824 -0.499974 0.057213 +v -0.009216 0.000014 0.025321 +v -0.041089 -0.499974 0.044905 +v -0.018185 0.000014 0.019874 +v -0.055099 -0.499974 0.025761 +v -0.024386 0.000014 0.011401 +v -0.060720 -0.499974 0.002695 +v -0.026874 0.000014 0.001193 +v -0.068927 -0.223085 -0.025087 +v -0.054060 -0.223085 -0.049608 +v -0.030964 -0.223085 -0.066576 +v -0.003153 -0.223085 -0.073409 +v 0.025138 -0.223085 -0.069066 +v 0.049602 -0.223085 -0.054208 +v 0.066514 -0.223085 -0.031098 +v 0.073300 -0.223085 -0.003253 +v 0.068927 -0.223085 0.025087 +v 0.054060 -0.223085 0.049608 +v 0.030963 -0.223085 0.066577 +v 0.003153 -0.223085 0.073409 +v -0.025138 -0.223085 0.069066 +v -0.049602 -0.223085 0.054208 +v -0.066514 -0.223085 0.031098 +v -0.073300 -0.223085 0.003253 +v -0.029876 -0.112565 -0.010874 +v -0.023432 -0.112565 -0.021502 +v -0.013421 -0.112565 -0.028857 +v -0.001367 -0.112565 -0.031819 +v 0.010896 -0.112565 -0.029936 +v 0.021499 -0.112565 -0.023496 +v 0.028830 -0.112565 -0.013479 +v 0.031771 -0.112565 -0.001410 +v 0.029876 -0.112565 0.010874 +v 0.023432 -0.112565 0.021502 +v 0.013421 -0.112565 0.028857 +v 0.001366 -0.112565 0.031819 +v -0.010896 -0.112565 0.029936 +v -0.021500 -0.112565 0.023496 +v -0.028830 -0.112565 0.013479 +v -0.031772 -0.112565 0.001410 +v -0.025270 -0.050066 -0.009198 +v -0.019820 -0.050066 -0.018187 +v -0.011352 -0.050066 -0.024408 +v -0.001156 -0.050066 -0.026914 +v 0.009216 -0.050066 -0.025321 +v 0.018185 -0.050066 -0.019874 +v 0.024386 -0.050066 -0.011401 +v 0.026873 -0.050066 -0.001193 +v 0.025270 -0.050066 0.009198 +v 0.019820 -0.050066 0.018188 +v 0.011352 -0.050066 0.024409 +v 0.001156 -0.050066 0.026914 +v -0.009216 -0.050066 0.025321 +v -0.018185 -0.050066 0.019874 +v -0.024386 -0.050066 0.011401 +v -0.026874 -0.050066 0.001193 +v -0.055878 -0.490231 -0.051276 +v -0.032004 -0.490231 -0.068815 +v -0.003259 -0.490231 -0.075877 +v 0.025983 -0.490231 -0.071388 +v 0.051269 -0.490231 -0.056031 +v 0.068750 -0.490231 -0.032143 +v 0.075764 -0.490231 -0.003362 +v 0.071244 -0.490231 0.025931 +v 0.055878 -0.490231 0.051276 +v 0.032004 -0.490231 0.068815 +v 0.003259 -0.490231 0.075877 +v -0.025983 -0.490231 0.071388 +v -0.051269 -0.490231 0.056031 +v -0.068750 -0.490231 0.032143 +v -0.075764 -0.490231 0.003362 +v -0.071244 -0.490231 -0.025931 +v -0.057437 -0.360107 -0.052706 +v -0.032897 -0.360107 -0.070735 +v -0.003350 -0.360107 -0.077994 +v 0.026708 -0.360107 -0.073380 +v 0.052699 -0.360107 -0.057594 +v 0.070668 -0.360107 -0.033040 +v 0.077878 -0.360107 -0.003456 +v 0.073232 -0.360107 0.026654 +v 0.057437 -0.360107 0.052706 +v 0.032897 -0.360107 0.070735 +v 0.003350 -0.360107 0.077994 +v -0.026708 -0.360107 0.073380 +v -0.052700 -0.360107 0.057594 +v -0.070668 -0.360107 0.033040 +v -0.077878 -0.360107 0.003456 +v -0.073232 -0.360107 -0.026654 +v -0.055878 -0.235452 -0.051276 +v -0.032004 -0.235452 -0.068814 +v -0.003259 -0.235452 -0.075877 +v 0.025983 -0.235452 -0.071388 +v 0.051269 -0.235452 -0.056030 +v 0.068750 -0.235452 -0.032143 +v 0.075764 -0.235452 -0.003362 +v 0.071244 -0.235452 0.025931 +v 0.055878 -0.235452 0.051276 +v 0.032004 -0.235452 0.068815 +v 0.003259 -0.235452 0.075877 +v -0.025983 -0.235452 0.071388 +v -0.051269 -0.235452 0.056031 +v -0.068750 -0.235452 0.032143 +v -0.075764 -0.235452 0.003362 +v -0.071244 -0.235452 -0.025931 +v -0.017689 -0.360107 0.209718 +v 0.101342 -0.050066 0.154067 +v 0.044952 -0.490231 0.096654 +v 0.055878 -0.235452 0.051276 +v -0.025983 -0.235452 0.071388 +v -0.063971 -0.050066 0.231357 +v 0.187337 -0.264835 0.222820 +v 0.275694 -0.264835 -0.019938 +v 0.110381 -0.264835 0.057352 +v -0.214723 -0.515684 0.196759 +v 0.023805 -0.233479 -0.128800 +v -0.111224 -0.233479 -0.040488 +v -0.364894 -0.515684 0.279560 +v 0.275694 -0.515684 -0.019938 +v 0.110381 -0.515684 0.057352 +v -0.229864 -0.515684 0.191248 +v -0.000000 0.000014 0.000000 +v -0.000000 -0.499974 0.000000 +vt 0.672622 0.911870 +vt 0.657436 0.915004 +vt 0.657151 0.875265 +vt 0.312500 0.895833 +vt 0.312500 0.979167 +vt 0.291667 0.979167 +vt 0.291667 0.895833 +vt 0.270833 0.895833 +vt 0.270833 0.979167 +vt 0.250000 0.979167 +vt 0.250000 0.895833 +vt 0.229167 0.979167 +vt 0.229167 0.895833 +vt 0.208333 0.979167 +vt 0.208333 0.895833 +vt 0.187500 0.895833 +vt 0.187500 0.979167 +vt 0.166667 0.979167 +vt 0.166667 0.895833 +vt 0.145833 0.979167 +vt 0.145833 0.895833 +vt 0.125000 0.979167 +vt 0.125000 0.895833 +vt 0.104167 0.979167 +vt 0.104167 0.895833 +vt 0.083333 0.979167 +vt 0.083333 0.895833 +vt 0.062500 0.895833 +vt 0.062500 0.979167 +vt 0.041667 0.979167 +vt 0.041667 0.895833 +vt 0.020833 0.979167 +vt 0.491718 0.964957 +vt 0.457337 0.958217 +vt 0.491470 0.875167 +vt 0.333333 0.895833 +vt 0.333333 0.979167 +vt 0.354167 0.895833 +vt 0.354167 0.979167 +vt 0.604167 0.520833 +vt 0.604167 0.562500 +vt 0.562500 0.562500 +vt 0.562500 0.520833 +vt 0.520833 0.562500 +vt 0.520833 0.520833 +vt 0.479167 0.562500 +vt 0.479167 0.520833 +vt 0.437500 0.562500 +vt 0.437500 0.520833 +vt 0.395833 0.562500 +vt 0.395833 0.520833 +vt 0.354167 0.520833 +vt 0.354167 0.562500 +vt 0.312500 0.520833 +vt 0.312500 0.562500 +vt 0.270833 0.562500 +vt 0.270833 0.520833 +vt 0.229167 0.520833 +vt 0.229167 0.562500 +vt 0.187500 0.562500 +vt 0.187500 0.520833 +vt 0.145833 0.562500 +vt 0.145833 0.520833 +vt 0.104167 0.562500 +vt 0.104167 0.520833 +vt 0.062500 0.520833 +vt 0.062500 0.562500 +vt 0.020833 0.562500 +vt 0.645833 0.520833 +vt 0.645833 0.562500 +vt 0.687500 0.520833 +vt 0.687500 0.562500 +vt 0.604167 0.750000 +vt 0.562500 0.750000 +vt 0.520833 0.750000 +vt 0.479167 0.750000 +vt 0.437500 0.750000 +vt 0.395833 0.750000 +vt 0.354167 0.750000 +vt 0.312500 0.750000 +vt 0.270833 0.750000 +vt 0.229167 0.750000 +vt 0.187500 0.750000 +vt 0.145833 0.750000 +vt 0.104167 0.750000 +vt 0.062500 0.750000 +vt 0.020833 0.750000 +vt 0.645833 0.750000 +vt 0.687500 0.750000 +vt 0.312500 0.791667 +vt 0.291667 0.791667 +vt 0.270833 0.791667 +vt 0.250000 0.791667 +vt 0.229167 0.791667 +vt 0.208333 0.791667 +vt 0.187500 0.791667 +vt 0.166667 0.791667 +vt 0.145833 0.791667 +vt 0.125000 0.791667 +vt 0.104167 0.791667 +vt 0.083333 0.791667 +vt 0.062500 0.791667 +vt 0.041667 0.791667 +vt 0.020833 0.791667 +vt 0.333333 0.791667 +vt 0.354167 0.791667 +vt 0.604167 0.020833 +vt 0.604167 0.062500 +vt 0.562500 0.062500 +vt 0.562500 0.020833 +vt 0.520833 0.020833 +vt 0.520833 0.062500 +vt 0.479167 0.020833 +vt 0.479167 0.062500 +vt 0.437500 0.062500 +vt 0.437500 0.020833 +vt 0.395833 0.020833 +vt 0.395833 0.062500 +vt 0.354167 0.062500 +vt 0.354167 0.020833 +vt 0.312500 0.062500 +vt 0.312500 0.020833 +vt 0.270833 0.062500 +vt 0.270833 0.020833 +vt 0.229167 0.062500 +vt 0.229167 0.020833 +vt 0.187500 0.062500 +vt 0.187500 0.020833 +vt 0.145833 0.062500 +vt 0.145833 0.020833 +vt 0.104167 0.062500 +vt 0.104167 0.020833 +vt 0.062500 0.020833 +vt 0.062500 0.062500 +vt 0.020833 0.020833 +vt 0.645833 0.020833 +vt 0.645833 0.062500 +vt 0.687500 0.020833 +vt 0.687500 0.062500 +vt 0.562500 0.312500 +vt 0.520833 0.312500 +vt 0.479167 0.312500 +vt 0.437500 0.312500 +vt 0.395833 0.312500 +vt 0.354167 0.312500 +vt 0.312500 0.312500 +vt 0.270833 0.312500 +vt 0.229167 0.312500 +vt 0.187500 0.312500 +vt 0.145833 0.312500 +vt 0.104167 0.312500 +vt 0.062500 0.312500 +vt 0.020833 0.312500 +vt 0.645833 0.312500 +vt 0.604167 0.312500 +vt 0.687500 0.312500 +vt 0.020833 0.520833 +vt 0.020833 0.895833 +vt 0.020833 0.062500 +vt 0.642207 0.912088 +vt 0.629253 0.903566 +vt 0.620547 0.890735 +vt 0.617413 0.875550 +vt 0.620329 0.860321 +vt 0.628851 0.847367 +vt 0.641681 0.838660 +vt 0.656867 0.835526 +vt 0.672096 0.838442 +vt 0.685050 0.846964 +vt 0.693756 0.859795 +vt 0.696890 0.874980 +vt 0.693974 0.890209 +vt 0.685452 0.903163 +vt 0.428154 0.938834 +vt 0.408609 0.909757 +vt 0.401680 0.875415 +vt 0.408420 0.841035 +vt 0.427804 0.811851 +vt 0.456880 0.792307 +vt 0.491222 0.785377 +vt 0.525602 0.792117 +vt 0.554786 0.811501 +vt 0.574330 0.840577 +vt 0.581260 0.874920 +vt 0.574520 0.909300 +vt 0.555136 0.938483 +vt 0.526059 0.958028 +s 1 +f 5/1 3/2 146/3 +f 66/4 3/5 5/6 +f 67/7 5/6 68/8 +f 68/8 7/9 9/10 +f 69/11 9/10 11/12 +f 70/13 11/12 13/14 +f 71/15 13/14 72/16 +f 72/16 15/17 17/18 +f 73/19 17/18 19/20 +f 74/21 19/20 21/22 +f 75/23 21/22 23/24 +f 76/25 23/24 25/26 +f 77/27 25/26 78/28 +f 78/28 27/29 29/30 +f 79/31 29/30 31/32 +f 2/33 4/34 147/35 +f 81/36 33/37 3/5 +f 80/38 31/39 33/37 +f 129/40 34/41 35/42 +f 114/43 35/42 36/44 +f 115/45 36/44 37/46 +f 116/47 37/46 38/48 +f 117/49 38/48 39/50 +f 118/51 39/50 119/52 +f 119/52 40/53 120/54 +f 120/54 41/55 42/56 +f 121/57 42/56 122/58 +f 122/58 43/59 44/60 +f 123/61 44/60 45/62 +f 124/63 45/62 46/64 +f 125/65 46/64 126/66 +f 126/66 47/67 48/68 +f 128/69 49/70 129/40 +f 127/71 48/72 49/70 +f 34/41 50/73 35/42 +f 35/42 51/74 36/44 +f 36/44 52/75 37/46 +f 37/46 53/76 54/77 +f 38/48 54/77 55/78 +f 39/50 55/78 40/53 +f 40/53 56/79 57/80 +f 41/55 57/80 58/81 +f 42/56 58/81 59/82 +f 43/59 59/82 60/83 +f 44/60 60/83 45/62 +f 45/62 61/84 46/64 +f 46/64 62/85 47/67 +f 47/67 63/86 64/87 +f 49/70 65/88 50/73 +f 48/72 64/89 65/88 +f 50/90 66/4 67/7 +f 51/91 67/7 68/8 +f 52/92 68/8 69/11 +f 53/93 69/11 70/13 +f 54/94 70/13 71/15 +f 55/95 71/15 72/16 +f 56/96 72/16 73/19 +f 57/97 73/19 74/21 +f 58/98 74/21 75/23 +f 59/99 75/23 76/25 +f 60/100 76/25 77/27 +f 61/101 77/27 78/28 +f 62/102 78/28 79/31 +f 63/103 79/31 64/104 +f 65/105 81/36 66/4 +f 64/106 80/38 81/36 +f 2/107 97/108 82/109 +f 4/110 82/109 6/111 +f 6/111 83/112 8/113 +f 8/113 84/114 85/115 +f 10/116 85/115 12/117 +f 12/117 86/118 87/119 +f 14/120 87/119 88/121 +f 16/122 88/121 89/123 +f 18/124 89/123 90/125 +f 20/126 90/125 91/127 +f 22/128 91/127 92/129 +f 24/130 92/129 93/131 +f 26/132 93/131 28/133 +f 28/133 94/134 30/135 +f 32/136 96/137 2/107 +f 30/138 95/139 32/136 +f 82/109 98/140 83/112 +f 83/112 99/141 84/114 +f 84/114 100/142 101/143 +f 85/115 101/143 102/144 +f 86/118 102/144 103/145 +f 87/119 103/145 104/146 +f 88/121 104/146 105/147 +f 89/123 105/147 106/148 +f 90/125 106/148 107/149 +f 91/127 107/149 108/150 +f 92/129 108/150 109/151 +f 93/131 109/151 110/152 +f 94/134 110/152 111/153 +f 96/137 112/154 113/155 +f 95/139 111/156 112/154 +f 113/155 129/40 114/43 +f 98/140 114/43 99/141 +f 99/141 115/45 116/47 +f 100/142 116/47 117/49 +f 101/143 117/49 102/144 +f 102/144 118/51 119/52 +f 103/145 119/52 120/54 +f 104/146 120/54 105/147 +f 105/147 121/57 122/58 +f 106/148 122/58 123/61 +f 107/149 123/61 108/150 +f 108/150 124/63 125/65 +f 109/151 125/65 126/66 +f 110/152 126/66 111/153 +f 112/154 128/69 129/40 +f 111/156 127/71 128/69 +f 97/108 113/155 82/109 +f 61/84 62/85 46/64 +f 13/14 15/17 72/16 +f 126/66 127/157 111/153 +f 55/78 56/79 40/53 +f 40/53 41/55 120/54 +f 85/115 86/118 12/117 +f 117/49 118/51 102/144 +f 67/7 66/4 5/6 +f 69/11 68/8 9/10 +f 70/13 69/11 11/12 +f 71/15 70/13 13/14 +f 73/19 72/16 17/18 +f 74/21 73/19 19/20 +f 75/23 74/21 21/22 +f 76/25 75/23 23/24 +f 77/27 76/25 25/26 +f 79/31 78/28 29/30 +f 80/158 79/31 31/32 +f 66/4 81/36 3/5 +f 81/36 80/38 33/37 +f 114/43 129/40 35/42 +f 115/45 114/43 36/44 +f 116/47 115/45 37/46 +f 117/49 116/47 38/48 +f 118/51 117/49 39/50 +f 39/50 40/53 119/52 +f 60/83 61/84 45/62 +f 121/57 120/54 42/56 +f 99/141 100/142 84/114 +f 123/61 122/58 44/60 +f 124/63 123/61 45/62 +f 125/65 124/63 46/64 +f 127/157 126/66 48/68 +f 128/69 127/71 49/70 +f 79/31 80/158 64/104 +f 38/48 37/46 54/77 +f 39/50 38/48 55/78 +f 41/55 40/53 57/80 +f 42/56 41/55 58/81 +f 43/59 42/56 59/82 +f 44/60 43/59 60/83 +f 48/68 47/67 64/87 +f 34/41 49/70 50/73 +f 49/70 48/72 65/88 +f 51/91 50/90 67/7 +f 52/92 51/91 68/8 +f 53/93 52/92 69/11 +f 54/94 53/93 70/13 +f 55/95 54/94 71/15 +f 56/96 55/95 72/16 +f 57/97 56/96 73/19 +f 58/98 57/97 74/21 +f 59/99 58/98 75/23 +f 60/100 59/99 76/25 +f 61/101 60/100 77/27 +f 62/102 61/101 78/28 +f 63/103 62/102 79/31 +f 50/90 65/105 66/4 +f 65/105 64/106 81/36 +f 4/110 2/107 82/109 +f 10/116 8/113 85/115 +f 14/120 12/117 87/119 +f 16/122 14/120 88/121 +f 18/124 16/122 89/123 +f 20/126 18/124 90/125 +f 22/128 20/126 91/127 +f 24/130 22/128 92/129 +f 26/132 24/130 93/131 +f 93/131 94/134 28/133 +f 94/134 95/159 30/135 +f 96/137 97/108 2/107 +f 95/139 96/137 32/136 +f 85/115 84/114 101/143 +f 86/118 85/115 102/144 +f 87/119 86/118 103/145 +f 88/121 87/119 104/146 +f 89/123 88/121 105/147 +f 90/125 89/123 106/148 +f 91/127 90/125 107/149 +f 92/129 91/127 108/150 +f 93/131 92/129 109/151 +f 94/134 93/131 110/152 +f 95/159 94/134 111/153 +f 97/108 96/137 113/155 +f 96/137 95/139 112/154 +f 98/140 113/155 114/43 +f 100/142 99/141 116/47 +f 101/143 100/142 117/49 +f 103/145 102/144 119/52 +f 104/146 103/145 120/54 +f 106/148 105/147 122/58 +f 107/149 106/148 123/61 +f 113/155 98/140 82/109 +f 109/151 108/150 125/65 +f 110/152 109/151 126/66 +f 113/155 112/154 129/40 +f 112/154 111/156 128/69 +f 5/6 7/9 68/8 +f 51/74 52/75 36/44 +f 82/109 83/112 6/111 +f 49/70 34/41 129/40 +f 52/75 53/76 37/46 +f 120/54 121/57 105/147 +f 98/140 99/141 83/112 +f 50/73 51/74 35/42 +f 62/85 63/86 47/67 +f 83/112 84/114 8/113 +f 114/43 115/45 99/141 +f 123/61 124/63 108/150 +f 25/26 27/29 78/28 +f 42/56 43/59 122/58 +f 46/64 47/67 126/66 +f 3/2 33/160 146/3 +f 33/160 31/161 146/3 +f 31/161 29/162 146/3 +f 29/162 27/163 146/3 +f 27/163 25/164 146/3 +f 25/164 23/165 146/3 +f 23/165 21/166 146/3 +f 21/166 19/167 146/3 +f 19/167 17/168 146/3 +f 17/168 15/169 146/3 +f 15/169 13/170 146/3 +f 13/170 11/171 146/3 +f 11/171 9/172 146/3 +f 9/172 7/173 146/3 +f 7/173 5/1 146/3 +f 4/34 6/174 147/35 +f 6/174 8/175 147/35 +f 8/175 10/176 147/35 +f 10/176 12/177 147/35 +f 12/177 14/178 147/35 +f 14/178 16/179 147/35 +f 16/179 18/180 147/35 +f 18/180 20/181 147/35 +f 20/181 22/182 147/35 +f 22/182 24/183 147/35 +f 24/183 26/184 147/35 +f 26/184 28/185 147/35 +f 28/185 30/186 147/35 +f 30/186 32/187 147/35 +f 32/187 2/33 147/35 diff --git a/homedecor/textures/homedecor_bottle_brown.png b/homedecor/textures/homedecor_bottle_brown.png new file mode 100644 index 00000000..fa72961e Binary files /dev/null and b/homedecor/textures/homedecor_bottle_brown.png differ diff --git a/homedecor/textures/homedecor_bottle_brown_inv.png b/homedecor/textures/homedecor_bottle_brown_inv.png index f720a69c..aff22d04 100644 Binary files a/homedecor/textures/homedecor_bottle_brown_inv.png and b/homedecor/textures/homedecor_bottle_brown_inv.png differ diff --git a/homedecor/textures/homedecor_bottle_brown_sides.png b/homedecor/textures/homedecor_bottle_brown_sides.png deleted file mode 100644 index ebb2a043..00000000 Binary files a/homedecor/textures/homedecor_bottle_brown_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bottle_brown_top.png b/homedecor/textures/homedecor_bottle_brown_top.png deleted file mode 100644 index 17b55dbe..00000000 Binary files a/homedecor/textures/homedecor_bottle_brown_top.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bottle_green.png b/homedecor/textures/homedecor_bottle_green.png new file mode 100644 index 00000000..a9f117ea Binary files /dev/null and b/homedecor/textures/homedecor_bottle_green.png differ diff --git a/homedecor/textures/homedecor_bottle_green_inv.png b/homedecor/textures/homedecor_bottle_green_inv.png index e2dab3d0..eedf7c98 100644 Binary files a/homedecor/textures/homedecor_bottle_green_inv.png and b/homedecor/textures/homedecor_bottle_green_inv.png differ diff --git a/homedecor/textures/homedecor_bottle_green_sides.png b/homedecor/textures/homedecor_bottle_green_sides.png deleted file mode 100644 index 83dcbde1..00000000 Binary files a/homedecor/textures/homedecor_bottle_green_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bottle_green_top.png b/homedecor/textures/homedecor_bottle_green_top.png deleted file mode 100644 index 3bc581f1..00000000 Binary files a/homedecor/textures/homedecor_bottle_green_top.png and /dev/null differ