fix mergeconflicts

game_api.txt

mods/beds/functions.lua

mods/bones/init.lua

mods/carts/cart_entity.lua

mods/carts/functions.lua

mods/carts/rails.lua

mods/creative/init.lua

mods/creative/inventory.lua

mods/default/crafting.lua

mods/default/craftitems.lua

mods/default/functions.lua

mods/default/furnace.lua

mods/default/mapgen.lua

mods/default/models/character.b3d

mods/default/models/character.blend

mods/default/nodes.lua

mods/default/textures/default_book.png

mods/default/textures/default_book_written.png

mods/default/textures/default_bookshelf_slot.png

mods/default/textures/default_clay_brick.png