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