mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-22 10:21:39 -07:00
Fix merge conflicts with master
This commit is contained in:
commit
94e89ad4ac
89 changed files with 1283 additions and 928 deletions
|
|
@ -7,9 +7,9 @@ definition = hms434
|
|||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = coarse
|
||||
weight = -3
|
||||
weight = -1
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.4
|
||||
layer_height_0 = 0.4
|
||||
layer_height_0 = 0.2
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Extra Coarse
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = extra coarse
|
||||
weight = -4
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.6
|
||||
layer_height_0 = 0.6
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Super Coarse
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = super coarse
|
||||
weight = -4
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.8
|
||||
layer_height_0 = 0.8
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Ultra Coarse
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = ultra coarse
|
||||
weight = -4
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 1.0
|
||||
layer_height_0 = 1.0
|
||||
36
resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg
Normal file
36
resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = High
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
material = generic_pla
|
||||
variant = 0.4mm TP extruder
|
||||
|
||||
[values]
|
||||
|
||||
wall_0_wipe_dist = 0.0
|
||||
|
||||
infill_overlap_mm = -0.1
|
||||
infill_wipe_dist = 0
|
||||
|
||||
default_material_print_temperature = 190
|
||||
material_standby_temperature = 160
|
||||
default_material_bed_temperature = 45
|
||||
build_volume_temperature = 43
|
||||
material_flow = 100
|
||||
retraction_amount = 1
|
||||
retraction_speed = 40
|
||||
retraction_prime_speed = 8
|
||||
retraction_extra_prime_amount = 0
|
||||
switch_extruder_retraction_amount = 2
|
||||
|
||||
speed_print = 50
|
||||
|
||||
coasting_volume = 0.05
|
||||
coasting_min_volume = 0.17
|
||||
coasting_speed = 100
|
||||
36
resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg
Normal file
36
resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
material = generic_pla
|
||||
variant = 0.4mm TP extruder
|
||||
|
||||
[values]
|
||||
|
||||
wall_0_wipe_dist = 0.0
|
||||
|
||||
infill_overlap_mm = -0.1
|
||||
infill_wipe_dist = 0
|
||||
|
||||
default_material_print_temperature = 190
|
||||
material_standby_temperature = 160
|
||||
default_material_bed_temperature = 45
|
||||
build_volume_temperature = 43
|
||||
material_flow = 100
|
||||
retraction_amount = 1
|
||||
retraction_speed = 40
|
||||
retraction_prime_speed = 8
|
||||
retraction_extra_prime_amount = 0
|
||||
switch_extruder_retraction_amount = 2
|
||||
|
||||
speed_print = 50
|
||||
|
||||
coasting_volume = 0.05
|
||||
coasting_min_volume = 0.17
|
||||
coasting_speed = 100
|
||||
36
resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg
Normal file
36
resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Coarse
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = coarse
|
||||
weight = -1
|
||||
material = generic_pla
|
||||
variant = 0.8mm TP extruder
|
||||
|
||||
[values]
|
||||
|
||||
wall_0_wipe_dist = 0.0
|
||||
|
||||
infill_overlap_mm = -0.1
|
||||
infill_wipe_dist = 0
|
||||
|
||||
default_material_print_temperature = 190
|
||||
material_standby_temperature = 160
|
||||
default_material_bed_temperature = 45
|
||||
build_volume_temperature = 43
|
||||
material_flow = 100
|
||||
retraction_amount = 1
|
||||
retraction_speed = 40
|
||||
retraction_prime_speed = 8
|
||||
retraction_extra_prime_amount = 0
|
||||
switch_extruder_retraction_amount = 2
|
||||
|
||||
speed_print = 50
|
||||
|
||||
coasting_volume = 0.05
|
||||
coasting_min_volume = 0.17
|
||||
coasting_speed = 100
|
||||
40
resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg
Normal file
40
resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
material = generic_pla
|
||||
variant = 0.8mm TP extruder
|
||||
|
||||
[values]
|
||||
|
||||
wall_0_wipe_dist = 0.0
|
||||
|
||||
infill_overlap_mm = -0.1
|
||||
infill_sparse_thickness = =0.4 if infill_sparse_density < 90 else 0.2
|
||||
infill_wipe_dist = 0
|
||||
|
||||
default_material_print_temperature = 190
|
||||
material_standby_temperature = 160
|
||||
default_material_bed_temperature = 45
|
||||
build_volume_temperature = 43
|
||||
material_flow = 100
|
||||
retraction_amount = 1
|
||||
retraction_speed = 40
|
||||
retraction_prime_speed = 8
|
||||
retraction_extra_prime_amount = 0
|
||||
switch_extruder_retraction_amount = 2
|
||||
|
||||
speed_print = 50
|
||||
speed_infill = 42
|
||||
|
||||
support_infill_sparse_thickness = 0.4
|
||||
|
||||
coasting_volume = 0.05
|
||||
coasting_min_volume = 0.17
|
||||
coasting_speed = 100
|
||||
|
|
@ -4,7 +4,7 @@ name = Coarse
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Fine
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Medium
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Coarse
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Fine
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Medium
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = UltraFine
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = ultrahigh
|
||||
weight = 2
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Coarse
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Fine
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = Medium
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ name = UltraFine
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 8
|
||||
setting_version = 10
|
||||
type = quality
|
||||
quality_type = ultrahigh
|
||||
weight = 2
|
||||
|
|
|
|||
|
|
@ -1,41 +1,41 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = High
|
||||
definition = tizyx_k25
|
||||
|
||||
[metadata]
|
||||
quality_type = draft
|
||||
setting_version = 7
|
||||
type = quality
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.1
|
||||
initial_layer_line_width_factor = 90
|
||||
infill_overlap = 15
|
||||
material_flow_layer_0 = 93
|
||||
material_flow = 99
|
||||
speed_wall_0 = 45
|
||||
speed_wall_x = 50
|
||||
speed_topbottom = 45
|
||||
support_enable= True
|
||||
support_angle = 70
|
||||
adhesion_type = skirt
|
||||
skirt_line_count = 2
|
||||
skirt_gap = 2
|
||||
fill_outline_gaps = True
|
||||
infill_sparse_density = 15
|
||||
material_diameter = 1.75
|
||||
retraction_min_travel = 2
|
||||
speed_print = 60
|
||||
cool_fan_speed_0 = 10
|
||||
cool_min_layer_time = 12
|
||||
layer_start_x = 250
|
||||
layer_start_y = 250
|
||||
coasting_enable = False
|
||||
wall_line_count = 2
|
||||
material_print_temperature = =default_material_print_temperature
|
||||
material_initial_print_temperature = =material_print_temperature
|
||||
material_final_print_temperature = =material_print_temperature
|
||||
z_seam_corner = z_seam_corner_none
|
||||
optimize_wall_printing_order = True
|
||||
[general]
|
||||
version = 4
|
||||
name = High
|
||||
definition = tizyx_k25
|
||||
|
||||
[metadata]
|
||||
quality_type = draft
|
||||
setting_version = 7
|
||||
type = quality
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.1
|
||||
initial_layer_line_width_factor = 90
|
||||
infill_overlap = 15
|
||||
material_flow_layer_0 = 93
|
||||
material_flow = 99
|
||||
speed_wall_0 = 45
|
||||
speed_wall_x = 50
|
||||
speed_topbottom = 45
|
||||
support_enable= True
|
||||
support_angle = 70
|
||||
adhesion_type = skirt
|
||||
skirt_line_count = 2
|
||||
skirt_gap = 2
|
||||
fill_outline_gaps = True
|
||||
infill_sparse_density = 15
|
||||
material_diameter = 1.75
|
||||
retraction_min_travel = 2
|
||||
speed_print = 60
|
||||
cool_fan_speed_0 = 10
|
||||
cool_min_layer_time = 12
|
||||
layer_start_x = 250
|
||||
layer_start_y = 250
|
||||
coasting_enable = False
|
||||
wall_line_count = 2
|
||||
material_print_temperature = =default_material_print_temperature
|
||||
material_initial_print_temperature = =material_print_temperature
|
||||
material_final_print_temperature = =material_print_temperature
|
||||
z_seam_corner = z_seam_corner_none
|
||||
optimize_wall_printing_order = True
|
||||
|
|
|
|||
|
|
@ -1,41 +1,41 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = tizyx_k25
|
||||
|
||||
[metadata]
|
||||
quality_type = normal
|
||||
setting_version = 10
|
||||
type = quality
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
initial_layer_line_width_factor = 90
|
||||
infill_overlap = 15
|
||||
material_flow_layer_0 = 93
|
||||
material_flow = 99
|
||||
speed_wall_0 = 45
|
||||
speed_wall_x = 50
|
||||
speed_topbottom = 45
|
||||
support_enable= True
|
||||
support_angle = 70
|
||||
adhesion_type = skirt
|
||||
skirt_line_count = 2
|
||||
skirt_gap = 2
|
||||
fill_outline_gaps = True
|
||||
infill_sparse_density = 15
|
||||
material_diameter = 1.75
|
||||
retraction_min_travel = 2
|
||||
speed_print = 60
|
||||
cool_fan_speed_0 = 10
|
||||
cool_min_layer_time = 12
|
||||
layer_start_x = 250
|
||||
layer_start_y = 250
|
||||
coasting_enable = False
|
||||
wall_line_count = 2
|
||||
material_print_temperature = =default_material_print_temperature
|
||||
material_initial_print_temperature = =material_print_temperature
|
||||
material_final_print_temperature = =material_print_temperature
|
||||
z_seam_corner = z_seam_corner_none
|
||||
optimize_wall_printing_order = True
|
||||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = tizyx_k25
|
||||
|
||||
[metadata]
|
||||
quality_type = normal
|
||||
setting_version = 10
|
||||
type = quality
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
initial_layer_line_width_factor = 90
|
||||
infill_overlap = 15
|
||||
material_flow_layer_0 = 93
|
||||
material_flow = 99
|
||||
speed_wall_0 = 45
|
||||
speed_wall_x = 50
|
||||
speed_topbottom = 45
|
||||
support_enable= True
|
||||
support_angle = 70
|
||||
adhesion_type = skirt
|
||||
skirt_line_count = 2
|
||||
skirt_gap = 2
|
||||
fill_outline_gaps = True
|
||||
infill_sparse_density = 15
|
||||
material_diameter = 1.75
|
||||
retraction_min_travel = 2
|
||||
speed_print = 60
|
||||
cool_fan_speed_0 = 10
|
||||
cool_min_layer_time = 12
|
||||
layer_start_x = 250
|
||||
layer_start_y = 250
|
||||
coasting_enable = False
|
||||
wall_line_count = 2
|
||||
material_print_temperature = =default_material_print_temperature
|
||||
material_initial_print_temperature = =material_print_temperature
|
||||
material_final_print_temperature = =material_print_temperature
|
||||
z_seam_corner = z_seam_corner_none
|
||||
optimize_wall_printing_order = True
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue