From 44ee349cca4b54d3a866ab50d607789fc5a4e067 Mon Sep 17 00:00:00 2001 From: HybridDog Date: Fri, 8 Aug 2014 13:22:40 +0200 Subject: [PATCH] automatic update --- README.txt | 3 +++ init.lua | 21 +++++++++++++++++++-- rest/mush45_b.png | Bin 0 -> 211 bytes rest/mush45_b0.png | Bin 0 -> 234 bytes rest/mush45_b1.png | Bin 0 -> 210 bytes rest/mush45_b2.png | Bin 0 -> 257 bytes rest/mush45_bm.png | Bin 0 -> 211 bytes rest/mush45_bm2.png | Bin 0 -> 211 bytes rest/mush45_bm3.png | Bin 0 -> 211 bytes rest/mush45_bm4.png | Bin 0 -> 211 bytes rest/mush45_meal.png | Bin 0 -> 232 bytes rest/mush45_r.png | Bin 0 -> 233 bytes rest/mush45_r0.png | Bin 0 -> 234 bytes rest/mush45_r1.png | Bin 0 -> 208 bytes rest/mush45_r2.png | Bin 0 -> 248 bytes rest/mush45_rm.png | Bin 0 -> 234 bytes rest/mush45_rm2.png | Bin 0 -> 239 bytes rest/mush45_rm3.png | Bin 0 -> 234 bytes rest/mush45_rm4.png | Bin 0 -> 238 bytes textures/riesenpilz_brown45_bottom.png | Bin 0 -> 211 bytes textures/riesenpilz_brown45_side.png | Bin 0 -> 211 bytes textures/riesenpilz_brown45_top.png | Bin 0 -> 211 bytes textures/riesenpilz_red45_bottom.png | Bin 0 -> 140 bytes textures/riesenpilz_red45_side.png | Bin 0 -> 233 bytes textures/riesenpilz_red45_top.png | Bin 0 -> 115 bytes 25 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 rest/mush45_b.png create mode 100644 rest/mush45_b0.png create mode 100644 rest/mush45_b1.png create mode 100644 rest/mush45_b2.png create mode 100644 rest/mush45_bm.png create mode 100644 rest/mush45_bm2.png create mode 100644 rest/mush45_bm3.png create mode 100644 rest/mush45_bm4.png create mode 100644 rest/mush45_meal.png create mode 100644 rest/mush45_r.png create mode 100644 rest/mush45_r0.png create mode 100644 rest/mush45_r1.png create mode 100644 rest/mush45_r2.png create mode 100644 rest/mush45_rm.png create mode 100644 rest/mush45_rm2.png create mode 100644 rest/mush45_rm3.png create mode 100644 rest/mush45_rm4.png create mode 100644 textures/riesenpilz_brown45_bottom.png create mode 100644 textures/riesenpilz_brown45_side.png create mode 100644 textures/riesenpilz_brown45_top.png create mode 100644 textures/riesenpilz_red45_bottom.png create mode 100644 textures/riesenpilz_red45_side.png create mode 100644 textures/riesenpilz_red45_top.png diff --git a/README.txt b/README.txt index c84557c..d9e7a6a 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,8 @@ ------Mushrooms------ — riesenpilz_stem.png (edited with gimp) from gamiano.de +— glowshroom and lavashroom from bas080's plants mod (WTFPL) +— parasol mushroom from a mod called mushrooms (WTFPL) +— "45" mushrooms from r01922090's mush45 mod (WTFPL) TODO: — add giant nethershroom diff --git a/init.lua b/init.lua index 563a131..925a584 100644 --- a/init.lua +++ b/init.lua @@ -430,12 +430,27 @@ local BOX = { { 2/16, -1/16, -2/16, 4/16, 1/16, 2/16} }, PARASOL = { - {-1/16, -8/16, -1/16, 1/16, 0, 1/16}, + {-1/16, -8/16, -1/16, 1/16, 0, 1/16}, {-2/16, -6/16, -2/16, 2/16, -5/16, 2/16}, {-5/16, -4/16, -5/16, 5/16, -3/16, 5/16}, {-4/16, -3/16, -4/16, 4/16, -2/16, 4/16}, {-3/16, -2/16, -3/16, 3/16, -1/16, 3/16} - } + }, + RED45 = { + {-1/16, -0.5, -1/16, 1/16, 1/8, 1/16}, + {-3/16, 1/8, -3/16, 3/16, 1/4, 3/16}, + {-5/16, -1/4, -5/16, -1/16, 1/8, -1/16}, + {1/16, -1/4, -5/16, 5/16, 1/8, -1/16}, + {-5/16, -1/4, 1/16, -1/16, 1/8, 5/16}, + {1/16, -1/4, 1/16, 5/16, 1/8, 5/16} + }, + BROWN45 = { + {-1/16, -0.5, -1/16, 1/16, 1/16, 1/16}, + {-3/8, 1/8, -7/16, 3/8, 1/4, 7/16}, + {-7/16, 1/8, -3/8, 7/16, 1/4, 3/8}, + {-3/8, 1/4, -3/8, 3/8, 5/16, 3/8}, + {-3/8, 1/16, -3/8, 3/8, 1/8, 3/8} + }, } @@ -447,6 +462,8 @@ local mushrooms_list = { {"glowshroom", "Glowshroom", BOX.GLOWSHROOM}, {"nether_shroom", "Nether Mushroom", BOX.NETHER_SHROOM, 6}, {"parasol", "Parasol Mushroom", BOX.PARASOL}, + {"red45", "45 Brown Mushroom", BOX.RED45}, + {"brown45", "45 Red Mushroom", BOX.BROWN45}, } for _,i in ipairs(mushrooms_list) do diff --git a/rest/mush45_b.png b/rest/mush45_b.png new file mode 100644 index 0000000000000000000000000000000000000000..cd5bca36d42fff8cd46d9b402a49da54e6f5beea GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!96VhdLoEE0CEOmIIkV;el7tmz91Wc3e2k9;bok4xlHL9Ghy>eJ zKE@MW9R~w)e>l!EJX|l(R^-XPn5{>ESwezAuYYyu%7gFE0?lIZboFyt=akR{0K^YK AjA5L~c#`DCC7dx@v7EBhS|b^#;y z?7iuFK%pp47sn6_|706u_Bu+V{ zDl_NAsaT0!Fg>KRFi+z&!rjA5L~c#`DCC7dx@v7EBhS|b^#;y z?7iuFKp`hj7sn6_|706uFt$FXb`azp0R|1M~FG$ALCD67LSMg?FJ1$ uxmg_Ql&9Lu9AdEab8HCtH-Vp-jg6u5tI@0P^EZH8&*16m=d#Wzp$Py`k2^pB literal 0 HcmV?d00001 diff --git a/rest/mush45_b2.png b/rest/mush45_b2.png new file mode 100644 index 0000000000000000000000000000000000000000..0c266bf1c7c3f687f469566789f61692bcf008fc GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBhS|b^#;y z?7iuFK%qiU7sn6_|E-e~`5F{BS|@53s=t3S_mPjNUQBV&g0HzbAD%1ndq$tMo?~Dv zFmZ`!e(xlYGfj&Y3A#!>p4xtK*<~g#t(mJjmER?QRnyAl&W~{0&8qY7^MT#h9&+qW t^p`)Yo3J!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!96VhdLoEE0CEOCyW__#=G6<1oIlyxMjL+eK4u6?dvb*0Nkzl*Z z$9STv<6uDU564-ChwBB}iagmDv-JotOGq%RIzN$9;$h|)pjix_u6{1-oD!M!lvI6;>1s;*b z3=DjSK$uZf!>a)($X?><>&kwIgI&OgJ$rAu9#BZE#5JNMI6tkVJh3R1p&&6cuS72| zwM4;0&%pY{*G!-a2TvEr5DWig2{(naGalM&O042#N@z+?Tb8JCM4j(y-`%n#p60A} zh7{K$2`kM0B&5yySTE34!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LG}_)Usv`!9P9!{?Ad$M^?*WRC9V-A!TD(=<%vb93~dIr`nzGebdIC#1^hFJI~OSmbVo$=6KQ(_e_Q$myRbP0l+XkK0wO(M literal 0 HcmV?d00001 diff --git a/rest/mush45_bm4.png b/rest/mush45_bm4.png new file mode 100644 index 0000000000000000000000000000000000000000..830285bb95fa2d41847cb78823b0cda837364bc4 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)($X?><>&kwIgI&OgJ$rAu9#BZE#5JNMI6tkVJh3R1p&&6cuS72| zwM4;0&%pY{*G!-a2TvEr5DWig3AYDl&TRR=Bw>XaM+4_FN#g{KBkFut`|g${@ib?( yGo-j40ZRQzNSpPsUZAbWlYKE;j{viT1jB{2&6^$n=Bx&q#o+1c=d#Wzp$P!!=06Vr literal 0 HcmV?d00001 diff --git a/rest/mush45_meal.png b/rest/mush45_meal.png new file mode 100644 index 0000000000000000000000000000000000000000..ba9799d2cd093ec46bc5b514e70b8ed047e347df GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!LOop^LoEE0C0K79oH;Y|f8q~&W@Z`Zr5~AR9GjVWOoB}ymE#P9 zL|Zl+V;4_D(h8$H46)3+8Us>yFh(d}+4)4ep~Z1l0;AUyMumnv2G3dUG6@L`3?f@5 VS#R6_jtOW1gQu&X%Q~loCIFn0MGyc0 literal 0 HcmV?d00001 diff --git a/rest/mush45_r.png b/rest/mush45_r.png new file mode 100644 index 0000000000000000000000000000000000000000..96345d9f9eb23e6534330040231c5792ae27a65d GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!!aQ9ZLoEE?_IYwKDDW`<{xAO{%6!?PwMtdOGG`8&@lHHHXU2V> zHQ#SIi@rAfrl4Sb{N2hnrelf=W+#7N;aGZo!R1;M1& literal 0 HcmV?d00001 diff --git a/rest/mush45_r0.png b/rest/mush45_r0.png new file mode 100644 index 0000000000000000000000000000000000000000..03b39b7465956a4421405347c9aae73f7096cfbf GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBhS|b^#;y z?7iuFK%pp47sn6_|KvaC4=}hqVOG=dHFGe1V1L4Pi6uuO!zMQ&o`s9VB_tQ}C^)1k zGwZ~u*oj@(%euAY)W!z>2OpGpg@vXu9A?`f-LPh2gQ5wSOVTA45uTE~lmrF_rL%Ip UZ(bUB0&QXNboFyt=akR{0Q@#V(*OVf literal 0 HcmV?d00001 diff --git a/rest/mush45_r1.png b/rest/mush45_r1.png new file mode 100644 index 0000000000000000000000000000000000000000..4a56801314790a200335193d37c6313e0be5c9d3 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBhS|b^#;y z?7iuFKp_WD7sn6_|KvaC4}6&a(0)QnN=gH>&<~%4NlXSG*c=Wqu$|!OP84ACNvJ=_ taH3x2Q@g9gfk&dx%!PhB+wn+9Fif;ikxcr?;0-j3!PC{xWt~$(6997xJKg{Q literal 0 HcmV?d00001 diff --git a/rest/mush45_r2.png b/rest/mush45_r2.png new file mode 100644 index 0000000000000000000000000000000000000000..9dcdeef5a4758c4f265cd6f27e2f8eb7294e41e3 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBhS|b^#;y z?7iuFK%opz7sn6_|E-fB@---Mv^0LNPv0eRE-i4uH(#}X51&Y^aj|eHG>pztxu0}W za&kv#ZXoNSN13wXbM+r=U^@Rk=62C#w_hUrI7&XTGSz)iu)OwM%OV literal 0 HcmV?d00001 diff --git a/rest/mush45_rm.png b/rest/mush45_rm.png new file mode 100644 index 0000000000000000000000000000000000000000..bc02d6562e85f5801d688d7c5aa3429d672f5e91 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!!aZFaLoEE?o{Q!>puppD@l8E@?AqKXVV8OqzKCDQe&jfh!lvI6;>1s;*b z3=DjSK$uZf!>a)($X?><>&kwIgI&OgJ$rAu9#BZE#5JNMI6tkVJh3R1p&&6cuS72| zwM4;0&%pY{*G!;_7*7|+5DWjeeFr%Y81OJ}{m(XY&0`aml7N)yUv9edeVOR5X!V8X z<-13p=jH8r^x4|7;mz9cYagpRChYyn#ncGo1hoJOfggG)`Foo@6sliW@A+@%vFHC+ b=1VN*cQ$yQTJ`QH&>jX)S3j3^P6NHj~ literal 0 HcmV?d00001 diff --git a/rest/mush45_rm3.png b/rest/mush45_rm3.png new file mode 100644 index 0000000000000000000000000000000000000000..60f2d2792f7fceaa5b157c450d7d6109a6c42454 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LG}_)Usv`!9P9!{?Ad$M^?*WRC9V-A!TD(=<%vb93~dIr`nzGebdgnPO;hFJK&?F-~$P~dPb|1Vv#sV|sAx{*S}`kE6x4HcwS(D)jx$rOnuMy1Tgr# X7U_MNth!tqXa$3(tDnm{r-UW|xQI!q literal 0 HcmV?d00001 diff --git a/rest/mush45_rm4.png b/rest/mush45_rm4.png new file mode 100644 index 0000000000000000000000000000000000000000..b222b06b9b023172e30086b0f8738e98e3d7c74f GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)($X?><>&kwIgI&OgJ$rAu9#BZE#5JNMI6tkVJh3R1p&&6cuS72| zwM4;0&%pY{*G!;_Xipc%5DWjeeU4lW1_I3A|J#4q8kH!d5}nyECv!&CTJzfZImI=b z3*sg_w|=&^G`P69{N3Y^0={2f$a3~|$nBlHs8epQ^1=Pui`?IPl(>9(kv-!*ztFe& dbqiiGsk}Y9aM{AA?}64Zc)I$ztaD0e0svjmQM~{F literal 0 HcmV?d00001 diff --git a/textures/riesenpilz_brown45_bottom.png b/textures/riesenpilz_brown45_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..cd5bca36d42fff8cd46d9b402a49da54e6f5beea GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!96VhdLoEE0CEOmIIkV;el7tmz91Wc3e2k9;bok4xlHL9Ghy>eJ zKE@MW9R~w)e>l!EJX|l(R^-XPn5{>ESwezAuYYyu%7gFE0?lIZboFyt=akR{0K^YK A!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!96VhdLoEE0CEOmIIkV;el7tmz91Wc3e2k9;bok4xlHL9Ghy>eJ zKE@MW9R~w)e>l!EJX|l(R^-XPn5{>ESwezAuYYyu%7gFE0?lIZboFyt=akR{0K^YK A!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!96VhdLoEE0CEOmIIkV;el7tmz91Wc3e2k9;bok4xlHL9Ghy>eJ zKE@MW9R~w)e>l!EJX|l(R^-XPn5{>ESwezAuYYyu%7gFE0?lIZboFyt=akR{0K^YK A!lvI6;>1s;*b z3=DjSL74G){)!Z!AbW|YuPgf<4t4<}_UygsdO#tu64!{5;QX|b^2DN4hJwV*yb`^< z)Di^~Jp=0(Uo(L!!aQ9ZLoEE?_IYwKDDW`<{xAO{%6!?PwMtdOGG`8&@lHHHXU2V> zHQ#SIi@rAfrl4Sb{N2hnrelf=W+#7N;aGZo!R1;M1& literal 0 HcmV?d00001 diff --git a/textures/riesenpilz_red45_top.png b/textures/riesenpilz_red45_top.png new file mode 100644 index 0000000000000000000000000000000000000000..789f69520ebc63bdfaad15e7b52dd370204dd1a4 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`R-P`7Ar_~T6C^%02+sUGzwx2{ z#90r1&G@kDkN*vuKWqj@K^Y8!4V@Y3j|G+&DolFHDzw+|L!1QA2(G6BTzo3RT0m16 NJYD@<);T3K0RWS