Remove traces of the subversion folder existing

Marsey/MarseyVars.cs

@@ -24,11 +24,6 @@ public abstract class MarseyVars
     /// </summary>
     public const string MarseyPatchFolder = "Marsey";
 
-    /// <summary>
-    /// Subverter patches saved to this one
-    /// </summary>
-    public const string SubverterPatchFolder = "Subversion";
-
     /// <summary>
     /// Should code side-loading be enabled
     /// This is only true if any subverter patch is enabled

SS14.Launcher/LauncherPaths.cs

@@ -15,7 +15,6 @@ public static class LauncherPaths
     public static readonly string ServerContentDirName = "server content";
     public static readonly string LogsDirName = "logs";
     public static readonly string MarseyPatchesDirName = "Marsey";
-    public static readonly string SubverterPatchesDirName = "Subversion";
     public static readonly string EnabledPatchesDirName = "Enabled";
     public static readonly string LauncherLogName = "launcher.log";
     public static readonly string ClientMacLogName = "client.mac.log";
@@ -31,7 +30,6 @@ public static class LauncherPaths
     public static readonly string DirServerContent = Path.Combine(DirUserData, ServerContentDirName);
     public static readonly string DirLogs = Path.Combine(DirUserData, LogsDirName);
     public static readonly string DirPatch = Path.Combine(DirLauncherInstall, MarseyPatchesDirName);
-    public static readonly string DirSubvPatch = Path.Combine(DirLauncherInstall, SubverterPatchesDirName);
     public static readonly string DirEnPatch = Path.Combine(DirPatch, EnabledPatchesDirName);
     public static readonly string PathLauncherLog = Path.Combine(DirLogs, LauncherLogName);
     public static readonly string PathClientMacLog = Path.Combine(DirLogs, ClientMacLogName);
@@ -45,7 +43,6 @@ public static void CreateDirs()
     {
         Ensure(DirLogs);
         Ensure(DirLocalData);
-        Ensure(DirSubvPatch);
         Ensure(DirEnPatch);
         Ensure(DirEngineInstallations);
         Ensure(DirModuleInstallations);

SS14.Launcher/ViewModels/MainWindowTabs/PatchesTabViewModel.cs

@@ -20,14 +20,12 @@ public class PatchesTabViewModel : MainWindowTabViewModel
         public ObservableCollection<MarseyPatch> MarseyPatches { get; } = new ObservableCollection<MarseyPatch>();
         public ObservableCollection<SubverterPatch> SubverterPatches { get; } = new ObservableCollection<SubverterPatch>();
 
-        public ICommand OpenMarseyPatchDirectoryCommand { get; }
-        public ICommand OpenSubverterPatchDirectoryCommand { get; }
+        public ICommand OpenPatchDirectoryCommand { get; }
 
         public PatchesTabViewModel()
         {
             SubverterPresent = Subverse.CheckSubverterPresent();
-            OpenMarseyPatchDirectoryCommand = new RelayCommand(() => OpenPatchDirectory(MarseyVars.MarseyPatchFolder));
-            OpenSubverterPatchDirectoryCommand = new RelayCommand(() => OpenPatchDirectory(MarseyVars.SubverterPatchFolder));
+            OpenPatchDirectoryCommand = new RelayCommand(() => OpenPatchDirectory(MarseyVars.MarseyPatchFolder));
             LoadPatches();
         }
 

SS14.Launcher/Views/MainWindowTabs/PatchesTabView.xaml

@@ -23,7 +23,7 @@
         <StackPanel>
           <TextBlock Margin="4, 0" Text="Patches" Classes="NanoHeadingMedium" />
           <Button Content="Open patch directory" Margin="4, 0" HorizontalAlignment="Left"
-                  Command="{Binding OpenMarseyPatchDirectoryCommand}"/>
+                  Command="{Binding OpenPatchDirectoryCommand}"/>
           <Separator/>
 
           <ItemsControl Items="{Binding MarseyPatches}" Name="MarseyPatchList">
@@ -51,7 +51,7 @@
         <StackPanel>
           <TextBlock Margin="4, 0" Text="Sideloading" Classes="NanoHeadingMedium" />
           <Button Content="Open patch directory" Margin="4, 0" HorizontalAlignment="Left"
-                  Command="{Binding OpenSubverterPatchDirectoryCommand}"/>
+                  Command="{Binding OpenPatchDirectoryCommand}"/>
           <Separator/>
 
           <ItemsControl Items="{Binding SubverterPatches}" Name="SubverterPatchList">

publish_linux.sh

@@ -14,8 +14,7 @@ dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r
 # Create intermediate directories.
 mkdir -p bin/publish/Linux/bin
 mkdir -p bin/publish/Linux/bin/loader
-mkdir -p bin/publish/Linux/Marsey/Enabled
-mkdir -p bin/publish/Linux/Subversion
+mkdir -p bin/publish/Linux/Marsey
 mkdir -p bin/publish/Linux/dotnet
 
 cp PublishFiles/SS14.Launcher PublishFiles/SS14.desktop bin/publish/Linux/

publish_osx.sh

@@ -18,8 +18,7 @@ cp -r "PublishFiles/Space Station 14 Launcher.app" bin/publish/macOS
 
 mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/dotnet/"
 mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/"
-mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/Subversion"
-mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/Marsey/Enabled"
+mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/Marsey"
 mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
 
 cp -r Dependencies/dotnet/mac/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/dotnet/"

publish_windows.sh

@@ -20,8 +20,7 @@ dotnet publish SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj -c Release
 mkdir -p bin/publish/Windows/bin
 mkdir -p bin/publish/Windows/bin/loader
 mkdir -p bin/publish/Windows/dotnet
-mkdir -p bin/publish/Windows/Marsey/Enabled
-mkdir -p bin/publish/Windows/Subversion
+mkdir -p bin/publish/Windows/Marsey
 
 cp -r Dependencies/dotnet/windows/* bin/publish/Windows/dotnet
 cp "SS14.Launcher.Bootstrap/bin/Release/net45/publish/Space Station 14 Launcher.exe" bin/publish/Windows