3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '2.6'

Browse source
This commit is contained in:
Ghostkeeper 2017-06-26 17:23:57 +02:00
commit ee0918f1d0
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
25 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/definitions/fdmprinter.def.json
View file

@ -916,7 +916,7 @@
"default_value": 0.2,
"value": "machine_nozzle_size / 2",
"minimum_value": "0",
"maximum_value_warning": "machine_nozzle_size",
"maximum_value_warning": "machine_nozzle_size * 2",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
@ -1393,7 +1393,6 @@
"default_value": 1.5,
"minimum_value": "0.0001",
"minimum_value_warning": "3 * resolveOrValue('layer_height')",
"maximum_value_warning": "100",
"enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
@ -1445,6 +1444,7 @@
"type": "bool",
"default_value": false,
"limit_to_extruder": "top_bottom_extruder_nr",
"value": "expand_skins_into_infill",
"settable_per_mesh": true
}
}
@ -2908,7 +2908,7 @@
"unit": "mm",
"type": "float",
"default_value": 1,
"minimum_value_warning": "0.75 * machine_nozzle_size",
"minimum_value_warning": "0",
"maximum_value_warning": "10",
"enabled": "retraction_enable and retraction_hop_enabled",
"settable_per_mesh": false,

3
resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
View file

@ -25,12 +25,9 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
gradual_infill_step_height = =layer_height * 2
gradual_infill_steps = 3
infill_line_width = =round(line_width * 0.4 / 0.38, 2)
infill_overlap = 0
infill_pattern = cubic
infill_sparse_density = 96
infill_wipe_dist = 0
jerk_enabled = True
jerk_layer_0 = =jerk_topbottom

3
resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
View file

@ -25,12 +25,9 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
gradual_infill_step_height = =layer_height * 2
gradual_infill_steps = 3
infill_line_width = =round(line_width * 0.4 / 0.38, 2)
infill_overlap = 0
infill_pattern = cubic
infill_sparse_density = 96
infill_wipe_dist = 0
jerk_enabled = True
jerk_layer_0 = =jerk_topbottom

4
resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
View file

@ -25,13 +25,9 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
gradual_infill_step_height = =layer_height * 2
gradual_infill_steps = 3
infill_line_width = =round(line_width * 0.6 / 0.57, 2)
infill_overlap = 0
infill_overlap_mm = 0
infill_pattern = cubic
infill_sparse_density = 96
infill_wipe_dist = 0
jerk_enabled = True
jerk_layer_0 = =jerk_topbottom

4
resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
View file

@ -25,13 +25,9 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
gradual_infill_step_height = =layer_height * 2
gradual_infill_steps = 3
infill_line_width = =round(line_width * 0.6 / 0.57, 2)
infill_overlap = 0
infill_overlap_mm = 0
infill_pattern = cubic
infill_sparse_density = 96
infill_wipe_dist = 0
jerk_enabled = True
jerk_layer_0 = =jerk_topbottom

4
resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
View file

@ -25,13 +25,9 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
gradual_infill_step_height = =layer_height * 3
gradual_infill_steps = 3
infill_line_width = =round(line_width * 0.8 / 0.76, 2)
infill_overlap = 0
infill_overlap_mm = 0
infill_pattern = cubic
infill_sparse_density = 96
infill_wipe_dist = 0
jerk_enabled = True
jerk_layer_0 = =jerk_topbottom

4
resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
View file

@ -25,13 +25,9 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
gradual_infill_step_height = =layer_height * 2
gradual_infill_steps = 3
infill_line_width = =round(line_width * 0.8 / 0.76, 2)
infill_overlap = 0
infill_overlap_mm = 0
infill_pattern = cubic
infill_sparse_density = 96
infill_wipe_dist = 0
jerk_enabled = True
jerk_layer_0 = =jerk_topbottom

3
resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_polypropylene_ultimaker3_AA_0.4
material = generic_pp_ultimaker3_AA_0.4
weight = -2
setting_version = 1
@ -34,6 +34,7 @@ material_final_print_temperature = 205
material_initial_print_temperature = 210
material_print_temperature = 215
material_print_temperature_layer_0 = 220
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_size = 16

3
resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker3
[metadata]
type = quality
quality_type = fast
material = generic_polypropylene_ultimaker3_AA_0.4
material = generic_pp_ultimaker3_AA_0.4
weight = -1
setting_version = 1
@ -34,6 +34,7 @@ material_final_print_temperature = 195
material_initial_print_temperature = 205
material_print_temperature = 207
material_print_temperature_layer_0 = 210
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_size = 16

3
resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker3
[metadata]
type = quality
quality_type = normal
material = generic_polypropylene_ultimaker3_AA_0.4
material = generic_pp_ultimaker3_AA_0.4
weight = 0
setting_version = 1
@ -33,6 +33,7 @@ material_final_print_temperature = 195
material_initial_print_temperature = 200
material_print_temperature = 205
material_print_temperature_layer_0 = 208
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_size = 16

1
resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
View file

@ -36,6 +36,7 @@ material_flow = 106
material_initial_print_temperature = =material_print_temperature - 16
material_print_temperature = =default_material_print_temperature + 2
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_wipe_enabled = True
retraction_count_max = 12

1
resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
View file

@ -36,6 +36,7 @@ material_flow = 106
material_initial_print_temperature = =material_print_temperature - 16
material_print_temperature = =default_material_print_temperature + 2
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_wipe_enabled = True
retraction_amount = 7

1
resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
View file

@ -34,6 +34,7 @@ material_final_print_temperature = =material_print_temperature - 21
material_flow = 106
material_initial_print_temperature = =material_print_temperature - 16
material_print_temperature_layer_0 = =default_material_print_temperature
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_wipe_enabled = True
retraction_count_max = 12

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Draft_Print.inst.cfg
View file

@ -19,6 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 10
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
retraction_combing = off
retraction_hop = 0.1
retraction_hop_enabled = False

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
View file

@ -20,6 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
prime_tower_enable = True
retraction_combing = off
retraction_hop = 0.1

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg
View file

@ -20,6 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 7
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
prime_tower_enable = True
retraction_combing = off
retraction_hop = 0.1

1
resources/quality/ultimaker3/um3_aa0.8_PC_Draft_Print.inst.cfg
View file

@ -17,6 +17,7 @@ infill_before_walls = True
line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
raft_airgap = 0.5
raft_margin = 15
skin_overlap = 0

1
resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
View file

@ -17,6 +17,7 @@ infill_before_walls = True
layer_height = 0.4
line_width = =machine_nozzle_size * 0.875
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
raft_airgap = 0.5
raft_margin = 15
skin_overlap = 0

1
resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
View file

@ -18,6 +18,7 @@ layer_height = 0.3
line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
raft_airgap = 0.5
raft_margin = 15
skin_overlap = 0

4
resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_polypropylene_ultimaker3_AA_0.8
material = generic_pp_ultimaker3_AA_0.8
weight = -2
setting_version = 1
@ -15,7 +15,6 @@ brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
expand_skins_expand_distance = =line_width * 2
expand_skins_into_infill = True
expand_upper_skins = True
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
@ -26,6 +25,7 @@ jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100

4
resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker3
[metadata]
type = quality
quality_type = superdraft
material = generic_polypropylene_ultimaker3_AA_0.8
material = generic_pp_ultimaker3_AA_0.8
weight = -4
setting_version = 1
@ -15,7 +15,6 @@ brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
expand_skins_expand_distance = =line_width * 2
expand_skins_into_infill = True
expand_upper_skins = True
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
@ -26,6 +25,7 @@ jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature = =default_material_print_temperature + 2
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100

4
resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker3
[metadata]
type = quality
quality_type = verydraft
material = generic_polypropylene_ultimaker3_AA_0.8
material = generic_pp_ultimaker3_AA_0.8
weight = -3
setting_version = 1
@ -15,7 +15,6 @@ brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
expand_skins_expand_distance = =line_width * 2
expand_skins_into_infill = True
expand_upper_skins = True
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
@ -26,6 +25,7 @@ jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
layer_height = 0.3
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100

2
resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
View file

@ -14,7 +14,6 @@ setting_version = 1
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
expand_skins_expand_distance = =line_width * 2
expand_skins_into_infill = True
expand_upper_skins = True
gradual_infill_step_height = =4 * layer_height
gradual_infill_steps = 5
@ -33,6 +32,7 @@ material_flow = 105
material_initial_print_temperature = =material_print_temperature - 16
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100

2
resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
View file

@ -14,7 +14,6 @@ setting_version = 1
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
expand_skins_expand_distance = =line_width * 2
expand_skins_into_infill = True
expand_upper_skins = True
gradual_infill_step_height = =4 * layer_height
gradual_infill_steps = 5
@ -34,6 +33,7 @@ material_flow = 105
material_initial_print_temperature = =material_print_temperature - 16
material_print_temperature = =default_material_print_temperature + 2
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100

2
resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
View file

@ -14,7 +14,6 @@ setting_version = 1
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
expand_skins_expand_distance = =line_width * 2
expand_skins_into_infill = True
expand_upper_skins = True
gradual_infill_step_height = =4 * layer_height
gradual_infill_steps = 5
@ -33,6 +32,7 @@ material_final_print_temperature = =material_print_temperature - 21
material_flow = 105
material_initial_print_temperature = =material_print_temperature - 16
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100