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

Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent

Browse source
This commit is contained in:
Jaime van Kessel 2019-09-23 11:19:19 +02:00
commit 08ffafa475
No known key found for this signature in database
GPG key ID: 3710727397403C91
17 changed files with 95 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/Preferences/Materials/MaterialsSlot.qml
View file

@ -82,11 +82,12 @@ Rectangle
{
if (materialSlot.is_favorite)
{
CuraApplication.getMaterialManager().removeFavorite(material.root_material_id)
return
CuraApplication.getMaterialManagementModel().removeFavorite(material.root_material_id)
}
else
{
CuraApplication.getMaterialManagementModel().addFavorite(material.root_material_id)
}
CuraApplication.getMaterialManager().addFavorite(material.root_material_id)
return
}
style: ButtonStyle
{

2
resources/variants/ultimaker2_extended_0.25.inst.cfg → resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg
View file

@ -1,7 +1,7 @@
[general]
name = 0.25 mm
version = 4
definition = ultimaker2_extended
definition = ultimaker2_extended_olsson
[metadata]
setting_version = 10

2
resources/variants/ultimaker2_extended_0.4.inst.cfg → resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg
View file

@ -1,7 +1,7 @@
[general]
name = 0.4 mm
version = 4
definition = ultimaker2_extended
definition = ultimaker2_extended_olsson
[metadata]
setting_version = 10

2
resources/variants/ultimaker2_extended_0.6.inst.cfg → resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg
View file

@ -1,7 +1,7 @@
[general]
name = 0.6 mm
version = 4
definition = ultimaker2_extended
definition = ultimaker2_extended_olsson
[metadata]
setting_version = 10

2
resources/variants/ultimaker2_extended_0.8.inst.cfg → resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg
View file

@ -1,7 +1,7 @@
[general]
name = 0.8 mm
version = 4
definition = ultimaker2_extended
definition = ultimaker2_extended_olsson
[metadata]
setting_version = 10