From 1c05461e6743e58a71fb75e045501cdeec0d1eac Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Fri, 30 Apr 2021 23:05:40 +0000
Subject: [PATCH 1/8] Add #924 (cactus breaks minecart now)

---
 mods/ITEMS/mcl_core/functions.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua
index 732c386b09..96f020ee20 100644
--- a/mods/ITEMS/mcl_core/functions.lua
+++ b/mods/ITEMS/mcl_core/functions.lua
@@ -197,9 +197,21 @@ minetest.register_abm({
 	interval = 1,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		for _,object in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
+		for _,object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
 			if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
 				object:remove()
+			elseif not object:is_player() and object:get_luaentity().name == "mcl_minecarts:minecart" then
+				local pos = object:get_pos()
+				local driver = object:get_luaentity()._driver
+				if driver ~= nil then
+					mcl_player.player_attached[driver] = nil
+					local player = minetest.get_player_by_name(driver)
+					player:set_detach()
+					player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
+					mcl_player.player_set_animation(player, "stand" , 30)
+				end
+				minetest.add_item(pos, "mcl_minecarts:minecart")
+				object:remove()
 			end
 		end
 	end,

From f6b8133381d6ef6b0f6bd821f654e1d36d44313e Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 9 May 2021 21:54:56 +0000
Subject: [PATCH 2/8] Better textures for stripped wood part1

---
 .../textures/mcl_core_stripped_acacia_side.png | Bin 361 -> 2171 bytes
 .../textures/mcl_core_stripped_acacia_top.png  | Bin 426 -> 2025 bytes
 .../textures/mcl_core_stripped_birch_side.png  | Bin 531 -> 611 bytes
 .../textures/mcl_core_stripped_birch_top.png   | Bin 439 -> 681 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png
index 2e2de8dbeb40446e193bc91c921dcd549cb8f5ed..2b57a0863e404e0ee1177fd4562bffecc5a3e527 100644
GIT binary patch
delta 2114
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

delta 292
zcmV+<0o(rj5a|MtBa<lxFMk9H5-%JZYTD-j008z$L_t(I%Y{-q4udcZeT`TR0tqp|
zOz+UE^kh9+nPG^K5>X$Z9V(}8Fzs6s+j;)H_;kBoo&ewjqiYCNTVh)u0D!730RY?j
zK-HF@n!u4U-4_U4P8R4p08mXSnV@S3&IiU3sHQ}irv)58Z^v_ws(&rt9dr$uWQ}3$
zcRm0pG+DRDk-u#5NkNG@3Ff0vO&G?0NA`h}K0fd#fwZYf^R$?PYM;}Ja^zHrBb&q=
zPPe61w;(b7rjQ-bbN+)5oHTRRjCup*lzaZ=h1Fs%?2(v0Fr2kSR+9Xi#V(Gji>-B;
q?#ph3!$q>z+UnN*su`Ydp@kO=`jJm5vvacm0000<MNUMnLSTZ}&xC~l

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png
index 0746884de9e39cbf129e4291b660df94adc9676c..bd10499c811843193bf35170c6ebb4bd8cd290dd 100644
GIT binary patch
delta 1966
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
A&;S4c

delta 357
zcmV-r0h<2l52^!@Ba_PoFMk9H69o(Q5cxj<00B2iL_t(I%cWCIYlA=#eGNh&VRunj
zgcuNV&{H9QqkpTvu9rfOjfaAuLJ$&ktJGfFLp#&mRZ5|rc4wY5??Z3y?`}Wvk0-D%
zaU}SBz8J14Ez!08tOo!qI%IhQr6rV>&M*Qm^>_dkL?|FaF#}S)DSulG<K#$K`I@St
zh6n}rS;9lAq6Pru#{=@?!5PjTh)}>>4V0FsirUc`M_)a{%@`160u1AXEKhjLFivR7
z)-iHXf)5}T+szugRI`42p%Wtkwwv{A6AeE-y#N4S-`;;1_?yYVEKi&W$;4f%e@}tD
z=-M7}BsfN!!7K%HHCouE8eQ9?Dr(lLwB!VuvSp0Jz>Z95iG7yv#^O{n1DiU%6WAv4
zSN6S0X^Hd2;PK&^{qX$?mVO=r+RXg>VvN3=ztlegs6Cf*_l|Em00000NkvXXu0mjf
DmWrWo

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_side.png
index a27739c1e6dcb48dbb821783a2d00a007b9f9c88..5eed80b39cb4260a31b8b111c23ff6d321480582 100644
GIT binary patch
delta 540
zcmV+%0^|LY1mgsdQhx;r3jzn9viPe200HnxL_t(I%RQ4(lH529LmxrPp6+C~a>86A
zXW3IGRoTh3Es@NJyGOr-AP4~MzaQWGe&5-*jc@<{!`tmf&V%DP8T*dh$$2uyMrCr&
z#rwwxzka`SJSH+Tz;GAPR26eBOokMA>~uGZjjY1m=qkd4Y=4jsXN<tzp^MC7WfC5k
z8MP*3yYcJiPdtLEA|fyvFtkNr1~kl-oaYI^$_2n&Cm)Xwwh_=EGXS=IBf`)KznF9l
zFgRDTs#t5$*>uC(m#;u$(uHd<6RK{^40|%08T-C7XM#a@QI%8{*!37dRZ%q2-Jci3
zg=iAk!ZE-{fPWdeCK`i03Q4$xn+Qpl0zfV*69Xa~vkQ2fi>!lw{GoxYrfFm#m*{S)
z3mP8hVvLQkzwtWz*f8LB|B8n{6@vhsa{?eaRf%NGH8I4T=Ox|kDpD7E8t!tk8=dFE
zC8~<X=<cV(MrG1nSFCGdCL)5WOL2swRn1(B>PBW%8GmLlk3SfYRTzeKBZ;bfrf}g!
z7j8llS<SvX`|VC)#0Xr%3@)0+5Nl2L5zM(z1IL``6{8tzEhPUm@%{hbj1km2=}ufu
zcQaR_*MFgL_s>#AICMi7)yDC7&=}`Rwr!BrR5x+8?PVP7+Xi|O0VclO--xkM>qHXP
e&6?M){1pXplqc&=(;Z0w0000<MNUMnLSTY$4E@3Y

delta 459
zcmV;+0W|*O1d{}iQhx*q6Br1Pb;Owf00E#$L_t(I%XO2zj?+LCg}+1*{wdapMv84&
zLd4Aq+z_gjTy47#!8`CIJPou|AgWy&f@mDH60#F%6i<qHTtN|Lc4mQFS$F21bI+OM
z$=f%te*ru%QvjkcV9=xeHZ|yxcb_%@)Kx(%H2^b!T!gswt$*3kbdorZxw*QufN>m?
zT}0m9X?GmF#-K-<P6DuAEo?su1J<jBN7i(bsf+mG%MYS3psot)s$iZZo|Ji#*q$Mt
zn&Dn4%jjM->$^aA+rxtdfL3a62p|Za5QPD~QrvFtx!v4*AZGI!kIFDkClkwdI-M|P
z=joF5YQe{^KY#sK=#`?Cnx>P~RY4Rk8T9x^)>&GfE-g`+iL;5O;p#HzX2_NI{_}Sa
zWY!%AauHesb5Z<dnj0?nX+00z^&WfTCUTx6^h(hk2eOOE&jCQY+tcp${{?fa>EwBX
zR%-Ip*B@^W++1B+_FgG_R#%0egIt7`waf%%Cb)k2%tT`|!(}G8+a4ZrU`#y!U3*@=
zcxqQ|cYEuN%ldB<Md)RJ(4&{kJY9Mov{F-Mg5S6>uEYPSXp;Z{002ovPDHLkV1k|4
B+#CP^

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png
index e5290422d4f7f826064a1bff7baf1cea5a2b46c7..69d2e0bfdffc760bed2d9936723cbe5d8803207b 100644
GIT binary patch
delta 610
zcmV-o0-gQ01E~d&Qhx;r3L6-Rcs6kW00K5iL_t(I%WaZda@s%;MbC`J2!tMkO~rPe
z3(GFDl5Eil;$^T#LVy5Coe$ZHsbs#otNKoN-#+T+kME+jLMer(G}_Y`PxHT5*9`!d
zx<L@yRxqBY3H%%Uf$0mU6Whm|%w6SMmvd(mHkqT?R~W5SFMobt=yJ!tsu>RrE_VPt
zJbvcxU6Z0*VYJp);$aZ7T%-W_1A|Tee)_Uqlh|7>r;1JH@I1}cvVJgTy_#c_q!+r~
zuAe9v1?&pPFbDxqTA|gecsP#OKCiem(&hdQ(}~5?9_RBJn^<;b$<QCNTBb}V7KOqX
z<1w9B*2|Rp$A3>8%N^C}#Nlv2dmfj%#=q%2io&k5h_J~zU(EXzM5I4cG!AgN<5<<4
zP8SBRMvF-A*YD*PBLdsZabq-!ZlSihu*n>!bIqswDaEef;o}!XgkxDS3S$=OFO;G)
z@or+-S2gK8y<)*180PCOaTGJ3J+WHM09Y?mY+?}sU4J(nU88{p5nl3wB<?`@`t=)u
z@3GAsHnAwB{-IMhZQB_&@G+j^Hi>b$!)Tb#p1P`6VH8G;!swl6Ev9W+M1;Dj5fSnt
zzk=rt=kC-Yt3}F(`;W}h8BNoo1vnfl1_PfYPS8p-3_^xM$Y|Vk(@HT4BUX!)IEtwb
zCDVyT09(_xE&Jn%rfn(r2ks`8>QIswIZ2$5<psAk;aKiyM3LnM0wiIGh;$qrPZz3l
wjqyCn<8wcHzTY4sxN_Yy^2WkTaX{LZKUg><l|udDNdN!<07*qoM6N<$f<&7nPyhe`

delta 366
zcmV-!0g?Wx1-Ao`Qhx*q6BrbPbePrv00BfvL_t(I%cYaQii1E9#(x)5Xd{TAZWFK)
z(wQpH;4|Hu+<RPq-Bqy*q!Mga1rcntyDMbY-9)(JrrTM+Kl9D{_Vw}p!$0Z>@cI34
znrYwz&`z^+wtE2OHD3vyfdDG<Xs4MX3%6bpbGtVV(eW94Ie(wfU2i~oSS*R2%lTwT
z01mbT8!SLkQjv!q7Ie3gybuVusz>y&a5<lhD*@Xia(58>y6aI%Od9yK)4ZM|&k5Ha
z=Ou&Z5=DTj9-TXT6Gv&-YDE@O)uZ{a$U;;S18}=HPFBW2RgYBlXl9d9HtW`Ax_)(-
zSQ*H^+i6A*3uo;#Q(kk5EHu5nI@mK6Sx6fAsK}$pLgzh*6MKcbA<C-uN@iC{OjSQ#
zGZ1xKMP8kN^{}9aX5YaUT4S8F(@Yxp-0qFDK8K*Z=DU_v^7rrj3ltf<(~vU_tpET3
M07*qoM6N<$f*hi%s{jB1


From 358ea695e17cc94e5c14f123e1b254538dc1b17c Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 9 May 2021 21:55:51 +0000
Subject: [PATCH 3/8] Better textures for stripped wood part2

---
 .../mcl_core_stripped_dark_oak_side.png        | Bin 382 -> 2007 bytes
 .../mcl_core_stripped_dark_oak_top.png         | Bin 438 -> 695 bytes
 .../textures/mcl_core_stripped_jungle_side.png | Bin 415 -> 650 bytes
 .../textures/mcl_core_stripped_jungle_top.png  | Bin 480 -> 637 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png
index 9345a14dc22824b02974199546cd9a357df98c15..32a8bfebd2cd0b3954d8c6a0c35e28a25673e9bd 100644
GIT binary patch
delta 1948
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

delta 313
zcmV-90mlB<5B>s>Ba^HJFMk9H6E-V36}-m)009e0L_t(I%Z-z<YQsPbhQA&@4B1TJ
zFzplqO^3cg*FHdBKSRhGOjBnv9D=k%sza8KrkX6tzoh?{?&0J8?K{Q@K+Y3wyF#tz
zKlV?YhJhF(IZp%ytL?TMcH7M?w(h#}eI7>uL<E4KfSe})KEEzAkbec&{6+!R_J`x5
zqc%|gdi|Y110JBAJf(HlVQB{ovfR$&NC=Vr;aF(3?F!#8)OguKJ|`k22M|PLQ57g-
z`dpt9uP@L4pP*(|<Y4*UGZEo542VeizZ{Z3C|#3+G!|o=Z^4ghlYL6`DgAk=%{{(e
zL|y6aEyzs+udIq%+b)ie2VdE4M9&wPiEJlsd{q^!b{9Fz;x+yNd<CSM!0>tZ00000
LNkvXXu0mjfAxDjk

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_top.png
index fbc45938f39a4c70c4f1b506a630a606676ebb15..48c6da9afb1f59cd193feec2edafbbe7fe46ae8e 100644
GIT binary patch
delta 637
zcmV-@0)qXv1Gfc`7zqdl0000V^Z#LyAu)di2^AkNL({T10006+Nkl<ZILlR&NpsUc
z5QV?i8rzb$xI#7{##Q7<6$dzS=jT%e7pMvqvVfP^*2uCINz)u;JITAuq5I9e_qs>E
ze)*&*D2ghmDm(bTPf-*+hll{WJ;4)UOBAZAq}lKZ!zTT17n7!#bjj)Q8MFDkCb)ls
zF&RZw;<_%LwMyVSxUNS#9uT#fxQ>geWs_%|9-jel*z4_8SQWA?rK}W3sAZqLI$>#2
zM1(kM;<+xqACj(C4EkLL{q9~xuhSt2d{h<3DuiJZYb^(XODB#1s8p%S3V`Xug6YG8
z%h8b8e2$1<twj}_U1<Nte<{j>Z$E#&vq;jqVH@moT#kmQDxMbt;Oq(qjTWvO;CUf8
zw>Na+h>P=cs;XjX5=4aQ!(yvwf@)cZ3Xquk#m^r<uuM`Wvl#&Q;|ZI5O%Q}6#*ja*
zS#LHp8xhS$1C#!#F92b5@fLuhED;g%{E;|{cq|Iuzq?@iuplPFTIGH`=HGv0`edOU
zw_f;cG#Xsr-81NSxf~5&)Q$!{4#I%po7Ybkp3itc>#F4E)o;4(4yrI;*8T_m?u&j0
z*w1$tl1Wnz`-hZe$s$QuWf_;FA$gwdd&aXFB7(Qu=^d`FZ#WwC_sjDfr^jd9{k;WX
zy(#fLx3*x?)qY*At!PIPW|e8-h)`A)MNtPUBAlI^Zy);e^qH#4V$v0Pp5ZtSzkXlS
zj$0h|dIY{lwq6rQEtZKvRms*VjtB^Ns^B<+2s{?MwNnz4l9+Tae=?n6RjGM3SuOkr
X0j(<2i>x$V00000NkvXXu0mjf8q+E&

delta 378
zcmV-=0fqjz1-1i_7zq#t0000_V<RGwAu)dh2@^IRZ>D(U0003)Nkl<ZNXNxhy9&ZU
z5IjR5VCAVr&`K=w2Y!Gb;KvIJDa6W<!X#FKRI!jDVa{Pq<u(`ZF*`f^aCSN!kB39w
zyFXckk0eQw`FvQ}u)o=)>2|9DEgZHOA6?gVZ5v*&99rkjIp@7|Rn;_26Z(l1AV+_&
zUN4u6MHnfcV}(Q5YURE6Kcs*aVaIH6^nBL!>ou%dw%_k|ArVOcRupCVcnrVK=j-)y
z8Gxr6h^Rm#E4O%nNT3LSp%h2Tgb^6mfGk3mo*h6LeqU9eTZ$M01EH9uQN^MZf&(Zr
zj(m($6lK}AVTz+)a|vR3e!Jc8VJc>n;hvf!vDGHZK!o41<RD<Sp;bgUR}MK9r~!o&
zC}8!u8aP&saL(l@R*@nS08X6;oO2$@K^vl2n7K7tnK<8Pe5ru?Q{sKJ)wfCdZC~NM
Y0X`vP0lgs2PXGV_07*qoM6N<$f;88nVE_OC

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_side.png
index 74f9f03d5e667b53454ffc28375b10408cf54135..c656696558567389d95946817c7f4eeaa03f6d21 100644
GIT binary patch
delta 579
zcmV-J0=)g71BwNZQhx;r2`wYCDe!p!00I|DL_t(I%SDq}k_0sjM4u$PmaZYV7T4fR
zT$7k#=;>N)OX8y%@TWo{W$LBnkKcdGb)NWjTQD_>K+)vmW8>@VFV=O%!^uq6b>(?9
zM(_Oj_s+o35y@1HwH8ERU1wAkfXtv2<2Vjf1XINXYAqC1B!4<8Kvf}t%%qwU;XI#D
z>NJr+49BdHnY7mMNU8~aIEsJ@ggdnupI@I$)5J7Qh(Ls+<yIsj)LI$C2@y;LT})`6
zj7W+pDuSw_W<(@{@bU2rnaS<T5f!QmBA}-7_Io!xwvEgr+#wUQLMesb8<|kb%raGk
zBmpI1s)cQxk$<<$&(AL+f_YiU4DJ=e@WFYV6jR8%rtK~LI6I=k_xCsJW1+Q9F~dD@
z4@xNr5WKzXty=9K&-R#U=f%3N%=1id9aY8MY5k(sLXs%LeqLxPhzKPTe)a=Z!OxRg
zjCEOfJXZdFQ=R^!peoE$A@ZiDBEnKD8A+NjFAMHYsegrtAW2&9WG4G-2f#fz+5kXn
zDb#AHDNbcs=J&M=eGF8Uh`8BDA_Co=F&Y7=yYo6b?m;y}M92(Om1X`v*023VtrbYz
zlRj=bIwBBLGJ|clJI=Lo9Os>nNIaZ~KurmEMkFQ%nP?`s59V6guSRks{&_wD7%{kx
z#`f6oNIb3)_kWSR6B~dabRSeRBAnJ5smag&LQ+`PnbsTay4X9I34&k({{WehL0ENE
R04V?f002ovPDHLkV1mqZ3-<s3

delta 342
zcmV-c0jd6q1)l?uQhx*q6DuJmtU1L100AsXL_t(I%Y~CcYQr!PMPG#pfgnR@>`fto
z1`J*I20lSg(d+acJw$HMbs!)YFT9BY28n?2rrlKPSZUI~@gR-<{Fy(#dwYHP+AQY)
z><&i&wndJyj=Cyo`+<Ga@$~orfXp4eCkqGRp+wsc0L-+WoPV$MBE~9B-Yn-B>tZYm
z1f2Z&mmshi>qynC^kP!YSjX;goG8m=_3%xrjo!mgd!zRlajyb%fK(x+${B5oJjO~U
zJ+JR4k|iXujFn^$WTW^0l7u|f_QQpJ0Q;tkacZNSl}fET`Ey*FYu-yJ$tHIp#rwx+
z+*GM9GuC0Oi%;t-A4~GsW|6aRx=5k`>Z<&+s%%fjGp*xXRQf30|F$14T#-Z1ZVf2(
oeCvNv(*HEEu1e~vyt?K9-;v&ygZ6z%UjP6A07*qoM6N<$f&((9$p8QV

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_top.png
index bfa54d8fe5470e58eb8ae0f161464355c6dbed27..028e37eafdb10bcd29ba938dea78c68e8370caeb 100644
GIT binary patch
delta 579
zcmV-J0=)g;1N{V$7zqdl0000V^Z#LyAu)di2?-+#ZWu+I0006CNkl<ZILmF4U2@t$
z5QM)SjU@ArAq2bZ;D=Pj$H+Nyrd%?VLmV4y5Rwp})ovcJ6kN$XZPj#d&vcLZ{_U$5
zBN!1P72+r)3WO*Sg1}H!9_t)|2mnXxNDmfUme{I7#R%;<q7_GY;O=S!z@|6=kgR`G
zs;c74rzv$UmI-jd(|Utq3}F~DyBZ-9@S5)$V4m$U9>$}7^C7^^WWZvXAjY6#3}GOs
zDyuYS-0e_R7JzP~Xb`+pzL^Y~&%z);Gz<|DR%y<M-ifTLs471mUz+zhdDw~pFo8iM
zl}2He<_udgt276oa-LP1lV^JXRF!{W>#slFd9)J+w7VAo3|ld(3Y-A<vnh*ZLg%e-
zt$pW%a~6qID0at2rB)xdViwDU<u+@2=ji}wU{C{Gk9(*p^T(H_S?rE1w;7Xumz&7|
zfS=0*=Nz-?B@fRDDxjO9WN(v(SdUxmj!cJruE)Jb^>#Ag;c3nM_bc8*C<cG6_fb`>
zwXAms)|-^kWsm<=uiwUdcwTLYHAK!6IJq1Vh~S(%ySj6O;j$fbKbvBmNA{&_K=a2J
zeyz5AzWvCk(`wAC$#u;2N?CD0y!Q>L_F(>YKmd2w<A2C`w&&q#4S3XA%l=q4Q=G?H
zU+B3&-7l@Bto+Hu?XF;VEQv2PAPxn=uuZZPFgXIS%W|B9ZE@gGo({@;#~*C@9pg_#
R&Bg!#002ovPDHLkV1l~Q46XnG

delta 421
zcmV;W0b2h31mFXZ7zq#t0000_V<RGwAu)dh2@@*}V{>J&0004PNkl<ZNXNxhJE{Uf
z5FABBkP$@PL{M}=Fy0#&85(&6uj4&D!A9O-VnJ9%!Nd=OgCHips933ag+}jnqBBf)
z)l_%Q7UuKWY%+Ph%s)j5f3oa!y4}J9aolRvYWcd`t=B7+e4VDwWtlPMvbENR=T(1w
zoGU57B<XY-4P(w{@9+1p;BvWMACEckXfzl^(dQd8k$?aLH=EX0tHwCD-(N0TncePs
zeLO-SoP%;qpvVLiFo@w7h15O+GeJp!iSSzOFBZ;ix1o{%=Gh5az&%8wng!etv%vY>
zGS#{wPcsTCB|r>PKcC)vALc37a1?*|9l(uQQUm}I%6`grtJP+6I2bb=_WSMjFYf>+
zvb1UH+&cjtHf1{i%Nbz*a}Oc$c$_40tnJ6~et{?oTP1DCQ~d42!o$n^atOH)W&r!s
zX_EAMc_F@ua?RH^RFXnMR)&eOf(*=r<+p&9;6xCD8<b5|{zn`Bb^HK#ps*1sJ_4hM
P00000NkvXXu0mjf{?WbH


From 7b78d500fd63498df3e9f2dc8baba1ed08ea18fc Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 9 May 2021 21:57:06 +0000
Subject: [PATCH 4/8] Better textures for stripped wood part3

---
 .../textures/mcl_core_stripped_oak_side.png    | Bin 551 -> 2130 bytes
 .../textures/mcl_core_stripped_oak_top.png     | Bin 523 -> 729 bytes
 .../textures/mcl_core_stripped_spruce_side.png | Bin 447 -> 2054 bytes
 .../textures/mcl_core_stripped_spruce_top.png  | Bin 556 -> 733 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_side.png
index 3bdffd76e14a9a256975620422c6830b37462408..c37220bb653a15b6170a20b09c34777eb138f6e3 100644
GIT binary patch
delta 2085
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
P00000NkvXXu0mjfLG|wa

delta 493
zcmV<J0TTYw5T^u?7zq#t0000_V<RGy3I;KM1PK!)F}#B{ZU6uQv`IukR7l5TOnBpe
z$A16+{|q>Q*(%i;qEiw4Q(?C=US}i3&CFC(L_`=ErYLN8xgO5IAk@ZF&(?-e|E}sw
z<F6_PoPY(!$a&zoM{^}Y0%qWyJI|kg{D|9tQ>X6SdGm&WfkA=6g@Fvfgf6gb+2O-~
zckf~<B;*rx5EW%>tE`ORGukr<GQ3C77$HC{i&a!4CHeU=L&h{)wOw=>QphntqLK++
zBaB9OIeHYq(gKVo7r-3=i)-{a&tB-cT5}g}1JE6Y%N!UuJ@t0w>nJP^z!lW6s6me+
zbc+cAbc-?40I6~Q`t`?;U%xUi+`s>S`t|qkh`7e3|NlXT_Y8t~q5zkVaHS2n#RLGX
zT!5DwXypnMp*Y1Abm(!8UI3x<(bW@O4#0vAJ++gX`f(*ng5>}#8^Rod9)x!oo-=&J
z7J^X>whYR+i)f4xKrgvqAl%TZTt1qCA)>&lL*5HBN{CIgFm>qa35LKfu}j}rpW84n
zxVq};Nk}j-{GR}g5(ey1051VyfIuCAQ4-<;yLVr@^x_5XT9Qym5X=RHYCUuZDjgI3
jz_k?-HG~o!uA&<NHeN(n+M`4H00000NkvXXu0mjf7(3eR

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png
index b07c726135d63653bd14fac277ed3f4f66cfd957..e060862e7a66b485affc10e0f6d74f20bdc2b298 100644
GIT binary patch
delta 659
zcmV;E0&M+@1la|UQhx;r6$29e%%gh%00L%7L_t(I%T<$KQ`1lo#eaK~rU~s(>ofw>
z5oM4;)Mt5e^n>_K{Cd3j=TSfqsUnp>0ZK}nq-}E7hqP7pW$*0Fp1XU_S^4n(ts(&6
zI4%N+lm!LM^bMe@SZm9yimJsG5dzP_F@ma6^?f|AN;b|xCx5IxYVh+aA*gzc#~Epo
zp{k7Xf=MB`Vg$zse&Dm&ZUPWCYDDpn<I4okbubjXe%2z2hjgNpJTI{QnA{e)j&T6)
zHSg@5VsQ}7F(v@uqBmfvSqI?9#Sq6Bj3@@c4}A8!eE@d$PI=s_v(;WiMEG@`AtD?{
z2~j)*V122^Vt=CnBA6LrTkS=5Pp+Bd1*bP7Cb<P*JkHo`H`#s`^8I`;CsfMjastou
z2^%#wRvzFu6|fV;$b2<bxV}r+-UvCqOaNF51B@{xz%0Cq!}@Za<%e}H<CNRGjIY0M
zY1aKxW@E^Uf=-lj(Cq=>&d^S;Vvf#k@v8w=m3|ykSbw-1Bz*pHg@~|wa)mJlwK?%%
z^bg?Uw=))em-XcbIF6xN_xXI3Q?)s@1)ry3ox^UAm#Zy0Q976O)4_SU!uInOUaqz{
z?@t&_a+1-6cdyz2JZaVDT+GIf;vxIpKB`k0J5h=;!uCeUpWcY$%Y?I=J1P~gWPIw6
z*}7q)hJWu>P{37H#^VeKxabXd^J0a<T8s#X(;pAIJvvc(Z;F0=i&|R(WNF6NlO9{`
z#@s9bL9oD=!wX(-F3)TKgIH@z67#}RWGP4Ir6*>w76wE&F`X!#n+hOHGjgjaifgT9
ttb#Ezm1Z;th;HJ08KAHhrsoX8UzyK7bIUoiUJL*L002ovPDHLkV1lh}J5T@s

delta 451
zcmV;!0X+WM1&aibQhx*q6D0wIK{SH^00EduL_t(I%cYYsPuoxwg}+!P!nG6+$&-@e
z0jriO7{Zinz?9u{H~t(0Q}>JvmFPs4C{j>Rm4rx-49}7Y3RUTV?v)MMxQit}-{W(>
zdtdD$JAdU9<pb1xuk!Nbu*viGg~>7}>&1*0Is5fJZtvHX?|-&`|Gf!FWxW^x6NOk;
zuwUN;V7`9h$LTi`6EL$I02T9gHD6xeF<#_MADoI?S74%$!~_)=DllH;09;<*G3d5A
zI%ojsA7^%hbp-&42{<`yRt1g@8VpCPN>kd2m_9fL-8TKSrSEq-Fj2^$+twyPn<YY7
zM56dYT`DmFiGK++(s+?`cHB|>;!q&^(qvu1aI_-rL`q(sH`7M|e*T{C-UB%(PvUv|
z!hHQi-26gf0*0d%SubX0H}umM))id+`t!yh>&1E~dC!hJ3Kw9|Z7XE!3XSNMsS6|-
znZyxS64ykbE}2)}Dk0rZTbL-+X$(gzZl;gw!n#6xYCIR&`D@+x`2Mw_cHh$$Hd4Z@
tau+7coXIl(Fw)z5KJ0(FYM;H%{{im@)*MZ?;pYGV002ovPDHLkV1i?D(&+#I

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png
index 11ea15bebbad35c0a09c692a42104d22382c31b1..55cb4cec3fdd8d2c466b30ddbf75a2aa6748b050 100644
GIT binary patch
delta 1995
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

delta 378
zcmV-=0fqjC5WfSEBa_?(FMk9H6EO=-Its`D00B%%L_t(I%Y9QZi-Ry2eX$`9L9s`n
zIusYDLg`vKTyE-ofBBZKhwCkJgEt&1N(M#94dn}ok^3h7lK17kmlyW__Nt}Ou<MfT
zQ8gXZ%y7#SBr*g5e0=?w9soS*9svO^+1?CDWQejz0RUCgp;r@nHGi4)s_9TQ9RPq!
zq0I?uW&q%9UKg>Yy_^6vWGzR{43E0^`ci19nLQ;CO}nb5gA^KBv_lr{Jda3nKvYN*
zeN+E>Iv{_E9NKmT_JR}|Wsw>K)y)3&!wk6PiJ?RQqFuKm>UQ*i<`$??w<F?^dw^kD
zJX3ACoWQg>4!H$nj&JV!`RD}7NU%>Dro}n+em<JykwiOmfeltOLs_JVL%tcREkgq-
zv=`;;>983pTf6aqG?NdX-@oSGU67j>DV~h^FfHCSt^bMLqwc*o;drq14#<l{hK`w3
Yf1hZ;Y>0n>j{pDw07*qoM6N<$g6iq2`~Uy|

diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_top.png
index 7699612b6bf2721104c69d9318710f7723554e40..ec0dd2da813ae457527cf65598c385e609d6a150 100644
GIT binary patch
delta 676
zcmV;V0$cs81l<LY7zqdl0000V^Z#LyAu)di2@eVw-D=m00007NNkl<ZILl3wOK%%T
z5QM*;$Ik9@xgu#ww2?U0!7y?Oz+>Q_ko<on2g865vLQ<$S0=gSK4v-x%C!5^K%>y8
zuBw*5->)^ZmZXZchTJ(s3<x-5NU9`NzE_NiZWxFPDJ7i2a5c#pqY}KM9|r14;AVeX
zFvi5khbP{yX6(BGBSO=5%p{N$zHE0GXN7J|TulPME+&MKv8oG<2<<TP%c26H%pAd4
zR&`0p9Nr4f8jJ{J&a$j><eBEK8_sl-ax*Q6N%`pt>f95P0)n%~0-!)rWtuw#p*eO0
zZ@Fs@7cC~4=jqfjjESU>dxtSbsB(W#W)0i6<91mStYLHL$c&-NJa3jYuNM`Ee!yG9
z^|T<*EQ;dBm@YI0;qluMfJtyX?2dSM23}7~L?CzWnLZTW;j9r3{lNY-0?-_LM4;^=
zni6AD5V-%gp)NcEY}$@~Ohi=-z(aFDRSDj3Rb>3}+YLo#F#^F`Qc^N!Xxe|CyQV!0
zS)P{}1zs;}UR38S2=M7^!}@lGb(Zz*ig_8Bmx0_{L|}-C`=+HIBPK=Vaeo3}R%A5C
z4xX3%++WTnfU<sb&CRr6QRO66Tv8B`i<R$Q&iVJt1`x)md~RBb%(87yyj{)s+U&WW
zmfUUkbVI};@YMFq%fPnn*tUNizrR{Ari3c|^LdN4hB|ou+nsn(6+G<PixX~)5pNBj
z9(UAb#=H#NKOHWqOR5Y*gx~?#>`!dlo>PBz%>nddB=?Tv^YDAk%fPFvk`MO{%PMEn
zcI;2X4}gOF_2*i>a~N};34*oef)Np7jED$BOsJlJ0F;yx{{tV$EVK}+{<_ov0000<
KMNUMnLSTXzA419i

delta 497
zcmV<N0S^A%1*`;+7zq#t0000_V<RGwAu)dh2@^3EE<9!t0005GNkl<ZNXNxhJ!`^X
z5I$={5<;v7(>f?|7qo*=kZyHw=wI+(c5p~Hmx4nrxGQF9{iq*^hAMU_j|rC?x_L|T
zChy%nch7V0n`*aPtw!T`q$`<%m&4OO``eN?=044>;Sss6ZCh6O{o{7L{eC2RSeAc`
zyLY0|Xg*)B!~Z|kjj?UU<E6XGLhVEVNQrvA;czk`a_e^4a>9K`lp~W2kBD3{$ch7W
zmo`}uU>wj52fzdHgxqSiQYoK5-)bqYa?a6lG8tW$f%N<1@pLLD#Qw=-wc73e;~5^&
ziUQh40igA0B^*)VVzJo-LHM0ll+Aydrl!fj>h*HjapDCi=URlsmr}xkNO5BTc&jAC
zf8{xSe|!l$2Y-lGq7MF=rfG^25g}J60-yp=!2?U0K_UQ>G<5=iIR;k}6#%k-JA9>H
z!!>~7$rAyPIEI{4u3||Oe9bk`Y*s48Vp!No?3a!qDwM{Jb1qE}fQeHeshnL0<mP#U
zf$tM(nyRWQQK4X2x*kuAH7H1Tl|bzzoP-h;2*95(-=EEr#*&{O;ur!M=SXq{FmQ`Y
niIzl^boN)tNa}Rz+Sl<Pamju(y!c+e00000NkvXXu0mjfy_Vw<


From 96be84161f1aaa153882bb17ef493470cbd81554 Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Mon, 10 May 2021 01:57:34 +0400
Subject: [PATCH 5/8] [mcl_mapgen_core] Don't crash if Ender Dragon doesn't
 spawn for some reason

---
 mods/MAPGEN/mcl_mapgen_core/init.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index 90b2725067..bdcdb1b4d4 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -1248,9 +1248,14 @@ local function generate_clay(minp, maxp, blockseed, voxelmanip_data, voxelmanip_
 end
 
 local function generate_end_exit_portal(pos)
-	local dragon_entity = minetest.add_entity(vector.add(pos, vector.new(3, 11, 3)), "mobs_mc:enderdragon"):get_luaentity()
-	dragon_entity._initial = true
-	dragon_entity._portal_pos = pos
+	local obj = minetest.add_entity(vector.add(pos, vector.new(3, 11, 3)), "mobs_mc:enderdragon")
+	if obj then
+		local dragon_entity = obj:get_luaentity()
+		dragon_entity._initial = true
+		dragon_entity._portal_pos = pos
+	else
+		minetest.log("error", "[mcl_mapgen_core] ERROR! Ender dragon doesn't want to spawn")
+	end
 	mcl_structures.call_struct(pos, "end_exit_portal")
 end
 

From a3d3055e8af15d00ca87123ec64fc0544fd529f7 Mon Sep 17 00:00:00 2001
From: NO11 <no11@noreply.git.minetest.land>
Date: Sun, 9 May 2021 22:10:08 +0000
Subject: [PATCH 6/8] Remove cactus destroys minecart from master

---
 mods/ITEMS/mcl_core/functions.lua | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua
index 96f020ee20..732c386b09 100644
--- a/mods/ITEMS/mcl_core/functions.lua
+++ b/mods/ITEMS/mcl_core/functions.lua
@@ -197,21 +197,9 @@ minetest.register_abm({
 	interval = 1,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		for _,object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
+		for _,object in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
 			if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
 				object:remove()
-			elseif not object:is_player() and object:get_luaentity().name == "mcl_minecarts:minecart" then
-				local pos = object:get_pos()
-				local driver = object:get_luaentity()._driver
-				if driver ~= nil then
-					mcl_player.player_attached[driver] = nil
-					local player = minetest.get_player_by_name(driver)
-					player:set_detach()
-					player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
-					mcl_player.player_set_animation(player, "stand" , 30)
-				end
-				minetest.add_item(pos, "mcl_minecarts:minecart")
-				object:remove()
 			end
 		end
 	end,

From f3c540af5d879c3e8c5b2eb32eb2c9bbbb4bf0a7 Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Mon, 10 May 2021 02:24:38 +0400
Subject: [PATCH 7/8] [mcl_mapgen_core, mcl_biomes] Make chorus growth
 deterministic

---
 mods/ITEMS/mcl_end/chorus_plant.lua | 16 ++++++++--------
 mods/MAPGEN/mcl_biomes/init.lua     |  7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mods/ITEMS/mcl_end/chorus_plant.lua b/mods/ITEMS/mcl_end/chorus_plant.lua
index 9622e618f1..5978428676 100644
--- a/mods/ITEMS/mcl_end/chorus_plant.lua
+++ b/mods/ITEMS/mcl_end/chorus_plant.lua
@@ -309,7 +309,7 @@ minetest.register_node("mcl_end:chorus_plant", {
 })
 
 -- Grow a complete chorus plant at pos
-mcl_end.grow_chorus_plant = function(pos, node)
+mcl_end.grow_chorus_plant = function(pos, node, pr)
 	local flowers = { pos }
 	-- Plant initial flower (if it isn't there already)
 	if not node then
@@ -321,7 +321,7 @@ mcl_end.grow_chorus_plant = function(pos, node)
 	while true do
 		local new_flowers_list = {}
 		for f=1, #flowers do
-			local new_flowers = mcl_end.grow_chorus_plant_step(flowers[f], minetest.get_node(flowers[f]))
+			local new_flowers = mcl_end.grow_chorus_plant_step(flowers[f], minetest.get_node(flowers[f]), pr)
 			if #new_flowers > 0 then
 				table.insert(new_flowers_list, new_flowers)
 			end
@@ -340,7 +340,7 @@ end
 
 -- Grow a single step of a chorus plant at pos.
 -- Pos must be a chorus flower.
-mcl_end.grow_chorus_plant_step = function(pos, node)
+mcl_end.grow_chorus_plant_step = function(pos, node, pr)
 	local new_flower_buds = {}
 	local above = { x = pos.x, y = pos.y + 1, z = pos.z }
 	local node_above = minetest.get_node(above)
@@ -396,7 +396,7 @@ mcl_end.grow_chorus_plant_step = function(pos, node)
 
 		if grow_chance then
 			local new_flowers = {}
-			local r = math.random(1, 100)
+			local r = pr:next(1, 100)
 			local age = node.param2
 			if r <= grow_chance then
 				table.insert(new_flowers, above)
@@ -404,13 +404,13 @@ mcl_end.grow_chorus_plant_step = function(pos, node)
 				age = age + 1
 				local branches
 				if branching == false then
-					branches = math.random(1, 4)
+					branches = pr:next(1, 4)
 				elseif branching == true then
-					branches = math.random(0, 3)
+					branches = pr:next(0, 3)
 				end
 				local branch_grown = false
 				for b=1, branches do
-					local next_branch = math.random(1, #around)
+					local next_branch = pr:next(1, #around)
 					local branch = vector.add(pos, around[next_branch])
 					local below_branch = vector.add(branch, {x=0,y=-1,z=0})
 					if minetest.get_node(below_branch).name == "air" then
@@ -457,7 +457,7 @@ minetest.register_abm({
 	interval = 35.0,
 	chance = 4.0,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		mcl_end.grow_chorus_plant_step(pos, node)
+		mcl_end.grow_chorus_plant_step(pos, node, pr)
 	end,
 })
 
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index f583d87b6f..cf9ccfb9e9 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -3976,9 +3976,12 @@ if mg_name ~= "singlenode" then
 			--local poslist = {}
 			for _, pos in ipairs(gennotify["decoration#"..deco_id_chorus_plant] or {}) do
 				local realpos = { x = pos.x, y = pos.y + 1, z = pos.z }
-				mcl_end.grow_chorus_plant(realpos)
+				local node = minetest.get_node(realpos)
+				if node and node.name == "mcl_end:chorus_flower" then
+					mcl_end.grow_chorus_plant(realpos, node, PseudoRandom(blockseed + 14))
+				end
 			end
-		end)
+		end, 999999999)
 	end
 
 end

From f054eb1ce60a653db9dc9a2bbe6cf8d8a8be619b Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Mon, 10 May 2021 02:47:56 +0400
Subject: [PATCH 8/8] [mcl_biomes] Fix chorus random function, prevent chorus
 growth at return portal position

---
 mods/MAPGEN/mcl_biomes/init.lua | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index cf9ccfb9e9..3655be7ebe 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -3974,14 +3974,18 @@ if mg_name ~= "singlenode" then
 		mcl_mapgen_core.register_generator("chorus_grow", nil, function(minp, maxp, blockseed)
 			local gennotify = minetest.get_mapgen_object("gennotify")
 			--local poslist = {}
+			local pr = PseudoRandom(blockseed + 14)
 			for _, pos in ipairs(gennotify["decoration#"..deco_id_chorus_plant] or {}) do
-				local realpos = { x = pos.x, y = pos.y + 1, z = pos.z }
-				local node = minetest.get_node(realpos)
-				if node and node.name == "mcl_end:chorus_flower" then
-					mcl_end.grow_chorus_plant(realpos, node, PseudoRandom(blockseed + 14))
+				local x, y, z = pos.x, pos.y, pos.z
+				if x < -2 or x > 2 or z < -2 or z > 2 then
+					local realpos = { x = x, y = y + 1, z = z }
+					local node = minetest.get_node(realpos)
+					if node and node.name == "mcl_end:chorus_flower" then
+						mcl_end.grow_chorus_plant(realpos, node, pr)
+					end
 				end
 			end
-		end, 999999999)
+		end)
 	end
 
 end