GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 21:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.7'

Browse Source
This commit is contained in:
Ghostkeeper 2020-08-11 13:30:09 +02:00
commit c49056f319
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Settings/MachineManager.py
View File

@ -1212,9 +1212,8 @@ class MachineManager(QObject):
return return
if not available_quality_types: if not available_quality_types:
if global_stack.qualityChanges == empty_quality_changes_container: Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).")
Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).") self._setEmptyQuality()
self._setEmptyQuality()
return return
if current_quality_type in available_quality_types: if current_quality_type in available_quality_types:

3
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View File

@ -282,12 +282,13 @@ Item
enabled: !cameraButton.enabled enabled: !cameraButton.enabled
} }
/* //Warning message is commented out because it's factually incorrect. Fix CURA-7637 to allow camera connections via cloud.
MonitorInfoBlurb MonitorInfoBlurb
{ {
id: cameraDisabledInfo id: cameraDisabledInfo
text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.") text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.")
target: cameraButton target: cameraButton
} }*/
} }
// Divider // Divider