Merge branch 'main' into CURA-12955_update-evil-infills-tooltip
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled

This commit is contained in:
HellAholic 2026-02-04 17:28:02 +01:00 committed by GitHub
commit 5a625e8e4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 107 additions and 25 deletions

View file

@ -241,7 +241,7 @@
"infill_material_flow": { "value": "material_flow if infill_sparse_density < 95 else 95" },
"infill_move_inwards_length": { "value": "3*machine_nozzle_size" },
"infill_overlap": { "value": 10 },
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'grid'" },
"infill_pattern": { "value": "'zigzag'" },
"infill_sparse_density": { "value": 15 },
"infill_wall_line_count": { "value": "1 if infill_sparse_density > 80 else 0" },
"initial_bottom_layers": { "value": "2 if extruderValueFromContainer(top_bottom_extruder_nr, 'bottom_layers', 2) == bottom_layers else bottom_layers" },
@ -425,7 +425,7 @@
"material_pressure_advance_factor":
{
"enabled": true,
"value": 0.5
"value": 0.75
},
"material_print_temperature": { "maximum_value_warning": 320 },
"material_print_temperature_layer_0": { "maximum_value_warning": 320 },
@ -456,6 +456,7 @@
"seam_overhang_angle": { "value": 35 },
"skin_material_flow": { "value": 93 },
"skin_outline_count": { "value": 0 },
"skin_preshrink": { "value": 0 },
"skin_support_speed": { "value": "speed_infill * infill_material_flow / skin_support_material_flow" },
"skirt_brim_minimal_length": { "value": 1000 },
"skirt_line_count": { "value": 5 },

View file

@ -13,7 +13,9 @@ variant = AA+ 0.4
[values]
material_print_temperature = =default_material_print_temperature - 5
skin_preshrink = 0
speed_print = 100
speed_wall = 75
top_bottom_thickness = =round(layer_height*6,3)
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x

View file

@ -13,10 +13,13 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -23,6 +23,5 @@ speed_wall = =speed_print
speed_wall_x = =speed_print
speed_wall_x_roofing = =speed_wall
wall_line_width_x = =wall_line_width
wall_thickness = =wall_line_width_0 + wall_line_width_x
xy_offset = 0.075

View file

@ -13,10 +13,13 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -13,10 +13,13 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -13,10 +13,13 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -13,7 +13,9 @@ variant = AA+ 0.4
[values]
material_print_temperature = =default_material_print_temperature - 5
skin_preshrink = 0
speed_print = 100
speed_wall = 75
top_bottom_thickness = =round(layer_height*6,3)
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x

View file

@ -13,10 +13,13 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -23,6 +23,5 @@ speed_wall = =speed_print
speed_wall_x = =speed_print
speed_wall_x_roofing = =speed_wall
wall_line_width_x = =wall_line_width
wall_thickness = =wall_line_width_0 + wall_line_width_x
xy_offset = 0.075

View file

@ -13,7 +13,10 @@ variant = AA+ 0.4
[values]
material_print_temperature = =default_material_print_temperature - 5
max_skin_angle_for_expansion = 45
skin_preshrink = 0
speed_print = 100
speed_wall = 75
top_bottom_thickness = =round(layer_height*6,3)
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x

View file

@ -13,10 +13,14 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
max_skin_angle_for_expansion = 45
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -23,6 +23,5 @@ speed_wall = =speed_print
speed_wall_x = =speed_print
speed_wall_x_roofing = =speed_wall
wall_line_width_x = =wall_line_width
wall_thickness = =wall_line_width_0 + wall_line_width_x
xy_offset = 0.075

View file

@ -13,7 +13,10 @@ variant = AA+ 0.4
[values]
material_print_temperature = =default_material_print_temperature - 5
max_skin_angle_for_expansion = 45
skin_preshrink = 0
speed_print = 100
speed_wall = 75
top_bottom_thickness = =round(layer_height*6,3)
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x

View file

@ -13,10 +13,14 @@ variant = AA+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
max_skin_angle_for_expansion = 45
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -23,6 +23,5 @@ speed_wall = =speed_print
speed_wall_x = =speed_print
speed_wall_x_roofing = =speed_wall
wall_line_width_x = =wall_line_width
wall_thickness = =wall_line_width_0 + wall_line_width_x
xy_offset = 0.075

View file

@ -14,10 +14,13 @@ variant = CC+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,10 +14,13 @@ variant = CC+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,10 +14,13 @@ variant = CC+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,10 +14,13 @@ variant = CC+ 0.4
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -13,10 +13,13 @@ variant = CC+ 0.6
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -13,10 +13,13 @@ variant = CC+ 0.6
[values]
hole_xy_offset = 0.1
infill_overlap = 10
infill_pattern = honeycomb
infill_sparse_density = 20
initial_bottom_layers = =bottom_layers
inset_direction = inside_out
skin_preshrink = 0
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 4
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,14 +14,18 @@ weight = -1
[values]
cool_min_temperature = =material_print_temperature - 20
hole_xy_offset = 0.1
infill_overlap = 0
infill_pattern = zigzag
material_final_print_temperature = =material_print_temperature - 15
material_initial_print_temperature = =material_print_temperature - 15
max_skin_angle_for_expansion = 75
retraction_prime_speed = 30
skin_preshrink = 0
small_skin_on_surface = true
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
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,15 +14,19 @@ weight = 0
[values]
cool_min_temperature = =material_print_temperature - 20
hole_xy_offset = 0.1
infill_overlap = 0
infill_pattern = zigzag
material_final_print_temperature = =material_print_temperature - 15
material_initial_print_temperature = =material_print_temperature - 15
max_skin_angle_for_expansion = 75
retraction_prime_speed = 30
skin_preshrink = 0
small_skin_on_surface = true
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
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,14 +14,18 @@ weight = -2
[values]
cool_min_temperature = =material_print_temperature - 20
hole_xy_offset = 0.1
infill_overlap = 0
infill_pattern = zigzag
material_final_print_temperature = =material_print_temperature - 15
material_initial_print_temperature = =material_print_temperature - 15
max_skin_angle_for_expansion = 75
retraction_prime_speed = 30
skin_preshrink = 0
small_skin_on_surface = true
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
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,13 +14,17 @@ weight = -1
[values]
cool_min_temperature = =material_print_temperature - 20
hole_xy_offset = 0.1
infill_overlap = 0
infill_pattern = zigzag
max_skin_angle_for_expansion = 75
retraction_prime_speed = 30
retraction_speed = 25
skin_preshrink = 0
small_skin_on_surface = true
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
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,13 +14,17 @@ weight = 0
[values]
cool_min_temperature = =material_print_temperature - 20
hole_xy_offset = 0.1
infill_overlap = 0
infill_pattern = zigzag
max_skin_angle_for_expansion = 75
retraction_prime_speed = 30
skin_preshrink = 0
small_skin_on_surface = true
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
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -14,12 +14,16 @@ weight = -2
[values]
cool_min_temperature = =material_print_temperature - 20
hole_xy_offset = 0.1
infill_overlap = 0
infill_pattern = zigzag
max_skin_angle_for_expansion = 75
retraction_prime_speed = 30
skin_preshrink = 0
small_skin_on_surface = true
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
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
xy_offset = 0.025

View file

@ -118,6 +118,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -117,6 +117,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -128,6 +128,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -117,6 +117,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -117,6 +117,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -118,6 +118,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -117,6 +117,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -128,6 +128,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -117,6 +117,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1

View file

@ -117,6 +117,7 @@ roofing_pattern = =top_bottom_pattern
seam_overhang_angle = =support_angle
skin_material_flow = =0.95 * material_flow
skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1
skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x
skin_support_speed = =bridge_skin_speed
skirt_brim_minimal_length = 250
skirt_line_count = 1