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

Merge branch '3.1'

Browse source
This commit is contained in:
ChrisTerBeke 2017-11-24 10:31:22 +01:00
commit 7d1db1b165
26 changed files with 565 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/SimulationView/SimulationView.qml
View file

@ -138,10 +138,11 @@ Item
text: catalog.i18nc("@label:listbox", "Feedrate"),
type_id: 2
})
layerViewTypes.append({
text: catalog.i18nc("@label:listbox", "Layer thickness"),
type_id: 3 // these ids match the switching in the shader
})
// TODO DON'T DELETE!!!! This part must be enabled when adaptive layer height feature is available
// layerViewTypes.append({
// text: catalog.i18nc("@label:listbox", "Layer thickness"),
// type_id: 3 // these ids match the switching in the shader
// })
}
ComboBox
@ -619,7 +620,7 @@ Item
Timer
{
id: simulationTimer
interval: 250
interval: 100
running: false
repeat: true
onTriggered: {