Merge branch '2.5'

This commit is contained in:
Ghostkeeper 2017-04-05 09:53:53 +02:00
commit 210e9b5869
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75

View file

@ -635,7 +635,7 @@
"description": "Width of a single line. Generally, the width of each line should correspond to the width of the nozzle. However, slightly reducing this value could produce better prints.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.5 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4,
"type": "float",
@ -649,7 +649,7 @@
"description": "Width of a single wall line.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.75 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"value": "line_width",
"default_value": 0.4,
@ -663,7 +663,7 @@
"description": "Width of the outermost wall line. By lowering this value, higher levels of detail can be printed.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.75 * machine_nozzle_size if outer_inset_first else 0.1 * machine_nozzle_size",
"minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4,
"value": "wall_line_width",
@ -676,7 +676,7 @@
"description": "Width of a single wall line for all wall lines except the outermost one.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.5 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4,
"value": "wall_line_width",
@ -691,7 +691,7 @@
"description": "Width of a single top/bottom line.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.1 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4,
"type": "float",
@ -704,7 +704,7 @@
"description": "Width of a single infill line.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.75 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "3 * machine_nozzle_size",
"default_value": 0.4,
"type": "float",
@ -718,7 +718,7 @@
"description": "Width of a single skirt or brim line.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.75 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "3 * machine_nozzle_size",
"default_value": 0.4,
"type": "float",
@ -733,7 +733,7 @@
"description": "Width of a single support structure line.",
"unit": "mm",
"minimum_value": "0.001",
"minimum_value_warning": "0.75 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "3 * machine_nozzle_size",
"default_value": 0.4,
"type": "float",
@ -750,7 +750,7 @@
"unit": "mm",
"default_value": 0.4,
"minimum_value": "0.001",
"minimum_value_warning": "0.4 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"type": "float",
"enabled": "support_enable and support_interface_enable",
@ -769,7 +769,7 @@
"default_value": 0.4,
"value": "line_width",
"minimum_value": "0.001",
"minimum_value_warning": "0.75 * machine_nozzle_size",
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"settable_per_mesh": false,
"settable_per_extruder": true