-map/*
-world/*
+## Generic ignorable patterns and files
+*~
+.*.swp
+*bak*
+tags
+*.vim
+*.orig
+*.rej
+
+## Non-static Minetest directories
+/bin/
+/games/*
+!/games/minimal/
+/cache/
+/textures/*
+!/textures/base/
+/sounds/
+/mods/*
+!/mods/minetest/
+/mods/minetest/*
+!/mods/minetest/mods_here.txt
+/worlds/
+/world/
+
+## Configuration/log files
+minetest.conf
+debug.txt
+
+## Build files
CMakeFiles/*
src/CMakeFiles/*
src/Makefile
src/jthread/Makefile
src/jthread/cmake_config.h
src/jthread/cmake_install.cmake
-minetest.conf
-bin/
+src/jthread/libjthread.a
+src/json/libjson.a
+src/lua/build/
+src/lua/CMakeFiles/
+src/cguittfont/CMakeFiles/
+src/cguittfont/libcguittfont.a
+src/cguittfont/cmake_install.cmake
+src/cguittfont/Makefile
+src/json/CMakeFiles/
+src/json/libjsoncpp.a
+src/sqlite/CMakeFiles/*
+src/sqlite/libsqlite3.a
CMakeCache.txt
CPackConfig.cmake
CPackSourceConfig.cmake
Makefile
cmake_install.cmake
-src/jthread/libjthread.a
-debug.txt
-bin/debug.txt
+locale/