fix mergeconflicts

game_api.txt

minetest.conf.example

mods/beds/spawns.lua

mods/boats

mods/bones/init.lua

mods/default/README.txt

mods/default/craftitems.lua

mods/default/functions.lua

mods/default/furnace.lua

mods/default/models/character.b3d

mods/default/models/character.blend

mods/default/nodes.lua

mods/default/textures/default_grass.png

mods/default/textures/default_grass_side.png

mods/default/textures/heart.png

mods/doors/init.lua

mods/farming/api.lua

mods/fire/init.lua

mods/flowers/init.lua

mods/tnt/init.lua