3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '5.4' into CURA-9709_custom_icons_with_profiles

Browse source 
# Conflicts:
#	cura/Machines/Models/IntentSelectionModel.py
This commit is contained in:
Jelle Spijker 2023-06-07 16:20:48 +02:00
commit 22134f2d3c
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
212 changed files with 1857 additions and 911 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Machines/Models/IntentSelectionModel.py
View file

@ -57,8 +57,8 @@ class IntentSelectionModel(ListModel):
self._onChange()
_default_intent_categories = ["default", "visual", "engineering", "quick"]
_icons = {"default": "GearCheck", "visual": "Visual", "engineering": "Nut", "quick": "SpeedOMeter"}
_default_intent_categories = ["default", "visual", "engineering", "quick", "annealing"]
_icons = {"default": "GearCheck", "visual": "Visual", "engineering": "Nut", "quick": "SpeedOMeter", "annealing": "Anneal"}
def _onContainerChange(self, container: ContainerInterface) -> None:
"""Updates the list of intents if an intent profile was added or removed."""