Merge branch 'master' into dev

This commit is contained in:
Regalis11
2023-01-31 18:09:45 +02:00
3 changed files with 11 additions and 3 deletions
+6
View File
@@ -0,0 +1,6 @@
[*.cs]
# IDE0090: Use 'new(...)'
csharp_style_implicit_object_creation_when_type_is_apparent = false
dotnet_diagnostic.CA1806.severity = silent
+1
View File
@@ -2,3 +2,4 @@
*.sln text eol=crlf *.sln text eol=crlf
*.cs text eol=crlf *.cs text eol=crlf
*.xml text eol=crlf *.xml text eol=crlf
Barotrauma\BarotraumaServer\DedicatedServer.exe text eol=lf
+3 -2
View File
@@ -52,8 +52,9 @@ body:
label: Version label: Version
description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu. description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
options: options:
- 0.18.15.1 / 0.18.15.2 on macOS - 0.21.6.0
- 0.19.8.0 (unstable) - 0.21.6.0 (Unstable)
- Faction/endgame test branch
- Other - Other
validations: validations:
required: true required: true