diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2017-10-02 18:40:24 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2017-10-02 18:40:24 +0300 |
| commit | 1d7792861d6f44bb10eeeb1010ce0a0ccaa48c56 (patch) | |
| tree | 48405f46e15c25d2661ad43c20525c90aadeb9a6 /cura | |
| parent | d9906caf0568fe176c5006bc4de3a956b2db3b8f (diff) | |
| parent | 6fc62fd2b3ce3a81edc70ccf86a6a5a616453854 (diff) | |
Merge branch '3.0'
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
Diffstat (limited to 'cura')
| -rwxr-xr-x | cura/Settings/MachineManager.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 520f95e293..e0e81fba1b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -304,6 +304,7 @@ class MachineManager(QObject): quality.nameChanged.connect(self._onQualityNameChanged) self._active_container_stack = self._global_container_stack + self.activeStackChanged.emit() self._error_check_timer.start() |