3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -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:
alekseisasin 2017-08-22 14:00:41 +02:00
commit 10b50244e0
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/definitions/creality_cr10.def.json
View file

@ -31,6 +31,18 @@
}, },
"gantry_height": { "gantry_height": {
"default_value": 30 "default_value": 30
},
"acceleration_enabled": {
"default_value": true
},
"acceleration_print": {
"default_value": 500
},
"jerk_enabled": {
"default_value": true
},
"jerk_print": {
"default_value": 20
} }
} }
} }

2
resources/qml/Topbar.qml
View file

@ -57,7 +57,7 @@ Rectangle
id: showMonitor id: showMonitor
height: UM.Theme.getSize("sidebar_header").height height: UM.Theme.getSize("sidebar_header").height
onClicked: base.startMonitoringPrint() onClicked: base.startMonitoringPrint()
text: catalog.i18nc("@title:tab", "Print") text: catalog.i18nc("@title:tab", "Monitor")
iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor") iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor")
property color overlayColor: property color overlayColor:
{ {