Merge branch 'main' into CURA-11650-thumnails-missing

plugins/3MFWriter/SettingsExportModel.py

@@ -39,7 +39,7 @@ class SettingsExportModel(QObject):
                            'adaptive_layer_height_enabled',
                            'brim_gap',
                            'support_offset',
-                           'brim_outside_only',
+                           'brim_location',
                            'magic_spiralize',
                            'slicing_tolerance',
                            'outer_inset_first',

resources/definitions/erzay3d.def.json

@@ -14,7 +14,7 @@
     {
         "acceleration_print": { "default_value": 1000 },
         "adhesion_type": { "default_value": "skirt" },
-        "brim_outside_only": { "default_value": false },
+        "brim_location": { "default_value": "everywhere" },
         "default_material_print_temperature": { "default_value": 220 },
         "infill_sparse_density": { "default_value": 20 },
         "ironing_flow": { "default_value": 7.0 },

resources/definitions/fdmprinter.def.json

@@ -6069,12 +6069,18 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "brim_outside_only":
+                "brim_location":
                 {
-                    "label": "Brim Only on Outside",
+                    "label": "Brim Location",
-                    "description": "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much.",
+                    "description": "Print a brim on the outside of the model, inside, or both. Depending on the model, this helps reducing the amount of brim you need to remove afterwards, while ensuring a proper bed adhesion.",
-                    "type": "bool",
+                    "type": "enum",
-                    "default_value": true,
+                    "options":
+                    {
+                        "outside": "Outside Only",
+                        "inside": "Inside Only",
+                        "everywhere": "Everywhere"
+                    },
+                    "default_value": "outside",
                     "enabled": "resolveOrValue('adhesion_type') == 'brim'",
                     "limit_to_extruder": "skirt_brim_extruder_nr",
                     "settable_per_mesh": false,
@@ -6082,13 +6088,14 @@
                 },
                 "brim_inside_margin":
                 {
-                    "label": "Brim Inside Avoid Margin",
+                    "label": "Brim Avoid Margin",
-                    "description": "A part fully enclosed inside another part can generate an outer brim that touches the inside of the other part. This removes all brim within this distance from internal holes.",
+                    "description": "A brim around a surface may touch an other surface where brim is not expected. This removes all brim within this distance from brimless surfaces.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 2.5,
+                    "value": "line_width * 4",
+                    "default_value": "1.6",
                     "minimum_value": "0",
-                    "enabled": "resolveOrValue('adhesion_type') == 'brim' and any(extruderValues('brim_outside_only'))",
+                    "enabled": "resolveOrValue('adhesion_type') == 'brim'",
                     "limit_to_extruder": "skirt_brim_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true

resources/definitions/inat_base.def.json

@@ -113,7 +113,7 @@
             "minimum_value_warning": "100"
         },
         "adhesion_type": { "value": "'skirt'" },
-        "brim_outside_only": { "value": false },
+        "brim_location": { "value": "everywhere" },
         "cool_fan_speed_min": { "value": "0.5*cool_fan_speed" },
         "cool_min_layer_time_fan_speed_max": { "value": 10 },
         "default_material_bed_temperature": { "maximum_value": "150" },

resources/definitions/ultimaker.def.json

@@ -8,8 +8,8 @@
         "author": "Ultimaker",
         "manufacturer": "Ultimaker B.V.",
         "exclude_materials": [
-            "generic_hips",
+            "structur3d_",
-            "structur3d_dap100silicone"
+            "generic_hips"
         ]
     },
     "overrides":

resources/definitions/ultimaker2.def.json

@@ -10,23 +10,23 @@
         "file_formats": "text/x-gcode",
         "platform": "ultimaker2_platform.obj",
         "exclude_materials": [
+            "generic_bam",
+            "generic_cffcpe",
+            "generic_cffpa",
+            "generic_flexible",
+            "generic_gffcpe",
+            "generic_gffpa",
             "generic_hips",
+            "generic_petcf",
             "generic_petg",
-            "structur3d_dap100silicone",
+            "generic_pva",
-            "ultimaker_petg_red",
+            "generic_tough_pla",
-            "ultimaker_petg_blue",
+            "structur3d_",
-            "ultimaker_petg_grey",
+            "ultimaker_bam",
-            "ultimaker_petg_black",
+            "ultimaker_petcf",
-            "ultimaker_petg_green",
+            "ultimaker_petg",
-            "ultimaker_petg_white",
+            "ultimaker_pva",
-            "ultimaker_petg_orange",
+            "ultimaker_tough_pla"
-            "ultimaker_petg_silver",
-            "ultimaker_petg_yellow",
-            "ultimaker_petg_transparent",
-            "ultimaker_petg_red_translucent",
-            "ultimaker_petg_blue_translucent",
-            "ultimaker_petg_green_translucent",
-            "ultimaker_petg_yellow_fluorescent"
         ],
         "firmware_file": "MarlinUltimaker2.hex",
         "has_machine_quality": true,

resources/definitions/ultimaker2_plus.def.json

@@ -9,43 +9,23 @@
         "file_formats": "text/x-gcode",
         "platform": "ultimaker2_platform.obj",
         "exclude_materials": [
-            "generic_hips",
-            "generic_petg",
             "generic_bam",
-            "ultimaker_bam",
-            "generic_pva",
-            "ultimaker_pva",
-            "generic_tough_pla",
-            "ultimaker_tough_pla_black",
-            "ultimaker_tough_pla_green",
-            "ultimaker_tough_pla_red",
-            "ultimaker_tough_pla_white",
-            "ultimaker_tough_pla_blue",
-            "ultimaker_tough_pla_gray",
-            "ultimaker_tough_pla_yellow",
             "generic_cffcpe",
             "generic_cffpa",
+            "generic_flexible",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_hips",
             "generic_petcf",
-            "structur3d_dap100silicone",
+            "generic_petg",
-            "ultimaker_petg_red",
+            "generic_pva",
-            "ultimaker_petg_blue",
+            "generic_tough_pla",
-            "ultimaker_petg_grey",
+            "structur3d_",
-            "ultimaker_petg_black",
+            "ultimaker_bam",
-            "ultimaker_petg_green",
+            "ultimaker_petcf",
-            "ultimaker_petg_white",
+            "ultimaker_petg",
-            "ultimaker_petg_orange",
+            "ultimaker_pva",
-            "ultimaker_petg_silver",
+            "ultimaker_tough_pla"
-            "ultimaker_petg_yellow",
-            "ultimaker_petg_transparent",
-            "ultimaker_petg_red_translucent",
-            "ultimaker_petg_blue_translucent",
-            "ultimaker_petg_green_translucent",
-            "ultimaker_petg_yellow_fluorescent",
-            "ultimaker_petcf_black",
-            "ultimaker_petcf_blue",
-            "ultimaker_petcf_gray"
         ],
         "firmware_file": "MarlinUltimaker2plus.hex",
         "first_start_actions": [],

resources/definitions/ultimaker2_plus_connect.def.json

@@ -9,20 +9,19 @@
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker2_plus_connect_platform.obj",
         "exclude_materials": [
-            "generic_hips",
             "generic_bam",
-            "ultimaker_bam",
-            "generic_pva",
-            "ultimaker_pva",
-            "ultimaker_petcf_black",
-            "ultimaker_petcf_blue",
-            "ultimaker_petcf_gray",
-            "generic_petcf",
             "generic_cffcpe",
             "generic_cffpa",
+            "generic_flexible",
             "generic_gffcpe",
             "generic_gffpa",
-            "structur3d_dap100silicone"
+            "generic_hips",
+            "generic_petcf",
+            "generic_pva",
+            "structur3d_",
+            "ultimaker_bam",
+            "ultimaker_petcf",
+            "ultimaker_pva"
         ],
         "first_start_actions": [],
         "has_machine_materials": true,

resources/definitions/ultimaker3.def.json

@@ -13,16 +13,15 @@
             9066
         ],
         "exclude_materials": [
-            "generic_hips",
             "generic_cffcpe",
             "generic_cffpa",
+            "generic_flexible",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_hips",
             "generic_petcf",
-            "ultimaker_petcf_black",
+            "structur3d_",
-            "ultimaker_petcf_blue",
+            "ultimaker_petcf"
-            "ultimaker_petcf_gray",
-            "structur3d_dap100silicone"
         ],
         "firmware_update_info":
         {

resources/definitions/ultimaker_original.def.json

@@ -10,43 +10,22 @@
         "file_formats": "text/x-gcode",
         "platform": "ultimaker_platform.3mf",
         "exclude_materials": [
-            "generic_hips",
-            "generic_petg",
-            "generic_bam",
-            "ultimaker_bam",
-            "generic_pva",
-            "ultimaker_pva",
-            "generic_tough_pla",
-            "ultimaker_tough_pla_black",
-            "ultimaker_tough_pla_green",
-            "ultimaker_tough_pla_red",
-            "ultimaker_tough_pla_white",
-            "ultimaker_tough_pla_blue",
-            "ultimaker_tough_pla_gray",
-            "ultimaker_tough_pla_yellow",
             "generic_cffcpe",
             "generic_cffpa",
+            "generic_flexible",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_hips",
             "generic_petcf",
-            "structur3d_dap100silicone",
+            "generic_petg",
-            "ultimaker_petg_blue",
+            "generic_pva",
-            "ultimaker_petg_grey",
+            "generic_tough_pla",
-            "ultimaker_petg_black",
+            "structur3d_",
-            "ultimaker_petg_green",
+            "ultimaker_bam",
-            "ultimaker_petg_white",
+            "ultimaker_petcf",
-            "ultimaker_petg_orange",
+            "ultimaker_petg",
-            "ultimaker_petg_silver",
+            "ultimaker_pva",
-            "ultimaker_petg_yellow",
+            "ultimaker_tough_pla"
-            "ultimaker_petg_transparent",
-            "ultimaker_petg_red_translucent",
-            "ultimaker_petg_blue_translucent",
-            "ultimaker_petg_green_translucent",
-            "ultimaker_petg_yellow_fluorescent",
-            "ultimaker_petg_red",
-            "ultimaker_petcf_black",
-            "ultimaker_petcf_blue",
-            "ultimaker_petcf_gray"
         ],
         "firmware_file": "MarlinUltimaker-{baudrate}.hex",
         "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex",

resources/definitions/ultimaker_original_dual.def.json

@@ -10,43 +10,22 @@
         "file_formats": "text/x-gcode",
         "platform": "ultimaker_platform.3mf",
         "exclude_materials": [
-            "generic_hips",
-            "generic_petg",
-            "generic_bam",
-            "ultimaker_bam",
-            "generic_pva",
-            "ultimaker_pva",
-            "generic_tough_pla",
-            "ultimaker_tough_pla_black",
-            "ultimaker_tough_pla_green",
-            "ultimaker_tough_pla_red",
-            "ultimaker_tough_pla_white",
-            "ultimaker_tough_pla_blue",
-            "ultimaker_tough_pla_gray",
-            "ultimaker_tough_pla_yellow",
             "generic_cffcpe",
             "generic_cffpa",
+            "generic_flexible",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_hips",
             "generic_petcf",
-            "structur3d_dap100silicone",
+            "generic_petg",
-            "ultimaker_petg_blue",
+            "generic_pva",
-            "ultimaker_petg_grey",
+            "generic_tough_pla",
-            "ultimaker_petg_black",
+            "structur3d_",
-            "ultimaker_petg_green",
+            "ultimaker_bam",
-            "ultimaker_petg_white",
+            "ultimaker_petcf",
-            "ultimaker_petg_orange",
+            "ultimaker_petg",
-            "ultimaker_petg_silver",
+            "ultimaker_pva",
-            "ultimaker_petg_yellow",
+            "ultimaker_tough_pla"
-            "ultimaker_petg_transparent",
-            "ultimaker_petg_red_translucent",
-            "ultimaker_petg_blue_translucent",
-            "ultimaker_petg_green_translucent",
-            "ultimaker_petg_yellow_fluorescent",
-            "ultimaker_petg_red",
-            "ultimaker_petcf_black",
-            "ultimaker_petcf_blue",
-            "ultimaker_petcf_gray"
         ],
         "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex",
         "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex",

resources/definitions/ultimaker_s3.def.json

@@ -16,7 +16,8 @@
         ],
         "exclude_materials": [
             "generic_hips",
-            "structur3d_dap100silicone"
+            "generic_flexible",
+            "structur3d_"
         ],
         "firmware_update_info":
         {

resources/definitions/ultimaker_s5.def.json

@@ -15,6 +15,11 @@
             214476,
             214477
         ],
+        "exclude_materials": [
+            "generic_hips",
+            "generic_flexible",
+            "structur3d_"
+        ],
         "firmware_update_info":
         {
             "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ],

resources/definitions/ultimaker_s7.def.json

@@ -44,6 +44,8 @@
     },
     "overrides":
     {
-        "machine_name": { "default_value": "Ultimaker S7" }
+        "default_material_print_temperature": { "maximum_value_warning": "320" },
+        "machine_name": { "default_value": "Ultimaker S7" },
+        "material_print_temperature_layer_0": { "maximum_value_warning": "320" }
     }
 }

resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg

@@ -14,7 +14,7 @@ weight = 0
 [values]
 adhesion_type = brim
 brim_line_count = 14
-brim_outside_only = True
+brim_location = outside
 brim_width = 8
 connect_infill_polygons = True
 cool_fan_enabled = True

resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg

@@ -14,7 +14,7 @@ weight = 0
 [values]
 adhesion_type = brim
 brim_line_count = 14
-brim_outside_only = True
+brim_location = outside
 brim_width = 8
 connect_infill_polygons = True
 cool_fan_enabled = True

resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.4
 weight = -1
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
@@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-top_bottom_thickness = 0.7
+top_bottom_thickness = =layer_height * 6
 travel_avoid_distance = 1.5
 wall_0_inset = 0
 

resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.4
 weight = 0
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
@@ -42,7 +47,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-top_bottom_thickness = 0.7
+top_bottom_thickness = =layer_height * 6
 travel_avoid_distance = 1.5
 wall_0_inset = 0
 

resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.4
 weight = -2
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
@@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-top_bottom_thickness = 0.7
+top_bottom_thickness = =layer_height * 6
 travel_avoid_distance = 1.5
 wall_0_inset = 0
 

resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.8
 weight = -2
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 machine_nozzle_cool_down_speed = 0.5
@@ -36,7 +41,7 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
-top_bottom_thickness = 1.2
+top_bottom_thickness = =layer_height * 6
 top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.8
 weight = -3
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 15
@@ -37,7 +42,7 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
-top_bottom_thickness = 1.2
+top_bottom_thickness = =layer_height * 6
 top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.8
 weight = -4
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 15
@@ -37,7 +42,7 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
-top_bottom_thickness = 1.2
+top_bottom_thickness = =layer_height * 6
 top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.4
 weight = -1
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
@@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-top_bottom_thickness = 0.7
+top_bottom_thickness = =layer_height * 6
 travel_avoid_distance = 1.5
 wall_0_inset = 0
 

resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.4
 weight = 0
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
@@ -42,7 +47,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-top_bottom_thickness = 0.7
+top_bottom_thickness = =layer_height * 6
 travel_avoid_distance = 1.5
 wall_0_inset = 0
 

resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.4
 weight = -2
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
@@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-top_bottom_thickness = 0.7
+top_bottom_thickness = =layer_height * 6
 travel_avoid_distance = 1.5
 wall_0_inset = 0
 

resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.8
 weight = -2
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 machine_nozzle_cool_down_speed = 0.5
@@ -36,7 +41,7 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
-top_bottom_thickness = 1.2
+top_bottom_thickness = =layer_height * 6
 top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.8
 weight = -3
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 15
@@ -37,7 +42,7 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
-top_bottom_thickness = 1.2
+top_bottom_thickness = =layer_height * 6
 top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg

@@ -12,6 +12,11 @@ variant = AA 0.8
 weight = -4
 
 [values]
+bridge_skin_material_flow = 200
+bridge_skin_speed = =bridge_wall_speed
+bridge_sparse_infill_max_density = 50
+bridge_wall_material_flow = =bridge_skin_material_flow
+bridge_wall_speed = 10
 brim_width = 8.75
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 15
@@ -36,7 +41,7 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
-top_bottom_thickness = 1.2
+top_bottom_thickness = =layer_height * 6
 top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/setting_visibility/advanced.cfg

@@ -124,7 +124,7 @@ adhesion_extruder_nr
 skirt_line_count
 brim_width
 brim_line_count
-brim_outside_only
+brim_location
 
 [dual]
 prime_tower_enable

resources/setting_visibility/expert.cfg

@@ -327,7 +327,7 @@ skirt_brim_minimal_length
 brim_width
 brim_gap
 brim_line_count
-brim_outside_only
+brim_location
 brim_smart_ordering
 raft_margin
 raft_smoothing