From f91619cae1814d9fba80a5b1907d2ee2d14a42f0 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Wed, 11 Dec 2019 04:17:38 +0100
Subject: [PATCH] New PP cobblestone and brick block textures

---
 mods/ITEMS/mcl_core/textures/default_brick.png  | Bin 185 -> 333 bytes
 mods/ITEMS/mcl_core/textures/default_cobble.png | Bin 219 -> 560 bytes
 .../mcl_core/textures/default_mossycobble.png   | Bin 255 -> 710 bytes
 mods/ITEMS/mcl_walls/register.lua               |   4 ++--
 .../mcl_walls_cobble_mossy_wall_side.png        | Bin 0 -> 684 bytes
 .../mcl_walls_cobble_mossy_wall_top.png         | Bin 0 -> 588 bytes
 .../textures/mcl_walls_cobble_wall_side.png     | Bin 0 -> 527 bytes
 .../textures/mcl_walls_cobble_wall_top.png      | Bin 0 -> 414 bytes
 tools/Conversion_Table.csv                      |   4 ++++
 9 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_mossy_wall_side.png
 create mode 100644 mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_mossy_wall_top.png
 create mode 100644 mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_wall_side.png
 create mode 100644 mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_wall_top.png

diff --git a/mods/ITEMS/mcl_core/textures/default_brick.png b/mods/ITEMS/mcl_core/textures/default_brick.png
index cb57018f86dd1b6d76e510b28f8322b697eb8e26..78555439559eaca6b314590993594899f3af12ab 100644
GIT binary patch
delta 318
zcmV-E0m1&c0nGxC7=H)?0001xk!Usm000DMK}|sb0I`n?{9y$E000SaNLh0L01mtW
z01mtXmArCE0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-@}MjU@eN0002XNkl<Z
zI8SAfu?hk)5JdA!7K)8nTKO54VrMHT)`yj?_@%z^j=3emkbm2q+1X6E_Bw3AZNGkA
zP86Tx4pfp;Qgj1U)wESZc+l+6n^iPh@qSzfvN89a?g0})<rxz#cd>)M7DxfD<nm~)
zlTw4B$h0ct{00q4tQMGFwGD}f7N@WUb0k+Lu`!Z_BINuZG=Qp^B)gR6H^flEG$-*Y
z*%A(58}P68NH@ulBnXuetnUUs!?Z&9OfLo>=cq{TLF$GfdJP?E`7_h~2bSP3VEIEd
Q=l}o!07*qoM6N<$g44=@O#lD@

delta 169
zcmX@hw3BgyL_G^L0|Ud`yN`l^6n}tEh-;6BRlU7wnvu@T5Vt@bo#mSrf}~PCT^vIy
z7-dg4avpZzaSq&hmSI}0@C?3!b!Hs*>X*g+a{R!+($Z4;Oi^i8!j@`_i{Y!7ozBMk
zUtkM=)xCYmO&f*3dDaErZ}BXVJe|AnUoD%EUZ!fsoLnXLyq|M~+Vq}j2l@wpWfu11
VO9;zZwiRe2gQu&X%Q~loCIE67Ko|f3

diff --git a/mods/ITEMS/mcl_core/textures/default_cobble.png b/mods/ITEMS/mcl_core/textures/default_cobble.png
index d50505e83607aead6494dee83ab848af2836d7a7..60750edaa9eb3543d58e0223d929ba987c77718c 100644
GIT binary patch
delta 547
zcmV+;0^I%E0k8y+7=H)?0001xk!Usm000JJOGiWi;{g8v<@nDeY5)KL32;bRa{vGi
zumAuKumMiX{XPHy00(qQO+^Re3=0DW0d4Mp#Q*>Sy-7qtR4C6)Qr&CYFc7~w3P`@S
zu4-uT2Q2fvr(ziFrLg@~gT3v~+h8w)LD*mrLI!q?y|}{blz&s3u<YSFEqanpr{Bl@
zbn^b)+vRE<>qtro0M0qy06^1rSu#^f0f0hWEWVb-e3B+fmdu0@P21i5wxN<j2!2WK
z{_OP0bUFoq{cd*xho<dBtRu!Ni#czMF@qUn9dX4N!*#8-lroS~Hf`segMVu<BVV(U
zG|&AJ0D`9Ne19tuDa5L}Vp@fG3_(Ny@F<B(3>G4KJOH@eYyjZ%mqm1T3IM`itbWvK
zo`;A--?Ma9KbUd+byqyi(>y0@C(oZ1S(;qv^X-<VlVJDo!0g@6;X<G9_xn)EKZis4
zq9khpKvdP0pOP`gImhyNNhzIkv5syx8xG`A5?QMdjejv(Yj$!|*Bm0hQA!b!b1ooj
znTxEIQu@iT?{D9iP1`Z2Qfe^cf78p=I!k7rknO&Cea%N7pEw=`!}z?*Vjd!HtyPFb
z#EA*-SRsD+_=!KF4}0kQ`0{dVt?vogqCzBVU%jk2NB_Y9VCegsx^CKz?Fp94aUM@I
lOXPC3W*lIx^<YNs{0jux`TTk?nCbuk002ovPDHLkV1gfB|BC<s

delta 203
zcmV;+05t!w1ls|S7=Hu<0002(-QrRJ000<JOjJdaiGzoLd~0E0Sx!fOba72VIy^f&
zaBOB?DyIPe004eTL_t(|0R_R)v4SuV1<(r<{^7kXz}bX<WrO|_xHcdz4LDjr?0?2{
z0Q^m8;t3?qQtk~X{Y9h;D230V9|H#AZZ;>FoBQ$Jfsq^97eui}`EOGuG%nq$H%0y0
zHF2tNJ3f{X@Bl(AByz2~^<0oub!!li$rQ~DZnOJt{sSI47upy&=Xd}B002ovPDHLk
FV1gTaQ9A$t

diff --git a/mods/ITEMS/mcl_core/textures/default_mossycobble.png b/mods/ITEMS/mcl_core/textures/default_mossycobble.png
index de3ce82554830e9d9900a2949686b70605302b65..0cbd5a5ba7b0a046f503318eecae59b0e4b09c51 100644
GIT binary patch
delta 698
zcmV;r0!97*0mcQ87=H)?0001xk!Usm000JJOGiWi;{g8v<@nDeY5)KL32;bRa{vGi
zxc~qTxdFHa7ry`i00(qQO+^Re3=0DW4~kZ;!T<mQQ%OWYR4C6qlEF_CK@`TnPIuc*
zx4Uec4b8R|2{a+56cUugDB&arjW@%=i+_ZPH~%895)LL@jDNRAJXAPHQ%Xy-Ze50T
zx9e;foO+nZJH5>OzIkun`!es}z3ue}j&0>B1u)}WB>={rUw5kqqO))9Qp4zWPns*s
z*_!Lt-KwVRW6zJLNwJXEbX_UG;B1Z7H%m<bw?dG)y!3p{u`Tu9H)lvpB4fG7*Ml%}
zY%5d3f#~e<b$<oel}esclBaa+`7_S<tz8*QVv-<?0DMZn10W_jDxWG^$+WTO<A1!=
zw<{$FZFr**QoM1WtMl&piCw91&H-e_t}&^`*3Ued%SG1(P&ACWlr8hVp34DXK@d-q
z^NZ1q5b-q8RNu#i;p(vLHX234xSC7=gp7rZ0SLnAcYhSGF4f&egC_~uJikXwl6A>~
zWwIbpH0L}BBQ;;gwiYZ?(Ezk|yVXVu0AEQ$#%7$WPpimNI^*22EfxfnQUIE|;7LLa
zBV^33RF2B0GM4ix9B$<)Rhq-XR~gB@+x6^|?MJslsMX8?%eFUi&2FX-%va^&kN(At
z5P#B{r+<aSB)!nr?yC3tgSuN)`K!#%hw0}ajdq?sR`nfb;Tl02Wj7wIrJP@Sekbmo
z5r3^vQw8h7tkv9wa#;wW=W;>_KVSgJoiB15g}=XUdi_DjSg$`&o4%S%iiV+>=E`!r
z-6C$Ip)4R{`Fiu2vX*08Tj`SGt|k+2H2Qemp)-a7KvUCwkv@bDwR|<rI;Fk-;J7f%
glmHD|>5?M<0d`R<FQA|vN&o-=07*qoM6N<$f*-F+@c;k-

delta 239
zcmV<L01*Gi1^)q%7=Hu<0002(-QrRJ001OVOjJdaiGyolVL6&RJUcsCPDg%paU^#y
zErK+MfP8RlW=%ml8D=c;Mi4~+005RrL_t(|0S(N72EtGj2H@Xx8Ng|G53mFRD8oQE
zXJWy|js`%n2r4mvpa;100x7T{q}X1r`#r!1U^r8#4-gp`qG-_$a=oP1PC`_bXF>^l
zz&kPX@(unrSu*{dfqqjOipMB8-s&SqAieHZogvuUA`5D^X!((FlPlZ-r6UozmdbgU
pBPF8Jhe9evuiXvT@7w3=^9Qo)B%60TulE1|002ovPDHLkV1fcqVO#(J

diff --git a/mods/ITEMS/mcl_walls/register.lua b/mods/ITEMS/mcl_walls/register.lua
index 363ef55c7..0ccefd62f 100644
--- a/mods/ITEMS/mcl_walls/register.lua
+++ b/mods/ITEMS/mcl_walls/register.lua
@@ -1,7 +1,7 @@
 local S = minetest.get_translator("mcl_walls")
 
-mcl_walls.register_wall("mcl_walls:cobble", S("Cobblestone Wall"), "mcl_core:cobble")
-mcl_walls.register_wall("mcl_walls:mossycobble", S("Mossy Cobblestone Wall"), "mcl_core:mossycobble")
+mcl_walls.register_wall("mcl_walls:cobble", S("Cobblestone Wall"), "mcl_core:cobble", {"mcl_walls_cobble_wall_top.png", "default_cobble.png", "mcl_walls_cobble_wall_side.png"})
+mcl_walls.register_wall("mcl_walls:mossycobble", S("Mossy Cobblestone Wall"), "mcl_core:mossycobble", {"mcl_walls_cobble_mossy_wall_top.png", "default_mossycobble.png", "mcl_walls_cobble_mossy_wall_side.png"})
 mcl_walls.register_wall("mcl_walls:andesite", S("Andesite Wall"), "mcl_core:andesite")
 mcl_walls.register_wall("mcl_walls:granite", S("Granite Wall"), "mcl_core:granite")
 mcl_walls.register_wall("mcl_walls:diorite", S("Diorite Wall"), "mcl_core:diorite")
diff --git a/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_mossy_wall_side.png b/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_mossy_wall_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d575d986f3caa45ad6a6088056b8efb570de06
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006VoOIv0OJ7v
z0Ok14Bx(Qv010qNS#tmY3km=L3km_hLuOL|000McNliru;|vP}1rRKA^Yj1!0y#-U
zK~yNuZBox`6G0e#yIIn-$;`$yZP|p4%?}HfL{z8;l|5Ke@M=lvNd!-VNB<)K2|*8@
zJQXdW6-sS2ZqtUwb$52Ao82_&#=}TNaSp@BdvD%1@0(F>zPcBScyfWOAD4-RWWrGK
z_liY4{`QAbV-ZVYjnt-!Sj1Po-}^s@)fTl{)Y>Xo05(!}0L^h7z*fO(QEMYrpIl&N
zvIJn=TLqxbrqckJ>+Xmn>0y{=i&_9?(`myrr(SQP{T8*9m(QQccE|RqPDwsX|H&Y6
zpNnd#2tacf_qhOYsGLKbuka;FA1dcEm`=%#ID!J$&?!*?=#(5UddXX<HB$Rp@nn-V
zQq#)GcDdUwceQd7K($oNXQ{TEx0~a7;+nedt!68^PiHn#kaug2>qf>5g8&pqqyylc
zwx4+MXgdnS2Mc$Ju8&8f;)nqFkoj^v=;LhU`@TAfqc9vq!$CA`B+W#@Fy>M-9lIM}
z4x=!17#~E#jq3f|^EciP_vT#n<GkI`ou0-TNz-9mYnQvRh@08E!+5Q-Y?$WW-e&+|
z5GWaR4F757F@R7BnCtH5ZEaI|2ny!9J{R&$YL(^Jy*DaR?>MD4>Gn=evbmfbaf@1s
zf?>EG>-C*#sd&M;rfC3XPA9$VUSn9QL<<h%GKRyr>oHAQ&Mz(wf*=e6=DO0X`MqJ7
z=3F|Bg9C^0sZ5nq|Jm=$4<b3Ai)=0z27$zVE~YYNd-I93^tsR}`EM-?iTncdr69AJ
STjm!40000<MNUMnLSTa3mNtz5

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_mossy_wall_top.png b/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_mossy_wall_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6ca4c364ed96790b2158bab8ec6fc0e7dc373e7
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0OJ7v
z0Ok14Bx(Qv010qNS#tmY3l0DP3l0H5zTrUt000McNliru;|vP}1qDH_7asrs0oh4J
zK~y-)eUsm68bKJve={q~3cEE+g<ug|Q%NbJqOExVNt!-H?)w6LnO^1ra-Gshu5xFq
z7|BHw+sGn>fER`lA|cN9VwpAmX}+7;nLT{x%=yj;mg@c2op5%e5iW$2`T1V5MAPc=
z``b_P6fap*!kvHDra1t7-$#0@@Wi?X(vvjCMMy%^?O}P6qws7UbhSa{I!jCS`OYuu
zUV%sTz;h+uefby~);HZ0gUTIR=~!;%ItxHIKLp_6e2QImIB@qlygEjPlgKQsG?(HQ
ztuzqrwbHbm0D#$zj#;(R99|t$o92+lFvDop>L^Eb6dBld0)z{VagptCGsd)?Aew@3
zBdK+-uyDVZehT5vr*gV+LF$DUtBg(Dot5yneENR}@sCbASjd5C(o%gAX*=G_Z~`ay
zJ&wXNTB=WDTts>@mT$6Pd@_XQnsP5$T9AFZae-EvPCAI0jge0=hCsf`X0bAIB}luo
z5>`ecJ&Bc(2$zK<cJo8J`5|IC7;it7!|iaBOK}T8-7C;ieazXPALq}%1-tApsNC^6
z_W`@?&`Ad*@-|zqv)E;4HTLV`sg<T_^=OQXR7a74C-=RD@%^{Kfx92OY{F8T=Hgem
aT>k*KkFZB!2IVsV0000<MNUMnLSTZ=&I$7X

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_wall_side.png b/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_wall_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..01937236d1b6d063a42b23db450dc972d27b2034
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0OJ7v
z0Ok14Bx(Qv010qNS#tmY3km=L3km_hLuOL|000McNliru;|vP}1TYQ;;(Y)B0h~!h
zK~y-)b&}0$+fWdNzqo3MEhKRfHN+7_2tlB(U#8vkak?yI(I+buOn1h$iR#jT7_P*%
z-Gq=X?72w!nU${2oS8Xi=H%P;*T=1M?3`n<T#=fDNtQ7RLjdaATe`7Wt|*I~;Smp>
zCTM8UVHmP=4#1PTG2oSWjcl8?mord6M0(&$WPOW>{|+`))$3e~eKw7Vcr1w{mg|b*
zhy}ISUT531*rp|kqu&1{jy$eKk~ktzP~F#2RZ?-8VT>UikNs9egw!Ml6U!p+txnDB
zb`=q}&iR$9Ok>Ppg6`@7)R(fz0r>u7PA%4V)gs0i-b~KVzl?@wtkyR?+~2X^@2SPI
z+yCPtyWs8VDeqFluk{Vn5ATWMn1}m2M#D3H|M|;cHk%$an#5O~&8EFwcjf5lI$@v*
z>aglBi=0hW`O#C8u&F9f)(95Ml_wXMSuaV+<<%8i=a|ob_B^P?9!xBYoOC?)_pgTo
zFv&8u&M^u@FSE-TsI$5v5%Ed3Y1ti%DsG#WF6ZR)r;m?a54vW(^nQAo{{f?r24AnX
RDOUgh002ovPDHLkV1j{h^e6xT

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_wall_top.png b/mods/ITEMS/mcl_walls/textures/mcl_walls_cobble_wall_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdde29c6cd7edd1d5b9962dd5415a296f1fc38f7
GIT binary patch
literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0OJ7v
z0Ok14Bx(Qv010qNS#tmY3l9JQ3l9O3`2(c@000McNliru;|vP}1UBboM@Rqw0V_#F
zK~y-)g;UFFgfJ96YBqXNxd^TY@qgM)e`a91m_mQ1oAyHrg>FmfIv_zMW@$H*kT_=M
zZp7rC`#9$$$+8T7oKMHqXzl)UA{eca69E98UtSYGKgFG}V85szA_gcf9hVC*R^+O{
z&+i|`X+~X@?rfaq=!D{YI<B_!=hrv-?trFkUBaR@3L-38!)T4VD%ZX{I8KD|Mg)MS
zZQa;r^UaAcPIItM3IIwe00_p8k>=kir6812VCDc2W4<6lU6rmOGea<Qu)-eW`9={7
z27uIFTG<9Ecfn={3;?O`vT>RN1uW19`#Cuggf-0|CF-igAZ4J$9tXZ!$@VQgJwB|y
zaV)@^>+Ss`x#`4)YxLdWs=H<Wu9cZNP{i)PJ&zW+_44-OAKaRs-28_~pa1{>07*qo
IM6N<$g8S91RR910

literal 0
HcmV?d00001

diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv
index a01d38f2d..242381c65 100644
--- a/tools/Conversion_Table.csv
+++ b/tools/Conversion_Table.csv
@@ -958,3 +958,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,red_nether_brick.png,,mcl_fences_fence_gate_red_nether_brick.png,,,,,,,
 /assets/minecraft/textures/blocks,nether_brick.png,,mcl_fences_fence_gate_nether_brick.png,,,,,,,
 /assets/minecraft/textures/blocks,stonebrick_carved.png,,mcl_supplemental_stonebrick_carved_slab.png,,,,,,,
+/assets/minecraft/textures/blocks,cobblestone.png,/mods/ITEMS/mcl_walls/textures,mcl_walls_cobble_wall_top.png,,,,,,,
+/assets/minecraft/textures/blocks,cobblestone.png,/mods/ITEMS/mcl_walls/textures,mcl_walls_cobble_wall_side.png,,,,,,,
+/assets/minecraft/textures/blocks,cobblestone_mossy.png,/mods/ITEMS/mcl_walls/textures,mcl_walls_cobble_mossy_wall_top.png,,,,,,,
+/assets/minecraft/textures/blocks,cobblestone_mossy.png,/mods/ITEMS/mcl_walls/textures,mcl_walls_cobble_mossy_wall_side.png,,,,,,,