Merge b54e44aa58 into 1f21e8ce0b

Bloxstrap/Paths.cs

@@ -26,7 +26,8 @@
 
         public static string Application { get; private set; } = "";
 
-        public static string CustomFont => Path.Combine(Modifications, "content\\fonts\\CustomFont.ttf");
+        public static string Fonts => Path.Combine("content\\fonts");
+        public static string CustomFont => Path.Combine(Fonts, "CustomFont.ttf");
 
         public static bool Initialized => !String.IsNullOrEmpty(Base);
 

Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml

@@ -99,7 +99,7 @@
             Description="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Description}">
             <StackPanel>
                 <ui:Button Icon="DocumentAdd16" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Choose}" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding ChooseCustomFontVisibility, Mode=OneWay}" />
-                <ui:Button Icon="Delete16" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Remove}" Appearance="Danger" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding DeleteCustomFontVisibility, Mode=OneWay}" />
+                <ui:Button Icon="Delete16" FontFamily="{Binding DeleteCustomFontFontFamily}" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Remove}" Appearance="Danger" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding DeleteCustomFontVisibility, Mode=OneWay}" />
             </StackPanel>
         </controls:OptionControl>
     </StackPanel>

Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs

@@ -9,8 +9,10 @@ using Windows.Win32.Foundation;
 
 using CommunityToolkit.Mvvm.Input;
 
-using Bloxstrap.Models.SettingTasks;
 using Bloxstrap.AppData;
+using System.Drawing.Text;
+using Wpf.Ui.Controls;
+using System.Windows.Media;
 
 namespace Bloxstrap.UI.ViewModels.Settings
 {
@@ -52,9 +54,12 @@ namespace Bloxstrap.UI.ViewModels.Settings
 
                 TextFontTask.NewState = dialog.FileName;
             }
+            
 
             OnPropertyChanged(nameof(ChooseCustomFontVisibility));
             OnPropertyChanged(nameof(DeleteCustomFontVisibility));
+            OnPropertyChanged(nameof(CustomFontName));
+            OnPropertyChanged(nameof(DeleteCustomFontFontFamily));
         }
 
         public ICommand OpenModsFolderCommand => new RelayCommand(OpenModsFolder);
@@ -63,6 +68,18 @@ namespace Bloxstrap.UI.ViewModels.Settings
 
         public Visibility DeleteCustomFontVisibility => !String.IsNullOrEmpty(TextFontTask.NewState) ? Visibility.Visible : Visibility.Collapsed;
 
+        public System.Windows.Media.FontFamily DeleteCustomFontFontFamily => new System.Windows.Media.FontFamily($"{TextFontTask.NewState}#{CustomFontName}");
+
+        public string CustomFontName
+        {
+            get
+            {
+                var families = Fonts.GetFontFamilies(TextFontTask.NewState);
+                var first = families.ElementAt(0);
+                return first.ToString().Split("#").ElementAt(first.ToString().Split("#").Count() - 1);
+            }
+        }
+
         public ICommand ManageCustomFontCommand => new RelayCommand(ManageCustomFont);
 
         public ICommand OpenCompatSettingsCommand => new RelayCommand(OpenCompatSettings);

README.md

@@ -36,10 +36,6 @@ Bloxstrap is only supported for PCs running Windows.
 
 **A:** No, it shouldn't. Bloxstrap doesn't interact with the Roblox client in the same way that exploits do. [Read more about that here.](https://github.com/bloxstraplabs/bloxstrap/wiki/Why-it's-not-reasonably-possible-for-you-to-be-banned-by-Bloxstrap)
 
-**Q: Why was multi-instance launching removed?**
-
-**A:** It was removed starting with v2.6.0 for the [reasons stated here](https://github.com/bloxstraplabs/bloxstrap/wiki/Plans-to-remove-multi%E2%80%90instance-launching-from-Bloxstrap). It may be added back in the future when there are less issues with doing so.
-
 ## Features
 
 - Hassle-free Discord Rich Presence to let your friends know what you're playing at a glance