Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Evil Factory
2026-06-16 09:40:27 -03:00
74 changed files with 1167 additions and 408 deletions
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>1.12.7.0</Version>
<Version>1.13.3.1</Version>
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>