From c347faaed69ac1b8e127bef18c4776a1e8b47e0e Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Wed, 27 May 2015 22:17:29 +0200 Subject: [PATCH] Updated plantlife - Updated meshes from @VanessaE 's repository, however, flowers_potted.obj is still missing --- .../dryplants/models/plantlike.obj | 76 ++++++------------ .../textures/flowers_flowerpot.png | Bin 972 -> 0 bytes .../flowers_plus/textures/flowers_potted.png | Bin 354 -> 0 bytes .../textures/flowers_potted_bonsai.png | Bin 286 -> 0 bytes .../textures/flowers_potted_cactus.png | Bin 185 -> 0 bytes .../flowers_potted_dandelion_white.png | Bin 131 -> 0 bytes .../flowers_potted_dandelion_yellow.png | Bin 133 -> 0 bytes .../textures/flowers_potted_geranium.png | Bin 163 -> 0 bytes .../textures/flowers_potted_rose.png | Bin 136 -> 0 bytes .../textures/flowers_potted_tulip.png | Bin 143 -> 0 bytes .../textures/flowers_potted_viola.png | Bin 130 -> 0 bytes 11 files changed, 24 insertions(+), 52 deletions(-) mode change 100755 => 100644 mods/plantlife_modpack/dryplants/models/plantlike.obj delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png delete mode 100755 mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png diff --git a/mods/plantlife_modpack/dryplants/models/plantlike.obj b/mods/plantlife_modpack/dryplants/models/plantlike.obj old mode 100755 new mode 100644 index 3a9ac439..4b38d39c --- a/mods/plantlife_modpack/dryplants/models/plantlike.obj +++ b/mods/plantlife_modpack/dryplants/models/plantlike.obj @@ -1,56 +1,28 @@ -# Blender v2.69 (sub 0) OBJ File: 'plantlike.blend' +# Blender v2.73 (sub 0) OBJ File: '' # www.blender.org -mtllib plantlike.mtl -o Plane.001 -v 0.347299 -0.500000 -0.359699 -v -0.347299 -0.500000 0.359699 -v 0.347299 0.500000 -0.359699 -v -0.347299 0.500000 0.359699 -v 0.359699 -0.500000 0.347299 -v -0.359699 -0.500000 -0.347299 -v 0.359699 0.500000 0.347299 -v -0.359699 0.500000 -0.347299 -v -0.347659 -0.500000 0.359352 -v -0.347659 0.500000 0.359351 -v 0.346940 0.500000 -0.360046 -v 0.346940 -0.500000 -0.360046 -v -0.359352 -0.500000 -0.347659 -v -0.359351 0.500000 -0.347659 -v 0.360046 0.500000 0.346939 -v 0.360046 -0.500000 0.346940 -vt 0.000000 0.000000 -vt 1.000000 0.000000 +o Cylinder +v 0.359670 -0.500000 0.347329 +v 0.359670 0.500000 0.347329 +v -0.359670 -0.500000 -0.347329 +v -0.359670 0.500000 -0.347329 +v 0.347329 0.500000 -0.359670 +v 0.347329 -0.500000 -0.359670 +v -0.347329 0.500000 0.359670 +v -0.347329 -0.500000 0.359670 +v 0.359670 -0.500000 0.347329 +v 0.359670 0.500000 0.347329 +v -0.359670 -0.500000 -0.347329 +v -0.359670 0.500000 -0.347329 +v 0.347329 0.500000 -0.359670 +v 0.347329 -0.500000 -0.359670 +v -0.347329 0.500000 0.359670 +v -0.347329 -0.500000 0.359670 +vt 1.000000 -0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 -vt 0.999500 0.499625 -vt 0.999500 0.000000 -vt 0.999750 0.000000 -vt 0.999750 0.499625 -vt 0.999250 0.499625 -vt 0.999251 0.000000 -vt 0.999750 0.999250 -vt 0.999500 0.999250 -vt 1.000000 0.499625 -vt 1.000000 0.999250 -vt 0.499625 0.999500 -vt 0.000000 0.999500 -vt 0.000000 0.999250 -vt 0.499625 0.999250 -vt 0.999251 0.999250 -vt 0.499625 0.999251 -vt 0.999250 0.999250 -vt 0.999250 0.999500 -usemtl None +vt -0.000000 0.000000 s off -f 2/1 1/2 3/3 4/4 -f 6/1 5/2 7/3 8/4 -f 9/2 10/3 11/4 12/1 -f 13/2 14/3 15/4 16/1 -f 5/5 6/6 13/7 16/8 -f 7/6 5/5 16/9 15/10 -f 8/8 7/11 15/12 14/5 -f 6/13 8/14 14/11 13/8 -f 1/15 2/16 9/17 12/18 -f 3/5 1/12 12/19 11/9 -f 4/20 3/21 11/22 10/15 -f 2/2 4/13 10/8 9/7 +f 1/1 2/2 4/3 3/4 +f 8/1 7/2 5/3 6/4 +f 9/1 11/4 12/3 10/2 +f 16/1 14/4 13/3 15/2 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png deleted file mode 100755 index acd7c8df464f37d8971a59ba1bf7939a4babd484..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 972 zcmV;-12g=IP)nSc*C8EZ2iN+K6oDjQ5B7;7>gL?9J!G$3Fu9b79MP$n5xC>m%nA7CyW zN+TCfB^gE`7J51(XE7dmIwNK=9(Fh)T`V1DF&;u66?r-%bvPnl#67BLkIBnbv~I3hndpaXgCK*X07DFBsG!+ak5(_C33U4$Z zNFo*|4hUQ;8$cQm7zPA89}qei4<8B!>yHqN0000rbW%=J015{KDH+r=9}oEG<>R@L zfp~I7K|A{R`0d}=*2>AZwX3O`nvaBfVOdNj_wmBDv7CH!U`o@#u>b%9CP_p=R9M69 z)7NsFKoo%CRqw?rakpbT?&%3)VQCUY1<^!Nm)`#^vM6#g$z&$LMQ*}(e|}ib0%EaP zEcP#?QpsduFPTb#P?DK+`=Newd2)1AES{d8U)R1or87wo(DP&M;ux{EVHmbSSQdjA znTN%T+G8Qm)9=p*!^y_=Hj3jo-rV)(o@W^Paxy&p@EqXi_vV0ed*jtgQPiHg_LQ}< zR+WvS8k}f;3h)9S&3?}}9?!?F(%Y`Ks^W}QbvxEI^EyD_Ml+$ZavZ-gS6$VebuQ_SFISyC=Q_DO!>=O_L;vraBZ&@dJTj zS%M&%0RriFoflL`lo4qWEV1`G732m!9R4UkQDBIlZVMogT=kCuvIzpK(A2L1izJzB z9t2jOPNgYL(-a&al3|$PaLABv5+JZl2TxD&5~#j_hjD@=$*&-UDn;+$>p*^IWpf~e z7NmCIK49S$f-njd{0aSlJjCM!hA&|l$@+ee^2-`aIS@*Y|1FRO;bf{1?gHd)oMrDo zNR2+vL&(b{9%j4UZW@HtuJn0qVRe0@6A)JFQtV>_fu~24$!8E+bo~rOa3wEf8Fh7?BAZ;@qhCd~NJtSr@9e6k)aWx=lF&!`w3PBnJL6rNcxDODV46h`7yc9Z^0h##l-g;n zk1A&iv_uXNUCf~J*NVLeCWE?xRHT_FDxhj06^HQf&hRq>F~$FemkxYPl)?JeBGBXj zF)Cff&>6P6u1xogcXDm00b4#!<&GW z699xGtAhYwFeU(~pkO8ez>r1&5LPe>M#0Df0A@l8P^FiA_W%F@07*qoM6N<$g5w>2 AjsO4v diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png deleted file mode 100755 index f2a8c6c8156c21b43f0f938f4c68013d2ef402ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}a)3{WE0E5QF_P6~u#I9caAh#@ zVhD28a*Ah+_OsA+W^hVourpCk2{N_}Veq!o(y(Drvt;mh)zz?Ik=J9i31MJnV=#_n zF!y8tN*TH{0Cfd8Yn%HrriAFbS*y!vGHO^buqho{3A9F{B*-tA;n(UZQ<~mAx^w5; z=|lVXY-&kK^t9mRVLoEYJsYSd$kW9!MB;L?gonZzJ!Qp{T5SRo7?@Z&#WegUMLKvm zHMMpJvuGXA(mZ%V;pmAo+FX|v^vB+77Z;Xpo>IIt4;OXk;vd$@?2>?b^Oo;#h diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png deleted file mode 100755 index 725c630355317786514ef0d108d0b8a48c5f5a40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ1=4Z#3gMNKpPPb_2yp3!)A$S;_|;n|HeAjitn#W95A zdh!Ap18E1zX_FOA!Z%E0p7C&=R3KZL$BG@CjgpN@ngVSZkBb5gn%!ScV3=_*_U|_) bW@ZNEY))VMFJdo&rZ9NA`njxgN@xNAHI+B> diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png deleted file mode 100755 index 0b0a8230a32e702aa7afedf04cdfd18a71df53fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=5$VpZA-^wrlS;lQfo^ zZrABRA;yv*zhDN3XE)M-93@W|#}JO|$qQr*xSS-LnwSFG7Ba-J`0_S0_bhBU7{HXo YV7HL5)mdKI;Vst09sumc>n+a diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png deleted file mode 100755 index ec11c1c80990a5e142f3cb9bc3d7da59b6bcce63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=9b|FnA_d{h!GYl5fSG z%(x#Y#8?vK7tG-B>_!@pqvGk}7{YNqSwV<{%OS%p+1Y~Gx2utJ*$vL-gDmM52?haI a7#KRIG0EP2;+_gr&*16m=d#Wzp$PyT>?1z_ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png deleted file mode 100755 index 88de1d7f21b0403a33413a7c76f27f3324ca8e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=6m87Y!WG_(yHjv7Qx@ zZ|0F?(A<8`!dH9O?gz@3CVd5}U@Qsp3ubV5b|VeQG4^zE4B@z*tRQY6Z6w_wspF&- zpmE6m-&O jOz0MzaxjS@xq*Yh!H}_2cb}jdP#c4%tDnm{r-UW|%lsz4 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png deleted file mode 100755 index 7971c76a2ac8b2032ae3d1843bbe99e0f3178fd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=6Jf)qbgTe~DWM4fxAY?`