Merge branch 'master' into exosuits5

Monkestation · Oct 20, 2023 · 0c0bb4d · 0c0bb4d
2 parents d2189ca + 642488c
commit 0c0bb4d
Show file tree

Hide file tree

Showing 1,016 changed files with 170,331 additions and 52,634 deletions.
diff --git a/.gitignore b/.gitignore
@@ -233,3 +233,6 @@ Tracy.exe
 
 # From /tools/define_sanity/check.py - potential output file that we load onto the user's machine that we don't want to have committed.
 define_sanity_output.txt
+
+#This file contains developer-specific config overrides. These shouldn't be committed.
+config/_config_nogit.txt