diff --git a/Bloxstrap/Dialogs/Preferences.Designer.cs b/Bloxstrap/Dialogs/Preferences.Designer.cs index 9c126ef8..c272dd1f 100644 --- a/Bloxstrap/Dialogs/Preferences.Designer.cs +++ b/Bloxstrap/Dialogs/Preferences.Designer.cs @@ -29,6 +29,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Preferences)); this.label1 = new System.Windows.Forms.Label(); this.Tabs = new System.Windows.Forms.TabControl(); this.DialogTab = new System.Windows.Forms.TabPage(); @@ -318,8 +319,7 @@ private void InitializeComponent() this.SelectChannel.Name = "SelectChannel"; this.SelectChannel.Size = new System.Drawing.Size(120, 23); this.SelectChannel.TabIndex = 0; - this.InfoTooltip.SetToolTip(this.SelectChannel, "Choose what deploy channel to use.\r\nThe default channel is LIVE.\r\nYou should only" + - " change this if you\'re know exactly what you\'re doing.\r\n"); + this.InfoTooltip.SetToolTip(this.SelectChannel, resources.GetString("SelectChannel.ToolTip")); this.SelectChannel.SelectedValueChanged += new System.EventHandler(this.SelectChannel_SelectedValueChanged); // // groupBox4 diff --git a/Bloxstrap/Dialogs/Preferences.resx b/Bloxstrap/Dialogs/Preferences.resx index ccfe85c9..1f348c93 100644 --- a/Bloxstrap/Dialogs/Preferences.resx +++ b/Bloxstrap/Dialogs/Preferences.resx @@ -60,10 +60,18 @@ 222, 17 + + Choose what build channel to install Roblox from. +You really shouldn't change this if you don't have to. + +Channels to note: +The default channel is LIVE. +ZCanary is equivalent to sitetest1. +ZIntegration is equivalent to sitetest2. + + + 17, 17 - - 222, 17 - \ No newline at end of file diff --git a/Bloxstrap/Helpers/Protocol.cs b/Bloxstrap/Helpers/Protocol.cs index 01f81bc1..f7410485 100644 --- a/Bloxstrap/Helpers/Protocol.cs +++ b/Bloxstrap/Helpers/Protocol.cs @@ -41,17 +41,23 @@ public static string ParseUri(string protocol) if (key == "placelauncherurl") val = HttpUtility.UrlDecode(val).Replace("browserTrackerId", "lol"); - if (key == "channel" && val != Program.Settings.Channel) + if (key == "channel") { - DialogResult result = Program.ShowMessageBox( - $"{Program.ProjectName} was launched with the Roblox build channel set to {val}, however your current preferred channel is {Program.Settings.Channel}.\n\n" + - $"Would you like to switch channels from {Program.Settings.Channel} to {val}?", - MessageBoxIcon.Question, - MessageBoxButtons.YesNo - ); - - if (result == DialogResult.Yes) - Program.Settings.Channel = val; + if (val != Program.Settings.Channel) + { + DialogResult result = Program.ShowMessageBox( + $"{Program.ProjectName} was launched with the Roblox build channel set to {val}, however your current preferred channel is {Program.Settings.Channel}.\n\n" + + $"Would you like to switch channels from {Program.Settings.Channel} to {val}?", + MessageBoxIcon.Question, + MessageBoxButtons.YesNo + ); + + if (result == DialogResult.Yes) + Program.Settings.Channel = val; + } + + if (val == DeployManager.DefaultChannel) + continue; } commandLine.Append(UriKeyArgMap[key] + val + " "); diff --git a/README.md b/README.md index 21ccac51..953ac873 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ Bloxstrap is only supported for PCs running Windows. Here's some of the features that Bloxstrap provides over the stock Roblox bootstrapper: * Support for persistent file modifications (including re-adding the old death sound!) -* Ability to choose where Roblox is installed to +* Ability to choose where Roblox is installed to +* Ability to choose which Roblox build channel to download from * Integration with Discord Rich Presence and [rbxfpsunlocker](https://github.com/axstin/rbxfpsunlocker) * Custom bootstrapper styles (includes old versions and dark theme)