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

This commit is contained in:
Jaime van Kessel 2016-12-05 13:56:43 +01:00
commit f24f06f106
2 changed files with 13 additions and 2 deletions

View File

@ -228,13 +228,23 @@
"machine_heat_zone_length": "machine_heat_zone_length":
{ {
"label": "Heat zone length", "label": "Heat zone length",
"description": "The distance from the tip of the nozzle in which heat from the nozzle is transfered to the filament.", "description": "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament.",
"default_value": 16, "default_value": 16,
"type": "float", "type": "float",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true, "settable_per_extruder": true,
"settable_per_meshgroup": false "settable_per_meshgroup": false
}, },
"machine_cool_zone_length":
{
"label": "Cool Zone Length",
"description": "The length of the piece that dissipates heat from the hot end to shield heat-sensitive equipment.",
"default_value": 0,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": true,
"settable_per_meshgroup": false
},
"machine_nozzle_heat_up_speed": "machine_nozzle_heat_up_speed":
{ {
"label": "Heat up speed", "label": "Heat up speed",
@ -990,7 +1000,7 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 100.0, "default_value": 100.0,
"value": "machine_depth / 2", "value": "machine_depth * 3",
"enabled": "z_seam_type == 'back'", "enabled": "z_seam_type == 'back'",
"settable_per_mesh": true "settable_per_mesh": true
}, },

View File

@ -38,6 +38,7 @@
"machine_depth": { "default_value": 215 }, "machine_depth": { "default_value": 215 },
"machine_height": { "default_value": 200 }, "machine_height": { "default_value": 200 },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_cool_zone_length": { "default_value": 26.5 },
"machine_nozzle_heat_up_speed": { "default_value": 1.4 }, "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
"machine_nozzle_cool_down_speed": { "default_value": 0.8 }, "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
"machine_head_with_fans_polygon": "machine_head_with_fans_polygon":