Merge branch '3.0'

This commit is contained in:
Ghostkeeper 2017-10-06 16:02:13 +02:00
commit bc419370d0
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
6 changed files with 53 additions and 37 deletions

View file

@ -1537,7 +1537,7 @@
"default_value": 0,
"type": "int",
"minimum_value": "0",
"maximum_value_warning": "5",
"maximum_value_warning": "1 if (infill_pattern == 'cross' or infill_pattern == 'cross_3d' or support_pattern == 'concentric' or support_pattern == 'concentric_3d') else 5",
"maximum_value": "0 if spaghetti_infill_enabled else (999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2)))",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
@ -3605,7 +3605,7 @@
"default_value": 0,
"type": "int",
"minimum_value": "0",
"maximum_value_warning": "5",
"maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'zigzag' or support_pattern == 'concentric' or support_pattern == 'concentric_3d') else 5",
"maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))",
"enabled": "support_enable and support_infill_rate > 0",
"limit_to_extruder": "support_infill_extruder_nr",