fix mergeconflicts

.gitmodules

.luacheckrc

LICENSE.txt

game_api.txt

mods/beds/api.lua

mods/boats

mods/carts/cart_entity.lua

mods/carts/functions.lua

mods/carts/textures/carts_cart_front.png

mods/carts/textures/carts_cart_side.png

mods/carts/textures/carts_cart_top.png

mods/creative/init.lua

mods/creative/inventory.lua

mods/default/README.txt

mods/default/crafting.lua

mods/default/craftitems.lua

mods/default/functions.lua

mods/default/furnace.lua

mods/default/license.txt

mods/default/mapgen.lua