diff --git a/SS14.Launcher/Assets/Locale/en-US/text.ftl b/SS14.Launcher/Assets/Locale/en-US/text.ftl index c6b6a07..425bd43 100644 --- a/SS14.Launcher/Assets/Locale/en-US/text.ftl +++ b/SS14.Launcher/Assets/Locale/en-US/text.ftl @@ -149,8 +149,7 @@ login-login-username-watermark = Username or email login-login-password-watermark = Password login-login-show-password = Show Password login-login-auth-server = Account Provider -login-login-auth-Space-Wizards-Federation = Space Wizards -login-login-auth-Space-Wizards = Space Wizards (Legacy) +login-login-auth-Space-Wizards = Space Wizards login-login-auth-SimpleStation = SimpleStation login-login-auth-guest = Guest login-login-auth-Custom = Custom diff --git a/SS14.Launcher/ConfigConstants.cs b/SS14.Launcher/ConfigConstants.cs index d564b4e..3d040cc 100644 --- a/SS14.Launcher/ConfigConstants.cs +++ b/SS14.Launcher/ConfigConstants.cs @@ -32,7 +32,7 @@ public static class ConfigConstants // Amount of time to wait to let a redialling client properly die public const int LauncherCommandsRedialWaitTimeout = 1000; - public const string FallbackAuthServer = "Space-Wizards-Federation"; + public const string FallbackAuthServer = "Space-Wizards"; public const string GuestAuthServer = "guest"; public const string CustomAuthServer = "Custom"; public static readonly AuthServer TemplateAuthServer = new(new("https://example.com/"), new("https://example.com/")); @@ -40,10 +40,6 @@ public static class ConfigConstants { { FallbackAuthServer, - new(new("https://auth.playss14.com/"), new("https://account.playss14.com/"), false) - }, - { - "Space-Wizards", new(new("https://auth.spacestation14.com/"), new("https://account.spacestation14.com/"), false) }, { @@ -61,7 +57,6 @@ public static class ConfigConstants new("https://hub.simplestation.org/"), new("https://hub.singularity14.co.uk/"), new("https://cdn.spacestationmultiverse.com/hub/"), - new("https://hub.playss14.com/"), new("https://hub.spacestation14.com/"), ]; @@ -114,6 +109,7 @@ public static class ConfigConstants { "Supermatter", new UrlFallbackSet([ + // Same as Robust for now "https://robust-builds.cdn.spacestation14.com/modules.json", "https://robust-builds.fallback.cdn.spacestation14.com/modules.json", ])