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

2023-01-31 13:17:15 -03:00
parent ba543aef2c cf9ecd35b3
commit d60efb17cd
232 changed files with 4481 additions and 2283 deletions
@@ -70,6 +70,7 @@ namespace Barotrauma
        
        public static ContentPackage VanillaContent => ContentPackageManager.VanillaCorePackage;

+
        public readonly string[] CommandLineArgs;

        public GameMain(string[] args)