Merge branch 'master' into fork-master

# Conflicts:
#	.gitignore
This commit is contained in:
Stephan Schielke 2026-03-29 09:10:44 +01:00
commit 48cf5e4389
No known key found for this signature in database
7 changed files with 54 additions and 51 deletions

6
.gitignore vendored
View file

@ -4,7 +4,12 @@ custom/
# temp files directories
cache/
log/
# Vim swap/backup files
*.swp
*.swo
# macOS system files
.DS_Store
# editor configs
@ -13,6 +18,7 @@ log/
# zcompile cached files
*.zwc
*.zwc.old
# Stakpak session files
.stakpak/session*