3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into full_screen_test

Browse source
This commit is contained in:
Jaime van Kessel 2018-09-28 11:24:22 +02:00 • committed by GitHub
commit c2f0a33b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
226 changed files with 85323 additions and 17316 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/ContextMenu.qml
View file

@ -103,7 +103,7 @@ Menu
{
id: machineExtruderCount
containerStackId: Cura.MachineManager.activeMachineId
containerStack: Cura.MachineManager.activeMachine
key: "machine_extruder_count"
watchedProperties: [ "value" ]
}

1
resources/qml/Menus/SettingVisibilityPresetsMenu.qml
View file

@ -29,7 +29,6 @@ Menu
onTriggered:
{
settingVisibilityPresetsModel.setActivePreset(model.id);
showSettingVisibilityProfile();
}
}