]> git.lizzy.rs Git - dragonfireclient.git/commit - src/script/lua_api/l_util.cpp
Merge branch 'master' of https://github.com/minetest/minetest
authorElias Fleckenstein <eliasfleckenstein@web.de>
Wed, 10 Feb 2021 18:50:36 +0000 (19:50 +0100)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Wed, 10 Feb 2021 18:50:36 +0000 (19:50 +0100)
commit1fbbb768252f872dfa961d3a73460d996164d527
treee9faf93dbd894b253ac3d1f0895b7468e8fee50d
parent74f5f033e04c0d8694815fedb795838d4926cbc9
parent9736b9cea5f841bb0e9bb2c9c05c3b2560327064
Merge branch 'master' of https://github.com/minetest/minetest
30 files changed:
CMakeLists.txt
builtin/game/item.lua
builtin/mainmenu/dlg_contentstore.lua
builtin/mainmenu/init.lua
builtin/mainmenu/pkgmgr.lua
builtin/settingtypes.txt
doc/client_lua_api.txt
doc/lua_api.txt
po/minetest.pot
src/client/client.cpp
src/client/client.h
src/client/clientenvironment.cpp
src/client/game.cpp
src/client/game.h
src/client/gameui.h
src/client/mapblock_mesh.cpp
src/client/mapblock_mesh.h
src/client/mesh_generator_thread.h
src/client/renderingengine.cpp
src/defaultsettings.cpp
src/gui/guiInventoryList.cpp
src/gui/guiKeyChangeMenu.cpp
src/map.cpp
src/map.h
src/nodedef.cpp
src/script/common/c_content.cpp
src/script/lua_api/l_mainmenu.cpp
src/script/lua_api/l_server.cpp
src/script/lua_api/l_util.cpp
src/unittest/test.cpp