Merge branch 'bloxstraplabs:main' into main

Author: bdidk235

.github/workflows/winget.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
+      - uses: vedantmgoyal9/winget-releaser@main
         with:
           identifier: pizzaboxer.Bloxstrap
           token: ${{ secrets.WINGET_TOKEN }}

Bloxstrap/Bloxstrap.csproj

@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
-    <Version>2.8.5</Version>
-    <FileVersion>2.8.5</FileVersion>
+    <Version>2.8.6</Version>
+    <FileVersion>2.8.6</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

Bloxstrap/LaunchSettings.cs

@@ -113,6 +113,7 @@ public LaunchSettings(string[] args)
                 if (i < Args.Length - 1 && Args[i+1] is string nextArg && !nextArg.StartsWith('-'))
                 {
                     flag.Data = nextArg;
+                    i++;
                     App.Logger.WriteLine(LOG_IDENT, $"Identifier '{identifier}' is active with data");
                 }
                 else

Bloxstrap/RobloxInterfaces/Deployment.cs

@@ -176,7 +176,15 @@ public static async Task<ClientVersion> GetInfo(string? channel = null)
                     App.Logger.WriteLine(LOG_IDENT, "Failed to contact clientsettingscdn! Falling back to clientsettings...");
                     App.Logger.WriteException(LOG_IDENT, ex);
 
-                    clientVersion = await Http.GetJson<ClientVersion>("https://clientsettings.roblox.com" + path);
+                    try
+                    {
+                        clientVersion = await Http.GetJson<ClientVersion>("https://clientsettings.roblox.com" + path);
+                    }
+                    catch (HttpRequestException httpEx)
+                    when (!isDefaultChannel && BadChannelCodes.Contains(httpEx.StatusCode))
+                    {
+                        throw new InvalidChannelException(httpEx.StatusCode);
+                    }
                 }
 
                 // check if channel is behind LIVE