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

This commit is contained in:
Jaime van Kessel 2019-04-19 13:58:58 +02:00
commit 9daa78a98f
9 changed files with 102 additions and 40 deletions

View file

@ -5853,10 +5853,10 @@
"description": "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway.",
"type": "float",
"unit": "mm",
"default_value": 0.20,
"default_value": 0.5,
"minimum_value": "0.001",
"minimum_value_warning": "0.02",
"maximum_value_warning": "2",
"minimum_value_warning": "0.01",
"maximum_value_warning": "3",
"settable_per_mesh": true
},
"meshfix_maximum_travel_resolution":
@ -5865,8 +5865,8 @@
"description": "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate.",
"type": "float",
"unit": "mm",
"default_value": 0.5,
"value": "meshfix_maximum_resolution * speed_travel / speed_print",
"default_value": 1.0,
"value": "min(meshfix_maximum_resolution * speed_travel / speed_print, 2 * line_width)",
"minimum_value": "0.001",
"minimum_value_warning": "0.05",
"maximum_value_warning": "10",
@ -5879,10 +5879,10 @@
"description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller.",
"type": "float",
"unit": "mm",
"default_value": 0.005,
"default_value": 0.05,
"minimum_value": "0.001",
"minimum_value_warning": "0.003",
"maximum_value_warning": "0.1",
"minimum_value_warning": "0.01",
"maximum_value_warning": "0.3",
"settable_per_mesh": true
},
"support_skip_some_zags":

View file

@ -118,7 +118,6 @@
"material_bed_temperature": { "maximum_value": "115" },
"material_bed_temperature_layer_0": { "maximum_value": "115" },
"material_standby_temperature": { "value": "100" },
"meshfix_maximum_resolution": { "value": "0.04" },
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "default_value": true },

View file

@ -156,7 +156,8 @@
"wall_0_inset": { "value": "0" },
"wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" },
"meshfix_maximum_resolution": { "value": "0.04" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
"meshfix_maximum_deviation": { "value": "layer_height / 2" },
"optimize_wall_printing_order": { "value": "True" },
"retraction_combing": { "default_value": "all" },
"initial_layer_line_width_factor": { "value": "120" },