Skip to content

Commit

Permalink
Merge branch 'main' into CURA-12048_option-to-publish-release-descrip…
Browse files Browse the repository at this point in the history
…tion
  • Loading branch information
wawanbreton authored Sep 20, 2024
2 parents 5261936 + 494e61a commit f134ebb
Show file tree
Hide file tree
Showing 14 changed files with 161 additions and 21 deletions.
2 changes: 1 addition & 1 deletion conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ requirements:
- "pynest2d/5.3.0"
- "native_cad_plugin/2.0.0"
requirements_internal:
- "fdm_materials/(latest)@internal/testing"
- "fdm_materials/5.8.1"
- "cura_private_data/(latest)@internal/testing"
urls:
default:
Expand Down
2 changes: 1 addition & 1 deletion resources/conandata.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: "5.8.0"
version: "5.9.0-alpha.0"
1 change: 0 additions & 1 deletion resources/definitions/fdmextruder.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@
"default_value": 3,
"description": "The height difference between the tip of the nozzle and the lowest part of the print head.",
"label": "Nozzle Length",
"settable_globally": false,
"settable_per_extruder": true,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
Expand Down
26 changes: 26 additions & 0 deletions resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[general]
definition = ultimaker_factor4
name = Extra Fast
version = 4

[metadata]
material = generic_tpu
quality_type = verydraft
setting_version = 23
type = quality
variant = AA 0.8
weight = -3

[values]
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d'
infill_sparse_density = 20
inset_direction = outside_in
material_print_temperature = =default_material_print_temperature + 5
max_flow_acceleration = 1
skin_material_flow = =material_flow * 0.9
skin_material_flow_layer_0 = 90
speed_layer_0 = 20
speed_print = 35

26 changes: 26 additions & 0 deletions resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[general]
definition = ultimaker_factor4
name = Sprint
version = 4

[metadata]
material = generic_tpu
quality_type = superdraft
setting_version = 23
type = quality
variant = AA 0.8
weight = -4

[values]
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d'
infill_sparse_density = 20
inset_direction = outside_in
material_print_temperature = =default_material_print_temperature + 8
max_flow_acceleration = 1
skin_material_flow = =material_flow * 0.9
skin_material_flow_layer_0 = 90
speed_layer_0 = 20
speed_print = 35

Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,32 @@ variant = BB 0.4
weight = -1

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

17 changes: 14 additions & 3 deletions resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,32 @@ variant = BB 0.4
weight = 0

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 50
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

17 changes: 14 additions & 3 deletions resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,32 @@ variant = BB 0.4
weight = -2

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 50
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

17 changes: 14 additions & 3 deletions resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,32 @@ variant = BB 0.4
weight = -3

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 40
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

16 changes: 14 additions & 2 deletions resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,32 @@ variant = BB 0.8
weight = -2

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

16 changes: 14 additions & 2 deletions resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,32 @@ variant = BB 0.8
weight = -3

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

16 changes: 14 additions & 2 deletions resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,32 @@ variant = BB 0.8
weight = -4

[values]
acceleration_print = 1000.0
acceleration_support_bottom = 100
acceleration_support_interface = 1500
acceleration_support_interface = 1000
brim_replaces_support = False
build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
gradual_flow_discretisation_step_size = 0.1
gradual_flow_enabled = True
initial_layer_line_width_factor = 150
gradual_support_infill_steps = 0
initial_layer_line_width_factor = 125
jerk_print = 10
material_flow_layer_0 = 90
max_flow_acceleration = 1
minimum_support_area = 4
prime_tower_flow = 90
prime_tower_min_volume = 15
retraction_min_travel = 5.0
retraction_prime_speed = 10.0
skin_material_flow = =material_flow * 0.93
speed_print = 30
support_angle = 45
support_infill_rate = 20
support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
support_interface_offset = 1
support_offset = 3
support_xy_distance = 2
support_z_distance = 0
switch_extruder_prime_speed = 10.0

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[general]
definition = ultimaker_factor4
name = Sprint
name = Extra Fast
version = 4

[metadata]
Expand Down
8 changes: 8 additions & 0 deletions resources/texts/change_log.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
[5.8.1]

* Bug fixes:
- Fixed an issue where materials could not be synced to UltiMaker Printers

* Profile Improvements
- Significant improvements for PVA and TPU 95A profiles for UltiMaker Factor 4

[5.8]

* New Z Seam Settings:
Expand Down

0 comments on commit f134ebb

Please sign in to comment.