Fixing merge

UWUVCI AIO WPF.sln

@@ -1,32 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
+# Visual Studio Version 16
-VisualStudioVersion = 17.2.32630.192
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.ActiveCfg = Debug|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.Build.0 = Debug|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.ActiveCfg = Debug|x86
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.Build.0 = Debug|x86
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.ActiveCfg = Release|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.Build.0 = Release|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.ActiveCfg = Release|x86
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

UWUVCI AIO WPF/Classes/KeyFile.cs

@@ -33,7 +33,7 @@ namespace UWUVCI_AIO_WPF.Classes
         public static void ExportFile(List<TKeys> precomp, GameConsoles console)
         {
             CheckAndFixFolder("bin\\keys");
-            Stream createConfigStream = new FileStream(Path.Combine(Directory.GetCurrentDirectory(), $@"bin\keys\{console.ToString().ToLower()}.vck"), FileMode.Create, FileAccess.Write);
+            Stream createConfigStream = new FileStream($@"bin\keys\{console.ToString().ToLower()}.vck", FileMode.Create, FileAccess.Write);
             GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress);
             IFormatter formatter = new BinaryFormatter();
             formatter.Serialize(compressedStream, precomp);

UWUVCI AIO WPF/FodyWeavers.xsd

@@ -17,16 +17,6 @@
                   <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                 <xs:annotation>
                   <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -53,16 +43,6 @@
                 <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
-            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
             <xs:attribute name="DisableCompression" type="xs:boolean">
               <xs:annotation>
                 <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -93,16 +73,6 @@
                 <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
-            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
               <xs:annotation>
                 <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs

@@ -91,17 +91,26 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
                 if (info[0])
                 {
                     mvm.BaseDownloaded = true;
-                    if (mvm.RomSet) 
+                    if (mvm.RomSet) mvm.CanInject = true;
-                        mvm.CanInject = true;
                 }
                 else
+                {
                     mvm.BaseDownloaded = false;
+                   
+                }
             }
+            
         }
+
         private void btnDwnlnd_Click(object sender, RoutedEventArgs e)
         {
-            mvm.Download();
+            
-            checkStuff(mvm.getInfoOfBase(Base));
+                mvm.Download();
+            Thread.Sleep(500);
+                checkStuff(mvm.getInfoOfBase(Base));
+         
+           
+            
         }
 
         private void btnDwnlnd_Copy_Click(object sender, RoutedEventArgs e)

UWUVCI AIO WPF/UI/Frames/StartFrame.xaml.cs

@@ -17,20 +17,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            OpenKofiLink("uwuvci");
+            Process.Start("https://ko-fi.com/uwuvci");
-        }
-        private void Button_Click2(object sender, RoutedEventArgs e)
-        {
-            OpenKofiLink("zestyts");
-        }
-        private void OpenKofiLink(string urlSuffix)
-        {
-            Process.Start(new ProcessStartInfo()
-            {
-                FileName = "https://ko-fi.com/" + urlSuffix,
-                UseShellExecute = true,
-                Verb = "open"
-            });
         }
         private void Button_Click2(object sender, RoutedEventArgs e)
         {

UWUVCI AIO WPF/UI/Windows/Custom Message.xaml.cs

@@ -110,24 +110,15 @@ namespace UWUVCI_AIO_WPF.UI.Windows
 
         private void Folder_Click(object sender, RoutedEventArgs e)
         {
-            var filePath = "";
             try
             {
-                filePath = path;
+                if (File.Exists(path)) path = new FileInfo(path).DirectoryName;
-                if (File.Exists(filePath)) 
+                Process.Start(path);
-                    filePath = new FileInfo(filePath).DirectoryName;
-
-                Process.Start(new ProcessStartInfo()
-                {
-                    FileName = filePath,
-                    UseShellExecute = true,
-                    Verb = "open"
-                });
                 Close();
             }
             catch (Exception)
             {
-                Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.\n\nFile path: " + filePath);
+                Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.");
                 try
                 {
                     cm.Owner = (FindResource("mvm") as MainViewModel).mw;
@@ -166,7 +157,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
             Close();
             var containNintendont = Message.Content.ToString().ToLower().Contains("nintendont");
 
-            SDSetup sd = new SDSetup(containNintendont, path);
+            SDSetup sd = new SDSetup(containNintendont ? true : false, path);
             try
             {
                 sd.Owner = (FindResource("mvm") as MainViewModel).mw;