v3.6.5v3.6.5

- **UI:**
  - (Add) Groups to convert menu
  - (Improvement) Re-arrange convert menu order
  - (Fix) Settings: Open file dialog filter dropdown width
- **PrusaSlicer:**
   - (Add) AnyCubic Photon D2
   - (Add) Creality Halot Ray CL925
   - (Add) Elegoo Saturn 8K
   - (Add) Uniformation GKtwo
   - (Add) Nova3D Whale3 Pro
   - (Add) Phrozen Sonic Mighty 8K
- (Add) AnyCubic Photon D2 (.dl2p) compatibility to AnyCubic file format
- (Fix) Hide "Debug tools" from "Help" menu

18 files changed, 68 insertions, 21 deletions

diff --git a/UVtools.Core/FileFormats/CTBEncryptedFile.cs b/UVtools.Core/FileFormats/CTBEncryptedFile.cs
index 7d14bf2..1c7b462 100644
--- a/UVtools.Core/FileFormats/CTBEncryptedFile.cs
+++ b/UVtools.Core/FileFormats/CTBEncryptedFile.cs
@@ -580,6 +580,8 @@ public class CTBEncryptedFile : FileFormat
     #region Properties
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Chitubox";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(CTBEncryptedFile), "ctb",           "Chitubox CTB (Encrypted)"),
         new(typeof(CTBEncryptedFile), "encrypted.ctb", "Chitubox CTB (Encrypted)", false, false),
diff --git a/UVtools.Core/FileFormats/CWSFile.cs b/UVtools.Core/FileFormats/CWSFile.cs
index 1cf7fc7..0414165 100644
--- a/UVtools.Core/FileFormats/CWSFile.cs
+++ b/UVtools.Core/FileFormats/CWSFile.cs
@@ -311,6 +311,8 @@ public class CWSFile : FileFormat
 
     public PrinterType Printer { get; set; } = PrinterType.Unknown;
 
+    public override string ConvertMenuGroup => "CWS";
+
     public override FileExtension[] FileExtensions { get; } = {
         new (typeof(CWSFile), "cws", "NovaMaker CWS"),
         new (typeof(CWSFile), "rgb.cws", "NovaMaker Bene4 Mono / Elfin2 Mono SE (CWS)"),
diff --git a/UVtools.Core/FileFormats/CXDLPFile.cs b/UVtools.Core/FileFormats/CXDLPFile.cs
index a8d18ed..a9cf2d5 100644
--- a/UVtools.Core/FileFormats/CXDLPFile.cs
+++ b/UVtools.Core/FileFormats/CXDLPFile.cs
@@ -492,7 +492,7 @@ public class CXDLPFile : FileFormat
         get => float.Parse(Encoding.ASCII.GetString(SlicerInfoSettings.DisplayWidthBytes.Where(b => b != 0).ToArray()));
         set
         {
-            string str = Math.Round(value, 2).ToString(CultureInfo.InvariantCulture);
+            var str = Math.Round(value, 2).ToString(CultureInfo.InvariantCulture);
             //string str = Math.Round(value, 2).ToString("0.000000");
             SlicerInfoSettings.DisplayWidthDataSize = (uint)(str.Length * 2);
             var data = new byte[SlicerInfoSettings.DisplayWidthDataSize];
@@ -675,12 +675,12 @@ public class CXDLPFile : FileFormat
     {
         using var outputFile = new FileStream(TemporaryOutputFileFullPath, FileMode.Create, FileAccess.ReadWrite);
 
-       if (string.IsNullOrWhiteSpace(MachineName) || (!MachineName.StartsWith("CL-") && !MachineName.StartsWith("CT")))
+       if (string.IsNullOrWhiteSpace(MachineName) || (!MachineName.StartsWith("CL") && !MachineName.StartsWith("CT")))
         {
             bool found = false;
             foreach (var machine in Machine.Machines
                          .Where(machine => machine.Brand == PrinterBrand.Creality
-                                           && (machine.Model.StartsWith("CL-") || machine.Model.StartsWith("CT"))
+                                           && (machine.Model.StartsWith("CL") || machine.Model.StartsWith("CT"))
                                            ))
             {
                 if (ResolutionX == machine.ResolutionX && ResolutionY == machine.ResolutionY)
diff --git a/UVtools.Core/FileFormats/ChituboxFile.cs b/UVtools.Core/FileFormats/ChituboxFile.cs
index bfcfeee..2b0b86c 100644
--- a/UVtools.Core/FileFormats/ChituboxFile.cs
+++ b/UVtools.Core/FileFormats/ChituboxFile.cs
@@ -1067,6 +1067,8 @@ public class ChituboxFile : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Chitubox";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(ChituboxFile), "photon", "Chitubox Photon"),
         new(typeof(ChituboxFile), "cbddlp", "Chitubox CBDDLP"),
diff --git a/UVtools.Core/FileFormats/ChituboxZipFile.cs b/UVtools.Core/FileFormats/ChituboxZipFile.cs
index ec53230..847f2ec 100644
--- a/UVtools.Core/FileFormats/ChituboxZipFile.cs
+++ b/UVtools.Core/FileFormats/ChituboxZipFile.cs
@@ -73,10 +73,12 @@ public class ChituboxZipFile : FileFormat
     #endregion
 
     #region Properties
-    public Header HeaderSettings { get; } = new Header();
+    public Header HeaderSettings { get; } = new();
         
     public override FileFormatType FileType => FileFormatType.Archive;
 
+    public override string ConvertMenuGroup => "Chitubox";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(ChituboxZipFile), "zip", "Chitubox Zip")
     };
diff --git a/UVtools.Core/FileFormats/FDGFile.cs b/UVtools.Core/FileFormats/FDGFile.cs
index 0668848..5bc0203 100644
--- a/UVtools.Core/FileFormats/FDGFile.cs
+++ b/UVtools.Core/FileFormats/FDGFile.cs
@@ -628,6 +628,8 @@ public class FDGFile : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Chitubox";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(FDGFile), "fdg", "Voxelab FDG"),
     };
diff --git a/UVtools.Core/FileFormats/FileFormat.cs b/UVtools.Core/FileFormats/FileFormat.cs
index bf4fdca..35ce5c8 100644
--- a/UVtools.Core/FileFormats/FileFormat.cs
+++ b/UVtools.Core/FileFormats/FileFormat.cs
@@ -372,24 +372,24 @@ public abstract class FileFormat : BindableBase, IDisposable, IEquatable<FileFor
         new CTBEncryptedFile(), // encrypted ctb
         new PhotonSFile(), // photons
         new PHZFile(), // phz
-        new FDGFile(), // fdg
         new PhotonWorkshopFile(),   // PSW
         new CWSFile(),   // CWS
-        new OSLAFile(),  // OSLA
-        new JXSFile(),      // jxs
+        new LGSFile(),   // LGS, LGS30
+        new VDAFile(),   // VDA
+        new VDTFile(),   // VDT
+        //new CXDLPv1File(),   // Creality Box v1
+        new CXDLPFile(),   // Creality Box
+        new FDGFile(), // fdg
         new ZCodeFile(),   // zcode
+        new JXSFile(),      // jxs
         new ZCodexFile(),   // zcodex
         new MDLPFile(),   // MKS v1
         new GR1File(),   // GR1 Workshop
-        //new CXDLPv1File(),   // Creality Box v1
-        new CXDLPFile(),   // Creality Box
-        new LGSFile(),   // LGS, LGS30
         new FlashForgeSVGXFile(), // SVGX
-        new GenericZIPFile(),   // Generic zip files
-        new VDAFile(),   // VDA
-        new VDTFile(),   // VDT
+        new OSLAFile(),  // OSLA
         new OSFFile(),   // OSF
         new UVJFile(),   // UVJ
+        new GenericZIPFile(),   // Generic zip files
         new ImageFile(),   // images
     };
 
@@ -1049,6 +1049,11 @@ public abstract class FileFormat : BindableBase, IDisposable, IEquatable<FileFor
     public virtual FileImageType LayerImageType => FileType == FileFormatType.Archive ? FileImageType.Png8 : FileImageType.Custom;
 
     /// <summary>
+    /// Gets the group name under convert menu to group all extensions, set to null to not group items
+    /// </summary>
+    public virtual string? ConvertMenuGroup => null;
+
+    /// <summary>
     /// Gets the valid file extensions for this <see cref="FileFormat"/>
     /// </summary>
     public abstract FileExtension[] FileExtensions { get; }
diff --git a/UVtools.Core/FileFormats/GenericZIPFile.cs b/UVtools.Core/FileFormats/GenericZIPFile.cs
index 0c9a956..06dad20 100644
--- a/UVtools.Core/FileFormats/GenericZIPFile.cs
+++ b/UVtools.Core/FileFormats/GenericZIPFile.cs
@@ -67,7 +67,7 @@ public class GenericZIPFile : FileFormat
     public override FileFormatType FileType => FileFormatType.Archive;
 
     public override FileExtension[] FileExtensions { get; } = {
-        new(typeof(GenericZIPFile), "zip", "Generic / Phrozen Zip")
+        new(typeof(GenericZIPFile), "zip", "Generic Zip / Phrozen Zip")
     };
 
     public override uint ResolutionX
diff --git a/UVtools.Core/FileFormats/LGSFile.cs b/UVtools.Core/FileFormats/LGSFile.cs
index cd21fda..9503f85 100644
--- a/UVtools.Core/FileFormats/LGSFile.cs
+++ b/UVtools.Core/FileFormats/LGSFile.cs
@@ -262,6 +262,8 @@ public class LGSFile : FileFormat
     public Header HeaderSettings { get; protected internal set; } = new();
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Longer3D";
+
     public override FileExtension[] FileExtensions { get; } = {
         new (typeof(LGSFile), "lgs", "Longer Orange 10 (LGS)"),
         new (typeof(LGSFile), "lgs30", "Longer Orange 30 (LGS30)"),
diff --git a/UVtools.Core/FileFormats/PHZFile.cs b/UVtools.Core/FileFormats/PHZFile.cs
index 6162604..7058188 100644
--- a/UVtools.Core/FileFormats/PHZFile.cs
+++ b/UVtools.Core/FileFormats/PHZFile.cs
@@ -642,6 +642,8 @@ public class PHZFile : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Chitubox";
+
     public override FileExtension[] FileExtensions { get; } = {
         new (typeof(PHZFile), "phz", "Chitubox PHZ"),
     };
diff --git a/UVtools.Core/FileFormats/PhotonSFile.cs b/UVtools.Core/FileFormats/PhotonSFile.cs
index 1dbbeab..58491c3 100644
--- a/UVtools.Core/FileFormats/PhotonSFile.cs
+++ b/UVtools.Core/FileFormats/PhotonSFile.cs
@@ -254,6 +254,8 @@ public class PhotonSFile : FileFormat
     public LayerHeader LayerSettings { get; protected internal set; } = new();
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Chitubox";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(PhotonSFile), "photons", "Chitubox PhotonS"),
     };
diff --git a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
index 3de216d..688795d 100644
--- a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
+++ b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
@@ -86,6 +86,7 @@ public class PhotonWorkshopFile : FileFormat
         AnyCubicPhotonZero,
         AnyCubicPhotonX,
         AnyCubicPhotonUltra,
+        AnyCubicPhotonD2,
         AnyCubicPhotonMono,
         AnyCubicPhotonMonoSE,
         AnyCubicPhotonMono4K,
@@ -1091,12 +1092,15 @@ public class PhotonWorkshopFile : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Binary;
 
+    public override string ConvertMenuGroup => "Anycubic Photon Workshop";
+
     public override FileExtension[] FileExtensions { get; } = {
 
         new(typeof(PhotonWorkshopFile), "pws", "Photon / Photon S (PWS)"),
         new(typeof(PhotonWorkshopFile), "pw0", "Photon Zero (PW0)"),
         new(typeof(PhotonWorkshopFile), "pwx", "Photon X (PWX)"),
         new(typeof(PhotonWorkshopFile), "dlp", "Photon Ultra (DLP)"),
+        new(typeof(PhotonWorkshopFile), "dl2p", "Photon Photon D2 (DL2P)"),
         new(typeof(PhotonWorkshopFile), "pwmx", "Photon Mono X (PWMX)"),
         new(typeof(PhotonWorkshopFile), "pwmb", "Photon Mono X 6K / Photon M3 Plus (PWMB)"),
         new(typeof(PhotonWorkshopFile), "pwmo", "Photon Mono (PWMO)"),
@@ -1217,6 +1221,7 @@ public class PhotonWorkshopFile : FileFormat
                 AnyCubicMachine.AnyCubicPhotonZero => 55.44f,
                 AnyCubicMachine.AnyCubicPhotonX => 192,
                 AnyCubicMachine.AnyCubicPhotonUltra => 102.40f,
+                AnyCubicMachine.AnyCubicPhotonD2 => 130.56f,
                 AnyCubicMachine.AnyCubicPhotonMono => 82.62f,
                 AnyCubicMachine.AnyCubicPhotonMonoSE => 82.62f,
                 AnyCubicMachine.AnyCubicPhotonMono4K => 134.40f,
@@ -1245,6 +1250,7 @@ public class PhotonWorkshopFile : FileFormat
                 AnyCubicMachine.AnyCubicPhotonZero => 98.637f,
                 AnyCubicMachine.AnyCubicPhotonX => 120,
                 AnyCubicMachine.AnyCubicPhotonUltra => 57.60f,
+                AnyCubicMachine.AnyCubicPhotonD2 => 73.44f,
                 AnyCubicMachine.AnyCubicPhotonMono => 130.56f,
                 AnyCubicMachine.AnyCubicPhotonMonoSE => 130.56f,
                 AnyCubicMachine.AnyCubicPhotonMono4K => 84,
@@ -1274,6 +1280,7 @@ public class PhotonWorkshopFile : FileFormat
                 AnyCubicMachine.AnyCubicPhotonZero => 150,
                 AnyCubicMachine.AnyCubicPhotonX => 245,
                 AnyCubicMachine.AnyCubicPhotonUltra => 165,
+                AnyCubicMachine.AnyCubicPhotonD2 => 165,
                 AnyCubicMachine.AnyCubicPhotonMono => 165,
                 AnyCubicMachine.AnyCubicPhotonMonoSE => 160,
                 AnyCubicMachine.AnyCubicPhotonMono4K => 165,
@@ -1570,6 +1577,7 @@ public class PhotonWorkshopFile : FileFormat
                 AnyCubicMachine.AnyCubicPhotonZero    => "Photon Zero",
                 AnyCubicMachine.AnyCubicPhotonX       => "Photon X",
                 AnyCubicMachine.AnyCubicPhotonUltra   => "Photon Ultra",
+                AnyCubicMachine.AnyCubicPhotonD2      => "Photon D2",
                 AnyCubicMachine.AnyCubicPhotonMono    => "Photon Mono",
                 AnyCubicMachine.AnyCubicPhotonMonoSE  => "Photon Mono SE",
                 AnyCubicMachine.AnyCubicPhotonMono4K  => "Photon Mono 4K",
@@ -1616,6 +1624,11 @@ public class PhotonWorkshopFile : FileFormat
                 return AnyCubicMachine.AnyCubicPhotonUltra;
             }
 
+            if (FileEndsWith(".dl2p"))
+            {
+                return AnyCubicMachine.AnyCubicPhotonD2;
+            }
+
             if (FileEndsWith(".pwmo"))
             {
                 return AnyCubicMachine.AnyCubicPhotonMono;
@@ -2058,6 +2071,7 @@ public class PhotonWorkshopFile : FileFormat
             AnyCubicMachine.AnyCubicPhotonZero => VERSION_1,
             AnyCubicMachine.AnyCubicPhotonX => VERSION_1,
             AnyCubicMachine.AnyCubicPhotonUltra => VERSION_515,
+            AnyCubicMachine.AnyCubicPhotonD2 => VERSION_516,
             AnyCubicMachine.AnyCubicPhotonMono => VERSION_515,
             AnyCubicMachine.AnyCubicPhotonMonoSE => VERSION_515,
             AnyCubicMachine.AnyCubicPhotonMono4K => VERSION_516,
diff --git a/UVtools.Core/FileFormats/SL1File.cs b/UVtools.Core/FileFormats/SL1File.cs
index e3e6390..04fe5c2 100644
--- a/UVtools.Core/FileFormats/SL1File.cs
+++ b/UVtools.Core/FileFormats/SL1File.cs
@@ -339,6 +339,8 @@ public class SL1File : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Archive;
 
+    public override string ConvertMenuGroup => "Prusa";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(SL1File), "sl1", "PrusaSlicer SL1"),
         new(typeof(SL1File), "sl1s", "PrusaSlicer SL1S Speed")
diff --git a/UVtools.Core/FileFormats/VDAFile.cs b/UVtools.Core/FileFormats/VDAFile.cs
index 3f8e81a..9ef424d 100644
--- a/UVtools.Core/FileFormats/VDAFile.cs
+++ b/UVtools.Core/FileFormats/VDAFile.cs
@@ -153,6 +153,8 @@ public class VDAFile : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Archive;
 
+    public override string ConvertMenuGroup => "Voxeldance";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(VDAFile), "zip", "Voxeldance Additive Zip")
     };
diff --git a/UVtools.Core/FileFormats/VDTFile.cs b/UVtools.Core/FileFormats/VDTFile.cs
index f63a821..8f7a4e9 100644
--- a/UVtools.Core/FileFormats/VDTFile.cs
+++ b/UVtools.Core/FileFormats/VDTFile.cs
@@ -197,6 +197,8 @@ public class VDTFile : FileFormat
 
     public override FileFormatType FileType => FileFormatType.Archive;
 
+    public override string ConvertMenuGroup => "Voxeldance";
+
     public override FileExtension[] FileExtensions { get; } = {
         new(typeof(VDTFile), "vdt", "Voxeldance Tango (VDT)")
     };
diff --git a/UVtools.Core/Printer/Machine.cs b/UVtools.Core/Printer/Machine.cs
index de5a890..e1c191b 100644
--- a/UVtools.Core/Printer/Machine.cs
+++ b/UVtools.Core/Printer/Machine.cs
@@ -194,6 +194,7 @@ namespace UVtools.Core.Printer
                 new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono", "Photon Mono", 1620, 2560, 82.62f, 130.56f, 165f, FlipDirection.Horizontally),
                 new(PrinterBrand.AnyCubic, "AnyCubic Photon S", "Photon S", 1440, 2560, 68.04f, 120.96f, 165f, FlipDirection.Horizontally),
                 new(PrinterBrand.AnyCubic, "AnyCubic Photon Ultra", "Photon Ultra", 1280, 720, 102.4f, 57.6f, 165f, FlipDirection.Horizontally),
+                new(PrinterBrand.AnyCubic, "AnyCubic Photon D2", "Photon D2", 2560, 1440, 130.56f, 73.44f, 165f, FlipDirection.Horizontally),
                 new(PrinterBrand.AnyCubic, "AnyCubic Photon X", "Photon X", 2560, 1600, 192f, 120f, 245f, FlipDirection.Horizontally),
                 new(PrinterBrand.AnyCubic, "AnyCubic Photon Zero", "Photon Zero", 480, 854, 55.4f, 98.63f, 150f, FlipDirection.Horizontally),
                 new(PrinterBrand.AnyCubic, "AnyCubic Photon", "Photon", 1440, 2560, 68.04f, 120.96f, 155f, FlipDirection.Horizontally),
@@ -205,8 +206,9 @@ namespace UVtools.Core.Printer
                 new(PrinterBrand.Creality, "Creality Halot One CL-60", "CL-60", 1620, 2560, 81f, 128f, 160f, FlipDirection.None),
                 new(PrinterBrand.Creality, "Creality Halot One Plus CL-79", "CL-79", 4320, 2560, 172.8f, 102.4f, 160f, FlipDirection.None),
                 new(PrinterBrand.Creality, "Creality Halot One Pro CL-70", "CL-70", 2560, 2400, 130.56f, 122.4f, 160f, FlipDirection.None),
-                new(PrinterBrand.Creality, "Creality Halot Sky CL-89", "", 3840, 2400, 192f, 120f, 200f, FlipDirection.None),
+                new(PrinterBrand.Creality, "Creality Halot Sky CL-89", "CL-89", 3840, 2400, 192f, 120f, 200f, FlipDirection.None),
                 new(PrinterBrand.Creality, "Creality Halot Sky Plus CL-92", "CL-92", 5760, 3600, 198.14f, 123.84f, 210f, FlipDirection.None),
+                new(PrinterBrand.Creality, "Creality Halot Ray CL925", "CL925", 5760, 3600, 198.14f, 123.84f, 210f, FlipDirection.None),
                 new(PrinterBrand.Creality, "Creality LD-002H", "LD-002H", 1620, 2560, 82.62f, 130.56f, 160f, FlipDirection.Horizontally),
                 new(PrinterBrand.Creality, "Creality LD-002R", "LD-002R", 1440, 2560, 68.04f, 120.96f, 160f, FlipDirection.Horizontally),
                 new(PrinterBrand.Creality, "Creality LD-006", "LD-006", 3840, 2400, 192f, 120f, 245f, FlipDirection.Horizontally),
@@ -218,6 +220,7 @@ namespace UVtools.Core.Printer
                 new(PrinterBrand.Elegoo, "Elegoo Mars C", "Mars C", 1440, 2560, 68.04f, 120.96f, 150f, FlipDirection.Horizontally),
                 new(PrinterBrand.Elegoo, "Elegoo Mars", "Mars", 1440, 2560, 68.04f, 120.96f, 150f, FlipDirection.Horizontally),
                 new(PrinterBrand.Elegoo, "Elegoo Saturn", "Saturn", 3840, 2400, 192f, 120f, 200f, FlipDirection.Horizontally),
+                new(PrinterBrand.Elegoo, "Elegoo Saturn 8K", "Saturn 8K", 7680, 4320, 218.88f, 123.12f, 210f, FlipDirection.Horizontally),
 
                 new(PrinterBrand.EPAX, "EPAX DX1 PRO", "DX1 PRO", 4098, 2560, 143.43f, 89.6f, 155f, FlipDirection.Horizontally),
                 new(PrinterBrand.EPAX, "EPAX DX10 Pro 5K", "DX10 Pro 5K", 4920, 2880, 221.4f, 129.6f, 120f, FlipDirection.Horizontally),
@@ -261,6 +264,7 @@ namespace UVtools.Core.Printer
                 new(PrinterBrand.Nova3D, "Nova3D Elfin3 Mini", "Elfin3 Mini", 1079, 1904, 68f, 120f, 150f, FlipDirection.Vertically),
                 new(PrinterBrand.Nova3D, "Nova3D Whale", "Whale", 3840, 2400, 192f, 120f, 250f, FlipDirection.Vertically),
                 new(PrinterBrand.Nova3D, "Nova3D Whale2", "Whale2", 3840, 2400, 192f, 120f, 250f, FlipDirection.Vertically),
+                new(PrinterBrand.Nova3D, "Nova3D Whale3 Pro", "Whale3 Pro", 7680, 4320, 228.096f, 128.304f, 260f, FlipDirection.Vertically),
 
                 new(PrinterBrand.Peopoly, "Peopoly Phenom L", "Phenom L", 3840, 2160, 345.6f, 194.4f, 400f, FlipDirection.Horizontally),
                 new(PrinterBrand.Peopoly, "Peopoly Phenom Noir", "Phenom Noir", 3840, 2160, 293.76f, 165.24f, 400f, FlipDirection.Horizontally),
@@ -277,6 +281,7 @@ namespace UVtools.Core.Printer
                 new(PrinterBrand.Phrozen, "Phrozen Sonic 4K", "Sonic 4K", 3840, 2160, 134.4f, 75.6f, 200f, FlipDirection.Horizontally),
                 new(PrinterBrand.Phrozen, "Phrozen Sonic Mega 8K", "Sonic Mega 8K", 7680, 4320, 330.24f, 185.76f, 400f, FlipDirection.Horizontally),
                 new(PrinterBrand.Phrozen, "Phrozen Sonic Mighty 4K", "Sonic Mighty 4K", 3840, 2400, 199.68f, 124.8f, 220f, FlipDirection.Horizontally),
+                new(PrinterBrand.Phrozen, "Phrozen Sonic Mighty 8K", "Sonic Mighty 8K", 7680, 4320, 218.88f, 123.12f, 235f, FlipDirection.Horizontally),
                 new(PrinterBrand.Phrozen, "Phrozen Sonic Mini 4K", "Sonic Mini 4K", 3840, 2160, 134.4f, 75.6f, 130f, FlipDirection.Horizontally),
                 new(PrinterBrand.Phrozen, "Phrozen Sonic Mini 8K", "Sonic Mini 8K", 7500, 3240, 165f, 71.28f, 180f, FlipDirection.Horizontally),
                 new(PrinterBrand.Phrozen, "Phrozen Sonic Mini", "Sonic Mini", 1080, 1920, 68.04f, 120.96f, 130f, FlipDirection.None),
@@ -289,6 +294,7 @@ namespace UVtools.Core.Printer
                 new(PrinterBrand.QIDI, "QIDI Shadow6.0 Pro", "Shadow6.0 Pro", 1440, 2560, 74.52f, 132.48f, 150f, FlipDirection.Horizontally),
 
                 new(PrinterBrand.Uniformation, "Uniformation GKone", "GKone", 4920, 2880, 221.4f, 129.6f, 245f, FlipDirection.Vertically),
+                new(PrinterBrand.Uniformation, "Uniformation GKtwo", "GKtwo", 7680, 4320, 228.089f, 128.3f, 200f, FlipDirection.Vertically),
 
                 new(PrinterBrand.Uniz, "Uniz IBEE", "IBEE", 3840, 2400, 192f, 120f, 220f, FlipDirection.Vertically),
 
diff --git a/UVtools.Core/SystemOS/SystemAware.cs b/UVtools.Core/SystemOS/SystemAware.cs
index 39f5089..561b8fe 100644
--- a/UVtools.Core/SystemOS/SystemAware.cs
+++ b/UVtools.Core/SystemOS/SystemAware.cs
@@ -165,6 +165,11 @@ public static class SystemAware
                 return key?.GetValue("ProcessorNameString")?.ToString();
             }
 
+            if (OperatingSystem.IsMacOS())
+            {
+                return GetProcessOutput("sysctl", "-n machdep.cpu.brand_string")?.TrimEnd('\r', '\n');
+            }
+
             if (OperatingSystem.IsLinux())
             {
                 if (!File.Exists("/proc/cpuinfo")) return null;
@@ -178,11 +183,6 @@ public static class SystemAware
 
                 return match.Groups[1].ToString();
             }
-
-            if (OperatingSystem.IsMacOS())
-            {
-                return GetProcessOutput("sysctl", "-n machdep.cpu.brand_string")?.TrimEnd('\r', '\n');
-            }
         }
         catch (Exception e)
         {
diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj
index 9723ae4..bc8270f 100644
--- a/UVtools.Core/UVtools.Core.csproj
+++ b/UVtools.Core/UVtools.Core.csproj
@@ -10,7 +10,7 @@
 		<RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/sn4k3/UVtools</PackageProjectUrl>
 		<Description>MSLA/DLP, file analysis, calibration, repair, conversion and manipulation</Description>
-		<Version>3.6.4</Version>
+		<Version>3.6.5</Version>
 		<Copyright>Copyright © 2020 PTRTECH</Copyright>
 		<PackageIcon>UVtools.png</PackageIcon>
 		<Platforms>AnyCPU;x64</Platforms>