Jelle Spijker
22134f2d3c
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles
...
# Conflicts:
# cura/Machines/Models/IntentSelectionModel.py
2023-06-07 16:20:48 +02:00
Jaime van Kessel
e2ac1ef810
Add anealing description and icon
...
CURA-10633
2023-06-06 12:42:09 +02:00
c.lamboo
27cc89ff89
Allow for custom descriptions/icons in packaged intents
...
CURA-9709
2023-05-31 12:54:56 +02:00
j.delarago
f9dda40409
Better typing
...
CURA-8849
2022-06-15 17:41:21 +02:00
j.delarago
6f8470167f
Suggested changes
...
CURA-8849
2022-06-15 17:40:07 +02:00
Joey de l'Arago
142f1823b3
Apply suggestions from code review
...
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:31:40 +02:00
Joey de l'Arago
b132b5c08c
Update cura/Machines/Models/IntentSelectionModel.py
...
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:59 +02:00
Joey de l'Arago
e47a2d1c99
Update cura/Machines/Models/IntentSelectionModel.py
...
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:26 +02:00
j.delarago
a87695cd8d
Added new intent selection buttons and resolution drop down to replace the matrix.
...
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.
CURA-8849
2022-06-14 11:41:38 +02:00
