Merge branch 'master' into mapgen
tree9c28335d8c264e59b67e571650c5691d937b6747
-rw-r--r-- 16 game.conf
drwxr-xr-x - menu
-rw-r--r-- 101 minetest.conf
drwxr-xr-x - mods