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

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse Source
This commit is contained in:
Ghostkeeper 2016-01-17 14:42:27 +01:00
commit 136eb65105
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ImageReader/ConfigUI.qml
View File

@ -146,7 +146,7 @@ UM.Dialog
ComboBox { ComboBox {
id: image_color_invert id: image_color_invert
objectName: "Image_Color_Invert" objectName: "Image_Color_Invert"
model: [ catalog.i18nc("@action:label","Lighter is higher"), catalog.i18nc("@action:label","Darker is higher") ] model: [ catalog.i18nc("@item:inlistbox","Lighter is higher"), catalog.i18nc("@item:inlistbox","Darker is higher") ]
width: 180 width: 180
onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) } onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) }
} }

2
resources/machines/fdmprinter.json
View File

@ -605,7 +605,7 @@
}, },
"material_flow_temp_graph": { "material_flow_temp_graph": {
"label": "Flow Temperature Graph", "label": "Flow Temperature Graph",
"description": "Data linking material flow (in mm/s) to temperature (degrees Celsius).", "description": "Data linking material flow (in mm3 per second) to temperature (degrees Celsius).",
"unit": "", "unit": "",
"type": "string", "type": "string",
"default": "[[3.5,200],[7.0,240]]", "default": "[[3.5,200],[7.0,240]]",