Merge branch 'master' into dev

This commit is contained in:
Juan Pablo Arce
2021-02-25 12:59:20 -03:00
14 changed files with 112 additions and 37 deletions
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.1100.0.4</Version>
<Version>0.1300.0.0</Version>
<Copyright>Copyright © FakeFish 2018-2020</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>