X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitignore;h=cd6ee3e32110ee3f64d99171f5cd878f00bfe0b6;hb=65c09a96f41705bb8e75fc5ff4276342be91ed11;hp=f12c41fc548857716bd7b1f4d049f8e644254d56;hpb=40e248b9f9e0a4f79e88c9b018ecfb84c2033e04;p=minetest.git

diff --git a/.gitignore b/.gitignore
index f12c41fc5..cd6ee3e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,46 @@
-## Generic ignorable patterns and files
+## Editors and Development environments
 *~
-.*.swp
-*bak*
-tags
-*.vim
+*.swp
+*.bak*
 *.orig
+# Vim
+*.vim
+# Kate
+.*.kate-swp
+.swp.*
+# KDevelop4
+.kdev4/
+*.kdev4
+# Eclipse (CDT and LDT)
+.project
+.cproject
+.settings/
+.buildpath
+.metadata
+# GNU Global
+tags
+!tags/
+gtags.files
+
+## Files related to minetest development cycle
+/*.patch
+# GNU Patch reject file
 *.rej
 
-## Non-static Minetest directories
+## Non-static Minetest directories or symlinks to these
 /bin/
 /games/*
 !/games/minimal/
-/cache/
+/cache
 /textures/*
 !/textures/base/
-/sounds/
+/screenshots
+/sounds
 /mods/*
 !/mods/minetest/
 /mods/minetest/*
 !/mods/minetest/mods_here.txt
-/worlds/
+/worlds
 /world/
 
 ## Configuration/log files
@@ -32,45 +53,24 @@ doc/html/
 doc/doxygen_*
 
 ## Build files
-CMakeFiles/*
-src/CMakeFiles/*
-src/Makefile
+CMakeFiles
+Makefile
+!build/android/Makefile
+cmake_install.cmake
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
 src/android_version.h
+src/android_version_githash.h
 src/cmake_config.h
 src/cmake_config_githash.h
-src/cmake_install.cmake
-src/script/CMakeFiles/*
-src/script/common/CMakeFiles/*
-src/script/cpp_api/CMakeFiles/*
-src/script/lua_api/CMakeFiles/*
-src/util/CMakeFiles/*
-src/jthread/CMakeFiles/*
-src/jthread/Makefile
-src/jthread/cmake_config.h
-src/jthread/cmake_install.cmake
-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
-src/client/CMakeFiles/
-src/network/CMakeFiles/
-CMakeCache.txt
-CPackConfig.cmake
-CPackSourceConfig.cmake
-Makefile
-cmake_install.cmake
 locale/
+.directory
 *.cbp
 *.layout
 *.o
+*.a
 
 ## Android build files
 build/android/assets
@@ -82,6 +82,6 @@ build/android/jni/src
 build/android/libs
 build/android/obj
 build/android/path.cfg
+build/android/and_env
 build/android/AndroidManifest.xml
 timestamp
-