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 00000000..0f68fbfa Binary files /dev/null and b/mods/skinsdb/textures/character_2119.png differ diff --git a/mods/skinsdb/textures/character_2120.png b/mods/skinsdb/textures/character_2120.png new file mode 100644 index 00000000..c5f71477 Binary files /dev/null and b/mods/skinsdb/textures/character_2120.png differ diff --git a/mods/skinsdb/textures/character_2121.png b/mods/skinsdb/textures/character_2121.png new file mode 100644 index 00000000..a4600c64 Binary files /dev/null and b/mods/skinsdb/textures/character_2121.png differ 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