System: Bugfixes for the release

Octal450 · Jul 2, 2023 · d8ec8a4 · d8ec8a4
1 parent 2cdff02
commit d8ec8a4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/J-Runner/Classes/variables.cs b/J-Runner/Classes/variables.cs
@@ -80,10 +80,10 @@ public enum Windows
             W10_11
         }
 
-        public static string version = "3.3.0 r2 Beta";
-        public static string build = "3301." + DateTime.ParseExact(Properties.Resources.Build.Trim(), "MM-dd-yyyy HH:mm:ss", null).ToString("yyMMdd.HHmm");
-        public const string staticversion = "3.3.0.1";
-        public static int revision = 34;
+        public static string version = "3.3.0";
+        public static string build = "3300." + DateTime.ParseExact(Properties.Resources.Build.Trim(), "MM-dd-yyyy HH:mm:ss", null).ToString("yyMMdd.HHmm");
+        public const string staticversion = "3.3.0.0";
+        public static int revision = 35;
         public static Windows currentOS = Windows.Unknown;
         public static bool isWinXP = false;
         public static bool isscanningip = false;

diff --git a/J-Runner/MainForm.cs b/J-Runner/MainForm.cs
@@ -2513,7 +2513,7 @@ public void createDonor(string con, string hack, string smc, string cpuk, string
                     if (kvPath == "donor")
                     {
                         string kv;
-                        if (con.Contains("Trinity") || con.Contains("Corona")) kv = "slim_nofcrt";
+                        if (con.Contains("Trinity") || con.Contains("Corona") || con.Contains("Winchester")) kv = "slim_nofcrt";
                         else if (con.Contains("Xenon")) kv = "phat_t1";
                         else kv = "phat_t2";
                         File.Copy(Path.Combine(variables.donorPath, kv + ".bin"), variables.xepath + "KV.bin", true);
@@ -2538,12 +2538,13 @@ public void createDonor(string con, string hack, string smc, string cpuk, string
                     // Copy SMC - only needed for RGH3
                     if ((hack == "Glitch2" || hack == "Glitch2m") && smc == "RGH3")
                     {
-                        if (con.Contains("Corona")) File.Copy(variables.xepath + "CORONA_CLEAN.bin", variables.xepath + "SMC.bin", true);
+                        if (con.Contains("Winchester")) File.Copy(variables.xepath + "WINCHESTER_CLEAN.bin", variables.xepath + "SMC.bin", true);
+                        else if (con.Contains("Corona")) File.Copy(variables.xepath + "CORONA_CLEAN.bin", variables.xepath + "SMC.bin", true);
                         else if (con.Contains("Trinity")) File.Copy(variables.xepath + "TRINITY_CLEAN.bin", variables.xepath + "SMC.bin", true);
                         else if (con.Contains("Jasper")) File.Copy(variables.xepath + "JASPER_CLEAN.bin", variables.xepath + "SMC.bin", true);
                         else if (con.Contains("Falcon")) File.Copy(variables.xepath + "FALCON_CLEAN.bin", variables.xepath + "SMC.bin", true);
-                        else if (con.Contains("Zephyr")) File.Copy(variables.xepath + "ZEPHYR_CLEAN.bin", variables.xepath + "SMC.bin", true); // Just in case we ever re-use this code for non RGH3
-                        else if (con.Contains("Xenon")) File.Copy(variables.xepath + "XENON_CLEAN.bin", variables.xepath + "SMC.bin", true); // Just in case we ever re-use this code for non RGH3
+                        else if (con.Contains("Zephyr")) File.Copy(variables.xepath + "ZEPHYR_CLEAN.bin", variables.xepath + "SMC.bin", true); // Just in case we ever re-use this code
+                        else if (con.Contains("Xenon")) File.Copy(variables.xepath + "XENON_CLEAN.bin", variables.xepath + "SMC.bin", true); // Just in case we ever re-use this code
                         Console.WriteLine("Copied SMC.bin");
                     }
 
@@ -2553,9 +2554,13 @@ public void createDonor(string con, string hack, string smc, string cpuk, string
                         string smcConfig;
 
                         // Catch all types
-                        if (con.Contains("Corona")) smcConfig = "Corona";
-                        else if (con.Contains("Jasper")) smcConfig = "Jasper";
+                        if (con.Contains("Winchester")) smcConfig = "Winchester";
+                        else if (con.Contains("Corona")) smcConfig = "Corona";
                         else if (con.Contains("Trinity")) smcConfig = "Trinity";
+                        else if (con.Contains("Jasper")) smcConfig = "Jasper";
+                        else if (con.Contains("Falcon")) smcConfig = "Falcon";
+                        else if (con.Contains("Zephyr")) smcConfig = "Zephyr";
+                        else if (con.Contains("Xenon")) smcConfig = "Xenon";
                         else smcConfig = con;
 
                         File.Copy(Path.Combine(variables.donorPath, "smc_config", smcConfig + ".bin"), variables.xepath + "smc_config.bin", true);
@@ -2575,9 +2580,11 @@ public void createDonor(string con, string hack, string smc, string cpuk, string
                     }
                     xPanel.createxebuild_v2(true, nand, true);
                 }
-                catch
+                catch (Exception ex)
                 {
                     Console.WriteLine("Donor Nand Creation Failed");
+                    if (variables.debugMode) Console.WriteLine(ex.ToString());
+                    else Console.WriteLine(ex.GetType());
                     Console.WriteLine("");
                     return;
                 }

diff --git a/J-Runner/Resources/Build.txt b/J-Runner/Resources/Build.txt
@@ -1 +1 @@
-07-01-2023 15:29:01
+07-02-2023 22:30:59