fix mergeconflicts

This commit is contained in:
tchncs 2016-05-02 10:16:25 +02:00
commit f4fc4294b7
22 changed files with 824 additions and 405 deletions

View file

@ -123,6 +123,8 @@ minetest.register_node("bones:bones", {
return true
end
end,
on_blast = function(pos)
end,
})
local function may_replace(pos, player)