Merge remote-tracking branch 'origin/main' into custom-bootstrappers

sync with main
returnrqt · Jan 24, 2025 · 433d3e7 · 433d3e7
2 parents e455a48 + 9084d66
commit 433d3e7
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 84 deletions.
diff --git a/.github/workflows/ci-debug.yml b/.github/workflows/ci-debug.yml
@@ -26,5 +26,5 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: Bloxstrap (Debug) (${{ github.sha }})
-        path: .\Bloxstrap\bin\Debug\net6.0-windows\win-x64\publish\*
+        name: Fishstrap (Debug) (${{ github.sha }})
+        path: .\Bloxstrap\bin\Debug\net6.0-windows\win-x64\publish\*
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -5,9 +5,6 @@ jobs:
   build:
     runs-on: windows-latest
 
-    outputs:
-      artifact-id: ${{ steps.upload-artifact.outputs.artifact-id }}
-
     steps:
     - uses: actions/checkout@v4
       with:
@@ -27,10 +24,9 @@ jobs:
       run: dotnet publish -p:PublishSingleFile=true -p:CommitHash=${{ github.sha }} -p:CommitRef=${{ github.ref_type }}/${{ github.ref_name }} -r win-x64 -c Release --self-contained false .\Bloxstrap\Bloxstrap.csproj
 
     - name: Upload Artifact
-      id: upload-artifact
       uses: actions/upload-artifact@v4
       with:
-        name: Bloxstrap (Release) (${{ github.sha }})
+        name: Fishstrap (Release) (${{ github.sha }})
         path: .\Bloxstrap\bin\Release\net6.0-windows\win-x64\publish\*
 
   release:
@@ -39,28 +35,40 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
 
     steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: Fishstrap (Release) (${{ github.sha }})
+          path: release
+
       - name: Rename binaries
-        run: mv release/Bloxstrap.exe Bloxstrap-${{ github.ref_name }}.exe
+        run: mv release/Bloxstrap.exe Fishstrap-${{ github.ref_name }}.exe
 
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
           draft: true
-          files: Bloxstrap-${{ github.ref_name }}.exe
-          name: Bloxstrap ${{ github.ref_name }}
+          files: Fishstrap-${{ github.ref_name }}.exe
+          name: Fishstrap ${{ github.ref_name }}
 
   release-test:
     needs: build
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/release-test')
 
     steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: Fishstrap (Release) (${{ github.sha }})
+          path: release
+
       - name: Rename binaries
-        run: mv release/Bloxstrap.exe Bloxstrap-${{ github.ref_name }}.exe
+        run: mv release/Bloxstrap.exe Fishstrap-${{ github.ref_name }}.exe
 
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
           draft: true
-          files: Bloxstrap-${{ github.ref_name }}.exe
-          name: Bloxstrap ${{ github.ref_name }}
+          files: Fishstrap-${{ github.ref_name }}.exe
+          name: Fishstrap ${{ github.ref_name }}
diff --git a/Bloxstrap/Models/Entities/ActivityData.cs b/Bloxstrap/Models/Entities/ActivityData.cs
@@ -105,7 +105,7 @@ public string GameHistoryDescription
 
         public string GetInviteDeeplink(bool launchData = true)
         {
-            string deeplink = $"roblox://experiences/start?placeId={PlaceId}";
+            string deeplink = $"https://www.roblox.com/games/start?placeId={PlaceId}";
 
             if (ServerType == ServerType.Private) // thats not going to work
                 deeplink += "&accessCode=" + AccessCode;

diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
@@ -823,13 +823,14 @@ Selecting 'No' will ignore this warning and continue installation.</value>
     <value>Choose preferred language</value>
   </data>
   <data name="Dialog.LanguageSelector.Subtext" xml:space="preserve">
-    <value>Choose a language before continuing with installation.</value>
+    <value>Choose a language before continuing with installation.
+Some text might not be translated to preferred language.</value>
   </data>
   <data name="Menu.Appearance.Language.Title" xml:space="preserve">
     <value>Language</value>
   </data>
   <data name="Menu.Appearance.Language.Description" xml:space="preserve">
-    <value>A relaunch is required for changes to take effect.</value>
+    <value>A relaunch is required for changes to take effect. Some text might not be translated to preferred language.</value>
   </data>
   <data name="Menu.Behaviour.ForceRobloxLanguage.Title" xml:space="preserve">
     <value>Allow use of unsupported Roblox languages</value>
@@ -1273,7 +1274,7 @@ Would you like to enable test mode?</value>
   </data>
   <data name="Menu.Behaviour.Channel.Title" xml:space="preserve">
     <value>Channel</value>
-</data>
+  </data>
   <data name="LaunchMenu.LaunchRobloxStudio" xml:space="preserve">
     <value>Launch Roblox Studio</value>
   </data>
@@ -1398,34 +1399,34 @@ Please close any applications that may be using Roblox's files, and relaunch.</v
   <data name="Menu.FastFlags.Presets.IngameMenu.Framerate.Title" xml:space="preserve">
     <value>Framerate cap</value>
   </data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.ChatTranslation.Title" xml:space="preserve">
+  <data name="Menu.FastFlags.Presets.IngameMenu.ChatTranslation.Title" xml:space="preserve">
     <value>Chat translation</value>
   </data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.VRToggle.Description" xml:space="preserve">
+  <data name="Menu.FastFlags.Presets.IngameMenu.VRToggle.Description" xml:space="preserve">
     <value>Allows to disable VR mode toggle.</value>
-</data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.SoothsayerCheck.Description" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.IngameMenu.SoothsayerCheck.Description" xml:space="preserve">
     <value>Hides the button for submitting feedback on translation quality.</value>
-</data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.Haptics.Description" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.IngameMenu.Haptics.Description" xml:space="preserve">
     <value>Disables haptic feedback features, such as vibrations for controllers.</value>
-</data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.Framerate.Description" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.IngameMenu.Framerate.Description" xml:space="preserve">
     <value>Removes FPS presets from the menu.</value>
-</data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.LanguageSelector.Description" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.IngameMenu.LanguageSelector.Description" xml:space="preserve">
     <value>Allows players to disable interface translation.</value>
-</data>
-	<data name="Menu.FastFlags.Presets.IngameMenu.ChatTranslation.Description" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.IngameMenu.ChatTranslation.Description" xml:space="preserve">
     <value>Disables automatic translation of chat messages.</value>
-</data>
-	<data name="Menu.FastFlags.Presets.FlagState.Title" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.FlagState.Title" xml:space="preserve">
     <value>Flag state</value>
-</data>
-	<data name="Menu.FastFlags.Presets.FlagState.Description" xml:space="preserve">
+  </data>
+  <data name="Menu.FastFlags.Presets.FlagState.Description" xml:space="preserve">
     <value>Show values of specified flags during runtime. Each flag is comma separated.</value>
-</data>
-	<data name="Common.Studio" xml:space="preserve">
+  </data>
+  <data name="Common.Studio" xml:space="preserve">
     <value>Studio</value>
   </data>
   <data name="Common.RobloxStudio" xml:space="preserve">
@@ -1440,13 +1441,13 @@ Please close any applications that may be using Roblox's files, and relaunch.</v
   <data name="Common.Type" xml:space="preserve">
     <value>Type</value>
   </data>
-	<data name="Common.UserId" xml:space="preserve">
+  <data name="Common.UserId" xml:space="preserve">
     <value>User Id</value>
   </data>
-	<data name="Common.Username" xml:space="preserve">
+  <data name="Common.Username" xml:space="preserve">
     <value>Username</value>
   </data>
-	<data name="Common.Time" xml:space="preserve">
+  <data name="Common.Time" xml:space="preserve">
     <value>Time</value>
   </data>
   <data name="Menu.Channel.VersionHash.Title" xml:space="preserve">
@@ -1458,48 +1459,48 @@ Please close any applications that may be using Roblox's files, and relaunch.</v
   <data name="Menu.SaveAndLaunch" xml:space="preserve">
     <value>Save and Launch</value>
   </data>
-	<data name="Menu.FastFlags.Presets.PingBreakdown.Title" xml:space="preserve">
-		<value>Ping breakdown</value>
-	</data>
-	<data name="Menu.FastFlags.Presets.PingBreakdown.Description" xml:space="preserve">
-		<value>Sends detailed ping information to the Roblox console.</value>
-	</data>
-	<data name="Bootstrapper.Dialog.NoUpgradeWithoutClient" xml:space="preserve">
-		<value>Launching failed due to missing client.
+  <data name="Menu.FastFlags.Presets.PingBreakdown.Title" xml:space="preserve">
+    <value>Ping breakdown</value>
+  </data>
+  <data name="Menu.FastFlags.Presets.PingBreakdown.Description" xml:space="preserve">
+    <value>Sends detailed ping information to the Roblox console.</value>
+  </data>
+  <data name="Bootstrapper.Dialog.NoUpgradeWithoutClient" xml:space="preserve">
+    <value>Launching failed due to missing client.
 		Please enable Roblox upgrades.</value>
-	</data>
-	<data name="ContextMenu.PlayerLogs.Title" xml:space="preserve">
-		<value>Player logs</value>
-	</data>
-	<data name="Common.Message" xml:space="preserve">
-		<value>Message</value>
-	</data>
-	<data name="ContextMenu.MessageLogs.Title" xml:space="preserve">
-		<value>Message logs</value>
-	</data>
-	<data name="ContextMenu.MessageLogs.Description" xml:space="preserve">
-		<value>Displays recently sent messages by players.</value>
-	</data>
-	<data name="Menu.Integrations.PlayerMessageLogs.Title" xml:space="preserve">
-		<value>Player and Message logs</value>
-	</data>
-	<data name="Menu.Integrations.PlayerMessageLogs.Description" xml:space="preserve">
-		<value>Shows you players joining/leaving and messages being sent.
+  </data>
+  <data name="ContextMenu.PlayerLogs.Title" xml:space="preserve">
+    <value>Player logs</value>
+  </data>
+  <data name="Common.Message" xml:space="preserve">
+    <value>Message</value>
+  </data>
+  <data name="ContextMenu.MessageLogs.Title" xml:space="preserve">
+    <value>Message logs</value>
+  </data>
+  <data name="ContextMenu.MessageLogs.Description" xml:space="preserve">
+    <value>Displays recently sent messages by players.</value>
+  </data>
+  <data name="Menu.Integrations.PlayerMessageLogs.Title" xml:space="preserve">
+    <value>Player and Message logs</value>
+  </data>
+  <data name="Menu.Integrations.PlayerMessageLogs.Description" xml:space="preserve">
+    <value>Shows you players joining/leaving and messages being sent.
 		Only works with [text chat service](https://devforum.roblox.com/t/new-in-experience-text-chat-system-public-release/1848837).</value>
-	</data>
-	<data name="Menu.Behaviour.AnselBanner" xml:space="preserve">
-		<value>Ansel support is required for shaders.</value>
-	</data>
-	<data name="Dialog.Bloxshade.ThankYou" xml:space="preserve">
-		<value>Thank you for using Bloxshade with Fishstrap</value>
-	</data>
-	<data name="Dialog.Bloxshade.Setting" xml:space="preserve">
-		<value>Ansel support has been enabled</value>
-	</data>
-	<data name="Common.Profiles" xml:space="preserve">
-		<value>Profiles</value>
-	</data>
-	<data name="Menu.Deployment.Channel.OutOfDate">
-		<value>This channel is out of date, and is likely no longer being updated. Please use another channel.</value>
-	</data>
+  </data>
+  <data name="Menu.Behaviour.AnselBanner" xml:space="preserve">
+    <value>Ansel support is required for shaders.</value>
+  </data>
+  <data name="Dialog.Bloxshade.ThankYou" xml:space="preserve">
+    <value>Thank you for using Bloxshade with Fishstrap</value>
+  </data>
+  <data name="Dialog.Bloxshade.Setting" xml:space="preserve">
+    <value>Ansel support has been enabled</value>
+  </data>
+  <data name="Common.Profiles" xml:space="preserve">
+    <value>Profiles</value>
+  </data>
+  <data name="Menu.Deployment.Channel.OutOfDate" xml:space="preserve">
+    <value>This channel is out of date, and is likely no longer being updated. Please use another channel.</value>
+  </data>
 </root>
diff --git a/README.md b/README.md
@@ -25,10 +25,12 @@ Found any bugs? Submit an [issue](https://github.com/returnrqt/bloxstrap/issues)
 ## Differences from Bloxstrap
 - Integrations
   - Player logs - Players leaving/joining server
+  - Message logs
 - Fast Flags
    - Flag profiles
    - Removed editor warnings & flag validation
-   - In-game menu editor
+   - Roblox menu customization
+   - More presets
  - Channels
    - Channel changer
    - Cancelling Roblox upgrades
@@ -38,6 +40,9 @@ Found any bugs? Submit an [issue](https://github.com/returnrqt/bloxstrap/issues)
    - Multi-instance launching
   - Appearance
     - Customizable downloading status
+  - Extras
+    - Save last opened settings page
+    - Custom bootstrapper themes
 
  *More changes coming soon!*
 
@@ -64,4 +69,4 @@ Found any bugs? Submit an [issue](https://github.com/returnrqt/bloxstrap/issues)
 [repo-releases]: https://github.com/returnrqt/bloxstrap/releases
 [repo-latest]:   https://github.com/returnrqt/bloxstrap/releases/latest
 
-[discord-invite]:  https://discord.gg/xSsamjAU84
+[discord-invite]:  https://discord.gg/xSsamjAU84