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

Merge branch '5.8'

Browse source
This commit is contained in:
Remco Burema 2024-07-31 14:55:44 +02:00
commit dd9f19605e
164 changed files with 92 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
View file

@ -208,7 +208,7 @@ Item
anchors.rightMargin: UM.Theme.getSize("thin_margin").height
enabled: UM.Backend.state == UM.Backend.Done
currentIndex: UM.Backend.state == UM.Backend.Done ? dfFilenameTextfield.text.startsWith("MM")? 1 : 0 : 2
currentIndex: UM.Backend.state == UM.Backend.Done ? (Cura.MachineManager.activeMachine.getOutputFileFormats.includes("application/x-makerbot") ? 1 : 0) : 2
textRole: "text"
valueRole: "value"

7
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -1083,10 +1083,9 @@ class XmlMaterialProfile(InstanceContainer):
# Skip material properties (eg diameter) or metadata (eg GUID)
return
if instance.value is True:
data = "yes"
elif instance.value is False:
data = "no"
truth_map = { True: "yes", False: "no" }
if tag_name != "cura:setting" and instance.value in truth_map:
data = truth_map[instance.value]
else:
data = str(instance.value)