Erwan MATHIEU
e2b19731ab
Merge branch 'main' into CURA-12449_handling-painted-models-map
conan-package-resources / conan-package (push) Waiting to run
conan-package-resources / signal-curator (push) Blocked by required conditions
conan-package / conan-package (push) Waiting to run
printer-linter-format / Printer linter auto format (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-09-11 09:00:07 +02:00
HellAholic
774878f946
Merge pull request #20865 from Ultimaker/CURA-12679_fix_definition_issue_zyyx_pro_and_zyyx_plus
...
conan-package-resources / conan-package (push) Waiting to run
conan-package-resources / signal-curator (push) Blocked by required conditions
printer-linter-format / Printer linter auto format (push) Waiting to run
Scorecard supply-chain security / Scorecard analysis (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
Cura 12679 fix definition issue zyyx pro and zyyx plus
2025-09-11 08:26:07 +02:00
Erwan MATHIEU
abb5261833
Merge branch 'main' into CURA-12679_fix_definition_issue_zyyx_pro_and_zyyx_plus
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-09-10 11:20:53 +02:00
Erwan MATHIEU
b5d72c5279
Merge pull request #20904 from Ultimaker/restore_theme_colors_for_retract_unretract_during_move
...
conan-package / conan-package (push) Waiting to run
Scorecard supply-chain security / Scorecard analysis (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
Add theme colors
2025-09-10 11:18:01 +02:00
Erwan MATHIEU
972e91ce3c
Merge branch 'main' into restore_theme_colors_for_retract_unretract_during_move
2025-09-10 11:10:47 +02:00
Erwan MATHIEU
6e6849c9c1
Take care of layer height for paint resolution
...
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-12584
Since the meshes generation has been once more optimized, we can now use lower resolutions.
2025-09-08 15:21:04 +02:00
HellAholic
ede8b7ea3a
Merge remote-tracking branch 'origin/5.10'
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-09-05 14:22:55 +02:00
HellAholic
39a322bfee
Merge pull request #20921 from Ultimaker/PP-650-High-Speed-S-line-improvement-pt2
...
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
Pp 650 high speed s line improvement pt2
2025-09-05 14:20:49 +02:00
THeijmans
28f2e4fb49
PP-650 R5
2025-09-05 10:08:40 +02:00
THeijmans
969cbf09e3
PP-650 R3
2025-09-05 10:08:40 +02:00
HellAholic
fe9975ebe5
Merge branch 'main' into CURA-12679_fix_definition_issue_zyyx_pro_and_zyyx_plus
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-09-04 15:48:53 +02:00
HellAholic
803d872e4f
Merge pull request #20835 from GregValiant/Annealing
...
conan-package / conan-package (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
Create AnnealingOrDrying.py
2025-09-03 13:29:31 +02:00
HellAholic
c1d12709b4
Merge branch 'main' into Annealing
2025-09-03 13:29:16 +02:00
HellAholic
e7ff346616
Merge pull request #18774 from GregValiant/DisplayInfoOnLCD
...
Update DisplayInfoOnLCD.py
2025-09-03 13:19:44 +02:00
HellAholic
bfefad0c94
Merge branch 'main' into DisplayInfoOnLCD
2025-09-03 13:19:03 +02:00
HellAholic
cc6083f4fa
Add theme colors
2025-08-29 19:23:07 +02:00
HellAholic
8aee04a968
Merge pull request #20842 from Ultimaker/CURA-12661_make-more-global-paint-undo
...
conan-package / conan-package (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12661 make more global paint undo
2025-08-26 13:06:04 +02:00
HellAholic
88b4b0729c
Merge branch 'main' into CURA-12661_make-more-global-paint-undo
2025-08-26 13:05:43 +02:00
HellAholic
a55cca73f4
Apply Review
...
clear_mask -> clear_texture_bit_mask
2025-08-26 13:05:56 +02:00
HellAholic
6defd4cea3
Merge remote-tracking branch 'origin/5.10'
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-08-21 10:37:04 +02:00
HellAholic
627e7f3c99
Merge pull request #20840 from Ultimaker/CURA-12660_painting-UI-improvements
...
Cura 12660 painting UI improvements
2025-08-21 09:58:53 +02:00
Remco Burema
8d42bb1f71
Apply suggestions from code review
...
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2025-08-19 12:26:23 +02:00
HellAholic
d372c68bd7
Set conan package version 5.10.3
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-12 11:58:41 +00:00
HellAholic
57fc187dbd
Merge pull request #20822 from Ultimaker/PP-650-High-speed-profile-improvements
...
PP-650-High-speed-profile-improvements-S6S8
2025-08-12 13:55:21 +02:00
HellAholic
d0c8dc0aa9
Merge branch '5.10' into PP-650-High-speed-profile-improvements
conan-package / conan-package (push) Has been cancelled
2025-08-12 13:52:12 +02:00
HellAholic
966ca502d9
Merge pull request #20797 from Ultimaker/CURA-11810_fix-mac-dialogs
...
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-11810 fix mac dialogs
2025-08-11 14:24:27 +02:00
HellAholic
b2e7877bc6
Apply printer-linter format
2025-08-11 11:40:17 +00:00
HellAholic
d0365db176
Update zyyx_pro.def.json
2025-08-11 13:38:40 +02:00
HellAholic
845713b03a
Update zyyx_plus.def.json
2025-08-11 13:38:37 +02:00
HellAholic
3da366f316
Apply printer-linter format
2025-08-11 10:58:51 +00:00
HellAholic
e83c21a5d9
Merge pull request #19968 from Asterchades/main
...
Update Top/Bottom Layers formula
2025-08-11 12:57:44 +02:00
HellAholic
4059744ce7
Merge pull request #20823 from Ultimaker/CURA-12615_early_error_check
...
Trigger machine error checking during startup. Otherwise slicing will keep failing until selected printer is changed.
2025-08-11 12:55:05 +02:00
HellAholic
0bc7ef72a0
Merge pull request #20432 from jeremysalwen/more_per_object_retraction
...
Enable more retraction settings to be set per-model
2025-08-11 12:27:04 +02:00
Erwan MATHIEU
d5cee01540
Set higher default multi-material precision
...
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-12584
0.4 is a bit too high, and since the processing has been improved a lot, we can now afford a 0.2
2025-08-08 10:09:15 +02:00
Erwan MATHIEU
175a72e12b
Fix direct import
...
CURA-12584
2025-08-08 08:32:09 +02:00
Erwan MATHIEU
88ab3c1732
Fix crash when trying to clear material painting
...
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12585
2025-08-07 11:19:14 +02:00
Erwan MATHIEU
3927b5e379
Merge branch 'CURA-12661_make-more-global-paint-undo' into CURA-12449_handling-painted-models-map
2025-08-07 11:15:49 +02:00
Erwan MATHIEU
243b7c56a6
Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-07 11:08:49 +02:00
Erwan MATHIEU
db514f0be7
Properly prepare the model for painting
...
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12660
The UV-unwrapping is now done in a background job, and the UI displays a waiting state. This fixes the issue where the user would start painting but the model was not ready yet, and the first stroke would be missing.
2025-08-07 11:03:51 +02:00
Erwan MATHIEU
8a59faceb1
Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-08-06 16:39:49 +02:00
Erwan MATHIEU
08a9bbe52c
Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12449_handling-painted-models-map
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-08-06 16:34:41 +02:00
Erwan MATHIEU
e69a436942
Fix sometimes wrongly displayed view
...
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
This required a refactoring of the management of the active view. The previous behavior was that anyone could set the active view, depending on certain conditions. But now we also have a view that is set by a tool, so sometimes the actually set view would be incorrect. Now each Stage requests an active view, and each tool CAN also request an active view. Then the Controller decides which view should actually be active depending on the active stage and tool.
2025-08-06 16:15:05 +02:00
Erwan MATHIEU
2e8cc4da82
Fix display not updating when changing tool
...
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-12660
Previous fix caused issues when moving to preview
2025-08-05 16:10:57 +02:00
Erwan MATHIEU
310128d87e
Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12449_handling-painted-models-map
2025-08-05 15:57:57 +02:00
Erwan MATHIEU
cf24ed91e9
Improve fix for opacity issues
...
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
Previous fix caused issues when moving to preview
2025-08-05 15:55:23 +02:00
Erwan MATHIEU
c75c668604
Allow user to display and select material color painting
...
CURA-12584
2025-08-05 15:34:57 +02:00
Erwan MATHIEU
9e186af74b
Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12449_handling-painted-models-map
2025-08-05 14:08:45 +02:00
Erwan MATHIEU
9d97eb7d59
Fix sometimes wrong painting color display
...
CURA-12660
2025-08-05 14:07:44 +02:00
Erwan MATHIEU
fa00082777
Set higher default multi-material resolution
...
CURA-12587
2025-08-05 12:54:44 +02:00
HellAholic
4006272fee
Some housekeeping
...
- anneal_type -> heating_zone: lines up the variable name with intent.
- Sort the variable inputs of the functions (annealing / drying)
- Add description for parameters in both functions (annealing / drying)
2025-08-05 00:45:48 +02:00