From b0fb180e4db2c311b2626face0e5635bb2a1d820 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Sat, 6 Dec 2014 11:28:24 +0100
Subject: [PATCH] Use an overlay over default_dirt.png for soil

---
 mods/farming/nodes.lua                          |   4 ++--
 mods/farming/textures/farming_soil.png          | Bin 713 -> 835 bytes
 mods/farming/textures/farming_soil_wet.png      | Bin 659 -> 831 bytes
 mods/farming/textures/farming_soil_wet_side.png | Bin 721 -> 109 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua
index 10c4afe..a99f505 100644
--- a/mods/farming/nodes.lua
+++ b/mods/farming/nodes.lua
@@ -18,7 +18,7 @@ minetest.override_item("default:dirt_with_grass", {
 
 minetest.register_node("farming:soil", {
 	description = "Soil",
-	tiles = {"farming_soil.png", "default_dirt.png"},
+	tiles = {"default_dirt.png^farming_soil.png", "default_dirt.png"},
 	drop = "default:dirt",
 	is_ground_content = true,
 	groups = {crumbly=3, not_in_creative_inventory=1, soil=2, grassland = 1, field = 1},
@@ -32,7 +32,7 @@ minetest.register_node("farming:soil", {
 
 minetest.register_node("farming:soil_wet", {
 	description = "Wet Soil",
-	tiles = {"farming_soil_wet.png", "farming_soil_wet_side.png"},
+	tiles = {"default_dirt.png^farming_soil_wet.png", "default_dirt.png^farming_soil_wet_side.png"},
 	drop = "default:dirt",
 	is_ground_content = true,
 	groups = {crumbly=3, not_in_creative_inventory=1, soil=3, wet = 1, grassland = 1, field = 1},
diff --git a/mods/farming/textures/farming_soil.png b/mods/farming/textures/farming_soil.png
index 0be94e3c9ef086f529907a178160f139f619fdba..6a59fca5bfc840496873bc9e5d3f54f4c420265b 100644
GIT binary patch
delta 813
zcmV+|1JeA-1;YlABYyw{b3#c}2nYxWd<bNS0008|Nkl<ZI8S|(%ZnUU6vn@LbltA%
z$Mn=xP1~l;#F<HECdNT@A!H$es2f2LG-eUE5<+kxu3Za)|3Of2XR-;dB7y^gj~H|@
zWJokZqSKjvRNK$$uI{e7<#(G&P!JFNxR1K$oO{1>$^fuN5`W^8$>E&C|C->}W2B;$
zZG7Gs<Ax{n?O-CWaC1gtQYRXz66NqutCmaV<#-fZ=4gWS^p<<+_T9hkXMq><Hr|Y<
z=tK!Vqla9`;)1T>dDGNIEF~m2;~9jLrdD%`Yub9rXg;^KQs{L1vs$Cqo+YxZ^Nf@l
zZ;;l0A0*$M*?;ig=?+KLup5Gb;V#%nHGLL_QBym+xt!L6K0L>SnKe^kWwZo3{y1o*
z`CNALXKfU?uJ9YJiO6Jtqem9eVW7NYqvGdNQ`0bw#!=m_EbEA4b2yWWckZ@O_A>in
zKLVfR(Ru&W=F+4;7>iDK;2XN$cZ<Sr20fuwa`+|;@qcL_*v$dUj==j$I{JR1O7et-
z^Svp)<jwDKyW;2YRuJNQuV|c$qNJ)+K2DV4A+d;3UD^KOc#NY*0&+l#g!$%WpI1i(
zQKlBFWQF7ji!u-9kWI?+!QuMRc{OSVQ=T*!%>=ex6CVnRmpD)PwYr$WMOLoErl=!D
zgJ%VwQh%VMicZnkNN=Bh`ax$fDD3S8?X5Mhf{Zzy%6R;+)*aeeOZugS&QHG{e66yb
zTKCUbrqQ}}r~U<#y!QIpXScPDB_YeMNKBaqh7iupz2K&$<C)c`7VrP~ptDnT^z)V>
zbGBuo(T**)=}rWE_38^N?~O*$ac#rPM9lKT&wuxVtCa%Yl`*ECo9q2j3%@;@#VbqY
z(&j?ZE-@%}Zyz+)szv>`TEEAROje&PLR+$MBb?$RZZtgymmZFAoeEA14lZcAabh@5
zYPl@dbln*C2FXsr#v5{mc00z$)L~yKxlUBcQnE~1N+jA5!rlXKJg<oQW0k#3ZjoK0
rS|;Uj8UJhkuafZqwS!Ak;JN(`m`EK~+baCb00000NkvXXu0mjf5%8hy

delta 690
zcmV;j0!{tH2FV4GBYy&rNkl<Zc-n1KTTc^V5Z&J(AThl_3n}fkOYfy!d!g<2E8Uh$
zDO!62+b*p|kYW%EDiM7lqQ=OBi9Q%(j1T_E<LsBf!=?|D+5L9TnQzaT5n75LXVoOm
z>&vJoL>v@?c;Cw6dT$+-s0&;7MKtNW7G1y>jp6ey!)04RkADTwO!**mlmK>_AMffJ
zw32S@s}bxMLL5{luuk@4SjNW=Lo?>YRXfL<^a$6<62VGv9;J{2iZqL)(}FGwp&WH0
zw>Zn=up-l002+bVq76B!%XqBNaV!2g2p;Pc+~x^LmPxSCJmo3=>@iQmZJ9vUYvb>6
zBCiv<8gamJ?|%+N!ic5`2sZ`eh-9ak2<!;hrm>lnpoSetx~*8G+5!=&baUaRz|d(d
zVPxI}@626_X=HqMEICXNx-5vI--c3f4z-jAjg*AOvV>+@LdIprX+uGa&hmacm}JAz
zRsw0a1%qN3k4SXk`C1g8v;z8y7dr_zUR4t~uO%@ohJWz=a0B1=SMmEz16SPw+C=)H
z&7hI`XPYwKlKsNb>Jqe!4^3Ibc1pzKv<K~sglB4qgGZG(jyL36f?+8Fz3Dbt{Q6-W
zLds>Kt6HJb6;B#jT=Yv=C5sek2GzI=52$c6=0e`9|AHL}r-j?iaU`hGMy|Ti8M5v+
z8$>tSIDfv#(B#%mPGBhJAB=-zB%<K9#>pk2D!Y&sty~9<b|CMw^O5Z^KMu+<tWmda
zK8U^=<~qHsrS;%C<t5TUBjukcKHUj!=dV!}KToQt#TIZtpu<v_tKN)>c*?x^OO{^m
z6?xucv`qglcJSx4hO15<-Lx0S>oga=0_w7puPZPS@hu$CoO~Uq7?owb*oZ;5|8hsc
Ye<~lj&|Ie+Bme*a07*qoM6N<$f&qR`-v9sr

diff --git a/mods/farming/textures/farming_soil_wet.png b/mods/farming/textures/farming_soil_wet.png
index d5e335ef30558faafda5da5df2541be28abb7bff..7e24c70458e5b3d14080b945cf0f68cd0bbc57ec 100644
GIT binary patch
delta 809
zcmV+^1J?YL1-}N6BYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2i^<^5-ljU`iD#a00O^BL_t(I%Y~EMZ`@Q6hre@t
zTPM5rdc8?$8j>g|g%oiUAP^7~i3+I&2_#<l4}d=oA>IM;Qhy{sv_%PN)Ivpoq{(J)
zUa!|)U(Vqnt^~X=FEb;}j7Ia#PXM0)6Tq!~!T*~Dgn%VNhi?aSZu^$lhzk7`Pyz}V
z0pfAte+GnI&v>s)E7Qz!^s8I#oA-Vl_bj;Dba<mIn5K$v0Oi~4nvzY^6jrG;3aARK
zMYMTV@SWK7Wq<V2_IhJDo>a$YQCwE4EupHE7%8oXM~OPz+3N1bvouV`30Val-$fy+
zX_7_aooANyX@5d@!NhEs+OaKBA^GFcxn5jwia(FjxYMz{UO%@i3)Zd#jK&Gg1((Z9
zO>KfMXR~Z%Us{rsrHu2cd3gVvrO+HqCmBr_@2sB>wtu&RBA#Z}a5V9xlxfhiy<R`E
z#Inm?obq)FM>hCPn-35W&H1tdx)wW8!H*R@5)gD<-W;YJcAN68`CNqp_^iHo_76M&
zgW4|xEg%MlzydG>e84h*)tbEpbbtzo09`kZ0TaP1z)3x%01{wgNVqP*m#`ifd~9i+
z<>CQC&wu1bsYukthGPkqzIZq!_yPj)(QE6yD4Dtk2ZQ+9Q(>S@GoPz6KRFp^u4Ai?
z*GhhR*!vma+D7=CAw_ieVgHs5FW-E7dqX@OI%+wvl~L)5(Qup}?hPI|g0;0Pe(&~Q
z(cX$Hb{s=D8n!`iSeZHOr*P-`i%-6vXY&<tHGeeocFVhe_xItgl_u}1k}_z!v;EWb
zVAbJ;?j?V<?YWD#guP!*$D6Ay@!&X~DNq}iTZp#BooT`63Zk&Vjq{A}Z7974yM~l2
zNu~yi4W1A}W>KQ{y#}vW1@W-r3kd@Od|D&ZHJV9{uLGDs4%oH80G<ba1CD?~03X)P
n^&;{A6;tPrV_C~St#R`=SRO2OVF6X|00000NkvXXu0mjfT3~WG

delta 635
zcmV->0)+j)29pJlBYy%~Nkl<Zc-n1KTT|0e5MDZ^NgL8OEp6;|8cs=CXaTLg(Mu?o
zk+wLBfQsk~BVI;coY4mz$MM1c{kb_29taQLoY~Fpw|l<tg!)z-XRQLxJ4JNzDyDW4
z@A?&7A2hI;QLyzuMUV6C%pyL!0-tsSE{7H-B7t5}2aT)*c7H@1Z#!l53sD?8X&l;y
zZ0c~cNA`W*#D|eUFB`$ta77N8aNnrH1gpsq>P8rrMkquGV_~3~iC|@kBxai?=Mr$a
zNq9M~E5`_4-)ejT6eB{Ep)rIJ@=l4Hd`0);9FupL+)0NK=2-m?x+%Di$c*>|2_kG1
zG&rd+3Q@um$A2~xIlMW^g5ack3DY5hPCm+9zZ@peSR_%46Y9wYw2Luxi<(5Qq@k=3
zPP-QR99OwUXoRD!JW9O9el3N^EIK`1&)}nLW7pC#$Vc(AmB)FzfO*Zpw^;*U57+SP
zbr)A-8$%|2KNN6T{j&`dZ`gi1T3d!&*3mOnY!_7wN`Em7%Nk~mA)8M&b9mM;Zwco0
zG`ykPZ1Jl{IZ#m{xvIk}9(OCa*sWtN8IrcPata=D;YL<LRrjxukN9@Wz9<E3lw#g>
zhON6j?}#3>F<2C|*tb*00UP;4;Nb*_7=DdHpq8niqWU_xw&CA(i7*mzOq*G(^R#g_
ziCrfpb#!{sE_skTRW$;+to)v(drn9@f1b4P<G6)(b`eu<n$=TM^<GxR6QSb|TY7y^
zlji})^!H+b-=}R{jj9-zbheD&#l%L(jL2V@iR53n&qKcKJ2+{Yc;3juv;T5n;U7zF
VROz@q<vIWW002ovPDHLkV1hz$DM0`L

diff --git a/mods/farming/textures/farming_soil_wet_side.png b/mods/farming/textures/farming_soil_wet_side.png
index 6bd3a56cb6d20ea9431a48c9cd0dafebc0a3af59..58bc4fb6d41f8ed8b61b3b0568a55944145d70f3 100644
GIT binary patch
delta 80
zcmcb}nma++i-D!s$uool2x>S|Iv5xjR6JcALoEE0QxXzBuqSO|6uxP-P|BS*Awhz-
i`Jw?sYI~zUJ44H5hWx-s2VVizGkCiCxvX<aXaWG1`xt%z

delta 697
zcmV;q0!IC9(FKqre*&0EL_t(|+C5TRQ`%q<{eXgk#TbH`P;P<>5|Ri8R4&><kQSpp
zXeqV$ptdu;Olzlaoxb#+pYCqQKI|m<@}0A1&spV~3m8{ZIJ48R^$>d5I4<3F+#YUV
zE2*%(5`shLHG04CExc=4xN4YaTZ?dv7*x|-M9W&hg}nwhe-%bIw}fssAt0N;O!ncZ
zjJHh-&a%Rkz}%!wxaK+$v@&sY2;ik7sPcuqEM69qXskxCyBfyFlT887+8OMvM$s@L
zLe97rsaLKMhOH^MbU5!7;OSv`ceD`dx{^96ElbVzGD28RDAY76YN&`^0F#Q2Kl2_Q
zj!U@f7tu_Ie=x3S=wueKZ^oEFlwA|aE{%FmV?FdsP|SL0#qjgolY{fRfxtH4ll)#T
zj_!*^?9=~2DT(9ab0U5wqfGq_1{+DJX)}WZGb)`XJ34}$6cY%MLo$B^9xiGr_-0JN
zpN174i&DztHK|rCYvyOk)u_z>s;c9R07v<RD7xzwfAMuvXLH5aHw_Cuxj)|25K#Pz
zW%+9{G0inX;(TK*f_^R`;L(;&^0og2M};Nv!lj5s0lCRwG3tBZ;`dEQ=JwKIjJGum
zw^o>dn(zoQRFX>KCY;2nzMSsh*R(AjJO-ZBZKue|h}1z*!=S9m<yku~N=k9Xgz~M1
zG|T&ge>^V9xcOn>sUypL>c*zALLqGvDHGr9=fGGYpyHXt$l*V*0IzpV&Ye1Cxrq>r
zHkSA)h6j}usIh=$^Y|jOOU~C#6Zgku^zsSLoI8q&$4Q+_eDc%efp3U`Jd?!vc~qsW
ztFop&N}^v#h$3e>gpL(uFz*0AWdRj$;J4EnGiaf>GjEqDv3b{%N{AdPUbgu`4x_Rr
fYt8Xrc_#h>=3{g`X*z>e00000NkvXXu0mjfQ|VUf