X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitignore;h=7b5ecab675dd3d523c7be2f4a15ba061199dcd2a;hb=d74385be24f0c11b34d4af6a92c7bc8d18e5748e;hp=42cb718a3bb674758035bb62277a843e5e915f6a;hpb=d75009a75853bd188f132e93165622c5e1315f70;p=dragonfireclient.git

diff --git a/.gitignore b/.gitignore
index 42cb718a3..7b5ecab67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,98 +1,101 @@
-## Generic ignorable patterns and files
+## Editors and Development environments
 *~
-.*.swp
-.*-swp
-*bak*
-tags
-*.vim
+*.swp
+*.bak*
 *.orig
-*.rej
+# Vim
+*.vim
+# Kate
+.*.kate-swp
+.swp.*
+# KDevelop4
+.kdev4/
+*.kdev4
+# Eclipse (CDT and LDT)
+.project
+.cproject
+.settings/
+.buildpath
+.metadata
+# GNU Global
+tags
+!tags/
+gtags.files
+.idea/*
+# Codelite
+*.project
 
 ## Files related to minetest development cycle
 /*.patch
+*.diff
+# 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/
+/clientmods/*
+!/clientmods/preview/
+/client/mod_storage/
 
 ## Configuration/log files
 minetest.conf
 debug.txt
 
+## Other files generated by minetest
+screenshot_*.png
+
 ## Doxygen files
 doc/Doxyfile
 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/unittest/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/gmp/CMakeFiles/
-src/gmp/libgmp.a
-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
-.kdev4/
 *.cbp
-*.kdev4
 *.layout
 *.o
+*.a
+*.ninja
+.ninja*
+*.gch
+cmake-build-debug/
+cmake-build-release/
 
 ## Android build files
-build/android/assets
-build/android/bin
-build/android/Debug
+build/android/src/main/assets
+build/android/build
 build/android/deps
-build/android/gen
-build/android/jni/src
 build/android/libs
+build/android/jni/lib
+build/android/jni/src
+build/android/src/main/jniLibs
 build/android/obj
-build/android/path.cfg
-build/android/and_env
-build/android/AndroidManifest.xml
+build/android/local.properties
+build/android/.gradle
 timestamp
-