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

This commit is contained in:
Jaime van Kessel 2018-10-15 11:47:45 +02:00
commit 167c6fbb76
3 changed files with 8 additions and 2 deletions

View file

@ -41,6 +41,9 @@
[30, 34]
]
},
"material_diameter": {
"default_value": 1.75
},
"acceleration_enabled": {
"default_value": true
},
@ -56,6 +59,9 @@
"jerk_travel": {
"default_value": 20
},
"layer_height": {
"default_value": 0.10
},
"layer_height_0": {
"default_value": 0.2
},

View file

@ -11,6 +11,6 @@
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 2.85 }
"material_diameter": { "default_value": 1.75 }
}
}

View file

@ -11,6 +11,6 @@
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 2.85 }
"material_diameter": { "default_value": 1.75 }
}
}