Merge branch 'main' into PP-622-RR-Raft-Middle

resources/definitions/ultimaker_s8.def.json

@@ -237,7 +237,10 @@
         "default_material_print_temperature": { "maximum_value_warning": 320 },
         "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" },
         "flooring_layer_count": { "value": 1 },
-        "gradual_flow_enabled": { "value": false },
+        "flooring_material_flow": { "value": "skin_material_flow * 110/93" },
+        "flooring_monotonic": { "value": false },
+        "gradual_flow_discretisation_step_size": { "value": 1 },
+        "gradual_flow_enabled": { "value": true },
         "hole_xy_offset": { "value": 0.075 },
         "infill_material_flow": { "value": "material_flow if infill_sparse_density < 95 else 95" },
         "infill_overlap": { "value": 10 },
@@ -428,7 +431,7 @@
         },
         "material_print_temperature": { "maximum_value_warning": 320 },
         "material_print_temperature_layer_0": { "maximum_value_warning": 320 },
-        "max_flow_acceleration": { "value": 8.0 },
+        "max_flow_acceleration": { "value": 1.5 },
         "max_skin_angle_for_expansion": { "value": 45 },
         "meshfix_maximum_resolution": { "value": 0.4 },
         "min_infill_area": { "default_value": 10 },
@@ -444,10 +447,13 @@
         "retraction_hop_enabled": { "value": true },
         "retraction_min_travel": { "value": "2.5 if support_enable and support_structure=='tree' else line_width * 2.5" },
         "retraction_prime_speed": { "value": 15 },
+        "roofing_monotonic": { "value": false },
+        "roofing_pattern": { "value": "'zigzag'" },
+        "seam_overhang_angle": { "value": 35 },
         "skin_edge_support_thickness": { "value": 0 },
         "skin_material_flow": { "value": 93 },
         "skin_outline_count": { "value": 0 },
-        "skin_overlap": { "value": 0 },
+        "skin_overlap": { "value": 20 },
         "skin_preshrink": { "value": 0 },
         "skirt_brim_minimal_length": { "value": 1000 },
         "skirt_brim_speed":
@@ -543,12 +549,12 @@
         "speed_wall":
         {
             "maximum_value_warning": 300,
-            "value": "speed_print*2/3"
+            "value": "speed_print*1/2"
         },
         "speed_wall_0":
         {
             "maximum_value_warning": 300,
-            "value": "speed_wall"
+            "value": "speed_wall*60/75"
         },
         "speed_wall_0_flooring":
         {

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg

@@ -16,7 +16,12 @@ cool_min_layer_time = 5
 cool_min_layer_time_overhang = 9
 cool_min_speed = 6
 cool_min_temperature = =material_print_temperature - 15
+gradual_flow_enable = False
+hole_xy_offset = 0.075
+inset_direction = outside-in
+speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg

@@ -16,7 +16,12 @@ cool_min_layer_time = 5
 cool_min_layer_time_overhang = 9
 cool_min_speed = 6
 cool_min_temperature = =material_print_temperature - 15
+gradual_flow_enable = False
+hole_xy_offset = 0.075
+inset_direction = outside-in
+speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg

@@ -16,7 +16,12 @@ cool_min_layer_time = 5
 cool_min_layer_time_overhang = 9
 cool_min_speed = 6
 cool_min_temperature = =material_print_temperature - 15
+gradual_flow_enable = False
+hole_xy_offset = 0.075
+inset_direction = outside-in
+speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = AA+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg

@@ -16,7 +16,12 @@ cool_min_layer_time = 5
 cool_min_layer_time_overhang = 9
 cool_min_speed = 6
 cool_min_temperature = =material_print_temperature - 15
+gradual_flow_enable = False
+hole_xy_offset = 0.075
+inset_direction = outside-in
+speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg

@@ -13,7 +13,10 @@ type = intent
 variant = CC+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg

@@ -13,7 +13,10 @@ type = intent
 variant = CC+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg

@@ -13,7 +13,10 @@ type = intent
 variant = CC+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg

@@ -13,7 +13,10 @@ type = intent
 variant = CC+ 0.4
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = CC+ 0.6
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg

@@ -12,7 +12,10 @@ type = intent
 variant = CC+ 0.6
 
 [values]
+hole_xy_offset = 0.075
 infill_sparse_density = 20
+inset_direction = outside-in
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 4
+xy_offset = 0.075
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg

@@ -15,9 +15,13 @@ weight = -2
 cool_min_layer_time = 4
 cool_min_layer_time_fan_speed_max = 9
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 retraction_prime_speed = 15
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg

@@ -13,9 +13,13 @@ weight = -2
 
 [values]
 cool_min_layer_time = 4
+hole_xy_offset = 0.1
+inset_direction = inside-out
 material_print_temperature = =default_material_print_temperature + 5
 retraction_prime_speed = 15
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg

@@ -13,11 +13,15 @@ weight = -1
 
 [values]
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg

@@ -13,12 +13,16 @@ weight = 0
 
 [values]
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 top_bottom_thickness = =round(6*layer_height,3)
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg

@@ -13,11 +13,15 @@ weight = -2
 
 [values]
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg

@@ -13,10 +13,14 @@ weight = -1
 
 [values]
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 retraction_prime_speed = =retraction_speed
 retraction_speed = 25
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg

@@ -13,10 +13,14 @@ weight = 0
 
 [values]
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 top_bottom_thickness = =round(6*layer_height,3)
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg

@@ -13,9 +13,13 @@ weight = -2
 
 [values]
 cool_min_temperature = =material_print_temperature - 20
+hole_xy_offset = 0.1
+inset_direction = inside-out
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+xy_offset = 0.025
 

resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg

@@ -13,12 +13,41 @@ variant = CC+ 0.4
 weight = -2
 
 [values]
+acceleration_roofing = =acceleration_topbottom/2
+bridge_enable_more_layers = True
+bridge_skin_density = 70
 bridge_skin_material_flow = 100
+bridge_skin_material_flow_2 = 70
 bridge_skin_speed = 30
+bridge_skin_speed_2 = =speed_print*2/3
 bridge_wall_material_flow = 100
+bridge_wall_min_length = 2
 bridge_wall_speed = 30
+cool_min_layer_time = 6
 cool_min_layer_time_fan_speed_max = 11
-retraction_prime_speed = 15
+cool_min_layer_time_overhang = 11
+cool_min_temperature = =material_print_temperature-10
+flooring_monotonic = False
+infill_material_flow = =material_flow if infill_sparse_density < 95 else 95
+infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'grid'
+jerk_roofing = =jerk_print
+material_flow = 95
+retraction_hop_enabled = False
+retraction_prime_speed = 25
+roofing_material_flow = =skin_material_flow
+roofing_monotonic = False
+skin_material_flow = =0.95*material_flow
+skin_outline_count = 0
+support_bottom_distance = =support_z_distance
 support_structure = tree
+support_tree_tip_diameter = 2.0
+support_tree_top_rate = 10
+support_xy_distance = 1.2
+support_xy_distance_overhang = =1.5*machine_nozzle_size
+support_z_distance = =min(2*layer_height, 0.4)
+top_bottom_thickness = =wall_thickness
+wall_0_inset = =0.05
 wall_overhang_speed_factors = [100,90,80,70,60,50]
+wall_x_material_flow = =material_flow
+xy_offset = 0.075
 

resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg

@@ -13,12 +13,43 @@ variant = CC+ 0.4
 weight = -2
 
 [values]
+acceleration_roofing = =acceleration_topbottom/2
 adhesion_type = skirt
+bridge_enable_more_layers = True
+bridge_skin_density = 70
 bridge_skin_material_flow = 100
+bridge_skin_material_flow_2 = 70
 bridge_skin_speed = 30
+bridge_skin_speed_2 = =speed_print*2/3
 bridge_wall_material_flow = 100
+bridge_wall_min_length = 2
 bridge_wall_speed = 30
+cool_min_layer_time = 6
+cool_min_layer_time_overhang = 11
+cool_min_temperature = =material_print_temperature-10
+flooring_monotonic = False
+infill_material_flow = =material_flow if infill_sparse_density < 95 else 95
+infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'grid'
+jerk_roofing = =jerk_print
+material_pressure_advance_factor = 0.25
+retraction_hop_enabled = False
+retraction_prime_speed = 15
+roofing_material_flow = =skin_material_flow
+roofing_monotonic = False
+skin_material_flow = =0.95*material_flow
+skin_outline_count = 0
+skirt_height = 5
+support_bottom_distance = =support_z_distance
 support_structure = tree
+support_tree_tip_diameter = 2.0
+support_tree_top_rate = 10
+support_xy_distance = 1.2
+support_xy_distance_overhang = =1.5*machine_nozzle_size
+support_z_distance = =min(2*layer_height, 0.4)
 switch_extruder_retraction_amount = 16
+top_bottom_thickness = =wall_thickness
+wall_0_inset = =0.05
 wall_overhang_speed_factors = [100,90,80,70,60,50]
+wall_x_material_flow = =material_flow
+xy_offset = 0.075
 

resources/themes/cura-light/theme.json

@@ -463,6 +463,8 @@
         "layerview_support_infill": [0, 230, 230, 127],
         "layerview_move_combing": [0, 0, 255, 255],
         "layerview_move_retraction": [128, 127, 255, 255],
+        "layerview_move_while_retracting": [127, 255, 255, 255],
+        "layerview_move_while_unretracting": [255, 127, 255, 255],
         "layerview_support_interface": [63, 127, 255, 127],
         "layerview_prime_tower": [0, 255, 255, 255],
         "layerview_nozzle": [224, 192, 16, 64],