From aa7ca03f956116624a699bd13ce4877739019d77 Mon Sep 17 00:00:00 2001
From: root <root@milan-minetest2-devel-testing.lxd>
Date: Sun, 19 Sep 2021 12:10:17 +0200
Subject: [PATCH] update

---
 .../worldedit/serialization.lua                 |   2 +-
 mods/skinsdb/meta/character_2119.txt            |   3 +++
 mods/skinsdb/meta/character_2120.txt            |   3 +++
 mods/skinsdb/meta/character_2121.txt            |   3 +++
 mods/skinsdb/textures/character_2119.png        | Bin 0 -> 2539 bytes
 mods/skinsdb/textures/character_2120.png        | Bin 0 -> 2136 bytes
 mods/skinsdb/textures/character_2121.png        | Bin 0 -> 580 bytes
 mods/techpack/tubelib/legacy_nodes.lua          |  16 +++++++++++++++-
 mods/techpack/tubelib_addons1/nodes.lua         |   1 +
 9 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 mods/skinsdb/meta/character_2119.txt
 create mode 100644 mods/skinsdb/meta/character_2120.txt
 create mode 100644 mods/skinsdb/meta/character_2121.txt
 create mode 100644 mods/skinsdb/textures/character_2119.png
 create mode 100644 mods/skinsdb/textures/character_2120.png
 create mode 100644 mods/skinsdb/textures/character_2121.png

diff --git a/mods/Minetest-WorldEdit/worldedit/serialization.lua b/mods/Minetest-WorldEdit/worldedit/serialization.lua
index c3793b24..0b3cc4b5 100644
--- a/mods/Minetest-WorldEdit/worldedit/serialization.lua
+++ b/mods/Minetest-WorldEdit/worldedit/serialization.lua
@@ -118,7 +118,7 @@ end
 -- by ChillCode, available under the MIT license.
 local function deserialize_workaround(content)
 	local nodes
-	if not jit then
+	if not minetest.global_exists("jit") then
 		nodes = minetest.deserialize(content, true)
 	else
 		-- XXX: This is a filthy hack that works surprisingly well
diff --git a/mods/skinsdb/meta/character_2119.txt b/mods/skinsdb/meta/character_2119.txt
new file mode 100644
index 00000000..2a42a121
--- /dev/null
+++ b/mods/skinsdb/meta/character_2119.txt
@@ -0,0 +1,3 @@
+Steven
+Tim7
+CC BY-SA 3.0
diff --git a/mods/skinsdb/meta/character_2120.txt b/mods/skinsdb/meta/character_2120.txt
new file mode 100644
index 00000000..7c1b6f9e
--- /dev/null
+++ b/mods/skinsdb/meta/character_2120.txt
@@ -0,0 +1,3 @@
+Mal
+TheMalaysianDude
+CC BY-SA 3.0
diff --git a/mods/skinsdb/meta/character_2121.txt b/mods/skinsdb/meta/character_2121.txt
new file mode 100644
index 00000000..e5522947
--- /dev/null
+++ b/mods/skinsdb/meta/character_2121.txt
@@ -0,0 +1,3 @@
+Paintball Gun Pixel 3D Zombie
+Mercenary S. Double 1.8W
+CC BY-SA 4.0
diff --git a/mods/skinsdb/textures/character_2119.png b/mods/skinsdb/textures/character_2119.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f68fbfa2e6a52bd1c34ac1d524734da462ef344
GIT binary patch
literal 2539
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
B=QscW

literal 0
HcmV?d00001

diff --git a/mods/skinsdb/textures/character_2120.png b/mods/skinsdb/textures/character_2120.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5f71477fd6a705b6f6210dc6ddc4496d214dc43
GIT binary patch
literal 2136
zcmV-e2&eanP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000OcNkl<ZXhYRm
zZ%ma{7(XwXpd<)&A-JF@vZS1o4FAo|HFC0aljT;8HeD{4tGTgOZT;f|_Gha;u=&Mi
zv-KgeHk)qRY~-5DnMj6n6&8Z1TnKMLpePt}JHO|>zn61g-h1C$*qmo$_kGWK-gBPk
zcYe=vp66gGpB4z*7fB?NkufXb4DIb_twaJx)bt7SSE%dGH?PjSCz78wRi+50+P|TZ
zQTgp29#!4?`IFFq=Ng-XnUQ#7)G48I5K0Ds!NI>gZ3H;U004slg!#(}i;EXT;(?5H
zpNNFjyB&Xe+5zz5jomQ-l$9+PhPXi>=#>L)w-<ndf+E$`)#=FqjJ33!@MT#d7Xbi?
z7;xJGfO3;{0RrIV0)7B&89uMJxAuC1yt6bn5^wC5xxi!@;P!pKQ^7mR1xQsgA{iGj
zPk}^1&?^RDotkO=|1Sd=g|V1vAgS-}!_Jwqelfs{0j5iE{bT^x`9Q7&%<aF}E|HWA
zn8#f22ahS0Jv-sK?mO6bQRTk$Ror8d08!w>f+_0d!I=WC37jcM<H0C223<1E1c!6r
z_x+43B9HtbkUm{a%?--?Xm3b`hptOLVG&_WDgdDUR}i%EXaE4pLJ2Bl21`C;3;;aW
zbyEN^L2w7wc*h`tbbrgaF}^r^rihsU;Qe&p6=i_|rgFWnEwlmf0wHQ(+%fF_J3q-{
z$?PcPuuA{{fZ>~?M-NZx*j&B3G6LhVp#Yb=?*#x@-~fQdNi7EilMULqlDgw!TwCqR
zaexSlVZ3|y@ePzRDa;+MN$nRUO%}w98yBl9#K&hh9PtDRCk9yu<3aItd08Zh&>ju$
zz~%tJUGqw6xSMVRyv~0bZyIg-rJEgFM$S7qettC9&oLB)(p0#m-}dRUESu8i7~U^O
z4Mcr_MgVB|$$??%Uz(Zb0AUd|2NL~YMt1W^GlLF+qVLjR_dJl}eC}fs^VJ6IS_mwF
z!i?bP>!?@|p^@{BoVD5?y<dcjzxma2k8xd`1e{Cy^cMgG;1U=<<5z;9sk9li+(w!J
zkZSnWi}IY)F9<$6^KXS}kCk4t-X#_=Czj8NQ2FI2E?D~>3W}~9e+*gfG4!MODUa?h
zz(lo3R=G1m9Fh1&T)+e%-m_m6PG$}-83I5Sc*(#B0Py|FIil-|;};wNyyVSt8RLnn
z#R<U#)H08YLp}X5YnT-ETAay9{m6LmfgFMz8^_pZzWdGJq*=jv5F4N$*h2;_(?I>3
z&6psJ1%M#_mS&{M?}5u#g-W2;<1L|t3jhF6?+Yv76iHwY>UL5c5g!ea8qIw7n;-fG
z(r4&1Jzo+U*`TPOC!?Pm98UmF4h}o0;+Z!u4{HGYcIeBpU<7`AIJ3k#RuLmmw$eW*
z13*Vbsb(mQ?-mdaoYr~AtpvdB0?3xo7*zajSP+~-H%8T4k-``N-mosI;Iyf#Spzy5
z7eFq6ou``ufJwOk5hXQxI?m~HcZR%%hps6wpe}3^1p#a8+#DB+BBBhH!uNUe=Bo{@
zLoqIJpfp`^jI!gu-LlrUkvy4uS89*wVD2>fvFq4w8b97Qt`fds!~8ft6U79JJ_R9s
zyrl7Gb!yFn@(rGGPMZK!<=h=JADF=`uCd6@uNP-$$Xoyc4aP(H(|v=Im#^uxGeg7x
z$f6zU>5E~;y1Z;py?d`-Qz=oC>;%bD%g)#VwrLRpZ^X&?#<Xj!Xi6Lu<rq9zoGKHn
zZy%8}eP8x~yl?Ew6dE&G0T7hMIFB0w@M++>BpWmeyNX6e0RRNkr^C}@06;(H+LJn0
z<e42}9vJ6NpmqhPsDkKCF<8TV1-gShXk9uGZwuX2;qdQ?8NfV%H#=Tco4X7(qc^~T
zPvg5c)g@K6KHaVp=C4xwYj=w>RdrjHI(JMdT`%lEIHY!{LIHqv0F6IYS1IyKY7aXg
z09=!i7{^+;2ti6)9R-v94SExh^48zTk~NY7z>ToEpqbmVU@{ruPGn#VgA$ZOgHq_n
z>41~KOjK|*0>HNVr)-eWG<YR7dj+5kix;Yba=nQfysq{_8GfWGB*tOwkFMNhe-mx&
zgRb8$3&t&+C?8V{VN&=J0||l%{gnv2Z-%`3<J}f9m39|Ln4@=_js;7rZM{x5sN7wH
z@`%kSSUX3ayS~04ztC&<`S1keO%S%u4M?zzS2;QWAPAPf{*1lAXWvPrHctUQn<$&U
z4gYmFy9S@3!LyUL#v)6iJa^ud4{2Ym`@<4iw^fhHP)S3I>~QV95w$KqOBK~<cIehw
zzgHEl98=AWBl5mqCum*?7Xx+qnpBmt<F~{y0EtUg%~}WHcmU972+|N33MJ53wBQ*u
z$2FH(JmKO4F5o507+}he2SU5_Wh>gG?;^B2G=JXa=wa#uIp|gXWQoM0l+AmR0AN$8
z4M1~5{m^<g=6`UA#N0jlx49tF<YQ@hvV)5*x5_*l^ij!^0q;EWAd7Y;r&Rh@4fm+$
z3ulQTUZ((WbC`_rY72~DfOWHqH30%|^V=UQzuLe;?*78YOi`@!_!K#-%~TZ=G98ZD
zis%c2kXiGaz78?JF$Bpj4Z<s$HE8c?wiM`f5k$cp6L5gQ3r#QzK@_Pv8lTOQ*e`XT
za3#j*i3u5P&3fN7$m>Rk;~0A}>!unU9g|>X9<Od7y~YyBdu>F#KHp=I<twR!iQNB&
zHr)W@Zl7bFKqbrz4)*!UFmOWN44CeIWPc_DAaCCE;2jL0`}n28{{Rnv>Rx7@sObOz
O002ovPDHLkV1fV;8R)A3

literal 0
HcmV?d00001

diff --git a/mods/skinsdb/textures/character_2121.png b/mods/skinsdb/textures/character_2121.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4600c6411a711d47d8ca9e0f8fcd7924cf65738
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZq?ny*JRA_<in7>Z~F%-wYy&POf1RRV6Vl=3`6Qgls
zfyKo?%|F7$MHV+_{{^FwK||sILP7uo4rdANwbzz%9tA$hg?sI5dDr&+xFb+dx+=_6
zI&pNKzKPBFr15o>a^<YBefT-n>R)HPv<*lbvjzD1yEcfeKLJ`XU`cH!*qs0!B~>(c
zA==9zwt3!`wCe;Pu+Q@@*9lrK@P79N064ihVC2KgLPBQ!A6h|>KDesQMYOZP;sbBW
z!vhi*n2x65?_|cv5k0Qo3*5`9?peHId>|T)>CRGyok{E@wBO5!Guk>tdl?anYe#Hd
z&^}}PReAflaXbTn=Ag^8KkV&m8B}YvwdSYr|6^KL2wk9(4^YVmb2(SeN^`l0#^YOL
z9Bl)D(|ksF>B8%q+PBCq28bFz`Xfd*_2E{%ispbF*Q!_N_pkl<n4*FoZxdq(@AIbI
zUa-DBnugO|_qxcH!ect@OmJTe^#YFw^=0t-rl?|y4`A-^bmvWF>W{iR%j=&P#s2%!
z8w>SK<v0@k#Gy)`>p)@)K##nNz$1{we|r4+oivr>Sos139+9TBWr81{=U0snM5Df`
zoHR7Y^WPVA<v4u4(%UvXAX-V8$}Y3@mEdjx(l#J%tUrtEzUD5AZ5mX)9{&O%Alnxd
Ss=z`30000<MNUMnLSTXbtq!&T

literal 0
HcmV?d00001

diff --git a/mods/techpack/tubelib/legacy_nodes.lua b/mods/techpack/tubelib/legacy_nodes.lua
index 865f5603..5f5fab7d 100644
--- a/mods/techpack/tubelib/legacy_nodes.lua
+++ b/mods/techpack/tubelib/legacy_nodes.lua
@@ -14,6 +14,18 @@
 	
 ]]--
 
+local function is_source(pos,meta,  item)
+	local inv = minetest.get_inventory({type="node", pos=pos})
+	local name = item:get_name()
+	if meta:get_string("src_item") == name then
+		return true
+	elseif inv:get_stack("src", 1):get_name() == name then
+		meta:set_string("src_item", name)
+		return true
+	end
+	return false
+end
+
 tubelib.register_node("default:chest", {"default:chest_open"}, {
 	on_pull_item = function(pos, side)
 		local meta = minetest.get_meta(pos)
@@ -65,7 +77,9 @@ tubelib.register_node("default:furnace", {"default:furnace_active"}, {
 	on_push_item = function(pos, side, item)
 		local meta = minetest.get_meta(pos)
 		minetest.get_node_timer(pos):start(1.0)
-		if minetest.get_craft_result({method="fuel", width=1, items={item}}).time ~= 0 then
+		if is_source(pos, meta, item) then
+			return tubelib.put_item(meta, "src", item)
+		elseif minetest.get_craft_result({method="fuel", width=1, items={item}}).time ~= 0 then
 			return tubelib.put_item(meta, "fuel", item)
 		else
 			return tubelib.put_item(meta, "src", item)
diff --git a/mods/techpack/tubelib_addons1/nodes.lua b/mods/techpack/tubelib_addons1/nodes.lua
index 0a165503..4eadfc07 100644
--- a/mods/techpack/tubelib_addons1/nodes.lua
+++ b/mods/techpack/tubelib_addons1/nodes.lua
@@ -163,6 +163,7 @@ fn("ethereal:bamboo_leaves")
 fn("ethereal:banana")
 fn("ethereal:orange")
 fn("ethereal:coconut")
+fn("ethereal:golden_apple")
 
 -------------------------------------------------------------------------------
 -- Default Ground