From 61f3b4c69e7969ab36fae3320b9345e56ded0474 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Fri, 16 Apr 2021 16:03:56 +0200 Subject: [PATCH] Fix merge conflict with mcl_smithing_table --- mods/ITEMS/mcl_smithing_table/init.lua | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index a6f8ab6103..adbac011bb 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -103,7 +103,6 @@ minetest.register_node("mcl_smithing_table:table", { sounds = mcl_sounds.node_sound_metal_defaults(), on_construct = function(pos) -<<<<<<< HEAD local meta = minetest.get_meta(pos) meta:set_string("formspec", formspec) @@ -147,14 +146,6 @@ minetest.register_node("mcl_smithing_table:table", { reset_upgraded_item(pos) end, -======= - local meta = minetest.get_meta(pos) - meta:set_string("formspec", formspec) - local inv = meta:get_inventory() - inv:set_size("input", 2) - inv:set_size("output", 1) - end, ->>>>>>> 742aa2becb09167466de2988c47b5856afc75b21 _mcl_blast_resistance = 2.5, _mcl_hardness = 2.5