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

Merge branch '2.6'

Browse source
This commit is contained in:
Ghostkeeper 2017-06-27 16:25:55 +02:00
commit 21624d7761
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
3 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/MachineManager.py
View file

@ -92,7 +92,7 @@ class MachineManager(QObject):
self._printer_output_devices = [] self._printer_output_devices = []
Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged) Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged)
if active_machine_id != "": if active_machine_id != "" and ContainerRegistry.getInstance().findContainerStacks(id = active_machine_id):
# An active machine was saved, so restore it. # An active machine was saved, so restore it.
self.setActiveMachine(active_machine_id) self.setActiveMachine(active_machine_id)
if self._global_container_stack and self._global_container_stack.getProperty("machine_extruder_count", "value") > 1: if self._global_container_stack and self._global_container_stack.getProperty("machine_extruder_count", "value") > 1:

0
resources/quality/ultimaker3/um3_aa0.8_CPEP_Draft_Print.inst.cfg → resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg
View file

0
resources/quality/ultimaker3/um3_aa0.8_PC_Draft_Print.inst.cfg → resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Quality.inst.cfg
View file