Merge branch '2.1'

Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-04-04 18:49:09 +02:00
commit 0684cee681
86 changed files with 2336 additions and 3490 deletions

View file

@ -5,5 +5,6 @@ weight = -3
[settings]
layer_height = 0.06
infill_sparse_density = 12
speed_topbottom = 15
speed_infill = 80

View file

@ -9,7 +9,9 @@ shell_thickness = 0.8
infill_sparse_density = 8
speed_print = 60
speed_wall_0 = 40
speed_wall_x = 50
speed_wall_x = 80
speed_infill = 100
wall_thickness = 1
speed_topbottom = 30
speed_travel = 150
speed_layer_0 = 30

View file

@ -4,3 +4,5 @@ name = Normal Quality
weight = -2
[settings]
speed_topbottom = 15
speed_infill = 80

View file

@ -5,6 +5,5 @@ weight = -4
[settings]
layer_height = 0.04
shell_thickness = 1.6
top_bottom_thickness = 0.8
infill_sparse_density = 14
speed_topbottom = 15
speed_infill = 80

View file

@ -5,8 +5,6 @@ name = ABS
[settings]
material_bed_temperature = 100
platform_adhesion = brim
material_flow = 107
material_print_temperature = 250
cool_fan_speed = 50
cool_fan_speed_max = 50

View file

@ -4,9 +4,5 @@ type = material
name = CPE
[settings]
material_bed_temperature = 60
platform_adhesion = brim
material_flow = 100
material_print_temperature = 250
cool_fan_speed = 50
cool_fan_speed_max = 50

View file

@ -4,6 +4,3 @@ type = material
name = PLA
[settings]
material_bed_temperature = 60
material_flow = 100
material_print_temperature = 210

View file

@ -8,19 +8,18 @@ weight = -2
[settings]
layer_height = 0.06
top_bottom_thickness = 0.72
layer_height_0 = 0.15
speed_wall_x = 25
wall_thickness = 0.88
line_width = 0.22
top_bottom_thickness = 0.72
infill_sparse_density = 22
speed_print = 20
layer_height_0 = 0.15
speed_layer_0 = 20
speed_infill = 30
speed_topbottom = 20
adhesion_type = brim
speed_print = 20
cool_min_speed = 25
line_width = 0.22
infill_sparse_density = 22
speed_wall_0 = 20
speed_wall_x = 25
cool_min_layer_time = 2
cool_min_speed = 10
cool_lift_head = True
cool_fan_speed_min = 50
cool_fan_speed_min = 20

View file

@ -8,19 +8,18 @@ weight = -1
[settings]
layer_height = 0.15
top_bottom_thickness = 0.75
layer_height_0 = 0.26
speed_print = 40
speed_wall_x = 40
wall_thickness = 0.7
line_width = 0.35
top_bottom_thickness = 0.75
infill_sparse_density = 18
speed_print = 40
layer_height_0 = 0.26
speed_layer_0 = 30
speed_travel = 150
speed_infill = 55
speed_topbottom = 30
speed_wall_0 = 30
cool_min_layer_time = 3
cool_min_speed = 20
line_width = 0.35
infill_sparse_density = 18
speed_travel = 150
speed_wall_0 = 30
adhesion_type = brim
cool_lift_head = True
cool_fan_speed_min = 50

View file

@ -8,19 +8,18 @@ weight = -3
[settings]
layer_height = 0.06
top_bottom_thickness = 0.72
layer_height_0 = 0.26
speed_print = 30
speed_wall_x = 30
wall_thickness = 1.05
line_width = 0.35
top_bottom_thickness = 0.72
infill_sparse_density = 22
speed_print = 30
layer_height_0 = 0.26
speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
adhesion_type = brim
cool_min_speed = 20
line_width = 0.35
infill_sparse_density = 22
speed_wall_0 = 20
cool_min_layer_time = 3
cool_min_speed = 10
cool_fan_speed_min = 20
cool_lift_head = True
cool_fan_speed_min = 50

View file

@ -7,17 +7,19 @@ material = ABS
weight = -2
[settings]
layer_height_0 = 0.26
speed_print = 30
speed_wall_x = 30
layer_height = 0.1
wall_thickness = 1.05
line_width = 0.35
top_bottom_thickness = 0.8
infill_sparse_density = 20
speed_print = 30
layer_height_0 = 0.26
speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
cool_min_layer_time = 3
cool_min_speed = 20
line_width = 0.35
speed_wall_0 = 20
adhesion_type = brim
cool_lift_head = True
cool_min_layer_time = 3
cool_fan_speed_min = 50
cool_min_speed = 10
cool_lift_head = True

View file

@ -8,18 +8,19 @@ weight = -2
[settings]
layer_height = 0.15
top_bottom_thickness = 1.2
layer_height_0 = 0.39
speed_print = 25
speed_wall_x = 30
wall_thickness = 1.59
speed_infill = 55
speed_topbottom = 20
adhesion_type = brim
cool_min_speed = 20
line_width = 0.53
top_bottom_thickness = 1.2
infill_sparse_density = 20
speed_print = 25
layer_height_0 = 0.39
speed_layer_0 = 20
speed_infill = 40
speed_topbottom = 20
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_lift_head = True
cool_fan_speed_min = 50
cool_min_speed = 20
cool_lift_head = True

View file

@ -8,18 +8,18 @@ weight = -2
[settings]
layer_height = 0.2
top_bottom_thickness = 1.2
layer_height_0 = 0.5
speed_print = 20
speed_wall_x = 30
wall_thickness = 2.1
line_width = 0.7
speed_print = 20
top_bottom_thickness = 1.2
infill_sparse_density = 20
layer_height_0 = 0.5
speed_layer_0 = 20
speed_infill = 40
speed_topbottom = 20
adhesion_type = brim
cool_min_speed = 15
line_width = 0.7
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_lift_head = True
cool_fan_speed_min = 50
cool_min_speed = 15
cool_lift_head = True

View file

@ -7,20 +7,20 @@ material = CPE
weight = -2
[settings]
infill_overlap = 17
layer_height = 0.06
wall_thickness = 0.88
layer_height_0 = 0.15
speed_wall_x = 25
line_width = 0.22
top_bottom_thickness = 0.72
infill_sparse_density = 22
speed_print = 20
layer_height_0 = 0.15
speed_layer_0 = 20
speed_infill = 30
speed_topbottom = 20
speed_wall_x = 25
cool_min_layer_time = 2
speed_print = 20
line_width = 0.22
infill_sparse_density = 22
speed_wall_0 = 20
adhesion_type = brim
cool_lift_head = True
cool_min_speed = 10
cool_fan_speed_min = 50
cool_lift_head = True
infill_overlap = 17

View file

@ -7,21 +7,20 @@ material = CPE
weight = -1
[settings]
infill_overlap = 17
cool_min_layer_time = 3
layer_height = 0.15
wall_thickness = 0.7
layer_height_0 = 0.26
speed_print = 30
speed_wall_x = 40
top_bottom_thickness = 0.75
speed_infill = 45
speed_topbottom = 20
speed_travel = 150
line_width = 0.35
top_bottom_thickness = 0.75
infill_sparse_density = 18
speed_print = 40
layer_height_0 = 0.26
speed_travel = 150
speed_layer_0 = 30
speed_infill = 45
speed_wall_0 = 30
adhesion_type = brim
cool_lift_head = True
cool_min_layer_time = 3
cool_fan_speed_min = 50
cool_min_speed = 10
cool_lift_head = True
infill_overlap = 17

View file

@ -8,18 +8,20 @@ weight = -3
[settings]
layer_height = 0.06
top_bottom_thickness = 0.72
layer_height_0 = 0.26
speed_print = 20
speed_wall_x = 30
wall_thickness = 1.05
line_width = 0.35
top_bottom_thickness = 0.72
infill_sparse_density = 22
speed_print = 20
layer_height_0 = 0.26
speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
adhesion_type = brim
line_width = 0.35
infill_sparse_density = 22
speed_wall_0 = 20
speed_wall_x = 30
cool_min_layer_time = 3
cool_lift_head = True
cool_fan_speed_min = 50
cool_min_speed = 10
cool_lift_head = True
infill_overlap = 15

View file

@ -7,16 +7,19 @@ material = CPE
weight = -2
[settings]
layer_height_0 = 0.26
speed_print = 20
speed_wall_x = 30
wall_thickness = 1.05
line_width = 0.35
top_bottom_thickness = 0.8
speed_print = 30
layer_height_0 = 0.26
speed_layer_0 = 20
speed_infill = 45
speed_topbottom = 20
cool_min_layer_time = 3
line_width = 0.35
speed_wall_0 = 20
adhesion_type = brim
cool_lift_head = True
speed_wall_x = 30
cool_min_layer_time = 3
cool_fan_speed_min = 50
cool_min_speed = 10
cool_lift_head = True
infill_overlap = 15

View file

@ -7,19 +7,20 @@ material = CPE
weight = -2
[settings]
infill_overlap = 17
layer_height = 0.15
top_bottom_thickness = 1.2
layer_height_0 = 0.39
speed_wall_x = 30
wall_thickness = 1.59
line_width = 0.53
top_bottom_thickness = 1.2
speed_print = 25
layer_height_0 = 0.4
speed_layer_0 = 20
speed_infill = 40
speed_topbottom = 20
cool_min_layer_time = 3
speed_print = 20
line_width = 0.53
speed_wall_0 = 20
adhesion_type = brim
cool_lift_head = True
speed_wall_x = 30
cool_min_layer_time = 3
cool_min_speed = 10
cool_fan_speed_min = 50
cool_lift_head = True
infill_overlap = 17

View file

@ -7,19 +7,19 @@ material = CPE
weight = -2
[settings]
infill_overlap = 17
layer_height = 0.2
top_bottom_thickness = 1.2
layer_height_0 = 0.5
speed_wall_x = 30
wall_thickness = 2.1
line_width = 0.7
top_bottom_thickness = 1.2
speed_print = 20
layer_height_0 = 0.5
speed_layer_0 = 20
speed_infill = 40
speed_topbottom = 20
speed_wall_x = 30
cool_min_layer_time = 3
speed_print = 20
line_width = 0.7
speed_wall_0 = 20
adhesion_type = brim
cool_lift_head = True
cool_min_speed = 10
cool_fan_speed_min = 50
cool_lift_head = True
infill_overlap = 17

View file

@ -10,22 +10,13 @@ weight = -2
line_width = 0.22
layer_height = 0.06
layer_height_0 = 0.15
shell_thickness = 0.88
wall_thickness = 0.88
top_bottom_thickness = 0.72
top_bottom_pattern = lines
infill_sparse_density = 22
infill_wipe_dist = 0.1
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
speed_print = 20
speed_infill = 30
speed_wall_0 = 20
speed_wall_x = 25
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -10,23 +10,14 @@ weight = -1
line_width = 0.35
layer_height = 0.15
layer_height_0 = 0.26
shell_thickness = 0.7
wall_thickness = 0.7
top_bottom_thickness = 0.6
top_bottom_pattern = lines
infill_sparse_density = 18
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
speed_print = 40
speed_infill = 60
speed_wall_0 = 40
speed_wall_x = 50
speed_topbottom = 30
speed_travel = 150
speed_topbottom = 30
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -10,22 +10,13 @@ weight = -3
line_width = 0.35
layer_height = 0.06
layer_height_0 = 0.26
shell_thickness = 1.05
wall_thickness = 1.05
top_bottom_thickness = 0.84
top_bottom_pattern = lines
infill_sparse_density = 22
infill_wipe_dist = 0.18
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
speed_print = 30
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim
cool_min_layer_time_fan_speed_max = 15

View file

@ -8,24 +8,14 @@ weight = -2
[settings]
line_width = 0.35
layer_height = 0.1
layer_height_0 = 0.26
shell_thickness = 1.05
wall_thickness = 1.05
top_bottom_thickness = 0.8
top_bottom_pattern = lines
infill_sparse_density = 20
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
speed_print = 30
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -10,23 +10,14 @@ weight = -4
line_width = 0.35
layer_height = 0.04
layer_height_0 = 0.26
shell_thickness = 1.4
wall_thickness = 1.4
top_bottom_thickness = 1.12
top_bottom_pattern = lines
infill_sparse_density = 25
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_print = 30
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -10,22 +10,12 @@ weight = -2
line_width = 0.53
layer_height = 0.15
layer_height_0 = 0.4
shell_thickness = 1.59
wall_thickness = 1.59
top_bottom_thickness = 1.2
top_bottom_pattern = lines
infill_sparse_density = 20
infill_wipe_dist = 0.3
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
speed_print = 25
speed_infill = 55
speed_wall_0 = 25
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.2
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 20
adhesion_type = brim

View file

@ -10,22 +10,13 @@ weight = -2
line_width = 0.7
layer_height = 0.2
layer_height_0 = 0.5
shell_thickness = 2.1
wall_thickness = 2.1
top_bottom_thickness = 1.6
top_bottom_pattern = lines
infill_sparse_density = 20
infill_wipe_dist = 0.4
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
speed_print = 20
speed_infill = 40
speed_wall_0 = 20
speed_wall_x = 30
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.6
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 25
adhesion_type = brim

View file

@ -1,32 +0,0 @@
[general]
version = 1
name = Normal Quality
machine_type = ultimaker2_olsson
machine_variant = 0.25 mm
weight = -2
[settings]
line_width = 0.22
layer_height = 0.06
layer_height_0 = 0.15
shell_thickness = 0.88
top_bottom_thickness = 0.72
top_bottom_pattern = lines
infill_sparse_density = 22
infill_overlap = 0.022
infill_wipe_dist = 0.1
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 30
speed_wall_0 = 20
speed_wall_x = 25
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -1,33 +0,0 @@
[general]
version = 1
name = Fast Print
machine_type = ultimaker2_olsson
machine_variant = 0.4 mm
weight = -1
[settings]
line_width = 0.35
layer_height = 0.15
layer_height_0 = 0.26
shell_thickness = 0.7
top_bottom_thickness = 0.6
top_bottom_pattern = lines
infill_sparse_density = 18
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 60
speed_wall_0 = 40
speed_wall_x = 50
speed_topbottom = 30
speed_travel = 150
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -1,32 +0,0 @@
[general]
version = 1
name = High Quality
machine_type = ultimaker2_olsson
machine_variant = 0.4 mm
weight = -3
[settings]
line_width = 0.35
layer_height = 0.06
layer_height_0 = 0.26
shell_thickness = 1.05
top_bottom_thickness = 0.84
top_bottom_pattern = lines
infill_sparse_density = 22
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -1,32 +0,0 @@
[general]
version = 1
name = Normal Quality
machine_type = ultimaker2_olsson
machine_variant = 0.4 mm
weight = -2
[settings]
line_width = 0.35
layer_height = 0.1
layer_height_0 = 0.26
shell_thickness = 1.05
top_bottom_thickness = 0.8
top_bottom_pattern = lines
infill_sparse_density = 20
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -1,32 +0,0 @@
[general]
version = 1
name = Ulti Quality
machine_type = ultimaker2_olsson
machine_variant = 0.4 mm
weight = -4
[settings]
line_width = 0.35
layer_height = 0.04
layer_height_0 = 0.26
shell_thickness = 1.4
top_bottom_thickness = 1.12
top_bottom_pattern = lines
infill_sparse_density = 25
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_0 = 30
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15
adhesion_type = brim

View file

@ -1,32 +0,0 @@
[general]
version = 1
name = Normal Quality
machine_type = ultimaker2_olsson
machine_variant = 0.6 mm
weight = -2
[settings]
line_width = 0.53
layer_height = 0.15
layer_height_0 = 0.4
shell_thickness = 1.59
top_bottom_thickness = 1.2
top_bottom_pattern = lines
infill_sparse_density = 20
infill_overlap = 0.053
infill_wipe_dist = 0.3
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 55
speed_wall_0 = 25
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.2
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 20
adhesion_type = brim

View file

@ -1,32 +0,0 @@
[general]
version = 1
name = Normal Quality
machine_type = ultimaker2_olsson
machine_variant = 0.8 mm
weight = -2
[settings]
line_width = 0.7
layer_height = 0.2
layer_height_0 = 0.5
shell_thickness = 2.1
top_bottom_thickness = 1.6
top_bottom_pattern = lines
infill_sparse_density = 20
infill_overlap = 0.07
infill_wipe_dist = 0.4
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 40
speed_wall_0 = 20
speed_wall_x = 30
speed_topbottom = 20
speed_layer_0 = 25
skirt_speed = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.6
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 25
adhesion_type = brim