Merge remote-tracking branch 'upstream/master'

Rhials · Feb 22, 2024 · 8c878f5 · 8c878f5
2 parents 7940d69 + 342f809
commit 8c878f5
Show file tree

Hide file tree

Showing 35 changed files with 5,589 additions and 4,078 deletions.
diff --git a/.gitignore b/.gitignore
@@ -192,6 +192,9 @@ Temporary Items
 /_maps/**/backup/
 /_maps/templates.dm
 
+#dmm palette file. You really should be using StrongDMM instead.
+*.dmm-pal
+
 #dmdoc default folder
 /dmdoc