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

plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py

@@ -151,6 +151,7 @@ class ProcessSlicedObjectListJob(Job):
             if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView":
                 if not self._progress:
                     self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0)
+                if self._progress.getProgress() != 100:
                     self._progress.show()
             else:
                 if self._progress:

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -89,7 +89,6 @@ Item {
         Button
         {
             id: customise_settings_button;
-            anchors.right: profileSelection.right;
             height: UM.Theme.getSize("setting").height;
             visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1
 

plugins/USBPrinting/USBPrinterManager.py

@@ -106,6 +106,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
             try:
                 self._printer_connections[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName()))
             except FileNotFoundError:
+                self._printer_connections[printer_connection].setProgress(100, 100)
                 Logger.log("w", "No firmware found for printer %s", printer_connection)
                 continue
 

resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile

@@ -5,39 +5,30 @@ machine_type = ultimaker2_olsson
 machine_variant = 0.25 mm
 
 [settings]
-retraction_combing = All
-top_thickness = 0.72
-speed_layer_0 = 20
-speed_print = 20
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-shell_thickness = 0.88
-infill_overlap = 15
-retraction_hop = 0.0
-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
+machine_nozzle_size = 0.22
 layer_height = 0.06
-brim_line_count = 36
-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.15
-infill_sparse_density = 22
+shell_thickness = 0.88
 top_bottom_thickness = 0.72
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+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
-magic_mesh_surface_mode = False
-bottom_thickness = 0.72
+speed_wall_0 = 20
 speed_wall_x = 25
-machine_nozzle_size = 0.22
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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
+brim_width = 7

resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile

@@ -5,38 +5,31 @@ machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
 
 [settings]
-retraction_combing = All
-top_thickness = 0.75
-speed_print = 40
-speed_wall_0 = 40
-raft_surface_line_spacing = 3.0
+machine_nozzle_size = 0.35
+layer_height = 0.15
+layer_height_0 = 0.26
 shell_thickness = 0.7
-infill_sparse_density = 18
-retraction_hop = 0.0
+top_bottom_thickness = 0.6
+travel_compensate_overlapping_walls_enabled = True
 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 = 15
-raft_interface_line_width = 0.4
+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
-support_pattern = lines
-layer_height_0 = 0.26
-raft_interface_line_spacing = 3.0
 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
-
+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
+brim_width = 8

resources/profiles/ultimaker2_olsson/0.4_high.curaprofile

@@ -5,39 +5,30 @@ machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
 
 [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 = 15
-retraction_hop = 0.0
-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
+machine_nozzle_size = 0.35
 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
+shell_thickness = 1.05
+top_bottom_thickness = 0.84
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
 infill_sparse_density = 22
-top_bottom_thickness = 0.72
+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
-magic_mesh_surface_mode = False
-bottom_thickness = 0.72
+speed_wall_0 = 30
 speed_wall_x = 40
-machine_nozzle_size = 0.35
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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
+brim_width = 8

resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile

@@ -5,34 +5,30 @@ machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
 
 [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
+machine_nozzle_size = 0.35
+layer_height = 0.1
 layer_height_0 = 0.26
-retraction_hop = 0.0
-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 = 15
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-speed_infill = 50
+shell_thickness = 1.05
+top_bottom_thickness = 0.8
+travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
-magic_mesh_surface_mode = False
+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
-machine_nozzle_size = 0.35
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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
+brim_width = 8

resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile

@@ -0,0 +1,34 @@
+[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
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+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
+brim_width = 8

resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile

@@ -5,38 +5,30 @@ machine_type = ultimaker2_olsson
 machine_variant = 0.6 mm
 
 [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 = 15
-retraction_hop = 0.0
-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
+machine_nozzle_size = 0.53
 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
+layer_height_0 = 0.4
+shell_thickness = 1.59
 top_bottom_thickness = 1.2
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+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
-magic_mesh_surface_mode = False
-bottom_thickness = 1.2
+speed_wall_0 = 25
 speed_wall_x = 40
-machine_nozzle_size = 0.53
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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
+brim_width = 7

resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile

@@ -5,38 +5,30 @@ machine_type = ultimaker2_olsson
 machine_variant = 0.8 mm
 
 [settings]
-retraction_combing = All
-top_thickness = 1.2
-speed_layer_0 = 20
-speed_print = 20
-speed_wall_0 = 25
-raft_interface_line_spacing = 3.0
-shell_thickness = 2.1
-infill_overlap = 15
-retraction_hop = 0.0
-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
+machine_nozzle_size = 0.7
 layer_height = 0.2
-brim_line_count = 11
-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.5
-top_bottom_thickness = 1.2
+shell_thickness = 2.1
+top_bottom_thickness = 1.6
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+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
-magic_mesh_surface_mode = False
-bottom_thickness = 1.2
+speed_wall_0 = 20
 speed_wall_x = 30
-machine_nozzle_size = 0.7
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+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
+brim_width = 7