From c6c137b09680e2ccaa505ce605945f7efb906929 Mon Sep 17 00:00:00 2001 From: smoluwu <79610644+smoluwu@users.noreply.github.com> Date: Thu, 5 May 2022 11:34:28 +0100 Subject: [PATCH 1/2] texture updates --- .../forestry/blockstates/carpenter.json | 2 +- .../models/block/machines/carpenter.json | 46 ++++++++++++++++++ .../textures/block/deepslate_apatite.png | Bin 0 -> 664 bytes .../forestry/textures/block/deepslate_tin.png | Bin 0 -> 663 bytes .../textures/block/machines/carpenter.png | Bin 0 -> 928 bytes .../forestry/textures/block/ores/apatite.png | Bin 0 -> 592 bytes .../forestry/textures/block/tin_ore.png | Bin 336 -> 662 bytes 7 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/forestry/models/block/machines/carpenter.json create mode 100644 src/main/resources/assets/forestry/textures/block/deepslate_apatite.png create mode 100644 src/main/resources/assets/forestry/textures/block/deepslate_tin.png create mode 100644 src/main/resources/assets/forestry/textures/block/machines/carpenter.png create mode 100644 src/main/resources/assets/forestry/textures/block/ores/apatite.png diff --git a/src/main/resources/assets/forestry/blockstates/carpenter.json b/src/main/resources/assets/forestry/blockstates/carpenter.json index 5b2ee55f3..dbac6b65b 100644 --- a/src/main/resources/assets/forestry/blockstates/carpenter.json +++ b/src/main/resources/assets/forestry/blockstates/carpenter.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "forestry:block/carpenter" + "model": "forestry:block/machines/carpenter" } } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/machines/carpenter.json b/src/main/resources/assets/forestry/models/block/machines/carpenter.json new file mode 100644 index 000000000..4d334edb0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/machines/carpenter.json @@ -0,0 +1,46 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "1": "forestry:block/machines/carpenter", + "particle": "forestry:block/carpenter" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 4], + "faces": { + "north": {"uv": [1, 1, 5, 5], "texture": "#1"}, + "east": {"uv": [0, 1, 1, 5], "texture": "#1"}, + "south": {"uv": [6, 1, 10, 5], "texture": "#1"}, + "west": {"uv": [5, 1, 6, 5], "texture": "#1"}, + "up": {"uv": [5, 1, 1, 0], "texture": "#1"}, + "down": {"uv": [9, 0, 5, 1], "texture": "#1"} + } + }, + { + "from": [0, 0, 12], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [1, 6.5, 5, 10.5], "texture": "#1"}, + "east": {"uv": [0, 6.5, 1, 10.5], "texture": "#1"}, + "south": {"uv": [6, 6.5, 10, 10.5], "texture": "#1"}, + "west": {"uv": [5, 6.5, 6, 10.5], "texture": "#1"}, + "up": {"uv": [5, 6.5, 1, 5.5], "texture": "#1"}, + "down": {"uv": [9, 5.5, 5, 6.5], "texture": "#1"} + } + }, + { + "from": [2, 2, 4], + "to": [14, 14, 12], + "faces": { + "north": {"uv": [2, 13, 5, 16], "texture": "#1"}, + "east": {"uv": [0, 13, 2, 16], "texture": "#1"}, + "south": {"uv": [7, 13, 10, 16], "texture": "#1"}, + "west": {"uv": [5, 13, 7, 16], "texture": "#1"}, + "up": {"uv": [5, 13, 2, 11], "texture": "#1"}, + "down": {"uv": [8, 11, 5, 13], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/block/deepslate_apatite.png b/src/main/resources/assets/forestry/textures/block/deepslate_apatite.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5ecc454d93d8acb1013f4bd60b92ece021c84a GIT binary patch literal 664 zcmV;J0%!e+P)Px%Qb|NXR5*=glQBqJK^Vt>i2;{zMBaN4QXG;c5$tG$5SONOa3~GU;%3BEa1GL- zh3sOWbO>5X=p?jsEN+S*f=h+mTV4n@A#nGI92ukOpt;8O+m8G0e*gdfyNlFnwTV)S zFbvV!;JO0GaqK#qO#|5Vv|LvJ5S3Em`yGOyZ#QR~!!QIuYs1#ZuaxR7+o!c5<~WWe zzW(ru?(m-9U)})_1bvJd*~`1bd*onDkl)6f>?1^+=q#Z-yyx&r3P;Pt& zK!`X1rx$0;EiNNO9M=^@wKn*Ehf=+T9E@2w+QxMS#*8d+W#u^l-*(;rP)H>(W`x#; zXt9_ln@w|grJ1c^wTT>zY1b=wp7&($ynhQoHk&2};QJj4uM*^vF?u4-{Kf%W$ru2= zN9j{lYpX>7+K&Opq?B~u?o&#}tV9}{^d1knu0TpjE|;_PLMlNflX@6q5cDae5>J9M zW<;spVt(U*Am|eWeUwtxf4g3>V~$RJP3i0FFUVw4$ibM?i!=1gU53>rmzTe6213OD zhM38u$R%S45ht5XBc*)s-q>VrahbK%B6l~}4699opii%{X+gzeo=B}$n*c~D(c0K? zw(Av3d$#l0(%bb4Lc}Q+^C+c=l*{Fb)&^rnEbSe0dU0l(-IIL)8`%8DfmJvCBayYW z(qtOku-c@MN^su4hzPd0BiT`|$=Xppet(7ngaU2Jw6n_BKJTWC)D*W^S0000Px%QAtEWR5*=&lTSz#Q5?rVYoeFod6*fPl{IoP#^@-D2dzT{5kk~n2iaGr)0#0bB&fC8ee_ zKBUvVNU51#m?f3;0LW!$sMU`7UtQ|%?s<7~a>~?Pj(ZR9bN%W7J(fj}WpVkM&+eBU z(&=6X2CmR-{-RWV#qQS~e7~PW;&+?De6hgYn>Xn0>H^^8^pu9yq>>&&SjL;_g<1MM zkInb*n0)-C?Lj)-ODgHn&~0spVMtI90az&%5yCPaq>>(<;}A;8^ujFLTa`A07jw^9 zTrH8y&KQ8>2!ya$TrIJ_yhN>bOrPf&?Wv@PQi_h4UM@QWfbaJ+Ha3E7+bph@3}|hm zY~&q=q3Q2XN}+WVAuQH5$|$9XqKInsfS?|77=}ox&3i-Zb4)wpTw{YCOir=4_Y;61 zIAVQy3C9tv6p94(kjzBJNR(2O$Y!&xYW0B1=T87MwC3CQAAH<=V{TmhjO8k&7#tjI zrx2TRHicBuGZ#qfCXb#y1z>b|h@c*_QYe~XW~#}SO&zQgG7 z(76QWiv_l~DgY$L$8WXbKLO`rj9JVV3kDnnM|^nw*7POv`Fsob=f=h9#G7}~3)gl3 xN{GR>ZKIUJaRgd7@%?^W*EKz7S3im({s57|A8j2$D002ovPDHLkV1o5qG+6)u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/block/machines/carpenter.png b/src/main/resources/assets/forestry/textures/block/machines/carpenter.png new file mode 100644 index 0000000000000000000000000000000000000000..85077ddb9cc77353f1725beba6a2b7a4f50e790a GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`GzR#DxB}@W zTc&I81b_j@)6wcC>sB=*0@lu~2p}!*8a#Ml(w))r|lX8FxGABFK%@3Ni zIwM3*u1ZH|uBD}ZeWFQ!g~P^0Tn|Nsfhx31g8YIR{u2$J{+&IMfq`k7r;B4qMC;qI z=pq?Ko;%)4xHvg)Sd=}w^S>d}^G);0M8*1l8{Wju*1K|9=)&QrO$kZI*zGkRn#&%a z9vToRcu>82TGZvjJt`hwCpL;$^<8I?b6Ga)W37z-q_qkArh1#%9F9AwE+#(PxHzq5 zexg2y$mDG2n}SI!ZMNsD935O|EOosdwVKzTJ7==ON`t3Wd*gZ^T#q(o?RzWa(RQcl z_@YPOzHLsBx#3_C@Abs6a~9Lpu&pbK8E=O)7 zZC!)w#;aHT^uidT!vmUK1Dc{XPw@{cPMMxIva(%Q$wqSABK2`%Xz=> zt3BsZPnYZJ2A?`~3Z$sqa`mnsr_8xO;8WyS?JMe|7x~)MJFM zqy@g_nk^h-%NG9Swv^Qd*Mzm#52qNHynZNmkiY-p^jgbLa*fvV*J>0xSkG>rqo`74 zFk@EQ{VCNf76oOZlAMopPU@s{@Ub4Y(~y$d#<61dJ>#&siN&Hd*X6A4nLmGh`f9A> f{)uZhME+sE>bqtRpQNw}C~tVW`njxgN@xNAZV0g( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/block/ores/apatite.png b/src/main/resources/assets/forestry/textures/block/ores/apatite.png new file mode 100644 index 0000000000000000000000000000000000000000..127fffb50eb00d22ddd46d983405d9d32ca7a323 GIT binary patch literal 592 zcmV-W0Px%3Q0skR5*=YlQC!;F&KrvIJZeqZ8EuJK7+Fr8VCsmcMCLArY@$TLm@*4<0*sj zkU3oPlNfyxOe`<^WLXxo&&wHu(JccS ztZr%zAv*f;W4%<48%-N5RagCKym5E`V-!DEe`22O=dCqJ9t&%!twXI`*Hs7IcPH@gu z9t4MrqF^|&>~8HaoY*DVZ@H>4=Rjc}(lo6`SX3c|Sh|7#%U9}OgmDjmn02TyBgNIy e6%R&-YyB4j-WKB{&Bi4F0000YGng~Ip zAbjFhvf~xnLoo$Ofo^3hQ_ZgCoq1>GouRe0wZHV4)|w(^`T%WX46hq+2AB*hrKr^E)D{<*otnbWWOy_- z20%XN1K_$Y0DqNQor3T4_T77=ln5d2Tgc~py4TkLT*fi2s~CWT-EG1!L~D&PhJ4P) z&t!<(ZC)-^Y5zRKky6s!Sf{bP!cKG3QcjWt&+{nG&D;Ni@7w)|V`(vAhC6@Aj6>{P)^8Abk6B+h)w#a6)jE;_ScXx-As;suS06=-V z2*CIKJ-hoqRo}(QG5LI8huCUGT$~&O5Cj2EdO!f4=l!SkbRI$olv0FYi064$olbvXzokjj jvyP$&DJA^{0sa95;v^kL;fxmm0000n<=xrS>*wL-;MnWs-ShG5^YZQN>EPty*y!Tg+0v;*xJ(Q>f+wq)_>XC)6UPu#K^qgC;GSd-g__iKi@9O8xWKvM35xR z+;Rgf(0?2RE>)6hb!arh06497BoqlHk#r=W(-q$9OAclXhNJNWrn7JW3cR$=7fTbY z))o|fv)%0_899I*j%IR&3=XGk=X}X$lk4sNc)mi?y8`L+Rrp9x9#URj1i=pnAOyLJ S>kHNZ0000 Date: Wed, 14 Aug 2024 10:22:57 -0700 Subject: [PATCH 2/2] Add strelka's textures in-game --- .../assets/forestry/blockstates/carpenter.json | 2 +- .../forestry/textures/block/apatite_ore.png | Bin 411 -> 592 bytes .../forestry/textures/block/carpenter.0.png | Bin 205 -> 320 bytes .../forestry/textures/block/carpenter_base.png | Bin 397 -> 386 bytes .../block/carpenter_tank_product_empty.png | Bin 404 -> 484 bytes .../block/carpenter_tank_resource_empty.png | Bin 352 -> 447 bytes .../textures/block/deepslate_apatite.png | Bin 664 -> 0 bytes .../textures/block/deepslate_apatite_ore.png | Bin 508 -> 664 bytes .../forestry/textures/block/deepslate_tin.png | Bin 663 -> 0 bytes .../textures/block/deepslate_tin_ore.png | Bin 466 -> 663 bytes .../textures/block/machine_tank_high.png | Bin 125 -> 189 bytes .../textures/block/machine_tank_low.png | Bin 122 -> 180 bytes .../textures/block/machine_tank_maximum.png | Bin 125 -> 187 bytes .../textures/block/machine_tank_medium.png | Bin 124 -> 182 bytes .../forestry/textures/block/ores/apatite.png | Bin 592 -> 0 bytes 15 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/forestry/textures/block/deepslate_apatite.png delete mode 100644 src/main/resources/assets/forestry/textures/block/deepslate_tin.png delete mode 100644 src/main/resources/assets/forestry/textures/block/ores/apatite.png diff --git a/src/main/resources/assets/forestry/blockstates/carpenter.json b/src/main/resources/assets/forestry/blockstates/carpenter.json index dbac6b65b..5b2ee55f3 100644 --- a/src/main/resources/assets/forestry/blockstates/carpenter.json +++ b/src/main/resources/assets/forestry/blockstates/carpenter.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "forestry:block/machines/carpenter" + "model": "forestry:block/carpenter" } } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/block/apatite_ore.png b/src/main/resources/assets/forestry/textures/block/apatite_ore.png index 1e315d78ba24c680eface4da404513f4bb19c29d..127fffb50eb00d22ddd46d983405d9d32ca7a323 100644 GIT binary patch delta 578 zcmV-I0=@m41JDGJ8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Ih0L_t(Ija`#5Xd5vY zg}*qrNl>HKm+|zG^0JSV5@QUtMV4l}i`?(vy~kP``{5Z+AIZxZU&PA@ zTnnsPYsS+@F76)?LST%c+3r$*(?e?=)eT0stZr;Z&{~kb^6EW#Ib$zB#~1?;83RFi z*#}^IO)V=BLVs{^|FAUgb>oPlNfyxOe`<^WLXxo&&wHu(SI!i8mw+?vX`H;SRt93bB;zm zK}s332T(UBtZrF$V8FE4^Ot$ryvy8t*-Fzq91Na}L`&j?CGQ zk8zEaQk98ep5HG%F!=m+-g(Yz|E-cbXSJAb3Fgxc!VIR^otwvZ>A%s}Ef&a@_>R*I$4}h3;s4yeN)zTFYMu%(t7XscE<0H++ QB>(^b07*qoM6N<$f_V!D%>V!Z delta 396 zcmV;70dxM)1e*hp8Gi!+001a04^sdD00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z004?mOjJdWkB@(Ue{^(oXlQ6ZweoMv@N35MUb*mIzV27Z@@UNNB$3oMq2(-+-8-b_ zIETVKhQ&9K%toKvMV;Lkce^T$&{dnvP?W__lEyoNx;T=?Q-74qQH{e&p3F;^$s%~Q zD}})wc(GfS&R(wH6@$VReY_%ozCW1MQnBe`x$X>dunKLi0EEQ=gTamWmhu1q010qN zS#tmY4#NNd4#NS*Z>VGd005dvL_t(2Q#Fs*76L&CLkZY>@49PS`~Ux*2_AWvfg!mt zrhq#PrEFSHW7$4x6~^gIf&RfA;FoK4yFWD7 q@O(-9{-h&+`VUdlEJ1P{_yQ%U1q_I;cqjk>002ovP6b4+LSTYrFR-rw diff --git a/src/main/resources/assets/forestry/textures/block/carpenter.0.png b/src/main/resources/assets/forestry/textures/block/carpenter.0.png index 4cdcd3152630a1aac7f0a105bd16f27fc757a65b..0fbac9536c426de7fe462919fe890e5829ef9750 100644 GIT binary patch delta 305 zcmX@hcz|hwL_G&H0|SGGE`KnPVk{1FcVbv~PUa<$!;&U>cv7h@-A}f$@8Q>G* zTIZmUr7IC7DLg$wzsE~`TYc<~NjaMe+*c%90+mc!ol!SGD08xd!^TA>{T2H4iE}M2 zt8{ciVt)78&qol`;+0K)-s Ak^lez delta 189 zcmV;u07C!30?h%C7=Hu<0002(-QrRJ000|MOjJdJO(Ta;B#Kfcl2<3AVJy3EGQo2+ z$$2>Ah(F%fB6R=&0BuP`K~#8NP0FzefG`w<;aeejMr=bYQVMA@g002V0R$bvT4Ry1 zJrKmdI*t#1@I$gGpqAD!!Cta5i><_oLolCNovOipcgm~5b~cTwj^-#)nGol9EW|X1 rru&)cGfr^OFblKB%2r57KJ^kF)7>NFM{SE!00000NkvXXu0mjfgNsgp diff --git a/src/main/resources/assets/forestry/textures/block/carpenter_base.png b/src/main/resources/assets/forestry/textures/block/carpenter_base.png index e960b11564ea77858a63d26de0724193ad4e1f18..15dee707370016db1621d6db2cc12b5522d98547 100644 GIT binary patch delta 359 zcmeBWZepIGQqNc%4dTp`WLwvv3`Atu}nY#{12e9qWSTI-VMUbuQCa(oogH?)~gmzYSr9^E| zG^#uJNOMvs)7p7Tk*XVBX-?XCa6^;329T$6fKP9p(oCrr74A9pryd+r?uq~Kb72Bc zo{E9IeNXQSjSa6Nr=8(k#M92d;e5eI9dCm-5}#iD)4cKhxHg;I^>0>wx4$Mm?_3&l zF}8p0v-K#wwby85}Sb4q9e02Ica A$p8QV delta 370 zcmV-&0ge8G1C0ZaB!5LvOjJbxWB^+<29#tdNz5g)*4x2zG|725{{H^YiBQ1x{w*yn zl2<2HG8Q)=4u?=Aic%#=D-%;O7FaYFqhTyE9Swp_BQ+lmf`pd?0000BbW%=J00000 z000000001y7^eRK008VsL_t(|UhR|HYQ!)ML`U*1seDV)_J99BwK9PkvJY!#`&4#< z1QYNf9AeaKQu<8wTUVR((64y_>{28jMI`GK*{}U6Ad2&D@$P&iUi$#RhY%22R^I^r z<2QZ)uw@qzKq~{*)U=n_iRU!EMK|kY9nd3D?k)cbhVK*+fnxzw;0d0?RB=JzLx(2cmv*mA3O+g)tnm6 Q<^TWy07*qoM6N<$f{0_8(f|Me diff --git a/src/main/resources/assets/forestry/textures/block/carpenter_tank_product_empty.png b/src/main/resources/assets/forestry/textures/block/carpenter_tank_product_empty.png index 4f9d83266d26ee732c59c0c8ef502e0da0f91490..78cc3c4d381d7979027b9229da9923e2b60106bb 100644 GIT binary patch delta 458 zcmbQj{DgUeNGZx^prw85kH?(j9#r85lP9bN@+X1@bKed_r8ON9gx>sjo=3 z+*IJcV^Yqx`q;YpL79^sO!_PI>l3SVbVB6hCaunJ*tlq}rDc|`M3kg(or3~Ux7FEi z(}9$5NswRge+r%vo_c-~QX1B_~|2?O2d?f01lvYwO3vYYe%*M_iOvX?5@wo85VS_rp`@p} zY?*Arbn~72PQPt_D)Ie|4?p{S@!z{%eeeAO<~dBB$;n_3)Uc(VnWOi#|CK%<`%Aak z*{@s-{QU*yf(MT}zTR`zWk#mo!pWs;YPE{Kotne2jzQswDG!%>?ZZq?B>mmGzG;mY9Y>gTe~DWM4f0a?n? delta 377 zcmV-<0fzqM1C#@hB!5CsOjJbx004(jB$8Jric%%JZ!*DiG~35d`}i;I9p^z5)K;01D0 XC6^1_9>{QA00000NkvXXu0mjf^5L5Q diff --git a/src/main/resources/assets/forestry/textures/block/carpenter_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/block/carpenter_tank_resource_empty.png index a237213ecbc5023498d8c3cbe551272387e45555..f07e7bc973bf30c753627033bdcc604766e002f5 100644 GIT binary patch delta 433 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 diff --git a/src/main/resources/assets/forestry/textures/block/deepslate_tin.png b/src/main/resources/assets/forestry/textures/block/deepslate_tin.png deleted file mode 100644 index cea9400a0ab5a15a3c7c602d840fe5951081faf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmV;I0%-k-P)Px%QAtEWR5*=&lTSz#Q5?rVYoeFod6*fPl{IoP#^@-D2dzT{5kk~n2iaGr)0#0bB&fC8ee_ zKBUvVNU51#m?f3;0LW!$sMU`7UtQ|%?s<7~a>~?Pj(ZR9bN%W7J(fj}WpVkM&+eBU z(&=6X2CmR-{-RWV#qQS~e7~PW;&+?De6hgYn>Xn0>H^^8^pu9yq>>&&SjL;_g<1MM zkInb*n0)-C?Lj)-ODgHn&~0spVMtI90az&%5yCPaq>>(<;}A;8^ujFLTa`A07jw^9 zTrH8y&KQ8>2!ya$TrIJ_yhN>bOrPf&?Wv@PQi_h4UM@QWfbaJ+Ha3E7+bph@3}|hm zY~&q=q3Q2XN}+WVAuQH5$|$9XqKInsfS?|77=}ox&3i-Zb4)wpTw{YCOir=4_Y;61 zIAVQy3C9tv6p94(kjzBJNR(2O$Y!&xYW0B1=T87MwC3CQAAH<=V{TmhjO8k&7#tjI zrx2TRHicBuGZ#qfCXb#y1z>b|h@c*_QYe~XW~#}SO&zQgG7 z(76QWiv_l~DgY$L$8WXbKLO`rj9JVV3kDnnM|^nw*7POv`Fsob=f=h9#G7}~3)gl3 xN{GR>ZKIUJaRgd7@%?^W*EKz7S3im({s57|A8j2$D002ovPDHLkV1o5qG+6)u diff --git a/src/main/resources/assets/forestry/textures/block/deepslate_tin_ore.png b/src/main/resources/assets/forestry/textures/block/deepslate_tin_ore.png index c9439a8299ea2b70a652b24676bdc570e9ff3c9f..cea9400a0ab5a15a3c7c602d840fe5951081faf0 100644 GIT binary patch delta 650 zcmV;50(Je;1D6Gm8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00L1-L_t(IjeV0(NEA^V z$3JVLm*IJs8JLwdaxuo}D2fNILj(~*)OLt2VJ>#?vWgOW*a#Pe1u+r!5LnVBI@KcG zOAmJNP|(G_tOrMTVBTZlu>^W(J1p~3iGG)vH~hZ8`TlvoM1MY?Z$(jrQVQF)i7P(4 zu1gd}<{N;N8pja;bnfr(Bc(>`CQ@oMz;T2DTm;7@rKU4Jq|?1fshM7wC6)95$Yp1! z)sFdJUFz=cd3kbj%G6wrdk^n({ptWcmPL0Sl~uF!1$qEvpx?$;fB zzn?_ncbma{v46nbn>Xn0>H^^8^pu9yq>>&&SjL;_g<1MMkInb*n0)-C?Lj)-ODgHn z&~0spVMtI90az&%5yCPaq>>(<;}A;8^ujFLTa`A07jw^9TrH8y&KQ8>2!ya$TrIJ_ zyhN>bOrPf&?Wv@PQi_h4UM@QWfbaJ+Ha3E7+bph@41Z{Cqip0IhN0>2P)eb76Co_t zHp(cah@yyU^?;xrau|k4sm*&s>vK#y;#^~c9!yTLxAzl(AUI-uc?ri6tQ3j_^^nX& z#z>S>lgMVXt!njv%I8l2G_>a1_aA)Rd}D50{EX!)r5GF>Y^M;LayErj(lZxG>n4w$ zJq2KNcz=kX9nqg)@W+KDdMwy@Y zwcUJ&CGz=v3;5^8#p%SGchL*ib^l6;!M1Iql)`ZYS~v0i keq7fzJ!e-xiX#31k-;Br9YHG~00000NkvXXt^-0~g4R+s>;M1& delta 451 zcmV;!0X+Vf1=0hM8Gi!+001a04^sdD00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z006O2OjJb^6BA2IOLTN}e}8|EkB?|*Xhudx4h{}fR8)C+d3SerL_|d9;@sig*WcRL z-Q3yd=jGkm)9dHq=HS@t<=yk~>+|yM?CId-;n?Wn+T`BW?|ErJ1;_K(z z^zh{BD0IEquL4Q;zQ!S1M5&|&{1C8YX2S@L{_g)Y9|HDuMnaRYlwUR|rstPk_V3E#9 zHnMP(*CCe|IMtZ5LJ=sH0f7N09^b!4c_K-dkdA+$pu=9iD^993b2|*`6jT`^~002ovPDHLkV1k8V=@kF~ diff --git a/src/main/resources/assets/forestry/textures/block/machine_tank_high.png b/src/main/resources/assets/forestry/textures/block/machine_tank_high.png index 5095e006f7fb0c80bffaf7cddbb07ffd97b43916..a3f239574c9f2aa316d178b87effb8af61d51d9c 100644 GIT binary patch delta 172 zcmb>3%Q!)zo`a2nfnm|yx)vbCSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@3Vz$3Dl zfr0N32s4Umcr^e8gFIavLo%G-UQ^_2Fc5G(*!KIrq`>a9W(5|elJqmhqWc%g&e`y; z&#GCqYPD6!w{AJf1$(PLM>70a_-jt;`W5LZYWFYwQ%-5fh-T|x0-6`wvypMHmi6Tm TXQ%E0av3~b{an^LB{Ts5bQ3)I delta 107 zcmdnXSUW)?m64f&fni4Qo8v%=Ex;$l^*t<8 diff --git a/src/main/resources/assets/forestry/textures/block/machine_tank_low.png b/src/main/resources/assets/forestry/textures/block/machine_tank_low.png index 5179cc899b6c7a6cce8729f8c7ee7423ed5dbff9..0d457cacbf4c562f01ea6e4a913826ad4cd271e2 100644 GIT binary patch delta 163 zcmb>0!Z<;qo`a2nfnm|yx)vbCSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@3Vz$3Dl zfr0N32s4Umcr^e8Jw06g)B$T;&rtt6h3Go#`QyDy6 L{an^LB{Ts5liWAw delta 104 zcmdnOST#W+iIJIsfni4Qo8v%=Ex;$l^*3%{W1#o`a2nfnm|yx)vbCSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@3Vz$3Dl zfr0N32s4Umcr^e813XI>k{K*ss21T#=i&1WAJqK Kb6Mw<&;$Tlu{3S~ delta 106 zcmdnSSTjK)g^`(ofni4Qo8v%=Ex;$l^*?&#t^&V5K=llsu6{1-oD!M< DJToWN diff --git a/src/main/resources/assets/forestry/textures/block/ores/apatite.png b/src/main/resources/assets/forestry/textures/block/ores/apatite.png deleted file mode 100644 index 127fffb50eb00d22ddd46d983405d9d32ca7a323..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmV-W0Px%3Q0skR5*=YlQC!;F&KrvIJZeqZ8EuJK7+Fr8VCsmcMCLArY@$TLm@*4<0*sj zkU3oPlNfyxOe`<^WLXxo&&wHu(JccS ztZr%zAv*f;W4%<48%-N5RagCKym5E`V-!DEe`22O=dCqJ9t&%!twXI`*Hs7IcPH@gu z9t4MrqF^|&>~8HaoY*DVZ@H>4=Rjc}(lo6`SX3c|Sh|7#%U9}OgmDjmn02TyBgNIy e6%R&-YyB4j-WKB{&Bi4F0000