Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
EvilFactory
2025-04-10 10:37:09 -03:00
296 changed files with 8420 additions and 2945 deletions

1
.gitignore vendored
View File

@@ -54,6 +54,7 @@ temp.txt
# Private assets
Barotrauma/BarotraumaShared/Content/*
Barotrauma/**/GameAnalyticsKeys.cs
Deploy/DeployAll/PrivateKey.*
.github/ISSUE_TEMPLATE/release-checklist.md
#Rider