3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-10-21 16:53:43 +02:00
commit c8889606a6
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFReader.py
View file

@ -109,7 +109,10 @@ class ThreeMFReader(MeshReader):
um_node = CuraSceneNode() # This adds a SettingOverrideDecorator um_node = CuraSceneNode() # This adds a SettingOverrideDecorator
um_node.addDecorator(BuildPlateDecorator(active_build_plate)) um_node.addDecorator(BuildPlateDecorator(active_build_plate))
try:
um_node.addDecorator(ConvexHullDecorator()) um_node.addDecorator(ConvexHullDecorator())
except:
pass
um_node.setName(node_name) um_node.setName(node_name)
um_node.setId(node_id) um_node.setId(node_id)
transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation()) transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation())

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -359,6 +359,10 @@ Item
{ {
return catalog.i18nc("@label:status", "Idle") return catalog.i18nc("@label:status", "Idle")
} }
if (!printer.activePrintJob && printer.state == "pre_print")
{
return catalog.i18nc("@label:status", "Preparing...")
}
if (!printer.activePrintJob && printer.state == "printing") if (!printer.activePrintJob && printer.state == "printing")
{ {
// The print job isn't quite updated yet. // The print job isn't quite updated yet.