Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gitignore
This commit is contained in:
deltreey
2024-06-21 12:40:15 -05:00
128 changed files with 71134 additions and 75276 deletions

4
.gitignore vendored
View File

@@ -29,6 +29,7 @@ nwn/nwnprc/trunk/makefile.temp
nwn/nwnprc/trunk/makefile.temp
nwn/nwnprc/DocGen/trunk/2da/*.2da
nwn/nwnprc/DocGen/trunk/tlk/*.tlk
nwn/nwnprc/trunk/makefile.temp
nwn/nwnprc/DocGen/trunk/manual/
nwn/nwnprc/DocGen/trunk/errorlog
@@ -149,4 +150,5 @@ fabric.properties
hs_err_pid*
replay_pid*
# End of https://www.toptal.com/developers/gitignore/api/intellij+all,java
# End of https://www.toptal.com/developers/gitignore/api/intellij+all,java
*.orig