Merge branch '2.1'

Conflicts: plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py plugins/USBPrinting/PrinterConnection.py resources/machines/fdmprinter.json resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
2025-10-10 07:17:52 -06:00 · 2016-03-17 15:24:00 +01:00 · 2016-03-17 15:24:00 +01:00 · de9a66e1f4
commit de9a66e1f4
parent 14f5d236b2 479c6c3319
47 changed files with 248 additions and 154 deletions
--- a/resources/profiles/materials/pla.cfg
+++ b/resources/profiles/materials/pla.cfg
@ -5,8 +5,5 @@ name = PLA

 [settings]
 material_bed_temperature = 60
-platform_adhesion = skirt
 material_flow = 100
-material_print_temperature = 210
-cool_fan_speed = 100
-cool_fan_speed_max = 100
+material_print_temperature = 210
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@ -19,7 +19,6 @@ 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
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@ -19,7 +19,6 @@ 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
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@ -19,7 +19,6 @@ adhesion_type = brim
 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
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@ -16,7 +16,6 @@ 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
 adhesion_type = brim
 cool_lift_head = True
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@ -18,7 +18,6 @@ speed_topbottom = 20
 adhesion_type = brim
 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
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@ -19,7 +19,6 @@ 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
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@ -20,7 +20,6 @@ speed_topbottom = 20
 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
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@ -18,7 +18,6 @@ speed_topbottom = 20
 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
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@ -15,7 +15,6 @@ speed_infill = 45
 speed_topbottom = 20
 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
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@ -18,7 +18,6 @@ speed_topbottom = 20
 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
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -2

 [settings]
-machine_nozzle_size = 0.22
+line_width = 0.22
 layer_height = 0.06
 layer_height_0 = 0.15
 shell_thickness = 0.88
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -1

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.15
 layer_height_0 = 0.26
 shell_thickness = 0.7
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -3

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.06
 layer_height_0 = 0.26
 shell_thickness = 1.05
@ -18,7 +18,6 @@ infill_wipe_dist = 0.18
 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
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -2

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -4

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.04
 layer_height_0 = 0.26
 shell_thickness = 1.4
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -2

 [settings]
-machine_nozzle_size = 0.53
+line_width = 0.53
 layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@ -7,7 +7,7 @@ material = PLA
 weight = -2

 [settings]
-machine_nozzle_size = 0.7
+line_width = 0.7
 layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1
@ -18,7 +18,6 @@ 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
--- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.25 mm
 weight = -2

 [settings]
-machine_nozzle_size = 0.22
+line_width = 0.22
 layer_height = 0.06
 layer_height_0 = 0.15
 shell_thickness = 0.88
--- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.4 mm
 weight = -1

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.15
 layer_height_0 = 0.26
 shell_thickness = 0.7
--- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.4 mm
 weight = -3

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.06
 layer_height_0 = 0.26
 shell_thickness = 1.05
--- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.4 mm
 weight = -2

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
--- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.4 mm
 weight = -4

 [settings]
-machine_nozzle_size = 0.35
+line_width = 0.35
 layer_height = 0.04
 layer_height_0 = 0.26
 shell_thickness = 1.4
--- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.6 mm
 weight = -2

 [settings]
-machine_nozzle_size = 0.53
+line_width = 0.53
 layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
--- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
@ -6,7 +6,7 @@ machine_variant = 0.8 mm
 weight = -2

 [settings]
-machine_nozzle_size = 0.7
+line_width = 0.7
 layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1