From ad0cbbc0fa3061b122ea6f78cdfd00ada110961c Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 19 Jul 2015 16:38:56 -0400 Subject: [PATCH] don't define acacia and pine nodes - alias them to the default ones instead --- node_defs.lua | 13 ++++++++++++- textures/moretrees_acacia_leaves.png | Bin 150 -> 0 bytes textures/moretrees_acacia_sapling.png | Bin 205 -> 0 bytes textures/moretrees_acacia_trunk.png | Bin 599 -> 0 bytes textures/moretrees_acacia_trunk_top.png | Bin 651 -> 0 bytes textures/moretrees_acacia_wood.png | Bin 175 -> 0 bytes textures/moretrees_pine_leaves.png | Bin 205 -> 0 bytes textures/moretrees_pine_sapling.png | Bin 202 -> 0 bytes textures/moretrees_pine_trunk.png | Bin 1074 -> 0 bytes textures/moretrees_pine_trunk_top.png | Bin 451 -> 0 bytes textures/moretrees_pine_wood.png | Bin 648 -> 0 bytes 11 files changed, 12 insertions(+), 1 deletion(-) delete mode 100644 textures/moretrees_acacia_leaves.png delete mode 100644 textures/moretrees_acacia_sapling.png delete mode 100644 textures/moretrees_acacia_trunk.png delete mode 100644 textures/moretrees_acacia_trunk_top.png delete mode 100644 textures/moretrees_acacia_wood.png delete mode 100644 textures/moretrees_pine_leaves.png delete mode 100644 textures/moretrees_pine_sapling.png delete mode 100644 textures/moretrees_pine_trunk.png delete mode 100644 textures/moretrees_pine_trunk_top.png delete mode 100644 textures/moretrees_pine_wood.png diff --git a/node_defs.lua b/node_defs.lua index cad3a07..724133f 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -76,7 +76,9 @@ for i in ipairs(moretrees.treelist) do local selbox = moretrees.treelist[i][5] local vscale = moretrees.treelist[i][6] - if treename ~= "jungletree" then -- the default game provides jungle tree trunk/planks nodes. + if treename ~= "jungletree" -- the default game provides jungle tree, acacia, and pine trunk/planks nodes. + and treename ~= "acacia" + and treename ~= "pine" then minetest.register_node("moretrees:"..treename.."_trunk", { description = S(treedesc.." Trunk"), @@ -451,3 +453,12 @@ minetest.register_alias("conifers:leaves", "moretrees:fir_leaves") minetest.register_alias("conifers:leaves_special", "moretrees:fir_leaves_bright") minetest.register_alias("conifers:sapling", "moretrees:fir_sapling") +minetest.register_alias("moretrees:acacia_trunk", "default:acacia_tree") +minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood") +minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling") +minetest.register_alias("moretrees:acacia_leaves", "default:acacia_leaves") + +minetest.register_alias("moretrees:pine_trunk", "default:pinetree") +minetest.register_alias("moretrees:pine_planks", "default:pinewood") +minetest.register_alias("moretrees:pine_sapling", "default:pine_sapling") +minetest.register_alias("moretrees:pine_leaves", "default:pine_needles") diff --git a/textures/moretrees_acacia_leaves.png b/textures/moretrees_acacia_leaves.png deleted file mode 100644 index 73a8951044c50cbfa3b6983184b81c6e2b9f6422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0Yx)%Gj$?FLJ)#j*=4x zfPBW1AirP+hi5m^fE)`?7sn8e=;S#s7QQ>rp;mRa_KZTy?9d*umW0(8xmpE!c)F7n tTK*hnVdgL_zczQVK+>~4!KV+hFjzg5%zPW8;tw=~!PC{xWt~$(699}pE};Mb diff --git a/textures/moretrees_acacia_sapling.png b/textures/moretrees_acacia_sapling.png deleted file mode 100644 index 5767f641c03d8826b89583e8cfdba4ef647675a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=0)-;uhM9cKRwN+N$=3 zswNt8jz(%;m3n@zc9HY-V!{IQG7>x=>P7)oa+C!51%tG(aB%U*97_xZGJQQ=978x} zCMP&BF!HsrCa_IE$hYD`7iT~lU&xY1;YBTttJ#zLSHJa1STGDQAwr*@>WY})S_uFBQpbp3qPgg&ebxsLQ02Y8aH2?qr diff --git a/textures/moretrees_acacia_trunk.png b/textures/moretrees_acacia_trunk.png deleted file mode 100644 index 7e6099580524e1c5c50d2bfad2e12ca8c38dce10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 599 zcmV-d0;v6oP){{J7gQk9w+6%k4IF-%!70_XHi_xsn+?uUS!Gc-?ALW&9P zYKUpXpYLycetqKgTDdo2@XprGb-dqi_zOTt3CD5by7XMAXGP~P3?A$IWd%bB7={6G z9%nl_Ij{@7<`6tQA8nRWSfE*lUtbjHnp~t`u>uMB?8!2tuhG|R?O3f;-CiN(U zPTf?%@qz>_dodR}X~@noKde|MG82u2W$V3e_DBu0F~*2>-7!wt6lWDfbiZE>dZN{G zqL9{uy7b=uBakc%#rk?-$}^$E)Gb@VvMi+Wwp?fg=HX;s6uOY68-YY~Za~Tj%VWkk zW=orFlfCc1Pjf|$B&_!IKgPj|sv)+OV$Cz2&nK3T#pn#Az&jY_0>{4ZHcOYCVG;^i z>Lt#`Owa6okZWOBluio{?HzgW@q<~|cGE<*%66S4cG*bIJS@)k9WX$$O7GQ8NmNE; zorJ7x(5g~;C(@hZv_~7`B%3@vpX{QtphV8I#PueweUapUcc-ul(oGKL|D3#alqPZ~ la9=KH&yaB_%0k=8^&j{%TfjBrJD~so002ovPDHLkV1jd-6c_*i diff --git a/textures/moretrees_acacia_trunk_top.png b/textures/moretrees_acacia_trunk_top.png deleted file mode 100644 index 858a8a8085ef8da6c38cce21c0c6d472e98c8c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmV;60(AX}P)BN9H^C+;h)e$lbjGbtHuV4fTHZPW}Ia^7&KUp2T_a z)nvVBuZ}5z62oAa3*h*+2U3iKylThsh8J?$gOhbXerA36^-#e1%X=sbPWnb+GXWUg zUq(0OM9Hp&80OFjvp8TisM|DX`;2IZcyyyq3=2v8eiWmOC<6sWISdN|N@gwOn_dhG z2@JMYFv!Jl`Xr6BXF2?Mk;mwH9^JSLqg-g7!EhshJzj_IstZRx6MZZt+>q`B(Z3}? zx*ovU;|#r10F{aa>RnqEQ8jH9UqK~sCyVxh^RYyJ+>JZqK`vA8${WnMSsoxuM1-a-H-_% zO~eBsGnx@I^+KD}tN5Ww?v&bFQ7hV4ZRn>Q^BTy+Fd`ALLTY`Z(czte!6#0SU7G=4 zIEHrUfMl0Q_Tg4|-pbiaS5P%w#vZqbBB5R)dMKKdZ44Dvj62YX*{Mcv?fkrvE*hlS lfl{wi4E{ID>M@=j=f5etgUGlS1IYjY002ovPDHLkV1oX1CT{=$ diff --git a/textures/moretrees_acacia_wood.png b/textures/moretrees_acacia_wood.png deleted file mode 100644 index 98c4038ed201b9dac53d1d638b757d5d64f7128c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bP1lvp)svrVtGvX^=v1hc zdg_N$K&fa?7sn6|S=ob)yv+tYE*IrjGAC?oe9WjN&pqYNKV#Dma)K-_6Ef@H`Q)rT z?Uq~Z`9yPNx{*>-p~LDR>8Y1erT4!}(b}%55I3d%)~qRi7Q9j29XaVwsbGKd5&45F WMU~A~T0aL`!{F)a=d#Wzp$P!DRXo7} diff --git a/textures/moretrees_pine_leaves.png b/textures/moretrees_pine_leaves.png deleted file mode 100644 index e6de4829367c815615988c4d36808a134cc20e1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bRmu<)G~<-;=Hb<31ByL% zxgiRqSWANZg8u^n!|!c;!9alwPZ!4!j_a%k8wFb&IG7Lo@nB72mf~_~W7<>j_xhLJ z8J@;cFABCVXuQ7Ii&ty5-1@{5vCCV2&v{jlB%i3a`@rwjeNq}P+uaxKjJ9fh5tEyf xl4&yggKPH>PQj?HDHWSfK4_NRy!hTvX0d9~KfK|(5$I6C_~@0WY? zfBz#Mo&$pCJ7f*NtabQO8OI#HGMame>G@rcGotOqcD!1@zi|D``>gZJVjh@Xwd<9* r{xj!oVn%Lv=Am6v7`)UnX3o^FpAaSxRhIEp2V||MtDnm{r-UW|k=sKV diff --git a/textures/moretrees_pine_trunk.png b/textures/moretrees_pine_trunk.png deleted file mode 100644 index ea685e3a91100ba3cdb73d4b4983e701fb216d93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmV-21kL-2P)BZ^jdNbOoQR@^Z=;26Ur9D_ zRX&%1Y;#*iY*apBNi)o?m3dxEe_%z4YgF34sE>PUmVj@Na#?X!Ky_F?Yg9swZ&hVW zH;#5;dtgVNf^VjXa+7#sc3nwvSVLt^IelPEVM#fEU`BUgOjSNBaa2BSSVvYtF=IzG zYEnC1LNIbzLwQ?6k8f3LPdai|LTyq$oPB7vmVb0tL#~Q&;J>KHs+GW>hk0I1nS5n% zRzq%4J8@M)d0a(vSVMebO?6sErh#Z>Nj7y+JEDYba#%raP&|ZYPlabub5=l-b6kLE zREK9xjBZw)d}N}0UU*+ib67-tUP_U1ScYg%Yfm|fZCGteGmvjsQ8y@TR6&MmRANdv zc344lTuM$pFjYb_fM`|Fsf~qYOKed;n|WY!Qa*@iQk#2Yd{a4CLo%d-XKqY3k#%B^ zaa?InJ%nUQgJDR5V@!u_T90;Mg=kTGVohvJH*Zxxa#KLGl6!?{RA)^(k8oOKO*KO@ zBym+grG#u)LNk|iT6|kWqJU>~RzXEFBSteNk8xV2eqp4Da&S*MlyFvAK`c@`Dsxjk zUPCdCa$R{|NqSsFRzNI)Uq_jFVofbv zSZ7W;T0=0Mby$X6KzLh3hiOw_L@B=&g#7RTb*B~?0reE2gsgtN+zd0RMCXA-8&W_+-`Vs zsMYl|q13=IHU_lp$zn{}p^S&s$EV0395o3k#IT;1(@FyZoFOI7Z+^=6h5uy;{sPG} sn`ypqA(*)bO$5R<%W4A@nU)8L|B>{4p{EVKi~s-t07*qoM6N<$f?E)^UjP6A diff --git a/textures/moretrees_pine_trunk_top.png b/textures/moretrees_pine_trunk_top.png deleted file mode 100644 index 01aed1d7dd0b0d627abcbdaf441f1b434b83ed7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+VRP)+E%UER@SGpohz;?fD)hKr?354m zv{l=Q4n;F5@R$|yt3mRrJ@c|qLoz7}1qF%#0075HL_t&-8AZWGb^}2S1we(F8O$Dr zW|IE>&y|;zt7wOWgS4mlZnLcG%d7Rx?rR1Ty)1K(QbdV3#{i`+C~tL)*|Kvz2rJj9 z5F|{~#Nio)KE&e1a^b0j2M~H`y%Fam3rh#WN_iF8u#IBn351SsZT6=1CTMvC;l21` zvL1DmENc)xr72Z5?Q51s?m_rak$D`oWiC>K5(?{!%EVY@ao>q%T-%(p_hTs%e?bGb t=cgxhbi6oQylu9Leugy6_?G~r{U7tZFU5qk?Y{s3002ovPDHLkV1nQ6y%7Ka diff --git a/textures/moretrees_pine_wood.png b/textures/moretrees_pine_wood.png deleted file mode 100644 index 8680bd5ba2ccd575391ac8812c20f6cfc066d3bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 648 zcmV;30(bq1P)9Zv}Kl0+U(<^v{;i zf(O=x2zp5ZSu_Ffz;w=l2j`n6;*AM{PXpeH2%lmEky!*gAp!2aY@=iZ?X+4~GXdI% z2*-N|onZv41g>7q2{mmluDYV591 z-H8a`j0sFE0ZJ#a*t zF9GC|6zQQeZwBIl^N}}UQ{swRx$zYwOsPWf97_g9pfT>aWaN<&>#IjGpYwbG008(&L_t&-(+$FdcEnH=0Ki+@w%x96W)XF>vGMf( zU(lWzcr5*f|Gt`)VzIeiSp)JAsn)aY_GgE?8-$hNNtTC1NjezC)jbvrAz^x4VBbHS z;@{0PbOLWTX3jIaf;X=lrm;VUqnb{SDHR7)(gwG528_6)z_F}p6#E$Q4ARp;b<=L` z{S&n%_7XrQ3`;BZ&66-}-M7w9uV8_T7KbT6O0J!L4@Fr3$4>dSeIQ@Daexp5JF7`L z38tg!M4NQT7Uc4tF!sjti+tA*Ji~+nw;b_pOwJNE!Xibmw5qDf?4#VU9DdtTV!#@G i^?R5!^aQh5-1!5su1FJ=;Ez`T0000