Merge branch '2.1' of https://github.com/Ultimaker/Cura

resources/profiles/materials/abs.cfg

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

resources/profiles/materials/cpe.cfg

@@ -5,7 +5,7 @@ name = CPE
 
 [settings]
 material_bed_temperature = 60
-platform_adhesion = Brim
+platform_adhesion = brim
 material_flow = 100
 material_print_temperature = 250
 cool_fan_speed = 50

resources/profiles/materials/pla.cfg

@@ -5,7 +5,7 @@ name = PLA
 
 [settings]
 material_bed_temperature = 60
-platform_adhesion = Skirt
+platform_adhesion = skirt
 material_flow = 100
 material_print_temperature = 210
 cool_fan_speed = 100

resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile

@@ -0,0 +1,26 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.25 mm
+material = ABS
+
+[settings]
+layer_height = 0.06
+top_bottom_thickness = 0.72
+layer_height_0 = 0.15
+speed_wall_x = 25
+wall_thickness = 0.88
+speed_infill = 30
+speed_topbottom = 20
+adhesion_type = brim
+speed_print = 20
+cool_min_speed = 25
+line_width = 0.22
+infill_sparse_density = 22
+machine_nozzle_size = 0.22
+speed_wall_0 = 20
+cool_min_layer_time = 2
+cool_lift_head = True
+cool_fan_speed_min = 50
+

resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile

@@ -1,51 +1,26 @@
 [general]
 version = 1
-name = Fast Prints
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-speed_travel = 150
-cool_min_speed = 20
-brim_line_count = 20
-top_thickness = 0.75
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 40
-retraction_hop = 0.0
-machine_nozzle_size = 0.35
 layer_height = 0.15
-speed_wall_0 = 30
-raft_interface_line_spacing = 3.0
-speed_topbottom = 30
-speed_infill = 55
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-infill_sparse_density = 18
-shell_thickness = 0.7
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 0.0525
-speed_wall_x = 40
-skirt_minimal_length = 150.0
-bottom_thickness = 0.75
-layer_height_0 = 0.26
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 0.75
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.26
+speed_print = 40
+speed_wall_x = 40
+wall_thickness = 0.7
+speed_infill = 55
+speed_topbottom = 30
+cool_min_layer_time = 3
+cool_min_speed = 20
+line_width = 0.35
+infill_sparse_density = 18
+machine_nozzle_size = 0.35
+speed_travel = 150
+speed_wall_0 = 30
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
-
+cool_lift_head = True
+cool_fan_speed_min = 50

resources/profiles/ultimaker2+/abs_0.4_high.curaprofile

@@ -6,46 +6,21 @@ machine_variant = 0.4 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-cool_min_speed = 20
-brim_line_count = 20
-top_thickness = 0.72
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 30
-retraction_hop = 0.0
-machine_nozzle_size = 0.35
 layer_height = 0.06
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 45
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-infill_sparse_density = 22
-shell_thickness = 1.05
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 0.0525
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-bottom_thickness = 0.72
-layer_height_0 = 0.26
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 0.72
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+layer_height_0 = 0.26
+speed_print = 30
+speed_wall_x = 30
+wall_thickness = 1.05
+speed_infill = 45
+speed_topbottom = 20
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+cool_min_speed = 20
+line_width = 0.35
+infill_sparse_density = 22
+machine_nozzle_size = 0.35  
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile

@@ -6,41 +6,18 @@ machine_variant = 0.4 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-support_enable = False
-retraction_combing = All
-cool_min_speed = 20
-brim_line_count = 20
-material_flow = 100.0
-cool_lift_head = True
+layer_height_0 = 0.26
 speed_print = 30
-retraction_hop = 0.0
+speed_wall_x = 30
+wall_thickness = 1.05
+speed_infill = 45
+speed_topbottom = 20
+cool_min_layer_time = 3
+cool_min_speed = 20
+line_width = 0.35
 machine_nozzle_size = 0.35
 speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 45
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-shell_thickness = 1.05
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 0.0525
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-layer_height_0 = 0.26
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
-cool_min_layer_time = 3
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
 adhesion_type = brim
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile

@@ -6,45 +6,20 @@ machine_variant = 0.6 mm
 material = ABS
 
 [settings]
-raft_surface_thickness = 0.27
-raft_base_line_width = 1.0
-raft_margin = 5.0
-cool_min_layer_time = 3
-support_enable = False
-retraction_combing = All
-cool_min_speed = 20
-brim_line_count = 14
-top_thickness = 1.2
-material_flow = 100.0
-cool_lift_head = True
-speed_print = 25
-retraction_hop = 0.0
-machine_nozzle_size = 0.53
 layer_height = 0.15
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-speed_topbottom = 20
-speed_infill = 55
-infill_before_walls = False
-retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
-shell_thickness = 1.59
-cool_fan_speed_max = 100
-raft_airgap = 0.0
-material_bed_temperature = 70
-infill_overlap = 0.0795
-speed_wall_x = 30
-skirt_minimal_length = 150.0
-speed_layer_0 = 20
-bottom_thickness = 1.2
-layer_height_0 = 0.39
-magic_mesh_surface_mode = False
-cool_fan_speed_min = 50
 top_bottom_thickness = 1.2
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
+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
-support_pattern = lines
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
+cool_min_speed = 20
+line_width = 0.53
+machine_nozzle_size = 0.53
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile

@@ -0,0 +1,25 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.8 mm
+material = ABS
+
+[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
+speed_infill = 40
+speed_topbottom = 20
+adhesion_type = brim
+cool_min_speed = 15
+line_width = 0.7
+machine_nozzle_size = 0.7
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
+

resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile

@@ -0,0 +1,26 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.25 mm
+material = CPE
+
+[settings]
+infill_overlap = 17
+layer_height = 0.06
+wall_thickness = 0.88
+layer_height_0 = 0.15
+speed_wall_x = 25
+top_bottom_thickness = 0.72
+speed_infill = 30
+speed_topbottom = 20
+cool_min_layer_time = 2
+speed_print = 20
+line_width = 0.22
+infill_sparse_density = 22
+machine_nozzle_size = 0.22
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
+

resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile

@@ -1,50 +1,27 @@
 [general]
 version = 1
-name = Fast Prints
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-skin_no_small_gaps_heuristic = False
-raft_airgap = 0.0
-speed_travel = 150
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-support_enable = False
-raft_surface_line_width = 0.4
-raft_surface_line_spacing = 3.0
-retraction_combing = All
-adhesion_type = brim
+infill_overlap = 17
 cool_min_layer_time = 3
 layer_height = 0.15
-raft_margin = 5.0
-speed_infill = 45
-bottom_thickness = 0.75
-brim_line_count = 20
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 30
-shell_thickness = 0.7
-speed_wall_0 = 30
-material_flow = 100.0
-support_pattern = lines
-infill_sparse_density = 18
-raft_interface_line_width = 0.4
+wall_thickness = 0.7
 layer_height_0 = 0.26
-material_bed_temperature = 70
-top_thickness = 0.75
-top_bottom_thickness = 0.75
+speed_print = 30
 speed_wall_x = 40
-infill_overlap = 0.0595
-infill_before_walls = False
-skirt_minimal_length = 150.0
+top_bottom_thickness = 0.75
+speed_infill = 45
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+speed_travel = 150
+line_width = 0.35
+infill_sparse_density = 18
 machine_nozzle_size = 0.35
+speed_wall_0 = 30
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile

@@ -6,45 +6,20 @@ machine_variant = 0.4 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-bottom_thickness = 0.72
-raft_surface_line_spacing = 3.0
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
 layer_height = 0.06
-raft_margin = 5.0
-speed_infill = 45
-speed_layer_0 = 20
-brim_line_count = 20
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 1.05
-speed_wall_0 = 20
-material_flow = 100.0
-support_pattern = lines
-infill_sparse_density = 22
-raft_interface_line_width = 0.4
-layer_height_0 = 0.26
-material_bed_temperature = 70
-top_thickness = 0.72
 top_bottom_thickness = 0.72
+layer_height_0 = 0.26
+speed_print = 20
 speed_wall_x = 30
-infill_overlap = 0.0525
-infill_before_walls = False
-raft_surface_line_width = 0.4
-skirt_minimal_length = 150.0
+wall_thickness = 1.05
+speed_infill = 45
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+adhesion_type = brim
+line_width = 0.35
+infill_sparse_density = 22
 machine_nozzle_size = 0.35
+speed_wall_0 = 20
+cool_min_layer_time = 3
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile

@@ -6,40 +6,17 @@ machine_variant = 0.4 mm
 material = CPE
 
 [settings]
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-support_pattern = lines
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-raft_surface_line_width = 0.4
-cool_fan_speed_min = 50
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
-infill_before_walls = False
-speed_layer_0 = 20
-brim_line_count = 20
-cool_lift_head = True
-raft_interface_line_width = 0.4
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 1.05
-speed_wall_0 = 20
-material_flow = 100.0
-raft_surface_line_spacing = 3.0
-raft_margin = 5.0
-retraction_speed = 40.0
 layer_height_0 = 0.26
-material_bed_temperature = 70
+speed_print = 20
 speed_wall_x = 30
-infill_overlap = 0.0525
+wall_thickness = 1.05
 speed_infill = 45
-skirt_minimal_length = 150.0
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+cool_min_layer_time = 3
+line_width = 0.35
 machine_nozzle_size = 0.35
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile

@@ -6,44 +6,20 @@ machine_variant = 0.6 mm
 material = CPE
 
 [settings]
-cool_fan_speed_min = 50
-retraction_hop = 0.0
-support_enable = False
-raft_airgap = 0.0
-raft_surface_thickness = 0.27
-raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
-bottom_thickness = 1.2
-support_pattern = lines
-retraction_combing = All
-adhesion_type = brim
-cool_min_layer_time = 3
+infill_overlap = 17
 layer_height = 0.15
-speed_infill = 40
-speed_layer_0 = 20
-brim_line_count = 14
-cool_lift_head = True
-retraction_speed = 40.0
-cool_fan_speed_max = 100
-magic_mesh_surface_mode = False
-speed_print = 20
-shell_thickness = 1.59
-speed_wall_0 = 20
-material_flow = 100.0
-raft_surface_line_spacing = 3.0
-raft_margin = 5.0
-raft_interface_line_width = 0.4
-layer_height_0 = 0.39
-material_bed_temperature = 70
-top_thickness = 1.2
 top_bottom_thickness = 1.2
+layer_height_0 = 0.39
 speed_wall_x = 30
-infill_overlap = 0.0901
-infill_before_walls = False
-raft_surface_line_width = 0.4
-skirt_minimal_length = 150.0
+wall_thickness = 1.59
+speed_infill = 40
 speed_topbottom = 20
-skirt_gap = 3.0
-raft_base_line_width = 1.0
+cool_min_layer_time = 3
+speed_print = 20
+line_width = 0.53
 machine_nozzle_size = 0.53
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile

@@ -0,0 +1,25 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.8 mm
+material = CPE
+
+[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
+speed_infill = 40
+speed_topbottom = 20
+cool_min_layer_time = 3
+speed_print = 20
+line_width = 0.7
+machine_nozzle_size = 0.7
+speed_wall_0 = 20
+adhesion_type = brim
+cool_lift_head = True
+cool_fan_speed_min = 50
+

resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.25 mm
+material = PLA
+
+[settings]
+machine_nozzle_size = 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_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

resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile

@@ -1,47 +1,32 @@
 [general]
 version = 1
-name = Fast Prints
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-top_thickness = 0.75
-speed_print = 40
-speed_wall_0 = 40
-raft_surface_line_spacing = 3.0
-shell_thickness = 0.7
-infill_sparse_density = 18
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.15
-brim_line_count = 22
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-infill_overlap = 0.0525
-raft_interface_line_width = 0.4
-speed_topbottom = 30
-support_pattern = lines
-layer_height_0 = 0.26
-raft_interface_line_spacing = 3.0
-material_flow = 100.0
-cool_fan_speed_min = 100
-cool_fan_speed_max = 100
-speed_travel = 150
-skirt_gap = 3.0
-magic_mesh_surface_mode = False
-bottom_thickness = 0.75
-speed_wall_x = 50
 machine_nozzle_size = 0.35
-top_bottom_thickness = 0.75
-support_enable = False
-
+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_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

resources/profiles/ultimaker2+/pla_0.4_high.curaprofile

@@ -6,43 +6,26 @@ machine_variant = 0.4 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-top_thickness = 0.72
-speed_layer_0 = 20
-speed_print = 30
-speed_wall_0 = 30
-raft_interface_line_spacing = 3.0
-shell_thickness = 1.05
-infill_overlap = 0.0525
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.06
-brim_line_count = 22
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-layer_height_0 = 0.26
-infill_sparse_density = 22
-material_flow = 100.0
-cool_fan_speed_min = 100
-top_bottom_thickness = 0.72
-cool_fan_speed_max = 100
-speed_infill = 50
-magic_mesh_surface_mode = False
-bottom_thickness = 0.72
-speed_wall_x = 40
 machine_nozzle_size = 0.35
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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_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

resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile

@@ -6,38 +6,26 @@ machine_variant = 0.4 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-shell_thickness = 1.05
-speed_print = 30
-speed_wall_0 = 30
-raft_interface_line_spacing = 3.0
-speed_layer_0 = 20
-layer_height_0 = 0.26
-retraction_hop = 0.0
-material_bed_temperature = 70
-skirt_gap = 3.0
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-brim_line_count = 22
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-infill_overlap = 0.0525
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-speed_infill = 50
-material_flow = 100.0
-cool_fan_speed_min = 100
-cool_fan_speed_max = 100
-skin_no_small_gaps_heuristic = False
-magic_mesh_surface_mode = False
-speed_wall_x = 40
 machine_nozzle_size = 0.35
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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_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

resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Ulti Quality
+machine_type = ultimaker2plus
+machine_variant = 0.4 mm
+material = PLA
+
+[settings]
+machine_nozzle_size = 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_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

resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile

@@ -6,42 +6,26 @@ machine_variant = 0.6 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-top_thickness = 1.2
-speed_layer_0 = 20
-speed_print = 25
-speed_wall_0 = 25
-raft_interface_line_spacing = 3.0
-shell_thickness = 1.59
-infill_overlap = 0.0795
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.15
-brim_line_count = 15
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-layer_height_0 = 0.39
-material_flow = 100.0
-cool_fan_speed_min = 100
-top_bottom_thickness = 1.2
-cool_fan_speed_max = 100
-speed_infill = 55
-magic_mesh_surface_mode = False
-bottom_thickness = 1.2
-speed_wall_x = 40
 machine_nozzle_size = 0.53
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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_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

resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.8 mm
+material = PLA
+
+[settings]
+machine_nozzle_size = 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_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

resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2_olsson
+machine_variant = 0.25 mm
+
+[settings]
+machine_nozzle_size = 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

resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile

@@ -0,0 +1,32 @@
+[general]
+version = 1
+name = Fast Print
+machine_type = ultimaker2_olsson
+machine_variant = 0.4 mm
+
+[settings]
+machine_nozzle_size = 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

resources/profiles/ultimaker2_olsson/0.4_high.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = High Quality
+machine_type = ultimaker2_olsson
+machine_variant = 0.4 mm
+
+[settings]
+machine_nozzle_size = 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

resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2_olsson
+machine_variant = 0.4 mm
+
+[settings]
+machine_nozzle_size = 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

resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Ulti Quality
+machine_type = ultimaker2_olsson
+machine_variant = 0.4 mm
+
+[settings]
+machine_nozzle_size = 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

resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2_olsson
+machine_variant = 0.6 mm
+
+[settings]
+machine_nozzle_size = 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

resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile

@@ -0,0 +1,31 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2_olsson
+machine_variant = 0.8 mm
+
+[settings]
+machine_nozzle_size = 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