chmodsayshello
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflict with mcl_smithing_table

This commit is contained in:
Lizzy Fleckenstein 2021-04-16 16:03:56 +02:00
parent 77a645102b
commit 61f3b4c69e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mods/ITEMS/mcl_smithing_table/init.lua
View File

@ -103,7 +103,6 @@ minetest.register_node("mcl_smithing_table:table", {
sounds = mcl_sounds.node_sound_metal_defaults(), sounds = mcl_sounds.node_sound_metal_defaults(),
on_construct = function(pos) on_construct = function(pos)
<<<<<<< HEAD
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("formspec", formspec) meta:set_string("formspec", formspec)
@ -147,14 +146,6 @@ minetest.register_node("mcl_smithing_table:table", {
reset_upgraded_item(pos) reset_upgraded_item(pos)
end, 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_blast_resistance = 2.5,
_mcl_hardness = 2.5 _mcl_hardness = 2.5