Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -25,8 +25,6 @@
 # Ignore compiled linux libs in the root folder, e.g. librust_g.so
 /*.so
 
-#
-
 #Ignore compiled files and other files generated during compilation.
 *.mdme
 *.mdme.*
@@ -37,16 +35,6 @@
 *.lk
 *.int
 *.backup
-
-# Ignore tools ported over from SpacemanDMM for personal use
-.fingerprint
-build/
-deps/
-incremental/
-dmm-tools.exe
-dmm-tools.d
-git-diagnostics-2024-08-11-1513.zip
-
 ### https://raw.github.com/github/gitignore/cc542de017c606138a87ee4880e5f06b3a306def/Global/Linux.gitignore
 
 *~
@@ -264,5 +252,8 @@ define_sanity_output.txt
 
 # Running OpenDream locally
 tgstation.json
+<<<<<<< HEAD
 .cargo-lock
 >>>>>>> 5d81843b3302 (Raptor faction fix (#85792))
+=======
+>>>>>>> 8fa9db8869f0 (Reverts accidental .gitignore changes (#86114))