GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:39:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/PP-336_Cleanup_infill_overlap_settings'

Browse Source 
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
This commit is contained in:
Jelle Spijker 2023-06-05 11:09:16 +02:00
commit e3a4c84463
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
47 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/definitions/ultimaker.def.json
View File

@ -45,6 +45,7 @@
"gradual_support_infill_step_height": { "value": "4 * layer_height" },
"gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" },
"infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },
"infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" },
"inset_direction": { "value": "'outside_in'" },
"jerk_infill": { "minimum_value_warning": 20 },
"jerk_prime_tower": { "minimum_value_warning": 20 },

1
resources/definitions/ultimaker_s3.def.json
View File

@ -66,7 +66,6 @@
"default_material_print_temperature": { "value": "200" },
"extruder_prime_pos_abs": { "default_value": true },
"gantry_height": { "value": "55" },
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
"infill_wipe_dist": { "value": "0" },
"jerk_enabled": { "value": "True" },

1
resources/definitions/ultimaker_s5.def.json
View File

@ -65,7 +65,6 @@
"default_material_print_temperature": { "value": "200" },
"extruder_prime_pos_abs": { "default_value": true },
"gantry_height": { "value": "55" },
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
"infill_wipe_dist": { "value": "0" },
"jerk_enabled": { "value": "True" },

1
resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
View File

@ -12,6 +12,5 @@ variant = AA 0.25
weight = 0
[values]
infill_overlap = =0 if infill_sparse_density > 80 else 15
speed_topbottom = =math.ceil(speed_print * 30 / 55)

1
resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 8
infill_overlap = =0 if infill_sparse_density > 80 else 10
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4

1
resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 8
infill_overlap = =0 if infill_sparse_density > 80 else 10
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4

1
resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = 1
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85

1
resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = -1
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
material_print_temperature = =default_material_print_temperature + 10

1
resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = 0
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85

1
resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = -2
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
material_print_temperature = =default_material_print_temperature + 10

2
resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg
View File

@ -13,8 +13,6 @@ weight = 1
[values]
brim_width = 20
infill_overlap = 0
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = -1
[values]
brim_width = 20
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

2
resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg
View File

@ -13,8 +13,6 @@ weight = -2
[values]
brim_width = 20
infill_overlap = 0
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = -1
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = -2
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

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

@ -14,7 +14,6 @@ weight = -1
[values]
brim_width = 8.75
gradual_infill_step_height = =5 * layer_height
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1

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

@ -14,7 +14,6 @@ weight = 0
[values]
brim_width = 8.75
gradual_infill_step_height = =5 * layer_height
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1

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

@ -14,7 +14,6 @@ weight = -2
[values]
brim_width = 8.75
gradual_infill_step_height = =5 * layer_height
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1

1
resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
View File

@ -12,6 +12,5 @@ variant = AA 0.25
weight = 0
[values]
infill_overlap = =0 if infill_sparse_density > 80 else 15
speed_topbottom = =math.ceil(speed_print * 30 / 55)

1
resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 8
infill_overlap = =0 if infill_sparse_density > 80 else 10
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4

1
resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 8
infill_overlap = =0 if infill_sparse_density > 80 else 10
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4

1
resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = 1
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85

1
resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = -1
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
material_print_temperature = =default_material_print_temperature + 10

1
resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = 0
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85

1
resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg
View File

@ -12,7 +12,6 @@ variant = AA 0.4
weight = -2
[values]
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
material_print_temperature = =default_material_print_temperature + 10

2
resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg
View File

@ -13,8 +13,6 @@ weight = 1
[values]
brim_width = 20
infill_overlap = 0
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = -1
[values]
brim_width = 20
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

2
resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg
View File

@ -13,8 +13,6 @@ weight = -2
[values]
brim_width = 20
infill_overlap = 0
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = -1
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = 0
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

1
resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg
View File

@ -13,7 +13,6 @@ weight = -2
[values]
brim_width = 20
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
machine_min_cool_heat_time_window = 15

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

@ -14,7 +14,6 @@ weight = -1
[values]
brim_width = 8.75
gradual_infill_step_height = =5 * layer_height
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1

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

@ -14,7 +14,6 @@ weight = 0
[values]
brim_width = 8.75
gradual_infill_step_height = =5 * layer_height
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1

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

@ -14,7 +14,6 @@ weight = -2
[values]
brim_width = 8.75
gradual_infill_step_height = =5 * layer_height
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1

1
resources/variants/ultimaker3_aa0.8.inst.cfg
View File

@ -12,7 +12,6 @@ type = variant
brim_width = 7
cool_fan_speed = 7
default_material_print_temperature = 200
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker3_bb0.8.inst.cfg
View File

@ -16,7 +16,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
brim_width = 3
cool_fan_speed = 50
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker3_extended_aa0.8.inst.cfg
View File

@ -12,7 +12,6 @@ type = variant
brim_width = 7
cool_fan_speed = 7
default_material_print_temperature = 200
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker3_extended_bb0.8.inst.cfg
View File

@ -16,7 +16,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
brim_width = 3
cool_fan_speed = 50
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker_s3_aa0.8.inst.cfg
View File

@ -12,7 +12,6 @@ type = variant
brim_width = 7
cool_fan_speed = 7
default_material_print_temperature = 200
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker_s3_bb0.8.inst.cfg
View File

@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
brim_width = 3
cool_fan_speed = 50
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker_s5_aa0.8.inst.cfg
View File

@ -12,7 +12,6 @@ type = variant
brim_width = 7
cool_fan_speed = 7
default_material_print_temperature = 200
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker_s5_bb0.8.inst.cfg
View File

@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
brim_width = 3
cool_fan_speed = 50
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker_s7_aa0.8.inst.cfg
View File

@ -12,7 +12,6 @@ type = variant
brim_width = 7
cool_fan_speed = 7
default_material_print_temperature = 200
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25

1
resources/variants/ultimaker_s7_bb0.8.inst.cfg
View File

@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
brim_width = 3
cool_fan_speed = 50
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0
jerk_print = 25