From f5bf0d98b12e0a43b3351e2fa0a36046c552f5ac Mon Sep 17 00:00:00 2001 From: GreenXenith <24834740+GreenXenith@users.noreply.github.com> Date: Mon, 26 Nov 2018 12:23:58 -0800 Subject: [PATCH 1/3] Add mod check for strut register --- extranodes/init.lua | 51 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/extranodes/init.lua b/extranodes/init.lua index 06e110e..edc7e87 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -193,7 +193,6 @@ end minetest.register_node(":technic:insulator_clip", iclip_def) minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def) -minetest.register_node(":technic:steel_strut_with_insulator_clip", sclip_def) minetest.register_craft({ output = "technic:insulator_clip", @@ -215,33 +214,35 @@ minetest.register_craft({ local steelmod = minetest.get_modpath("steel") -if steelmod then - minetest.register_craft({ - output = "technic:steel_strut_with_insulator_clip", - recipe = { - {"technic:insulator_clip_fencepost"}, - {"steel:strut_mount"} - } - }) +if streetsmod or steelmod then + minetest.register_node(":technic:steel_strut_with_insulator_clip", sclip_def) - minetest.register_craft({ - output = "technic:steel_strut_with_insulator_clip", - recipe = { - {"technic:insulator_clip_fencepost", "" }, - {"steel:strut", "default:steel_ingot" }, - } - }) + if steelmod then + minetest.register_craft({ + output = "technic:steel_strut_with_insulator_clip", + recipe = { + {"technic:insulator_clip_fencepost"}, + {"steel:strut_mount"} + } + }) -end + minetest.register_craft({ + output = "technic:steel_strut_with_insulator_clip", + recipe = { + {"technic:insulator_clip_fencepost", "" }, + {"steel:strut", "default:steel_ingot" }, + } + }) -if streetsmod then - minetest.register_craft({ - output = "technic:steel_strut_with_insulator_clip", - recipe = { - {"technic:insulator_clip_fencepost", "" }, - {"streets:steel_support", "default:steel_ingot" }, - } - }) + elseif streetsmod then + minetest.register_craft({ + output = "technic:steel_strut_with_insulator_clip", + recipe = { + {"technic:insulator_clip_fencepost", "" }, + {"streets:steel_support", "default:steel_ingot" }, + } + }) + end end if minetest.get_modpath("unifieddyes") then From bdd13beeff5045a34042439e39620b9ca550b214 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 27 Nov 2018 04:57:54 -0500 Subject: [PATCH 2/3] fix brass block->ingot recipe (clearing basic_materials' copper/silver recipe killed this one also) --- technic/crafts.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/technic/crafts.lua b/technic/crafts.lua index 90bd2dd..3b17e6d 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -44,6 +44,12 @@ minetest.clear_craft({ output = "basic_materials:brass_ingot", }) +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:brass_ingot 9", + recipe = { "basic_materials:brass_block" }, +}) + -- tubes crafting recipes minetest.register_craft({ From 38eeecfa0caaa78bfbe95d5b6b3ae18de17c92fd Mon Sep 17 00:00:00 2001 From: Thomas Rudin Date: Mon, 3 Dec 2018 10:49:41 +0100 Subject: [PATCH 3/3] fix #465 Checks if facedir is valid. if the face points up or down the depth-check would run endless and freeze the server --- technic/machines/HV/quarry.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 0a45559..b905bf9 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -112,6 +112,11 @@ local function quarry_run(pos, node) if meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then local pdir = minetest.facedir_to_dir(node.param2) + if pdir.y > 0 or pdir.y < 0 then + -- faces up or down, not valid, otherwise depth-check would run endless and hang up the server + return + end + local qdir = pdir.x == 1 and vector.new(0,0,-1) or (pdir.z == -1 and vector.new(-1,0,0) or (pdir.x == -1 and vector.new(0,0,1) or