Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflicts

Browse source
This commit is contained in:
tchncs 2016-04-11 12:39:33 +02:00
commit 31c58164d8
13 changed files with 413 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mods/default/furnace.lua
View file

@ -108,8 +108,8 @@ minetest.register_node("default:furnace", {
sounds = default.node_sound_stone_defaults(),
can_dig = can_dig,
allow_metadata_inventory_put = allow_metadata_inventory_put,
allow_metadata_inventory_put = allow_metadata_inventory_put,
allow_metadata_inventory_move = allow_metadata_inventory_move,
allow_metadata_inventory_take = allow_metadata_inventory_take,
})