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 '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
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
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).")
self._setEmptyQuality()
Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).")
self._setEmptyQuality()
return
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
}
/* //Warning message is commented out because it's factually incorrect. Fix CURA-7637 to allow camera connections via cloud.
MonitorInfoBlurb
{
id: cameraDisabledInfo
text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.")
target: cameraButton
}
}*/
}
// Divider