From 125bb7d3028e5376ff018515a29021219f76eafa Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Wed, 8 Jun 2016 16:48:25 +0200
Subject: [PATCH] [maptools & columnia] Fix missing textures

---
 mods/columnia/init.lua                            |  12 +++++++++++-
 mods/maptools/nodes.lua                           |   8 ++++----
 mods/maptools/textures/carts_rail_copper.png      | Bin 0 -> 437 bytes
 .../textures/carts_rail_copper_crossing.png       | Bin 0 -> 388 bytes
 .../textures/carts_rail_copper_curved.png         | Bin 0 -> 374 bytes
 .../textures/carts_rail_copper_t_junction.png     | Bin 0 -> 374 bytes
 .../maptools/textures/carts_rail_crossing_pwr.png | Bin 0 -> 398 bytes
 mods/maptools/textures/carts_rail_curved_pwr.png  | Bin 0 -> 387 bytes
 mods/maptools/textures/carts_rail_pwr.png         | Bin 0 -> 442 bytes
 .../textures/carts_rail_t_junction_pwr.png        | Bin 0 -> 385 bytes
 10 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100755 mods/maptools/textures/carts_rail_copper.png
 create mode 100755 mods/maptools/textures/carts_rail_copper_crossing.png
 create mode 100755 mods/maptools/textures/carts_rail_copper_curved.png
 create mode 100755 mods/maptools/textures/carts_rail_copper_t_junction.png
 create mode 100755 mods/maptools/textures/carts_rail_crossing_pwr.png
 create mode 100755 mods/maptools/textures/carts_rail_curved_pwr.png
 create mode 100755 mods/maptools/textures/carts_rail_pwr.png
 create mode 100755 mods/maptools/textures/carts_rail_t_junction_pwr.png

diff --git a/mods/columnia/init.lua b/mods/columnia/init.lua
index 164b0f8..b146b3c 100755
--- a/mods/columnia/init.lua
+++ b/mods/columnia/init.lua
@@ -676,6 +676,17 @@ columnia.register_column_ia("pinewood", "default:pine_wood",
         "Pineewood Column Linkdown",
         default.node_sound_wood_defaults())
 
+columnia.register_column_ia("acacia", "default:acacia_wood",
+			    {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
+			    {"default_acacia_wood.png"},
+			    "Acacia Column",
+			    "Acacia Column Top",
+			    "Acacia Column Bottom",
+			    "Acacia Column Crosslink",
+			    "Acacia Column Link",
+			    "Acacia Column Linkdown",
+			    default.node_sound_wood_defaults())
+
 if core.get_modpath( 'moretrees' ) then
 	local morewood = {
 		{ name='beech', description='Beech Tree' },
@@ -686,7 +697,6 @@ if core.get_modpath( 'moretrees' ) then
 		{ name='palm', description='Palm Tree', },
 		{ name='spruce', description='Spruce Tree' },
 		{ name='willow', description='Willow Tree' },
-		{ name='acacia', description='Acacia Tree' },
 		{ name='rubber_tree',	description='Rubber Tree' },
 		{ name='fir', description='Douglas Fir' }
 	}
diff --git a/mods/maptools/nodes.lua b/mods/maptools/nodes.lua
index d635324..3d36ecc 100755
--- a/mods/maptools/nodes.lua
+++ b/mods/maptools/nodes.lua
@@ -280,7 +280,7 @@ minetest.register_node("maptools:climb", {
 	description = S("Climb Block"),
 	range = 12,
 	stack_max = 10000,
-	inventory_image = "default_steel_block.png^default_ladder.png",
+	inventory_image = "default_steel_block.png^default_ladder_wood.png",
 	drawtype = "airlike",
 	walkable = false,
 	climbable = true,
@@ -341,9 +341,9 @@ minetest.register_node("maptools:ladder", {
 	range = 12,
 	stack_max = 10000,
 	drawtype = "signlike",
-	tiles = {"default_ladder.png"},
-	inventory_image = "default_ladder.png",
-	wield_image = "default_ladder.png",
+	tiles = {"default_ladder_wood.png"},
+	inventory_image = "default_ladder_wood.png",
+	wield_image = "default_ladder_wood.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	walkable = false,
diff --git a/mods/maptools/textures/carts_rail_copper.png b/mods/maptools/textures/carts_rail_copper.png
new file mode 100755
index 0000000000000000000000000000000000000000..73963f629f9bf6ff7a8ef6ac3febbb3240d9f6c2
GIT binary patch
literal 437
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf?Es$;S0EkZD3RhWo#G*t=_Q@%
zC6nbXljS3m?IV-xE0gOdo98E+?+-+B1^%)H0dj?228BQ}P_8IIt|(BhI7q%ESgs^k
zzBE|AEJVIMRK6lqzA_Am6sp1%s>2oPqZJ#Xl^SA{8l#oklC?Wib-L4aCuHeQ%+{Zr
zYcLgv@(iZs1Cim3LZg{QMzesZ*l2dK@thK)IVHw(ON{520+GqWGLuE+ri&|0msFT8
zsWe+!WwyN9d_}GK${O?4br$OzEjKh<Zf>#K(q^@--Fkbw&BZlSRzEKa0eX+IB*-tA
z!Qt7BG$5zL)5S4FBD}Z9Rp<}{!x6Fa2#uq$-O=5<-~Eq2(i*M*WX4REh7NfVh8maC
zc5n2)ZE?<JU^&{gKH!v^k**fk4&muHx;I~ZymL?9?kn65&SzN9)L6>)1)kk6r(U>8
zPUqg^(D_9SDo1xnc5Uf)>-zNn>x}O2i!bk<yH+ukQKQREH+KCop}13z{r3Hf7ZdRK
Sa=8lVCI(MeKbLh*2~7ZDg`zhA

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_copper_crossing.png b/mods/maptools/textures/carts_rail_copper_crossing.png
new file mode 100755
index 0000000000000000000000000000000000000000..3f12eec5edfccfcaba03b86ee0f7baac673a484e
GIT binary patch
literal 388
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfiU6MwS0J6?DVF0cp6e}9;44w+
zWl-oRS?DiW<S$X=FI5yESrQ;s5-3#~Bv~3HRTd;!79>?3Bvlb2T^%Z29VSx~CS4OQ
zQwKy5GTmvq-5I()>ADlL^(SWQPsufymS;G<z;H&P(M%vJGMZfsM8<Q9jph^^&n-2X
zS86=J)MR0~>7ojg#TBMYDuKvsX_eWsD$`|EX3J~LR@RxXsxx0xZ*g(Wl*wmnM1XE(
zED7=pW^j0RBMr#u@^o<wsbEa)KQ7c1Ai#3mfQ?6Kg@i%62y64_|Mkxj?;kv5R~CBx
z4U@pb1q{M}Wmeeucr22c!Xma|NeN5aO4W+4({F11;#T+UV(K_DZMymCgA3hC@1DwF
zGAXm)d{tOr?c5#RH|=)%iWmCiGWHxb@TqQ2xVNlk`VZ*^bsJk)|M_iSV$8g!U-jts
Z{iP<t)j3T4$v{^zc)I$ztaD0e0sx>djdB10

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_copper_curved.png b/mods/maptools/textures/carts_rail_copper_curved.png
new file mode 100755
index 0000000000000000000000000000000000000000..6cfc8c2dc2c1e5f698f08e32fdd1f2de3c9e6722
GIT binary patch
literal 374
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?jS0J6?C6nzVlj93Svbnx8
zd496_{;~xDKqOb_Wl$I>TNEHy6ew35BwrFNUm7e|79w8}3PcLkkt(&3ighunbuntq
zvC7Ty>MaTCEs5IgNgACgn!V|oy_tFwvh^os>rcu7B7>><1~UqcW)&IDE;gQ1Vm!CR
zcz&tL{4(Q(<)(|uO%_#{E&-xSv*k7BD{9PF*O{-Wvslw$adFL*uBz>(K!-Ax1o;Is
zI6S+N2ISOxx;TbNNU|PeS7K&lU^x(YxX7hb&&8$p+`s>sAO#1mN;4!}*~XADnZ;o?
zPjSQJezi4qOg+*w?l75%?=SeqV6ttwan4<4-rvv9zd7f?+^){uChey$y}`V8`@RPY
zen#&*R8Tv8fuvgYef@ZurLN7rQ_s#nUXtF)Cc*o1a=oq=j~=`1heDuD44$rjF6*2U
FngIDrfuR5Z

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_copper_t_junction.png b/mods/maptools/textures/carts_rail_copper_t_junction.png
new file mode 100755
index 0000000000000000000000000000000000000000..57759193a2798bebe1899827ad4e43f53668b652
GIT binary patch
literal 374
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf`~aU2S0J74DV^aZlj$v!<0F&f
zE0gOhljkR!4@Ca51p#t}UIv9gGElZCP_8&gz9d+_G+3@IM7|;vh!iTr6sjXtY9kfv
zVpQv5)as*^n&Z`564ZOsHT$#lCT8nT$}yOnYcM6(U|PQ6^nAk^1%@*Ujb;}c&nYpU
zTVgz~#CU$G$^0_oh2^G8DomHxn6IcYUtMRurp{tbgT=))Q~qt}*$i|dV@Z%-FoVOh
z8)-mJtEY=&h(vhkxlo})3?j}KyS*3e2)+}$>HpS`7pEQiZS#2&XM*5-o`UV$mOstf
zI4}Q+<b=&lh5Mr4T{YU|E45MeCHFRw(u9lqBfY#fX1K;{MqIwG9}#l+r~QRFGQk24
z={vd;M3{RGnznu27stS4DJRCm)&E&`NlBGqbk)13R-6n|9qc|ZzHt<2)vH*y4Co*R
MPgg&ebxsLQ0K_neng9R*

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_crossing_pwr.png b/mods/maptools/textures/carts_rail_crossing_pwr.png
new file mode 100755
index 0000000000000000000000000000000000000000..0b103f005a1000b2097737a70d8008c3f8a863ac
GIT binary patch
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf>Hwb*S0Ei49-QGRmg6m+>n%~>
zD^chtS?DiW<S$X=FI5yESrQ;s5-3#~Bv~3HRTd;!79>?3Bvlb2T^%Z29VSx~CS4OQ
zQwKy5GTmvq-5I()>ADlL^(SWQPsufymS;G<z;H&P(M%vJGMZfsM8<Q9jph^^&n-2X
zS86=J)MR0~>7ojg#TBMYDuKvsX_eWsD$`|EX3J~LR@RxXsxx0xZ?S9dw*UVbUK%a?
z1avNANswPKgTu2MX+X|IPZ!6Kid(7u$N3Hg@UWD>Z1H>1a*w&OW!u01`pi!Y9Sqd7
zQ!;ZH7AYRpIM5l!^kki%$D*J+4F4F6FB(~I&P$mhSs<ML@v*?Y=Z2+B7sR#Wg3fK*
z&bsQ~$}epWnSZCAeSd#;cmIx#k7_pk%N!lnGVr+E@0XhUZHbrZ!%b(GMt*#;>CeOW
lCE+W38Q;$g`**LN(Q?1UdP|4u&p^j9c)I$ztaD0e0st1!o4)`6

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_curved_pwr.png b/mods/maptools/textures/carts_rail_curved_pwr.png
new file mode 100755
index 0000000000000000000000000000000000000000..8816131a4f9e766108d96ba328a2a94aadfc6383
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfiU6MwS0Ei49-QGNlkFpu;|oNx
zxxO-aezN)gvIPM^Bv%+HTNEHy6ew35BwrFNUm7e|79w8}3PcLkkt(&3ighunbuntq
zvC7Ty>MaTCEs5IgNgACgn!V|oy_tFwvh^os>rcu7B7>><1~UqcW)&IDE;gQ1Vm!CR
zcz&tL{4(Q(<)(|uO%_#{E&-xSv*k7BD{9PF*O{-Wvslw$v1{+P|Nj{liHX?&-O5-J
z<QL4~@a#q!kkjeu;us<!$$F4o$(d1r^+2R<pk3f1ZpSMx_U!$C_6$%(!)bGd0~VeP
z6GB26Jyx~t&U^4eIrQ%8`3#do%r8qfT=}U#$Btp;y;)~BR`M^ob?>IJb@7BO85w<v
zb(T9lOy8WlS6zFs?p6LzuESSzMS~8Py#4*uTRyBQWb;O&UzKZe^e1K+$Z7fiW7I#+
Vm;L^=&2*rZ44$rjF6*2UngECXjcEV?

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_pwr.png b/mods/maptools/textures/carts_rail_pwr.png
new file mode 100755
index 0000000000000000000000000000000000000000..7d44a8003d031cb1be958fe289d1ceaf5a0b99d6
GIT binary patch
literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfy#SvOS0Ei49vtH+k>W0$;vtpk
zC7tOdljSXw<s*~rBa`bZlj|p&=O>%*4@7bW{;~xDa)m$?C|499R}?5$93)>7ELRdN
zUm7f579w9BDqj&QUl|5O3RU3>)!_>D(TWYxN)0hejnPVN$=aQ%I^F5I6SDLtX6sMR
zHJA!Sc?Q$+fyi)1q0!7Dqgg;yY&5&rcutAYoD$=?CC2khfyiWGnaQGZ)5VphODas4
zRGKZVGFx74zM|HAWsUjjI*av<mK&NaH@8@AX|vkaZoR$TX4l?r|Nk>cdb-U8`jD|C
z$S;_|;n|HeAg9aI#W6%8Jooff!9xKIEC;M(ns!^WTz|06{XcKufyd?PVhul786J2u
z9&q0h-hMaLG&5M5p>E@wlj4^zrcCByPBTo<_iOKe{%F_R0DXp1!`G*ucy%stHT@^b
z?DweR?)?4kr{$h9baYPiQMjVD<k6Jx@rDU%_xk<5mu+L8!n;6W*{aT{qg}f+r$^S6
XFi2cH=PeixbQOcAtDnm{r-UW|vy`IQ

literal 0
HcmV?d00001

diff --git a/mods/maptools/textures/carts_rail_t_junction_pwr.png b/mods/maptools/textures/carts_rail_t_junction_pwr.png
new file mode 100755
index 0000000000000000000000000000000000000000..0e156cd06c827aee5aad03f19b09a355e71f25ad
GIT binary patch
literal 385
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfq5z)|S0Ei49-Qteo#7>u=`EAv
zBa`DRlj|#!=O>#FME<e`0dj>v6ewF1C|4XLUlJ@|8Z1{9B3}^-L<*H*3e}M+wULT-
zF{*VjYW2}d&GG6j3F^J+n*CXN6SMUv<rqxPHJFlXFfHG3dcNU|0>c@FMzf2J=ad-F
zEis-~Vm!apWPX|P!gA9k6{gE;%vaQyudXv+Q)jWJ!D83mZU6r>+|JIw4s<1BNswPK
zgTu2MX+Tb|r;B4q1!L&>=R$`Jc$gEqZ57`5YF0Z-p8CCCO6}#v1@*t)3Eft5iYVN;
zAVVmrJZ|mu*%jP+B3vyq#eQFPRA!%aP*`Y|{0^^dTb}n(YyV$yY>!f9NcuO4Valt(
zKm3>G%{3}Wu6n$;-IME5*Pk1DANR%XPdZRyXsl(c*BPM@y?4%f8~%jgrsym-n^WwM
X&x#1jMyeMA9me44>gTe~DWM4fc^``Q

literal 0
HcmV?d00001