Merge branch 'feature_omp_writeGcode' into 2.5

This commit is contained in:
Ghostkeeper 2017-03-13 09:34:37 +01:00
commit 41e3336ea9
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -2556,16 +2556,6 @@
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
"start_layers_at_same_position":
{
"label": "Start Layers with the Same Part",
"description": "In each layer start with printing the object near the same point, so that we don't start a new layer with printing the piece which the previous layer ended with. This makes for better overhangs and small parts, but increases printing time.",
"type": "bool",
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": true
},
"layer_start_x": "layer_start_x":
{ {
"label": "Layer Start X", "label": "Layer Start X",
@ -2574,9 +2564,8 @@
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"minimum_value": "0", "minimum_value": "0",
"enabled": "start_layers_at_same_position",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": true,
"settable_per_meshgroup": true "settable_per_meshgroup": true
}, },
"layer_start_y": "layer_start_y":
@ -2587,9 +2576,8 @@
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"minimum_value": "0", "minimum_value": "0",
"enabled": "start_layers_at_same_position",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": true,
"settable_per_meshgroup": true "settable_per_meshgroup": true
}, },
"retraction_hop_enabled": { "retraction_hop_enabled": {