Merge branch 'master' into PP-54_decrease-resolutionPP-54_decrease-resolution

# Conflicts:
#	resources/definitions/ultimaker.def.json
#	resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg

5 files changed, 22 insertions, 39 deletions

diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json
index f25aed5d5b..a1917fc9b9 100644
--- a/resources/definitions/fdmextruder.def.json
+++ b/resources/definitions/fdmextruder.def.json
@@ -6,7 +6,7 @@
         "type": "extruder",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 19,
+        "setting_version": 20,
         "visible": false,
         "position": "0"
     },
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 95abd8df59..56e1a7ab07 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -6,7 +6,7 @@
         "type": "machine",
         "author": "Unknown",
         "manufacturer": "Unknown",
-        "setting_version": 19,
+        "setting_version": 20,
         "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,
@@ -764,7 +764,7 @@
                     "label": "Scale Fan Speed To 0-1",
                     "description": "Scale the fan speed to be between 0 and 1 instead of between 0 and 256.",
                     "type": "bool",
-                    "default_value": true,
+                    "default_value": false,
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
@@ -1088,21 +1088,6 @@
                         }
                     }
                 },
-                "beading_strategy_type":
-                {
-                    "label": "Variable Line Strategy",
-                    "description": "Strategy to use to print the width of a part with a number of walls. This determines how many walls it will use for a certain total width, and how wide each of these lines are. \"Center Deviation\" will print all walls at the nominal line width except the central one(s), causing big variations in the center but very consistent outsides. \"Distributed\" distributes the width equally over all walls. \"Inward Distributed\" is a balance between the other two, distributing the changes in width over all walls but keeping the walls on the outside slightly more consistent.",
-                    "type": "enum",
-                    "enabled": false,
-                    "options":
-                    {
-                        "center_deviation": "Center Deviation",
-                        "distributed": "Distributed",
-                        "inward_distributed": "Inward Distributed"
-                    },
-                    "default_value": "inward_distributed",
-                    "limit_to_extruder": "wall_0_extruder_nr"
-                },
                 "wall_transition_length":
                 {
                     "label": "Wall Transition Length",
@@ -1123,8 +1108,7 @@
                     "type": "int",
                     "maximum_value": "999999",
                     "default_value": 1,
-                    "minimum_value": "1",
-                    "enabled": "beading_strategy_type == 'inward_distributed'"
+                    "minimum_value": "1"
                 },
                 "wall_transition_angle":
                 {
@@ -1205,15 +1189,6 @@
                     "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
-                "filter_out_tiny_gaps":
-                {
-                    "label": "Filter Out Tiny Gaps",
-                    "description": "Filter out tiny gaps to reduce blobs on outside of model.",
-                    "type": "bool",
-                    "default_value": true,
-                    "limit_to_extruder": "wall_0_extruder_nr",
-                    "settable_per_mesh": true
-                },
                 "min_wall_line_width":
                 {
                     "label": "Minimum Wall Line Width",
@@ -1222,7 +1197,7 @@
                     "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
                     "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)",
                     "default_value": 0.3,
-                    "value": "machine_nozzle_size * .75",
+                    "value": "machine_nozzle_size * .85",
                     "type": "float",
                     "settable_per_mesh": true,
                     "children":
@@ -1306,7 +1281,7 @@
                     "label": "Minimum Thin Wall Line Width",
                     "description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.",
                     "unit": "mm",
-                    "value": "machine_nozzle_size * .75",
+                    "value": "min_wall_line_width",
                     "default_value": 0.2,
                     "minimum_value": "0.001",
                     "minimum_value_warning": "min_feature_size",
@@ -2559,7 +2534,7 @@
                     "unit": "%",
                     "type": "float",
                     "default_value": 100.0,
-                    "enabled": false,
+                    "enabled": true,
                     "minimum_value": "0.001",
                     "minimum_value_warning": "100",
                     "maximum_value_warning": "120",
@@ -2575,7 +2550,7 @@
                             "unit": "%",
                             "type": "float",
                             "default_value": 100.0,
-                            "enabled": false,
+                            "enabled": true,
                             "minimum_value": "0.001",
                             "minimum_value_warning": "100",
                             "maximum_value_warning": "120",
@@ -2591,7 +2566,7 @@
                             "unit": "%",
                             "type": "float",
                             "default_value": 100.0,
-                            "enabled": false,
+                            "enabled": true,
                             "minimum_value": "0.001",
                             "minimum_value_warning": "100",
                             "maximum_value_warning": "120",
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 437efda24f..5818c11a6f 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -53,9 +53,21 @@
         "infill_before_walls": {
             "value": "False"
         },
+        "infill_material_flow": {
+            "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow"
+        },
         "retraction_combing": {
             "value": "'no_outer_surfaces'"
         },
+        "roofing_layer_count": {
+            "value": "0"
+        },
+        "roofing_material_flow": {
+            "value": "material_flow"
+        },
+        "skin_material_flow": {
+            "value": "0.97 * material_flow"
+        },
         "skin_monotonic" : {
             "value": true
         },
@@ -69,7 +81,7 @@
             "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))"
         },
         "xy_offset": {
-            "value": "-layer_height * 0.2"
+            "value": "-layer_height * 0.1"
         },
         "meshfix_maximum_resolution": {
             "value": "max(speed_wall_0 / 75, 0.5)"
diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json
index 7c0e81b428..0d4191383d 100644
--- a/resources/definitions/ultimaker2_plus.def.json
+++ b/resources/definitions/ultimaker2_plus.def.json
@@ -34,9 +34,6 @@
         "layer_height_0": {
             "value": "round(machine_nozzle_size / 1.5, 2)"
         },
-        "line_width": {
-            "value": "machine_nozzle_size"
-        },
         "speed_support": {
             "value": "speed_wall_0"
         },
diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json
index 186637b487..1effa1616f 100644
--- a/resources/definitions/ultimaker2_plus_connect.def.json
+++ b/resources/definitions/ultimaker2_plus_connect.def.json
@@ -60,7 +60,6 @@
         "speed_infill": { "value": "speed_print" },
         "speed_wall_x": { "value": "speed_wall" },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
-        "line_width": { "value": "machine_nozzle_size" },
         "optimize_wall_printing_order": { "value": "True" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },
         "speed_support": { "value": "speed_wall_0" },