diff options
-rw-r--r-- | CHANGELOG.md | 11 | ||||
-rw-r--r-- | PrusaSlicer/printer/AnyCubic Photon M3 Max.ini | 41 | ||||
-rw-r--r-- | PrusaSlicer/printer/AnyCubic Photon M3 Plus.ini | 41 | ||||
-rw-r--r-- | PrusaSlicer/printer/AnyCubic Photon M3.ini | 41 | ||||
-rw-r--r-- | PrusaSlicer/printer/AnyCubic Photon Mono 4K.ini | 4 | ||||
-rw-r--r-- | PrusaSlicer/printer/AnyCubic Photon Mono X 6K.ini | 6 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | RELEASE_NOTES.md | 22 | ||||
-rw-r--r-- | UVtools.Core/FileFormats/PhotonWorkshopFile.cs | 41 | ||||
-rw-r--r-- | UVtools.Core/Operations/OperationLithophane.cs | 38 | ||||
-rw-r--r-- | UVtools.Core/Printer/Machine.cs | 7 | ||||
-rw-r--r-- | UVtools.Core/UVtools.Core.csproj | 2 | ||||
-rw-r--r-- | UVtools.InstallerMM/UVtools.InstallerMM.wxs | 11 | ||||
-rw-r--r-- | UVtools.WPF/Controls/Tools/ToolLithophaneControl.axaml | 4 | ||||
-rw-r--r-- | UVtools.WPF/UVtools.WPF.csproj | 2 |
15 files changed, 220 insertions, 53 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cd4313..8634e02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 11/04/2022 - v3.3.1 + +- **PrusaSlicer:** + - (Add) AnyCubic M3 + - (Add) AnyCubic M3 Max + - (Add) AnyCubic M3 Plus + - (Change) AnyCubic Photon Mono 4K: Display size and remove offset from bed shape + - (Change) AnyCubic Photon Mono X 6K: Display size and remove offset from bed shape +- (Add) File format: AnyCubic PM3 and PM3M (#454) +- (Fix) Tool - Lithophane: Value unit for "Lithophane height" was in px instead of mm + ## 10/04/2022 - v3.3.0 - **Shortcuts:** diff --git a/PrusaSlicer/printer/AnyCubic Photon M3 Max.ini b/PrusaSlicer/printer/AnyCubic Photon M3 Max.ini new file mode 100644 index 0000000..dc3cf8d --- /dev/null +++ b/PrusaSlicer/printer/AnyCubic Photon M3 Max.ini @@ -0,0 +1,41 @@ +# generated by PrusaSlicer 2.4.1+win64 on 2022-04-11 at 16:01:30 UTC +absolute_correction = 0 +area_fill = 50 +bed_custom_model = +bed_custom_texture = +bed_shape = 0x0,298.08x0,298.08x165.6,0x165.6 +default_sla_material_profile = Prusa Orange Tough 0.05 +default_sla_print_profile = 0.05 Normal +display_height = 165.6 +display_mirror_x = 1 +display_mirror_y = 0 +display_orientation = landscape +display_pixels_x = 6480 +display_pixels_y = 3600 +display_width = 298.08 +elefant_foot_compensation = 0.2 +elefant_foot_min_width = 0.2 +fast_tilt_time = 5 +gamma_correction = 1 +host_type = octoprint +inherits = Original Prusa SL1 +max_exposure_time = 120 +max_initial_exposure_time = 300 +max_print_height = 300 +min_exposure_time = 1 +min_initial_exposure_time = 1 +print_host = +printer_model = SL1 +printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_PHOTON_M3_MAX\nFILEVERSION_516\nFILEFORMAT_PM3M\n\nSTART_CUSTOM_VALUES\nWaitTimeBeforeCure_2.5\nBottomLiftHeight_8\nLiftHeight_8\nBottomLiftSpeed_120\nLiftSpeed_120\nRetractSpeed_120\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES +printer_settings_id = +printer_technology = SLA +printer_variant = default +printer_vendor = +printhost_apikey = +printhost_cafile = +relative_correction = 1,1 +relative_correction_x = 1 +relative_correction_y = 1 +relative_correction_z = 1 +slow_tilt_time = 8 +thumbnails = 400x400,800x480 diff --git a/PrusaSlicer/printer/AnyCubic Photon M3 Plus.ini b/PrusaSlicer/printer/AnyCubic Photon M3 Plus.ini new file mode 100644 index 0000000..713830b --- /dev/null +++ b/PrusaSlicer/printer/AnyCubic Photon M3 Plus.ini @@ -0,0 +1,41 @@ +# generated by PrusaSlicer 2.4.1+win64 on 2022-04-11 at 16:15:53 UTC +absolute_correction = 0 +area_fill = 50 +bed_custom_model = +bed_custom_texture = +bed_shape = 0x0,198.15x0,198.15x123.84,0x123.84 +default_sla_material_profile = Prusa Orange Tough 0.05 +default_sla_print_profile = 0.05 Normal +display_height = 123.84 +display_mirror_x = 1 +display_mirror_y = 0 +display_orientation = landscape +display_pixels_x = 5760 +display_pixels_y = 3600 +display_width = 198.15 +elefant_foot_compensation = 0.2 +elefant_foot_min_width = 0.2 +fast_tilt_time = 5 +gamma_correction = 1 +host_type = octoprint +inherits = Original Prusa SL1 +max_exposure_time = 120 +max_initial_exposure_time = 300 +max_print_height = 245 +min_exposure_time = 1 +min_initial_exposure_time = 1 +print_host = +printer_model = SL1 +printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_PHOTON_M3_PLUS\nFILEVERSION_516\nFILEFORMAT_PWMB\n\nSTART_CUSTOM_VALUES\nWaitTimeBeforeCure_2.5\nBottomLiftHeight_8\nLiftHeight_8\nBottomLiftSpeed_120\nLiftSpeed_120\nRetractSpeed_120\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES +printer_settings_id = +printer_technology = SLA +printer_variant = default +printer_vendor = +printhost_apikey = +printhost_cafile = +relative_correction = 1,1 +relative_correction_x = 1 +relative_correction_y = 1 +relative_correction_z = 1 +slow_tilt_time = 8 +thumbnails = 400x400,800x480 diff --git a/PrusaSlicer/printer/AnyCubic Photon M3.ini b/PrusaSlicer/printer/AnyCubic Photon M3.ini new file mode 100644 index 0000000..09cc39b --- /dev/null +++ b/PrusaSlicer/printer/AnyCubic Photon M3.ini @@ -0,0 +1,41 @@ +# generated by PrusaSlicer 2.4.1+win64 on 2022-04-11 at 16:25:49 UTC +absolute_correction = 0 +area_fill = 50 +bed_custom_model = +bed_custom_texture = +bed_shape = 0x0,163.84x0,163.84x102.4,0x102.4 +default_sla_material_profile = Prusa Orange Tough 0.05 +default_sla_print_profile = 0.05 Normal +display_height = 102.4 +display_mirror_x = 1 +display_mirror_y = 0 +display_orientation = landscape +display_pixels_x = 4096 +display_pixels_y = 2560 +display_width = 163.84 +elefant_foot_compensation = 0.2 +elefant_foot_min_width = 0.2 +fast_tilt_time = 5 +gamma_correction = 1 +host_type = octoprint +inherits = Original Prusa SL1 +max_exposure_time = 120 +max_initial_exposure_time = 300 +max_print_height = 180 +min_exposure_time = 1 +min_initial_exposure_time = 1 +print_host = +printer_model = SL1 +printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ANYCUBIC\nPRINTER_MODEL_PHOTON_M3\nFILEVERSION_516\nFILEFORMAT_PM3\n\nSTART_CUSTOM_VALUES\nWaitTimeBeforeCure_2.5\nBottomLiftHeight_8\nLiftHeight_8\nBottomLiftSpeed_120\nLiftSpeed_120\nRetractSpeed_120\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES +printer_settings_id = +printer_technology = SLA +printer_variant = default +printer_vendor = +printhost_apikey = +printhost_cafile = +relative_correction = 1,1 +relative_correction_x = 1 +relative_correction_y = 1 +relative_correction_z = 1 +slow_tilt_time = 8 +thumbnails = 400x400,800x480 diff --git a/PrusaSlicer/printer/AnyCubic Photon Mono 4K.ini b/PrusaSlicer/printer/AnyCubic Photon Mono 4K.ini index 3041198..c9d367c 100644 --- a/PrusaSlicer/printer/AnyCubic Photon Mono 4K.ini +++ b/PrusaSlicer/printer/AnyCubic Photon Mono 4K.ini @@ -1,9 +1,9 @@ -# generated by PrusaSlicer 2.4.0+win64 on 2022-01-06 at 23:03:19 UTC +# generated by PrusaSlicer 2.4.1+win64 on 2022-04-11 at 16:08:09 UTC absolute_correction = 0 area_fill = 50 bed_custom_model = bed_custom_texture = -bed_shape = 0.75x2,133.65x2,133.65x82,0.75x82 +bed_shape = 0x0,134.4x0,134.4x84,0x84 default_sla_material_profile = Prusa Orange Tough 0.05 default_sla_print_profile = 0.05 Normal display_height = 84 diff --git a/PrusaSlicer/printer/AnyCubic Photon Mono X 6K.ini b/PrusaSlicer/printer/AnyCubic Photon Mono X 6K.ini index 48b3036..8655a95 100644 --- a/PrusaSlicer/printer/AnyCubic Photon Mono X 6K.ini +++ b/PrusaSlicer/printer/AnyCubic Photon Mono X 6K.ini @@ -1,9 +1,9 @@ -# generated by PrusaSlicer 2.4.0+win64 on 2022-01-06 at 23:05:24 UTC +# generated by PrusaSlicer 2.4.1+win64 on 2022-04-11 at 16:16:26 UTC absolute_correction = 0 area_fill = 50 bed_custom_model = bed_custom_texture = -bed_shape = 0.57x0.52,197.57x0.52,197.57x123.32,0.57x123.32 +bed_shape = 0x0,198.15x0,198.15x123.84,0x123.84 default_sla_material_profile = Prusa Orange Tough 0.05 default_sla_print_profile = 0.05 Normal display_height = 123.84 @@ -12,7 +12,7 @@ display_mirror_y = 0 display_orientation = landscape display_pixels_x = 5760 display_pixels_y = 3600 -display_width = 198.14 +display_width = 198.15 elefant_foot_compensation = 0.2 elefant_foot_min_width = 0.2 fast_tilt_time = 5 @@ -87,6 +87,8 @@ But also, i need victims for test subject. Proceed at your own risk! - PWMX (Photon Workshop) - PWMB (Photon Workshop) - PWSQ (Photon Workshop) +- PM3 (Photon Workshop) +- PM3M (Photon Workshop) - JXS (GKone Slicer) - ZCode (UnizMaker) - ZCodex (Z-Suite) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 11aab5f..38941a0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,15 +1,9 @@ -- **Shortcuts:** - - (Add) **Delete:** While on layer preview and with roi or mask(s) selected, will remove the selected area from layer - - (Add) **Alt + Delete:** While on layer preview and with roi or mask(s) selected, will remove the selected area from all layers - - (Add) **Ctrl + Delete:** While on layer preview, will remove the current layer - - (Add) **Insert:** While on layer preview and with roi or mask(s) selected, will keep only the selected area in layer - - (Add) **Alt + Insert:** While on layer preview and with roi or mask(s) selected, will keep only the selected area in all layers - - (Add) **Ctrl + Insert:** While on layer preview, will clone the current layer - - (Add) **Home:** While on layer preview will go to first layer - - (Add) **End:** While on layer preview will go to last layer - - (Add) **Page up:** While on layer preview will skip +10 layers - - (Add) **Page down:** While on layer preview will skip -10 layers -- (Add) Tool - Lithophane: Generate lithophane from a picture -- (Fix) Pixel arithmetic: When run with masks it produce a incorrect outcome -- (Fix) CXDLP: Layer area table miscalculation, causing slow down prints +- **PrusaSlicer:** + - (Add) AnyCubic M3 + - (Add) AnyCubic M3 Max + - (Add) AnyCubic M3 Plus + - (Change) AnyCubic Photon Mono 4K: Display size and remove offset from bed shape + - (Change) AnyCubic Photon Mono X 6K: Display size and remove offset from bed shape +- (Add) File format: AnyCubic PM3 and PM3M (#454) +- (Fix) Tool - Lithophane: Value unit for "Lithophane height" was in px instead of mm diff --git a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs index 19b1d4d..3025610 100644 --- a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs +++ b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs @@ -99,8 +99,10 @@ public class PhotonWorkshopFile : FileFormat AnyCubicPhotonMonoSE, AnyCubicPhotonMono4K, AnyCubicPhotonMonoX, - AnyCubicPhotonMonoX6K, + AnyCubicPhotonMonoX6KM3Plus, AnyCubicPhotonMonoSQ, + AnyCubicPhotonM3, + AnyCubicPhotonM3Max, } #endregion @@ -1039,11 +1041,14 @@ public class PhotonWorkshopFile : FileFormat new(typeof(PhotonWorkshopFile), "pwx", "Photon X (PWX)"), new(typeof(PhotonWorkshopFile), "dlp", "Photon Ultra (DLP)"), new(typeof(PhotonWorkshopFile), "pwmx", "Photon Mono X (PWMX)"), - new(typeof(PhotonWorkshopFile), "pwmb", "Photon Mono X 6K (PWMB)"), + new(typeof(PhotonWorkshopFile), "pwmb", "Photon Mono X 6K / Photon M3 Plus (PWMB)"), new(typeof(PhotonWorkshopFile), "pwmo", "Photon Mono (PWMO)"), new(typeof(PhotonWorkshopFile), "pwms", "Photon Mono SE (PWMS)"), new(typeof(PhotonWorkshopFile), "pwma", "Photon Mono 4K (PWMA)"), new(typeof(PhotonWorkshopFile), "pmsq", "Photon Mono SQ (PMSQ)"), + new(typeof(PhotonWorkshopFile), "pm3", "Photon M3 (PM3)"), + new(typeof(PhotonWorkshopFile), "pm3m", "Photon M3 Max (PM3M)"), + //new(typeof(PhotonWorkshopFile), "pwmb", "Photon M3 Plus (PWMB)"), }; public override SpeedUnit FormatSpeedUnit => SpeedUnit.MillimetersPerSecond; @@ -1157,10 +1162,12 @@ public class PhotonWorkshopFile : FileFormat AnyCubicMachine.AnyCubicPhotonUltra => 102.40f, AnyCubicMachine.AnyCubicPhotonMono => 82.62f, AnyCubicMachine.AnyCubicPhotonMonoSE => 82.62f, - AnyCubicMachine.AnyCubicPhotonMono4K => 132.90f, + AnyCubicMachine.AnyCubicPhotonMono4K => 134.40f, AnyCubicMachine.AnyCubicPhotonMonoX => 192, - AnyCubicMachine.AnyCubicPhotonMonoX6K => 197, + AnyCubicMachine.AnyCubicPhotonMonoX6KM3Plus => 198.15f, AnyCubicMachine.AnyCubicPhotonMonoSQ => 120, + AnyCubicMachine.AnyCubicPhotonM3 => 163.84f, + AnyCubicMachine.AnyCubicPhotonM3Max => 298.08f, _ => 0 }; } @@ -1183,10 +1190,12 @@ public class PhotonWorkshopFile : FileFormat AnyCubicMachine.AnyCubicPhotonUltra => 57.60f, AnyCubicMachine.AnyCubicPhotonMono => 130.56f, AnyCubicMachine.AnyCubicPhotonMonoSE => 130.56f, - AnyCubicMachine.AnyCubicPhotonMono4K => 80, + AnyCubicMachine.AnyCubicPhotonMono4K => 84, AnyCubicMachine.AnyCubicPhotonMonoX => 120, - AnyCubicMachine.AnyCubicPhotonMonoX6K => 122.80f, + AnyCubicMachine.AnyCubicPhotonMonoX6KM3Plus => 123.84f, AnyCubicMachine.AnyCubicPhotonMonoSQ => 128, + AnyCubicMachine.AnyCubicPhotonM3 => 102.40f, + AnyCubicMachine.AnyCubicPhotonM3Max => 165.60f, _ => 0 }; } @@ -1212,8 +1221,10 @@ public class PhotonWorkshopFile : FileFormat AnyCubicMachine.AnyCubicPhotonMonoSE => 160, AnyCubicMachine.AnyCubicPhotonMono4K => 165, AnyCubicMachine.AnyCubicPhotonMonoX => 245, - AnyCubicMachine.AnyCubicPhotonMonoX6K => 245, + AnyCubicMachine.AnyCubicPhotonMonoX6KM3Plus => 245, AnyCubicMachine.AnyCubicPhotonMonoSQ => 200, + AnyCubicMachine.AnyCubicPhotonM3 => 180f, + AnyCubicMachine.AnyCubicPhotonM3Max => 300f, _ => 0 }; } @@ -1504,8 +1515,10 @@ public class PhotonWorkshopFile : FileFormat AnyCubicMachine.AnyCubicPhotonMonoSE => "Photon Mono SE", AnyCubicMachine.AnyCubicPhotonMono4K => "Photon Mono 4K", AnyCubicMachine.AnyCubicPhotonMonoX => "Photon Mono X", - AnyCubicMachine.AnyCubicPhotonMonoX6K => "Photon Mono X 6K", + AnyCubicMachine.AnyCubicPhotonMonoX6KM3Plus => "Photon Mono X 6K / M3 Plus", AnyCubicMachine.AnyCubicPhotonMonoSQ => "Photon Mono SQ", + AnyCubicMachine.AnyCubicPhotonM3 => "Photon M3", + AnyCubicMachine.AnyCubicPhotonM3Max => "Photon M3 Max", _ => base.MachineName }; } @@ -1565,7 +1578,7 @@ public class PhotonWorkshopFile : FileFormat if (FileEndsWith(".pwmb")) { - return AnyCubicMachine.AnyCubicPhotonMonoX6K; + return AnyCubicMachine.AnyCubicPhotonMonoX6KM3Plus; } if (FileEndsWith(".pmsq")) @@ -1573,6 +1586,16 @@ public class PhotonWorkshopFile : FileFormat return AnyCubicMachine.AnyCubicPhotonMonoSQ; } + if (FileEndsWith(".pm3")) + { + return AnyCubicMachine.AnyCubicPhotonM3; + } + + if (FileEndsWith(".pm3m")) + { + return AnyCubicMachine.AnyCubicPhotonM3Max; + } + return AnyCubicMachine.AnyCubicPhotonS; } } diff --git a/UVtools.Core/Operations/OperationLithophane.cs b/UVtools.Core/Operations/OperationLithophane.cs index d497e36..e40caa7 100644 --- a/UVtools.Core/Operations/OperationLithophane.cs +++ b/UVtools.Core/Operations/OperationLithophane.cs @@ -91,31 +91,33 @@ public class OperationLithophane : Operation { sb.AppendLine("The selected file does not exists"); } - - if (_startThresholdRange > _endThresholdRange) - { - sb.AppendLine("Start threshold can't be higher than end threshold"); - } - - using var mat = GetSourceMat(); - if (mat is null) - { - sb.AppendLine("Unable to generate the mat from source file, is it a valid image file?"); - } else { - if (SlicerFile.ResolutionX < mat.Width * _resizeFactor / 100 || SlicerFile.ResolutionY < mat.Height * _resizeFactor / 100) + using var mat = GetSourceMat(); + if (mat is null) { - //int differenceX = (int)SlicerFile.ResolutionX - mat.Width; - //int differenceY = (int)SlicerFile.ResolutionY - mat.Height; - var scaleX = SlicerFile.ResolutionX * 100f / mat.Width; - var scaleY = SlicerFile.ResolutionY * 100f / mat.Height; - var maxScale = Math.Min(scaleX, scaleY); + sb.AppendLine("Unable to generate the mat from source file, is it a valid image file?"); + } + else + { + if (SlicerFile.ResolutionX < mat.Width * _resizeFactor / 100 || SlicerFile.ResolutionY < mat.Height * _resizeFactor / 100) + { + //int differenceX = (int)SlicerFile.ResolutionX - mat.Width; + //int differenceY = (int)SlicerFile.ResolutionY - mat.Height; + var scaleX = SlicerFile.ResolutionX * 100f / mat.Width; + var scaleY = SlicerFile.ResolutionY * 100f / mat.Height; + var maxScale = Math.Min(scaleX, scaleY); - sb.AppendLine($"The printer resolution is not enough to accomodate the lithophane image, please scale down to a maximum of {maxScale:F0}%"); + sb.AppendLine($"The printer resolution is not enough to accomodate the lithophane image, please scale down to a maximum of {maxScale:F0}%"); + } } } + if (_startThresholdRange > _endThresholdRange) + { + sb.AppendLine("Start threshold can't be higher than end threshold"); + } + return sb.ToString(); } diff --git a/UVtools.Core/Printer/Machine.cs b/UVtools.Core/Printer/Machine.cs index 2c93cfc..76c997f 100644 --- a/UVtools.Core/Printer/Machine.cs +++ b/UVtools.Core/Printer/Machine.cs @@ -183,10 +183,13 @@ namespace UVtools.Core.Printer new(PrinterBrand.Creality, "CT133 Pro", "CT133PRO", 3840, 2160, 293.76f, 165.24f, 300), new(PrinterBrand.Creality, "CT-005 Pro", "CT-005", 3840, 2400, 192, 120, 250),*/ - new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono 4K", "Photon Mono 4K", 3840, 2400, 134.4f, 84f, 165f, FlipDirection.Horizontally), + new(PrinterBrand.AnyCubic, "AnyCubic Photon M3", "Photon M3", 4096, 2560, 163.84f, 102.40f, 180f, FlipDirection.Horizontally), + new(PrinterBrand.AnyCubic, "AnyCubic Photon M3 Max", "Photon M3 Max", 6480, 3600, 298.08f, 165.60f, 300f, FlipDirection.Horizontally), + new(PrinterBrand.AnyCubic, "AnyCubic Photon M3 Plus", "Photon M3 Plus", 5760, 3600, 198.15f, 123.84f, 245f, FlipDirection.Horizontally), + new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono 4K", "Photon Mono 4K", 3840, 2400, 134.40f, 84f, 165f, FlipDirection.Horizontally), new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono SE", "Photon Mono SE", 1620, 2560, 82.62f, 130.56f, 160f, FlipDirection.Horizontally), new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono SQ", "Photon Mono SQ", 2400, 2560, 120f, 128f, 200f, FlipDirection.Horizontally), - new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono X 6K", "Photon Mono X 6K", 5760, 3600, 198.14f, 123.84f, 245f, FlipDirection.Horizontally), + new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono X 6K", "Photon Mono X 6K", 5760, 3600, 198.15f, 123.84f, 245f, FlipDirection.Horizontally), new(PrinterBrand.AnyCubic, "AnyCubic Photon Mono X", "Photon Mono X", 3840, 2400, 192f, 120f, 245f, FlipDirection.Horizontally), 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), diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj index 32b8612..a78d002 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.3.0</Version> + <Version>3.3.1</Version> <Copyright>Copyright © 2020 PTRTECH</Copyright> <PackageIcon>UVtools.png</PackageIcon> <Platforms>AnyCPU;x64</Platforms> diff --git a/UVtools.InstallerMM/UVtools.InstallerMM.wxs b/UVtools.InstallerMM/UVtools.InstallerMM.wxs index 3257bcb..428cfbe 100644 --- a/UVtools.InstallerMM/UVtools.InstallerMM.wxs +++ b/UVtools.InstallerMM/UVtools.InstallerMM.wxs @@ -2,7 +2,7 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?define ComponentRules="OneToOne"?> <!-- SourceDir instructs IsWiX the location of the directory that contains files for this merge module --> - <?define SourceDir="..\publish\UVtools_win-x64_v3.3.0"?> + <?define SourceDir="..\publish\UVtools_win-x64_v3.3.1"?> <Module Id="UVtools" Language="1033" Version="1.0.0.0"> <Package Id="12aaa1cf-ff06-4a02-abd5-2ac01ac4f83b" Manufacturer="PTRTECH" InstallerVersion="200" Keywords="MSLA, DLP" Description="MSLA/DLP, file analysis, repair, conversion and manipulation" InstallScope="perMachine" Platform="x64" /> <Directory Id="TARGETDIR" Name="SourceDir"> @@ -1176,6 +1176,15 @@ <Component Id="owcE58B020744224713A7CD07B20B6ECB5A" Guid="E58B0207-4422-4713-A7CD-07B20B6ECB5A"> <File Id="owfE58B020744224713A7CD07B20B6ECB5A" Source="$(var.SourceDir)\Assets\PrusaSlicer\printer\Uniformation GKone.ini" KeyPath="yes" /> </Component> + <Component Id="owcA2F91C684CE645F6813B62176068913F" Guid="A2F91C68-4CE6-45F6-813B-62176068913F"> + <File Id="owfA2F91C684CE645F6813B62176068913F" Source="$(var.SourceDir)\Assets\PrusaSlicer\printer\AnyCubic Photon M3 Max.ini" KeyPath="yes" /> + </Component> + <Component Id="owc5199831A1AB0411C8D8E94D593B7556B" Guid="5199831A-1AB0-411C-8D8E-94D593B7556B"> + <File Id="owf5199831A1AB0411C8D8E94D593B7556B" Source="$(var.SourceDir)\Assets\PrusaSlicer\printer\AnyCubic Photon M3 Plus.ini" KeyPath="yes" /> + </Component> + <Component Id="owc3DB1625C977247EAA456B791FE93809C" Guid="3DB1625C-9772-47EA-A456-B791FE93809C"> + <File Id="owf3DB1625C977247EAA456B791FE93809C" Source="$(var.SourceDir)\Assets\PrusaSlicer\printer\AnyCubic Photon M3.ini" KeyPath="yes" /> + </Component> </Directory> <Directory Id="owd324203F33CD6B2D491618D3D363F997F" Name="sla_print"> <Component Id="owc988205CB4C2FC6EA3D41704B657C5681" Guid="5dd3f394-0e58-76db-f891-78c219b5339e"> diff --git a/UVtools.WPF/Controls/Tools/ToolLithophaneControl.axaml b/UVtools.WPF/Controls/Tools/ToolLithophaneControl.axaml index 39d0207..050866f 100644 --- a/UVtools.WPF/Controls/Tools/ToolLithophaneControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolLithophaneControl.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia" - mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600" x:Class="UVtools.WPF.Controls.Tools.ToolLithophaneControl"> <Grid ColumnDefinitions="Auto,10,350"> <StackPanel Spacing="10"> @@ -216,7 +216,7 @@ Text="Lithophane height:"/> <NumericUpDown Grid.Row="22" Grid.Column="2" - Classes="ValueLabel ValueLabel_px" + Classes="ValueLabel ValueLabel_mm" Minimum="0" Maximum="10000" Increment="1" diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj index 77dd831..8708537 100644 --- a/UVtools.WPF/UVtools.WPF.csproj +++ b/UVtools.WPF/UVtools.WPF.csproj @@ -12,7 +12,7 @@ <PackageLicenseFile>LICENSE</PackageLicenseFile> <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl> <RepositoryType>Git</RepositoryType> - <Version>3.3.0</Version> + <Version>3.3.1</Version> <Platforms>AnyCPU;x64</Platforms> <PackageIcon>UVtools.png</PackageIcon> <PackageReadmeFile>README.md</PackageReadmeFile> |