Merge branch 'libArachne_rebased'

Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.

resources/variants/liquid_vo08.inst.cfg

@@ -47,7 +47,6 @@ retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_overlap = 5
-speed_equalize_flow_enabled = True
 speed_layer_0 = 20
 speed_print = 35
 speed_topbottom = =math.ceil(speed_print * 25 / 35)

resources/variants/ultimaker3_aa0.25.inst.cfg

@@ -10,9 +10,7 @@ hardware_type = nozzle
 
 [values]
 brim_width = 7
-infill_line_width = 0.23
 layer_height_0 = 0.17
-line_width = 0.23
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = AA 0.25
@@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2
 switch_extruder_prime_speed = =switch_extruder_retraction_speeds
 switch_extruder_retraction_amount = =machine_heat_zone_length
 top_bottom_thickness = 1.2
-wall_line_width_x = 0.23
 wall_thickness = 1.3
 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

resources/variants/ultimaker3_aa0.8.inst.cfg

@@ -9,22 +9,17 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_enabled = True
-acceleration_print = 4000
 brim_width = 7
 cool_fan_speed = 7
 cool_fan_speed_max = 100
 cool_min_speed = 5
 default_material_print_temperature = 200
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
-line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
@@ -45,7 +40,6 @@ retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_overlap = 5
-speed_equalize_flow_enabled = True
 speed_layer_0 = 20
 speed_print = 35
 speed_topbottom = =math.ceil(speed_print * 25 / 35)
@@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20
 switch_extruder_retraction_amount = 16.5
 top_bottom_thickness = 1.4
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 2

resources/variants/ultimaker3_bb0.8.inst.cfg

@@ -10,9 +10,8 @@ hardware_type = nozzle
 
 [values]
 acceleration_enabled = True
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
-acceleration_print = 4000
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 brim_width = 3
@@ -20,15 +19,14 @@ cool_fan_speed = 50
 cool_min_speed = 5
 gradual_support_infill_step_height = 1.6
 gradual_support_infill_steps = 2
-infill_line_width = =round(line_width * 0.8 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -76,7 +74,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 1.5
 support_pattern = triangles
 support_use_towers = False
@@ -87,6 +84,4 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 12
 top_bottom_thickness = 1
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 1

resources/variants/ultimaker3_bb04.inst.cfg

@@ -9,8 +9,8 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
@@ -43,7 +43,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 3
 support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
 support_xy_distance_overhang = =wall_line_width_0 / 2

resources/variants/ultimaker3_extended_aa0.25.inst.cfg

@@ -10,9 +10,7 @@ hardware_type = nozzle
 
 [values]
 brim_width = 7
-infill_line_width = 0.23
 layer_height_0 = 0.17
-line_width = 0.23
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = AA 0.25
@@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2
 switch_extruder_prime_speed = =switch_extruder_retraction_speeds
 switch_extruder_retraction_amount = =machine_heat_zone_length
 top_bottom_thickness = 1.2
-wall_line_width_x = 0.23
 wall_thickness = 1.3
 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

resources/variants/ultimaker3_extended_aa0.8.inst.cfg

@@ -9,22 +9,17 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_enabled = True
-acceleration_print = 4000
 brim_width = 7
 cool_fan_speed = 7
 cool_fan_speed_max = 100
 cool_min_speed = 5
 default_material_print_temperature = 200
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
-line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
@@ -45,7 +40,6 @@ retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_overlap = 5
-speed_equalize_flow_enabled = True
 speed_layer_0 = 20
 speed_print = 35
 speed_topbottom = =math.ceil(speed_print * 25 / 35)
@@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20
 switch_extruder_retraction_amount = 16.5
 top_bottom_thickness = 1.4
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 2

resources/variants/ultimaker3_extended_bb0.8.inst.cfg

@@ -10,9 +10,8 @@ hardware_type = nozzle
 
 [values]
 acceleration_enabled = True
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
-acceleration_print = 4000
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 brim_width = 3
@@ -20,15 +19,14 @@ cool_fan_speed = 50
 cool_min_speed = 5
 gradual_support_infill_step_height = 1.6
 gradual_support_infill_steps = 2
-infill_line_width = =round(line_width * 0.8 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -76,7 +74,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 1.5
 support_pattern = triangles
 support_use_towers = False
@@ -87,6 +84,4 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 12
 top_bottom_thickness = 1
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 1

resources/variants/ultimaker3_extended_bb04.inst.cfg

@@ -9,8 +9,8 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
@@ -43,7 +43,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 3
 support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
 support_xy_distance_overhang = =wall_line_width_0 / 2

resources/variants/ultimaker_s3_aa0.25.inst.cfg

@@ -10,9 +10,7 @@ hardware_type = nozzle
 
 [values]
 brim_width = 7
-infill_line_width = 0.23
 layer_height_0 = 0.17
-line_width = 0.23
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = AA 0.25
@@ -46,5 +44,4 @@ support_z_distance = =layer_height * 2
 switch_extruder_prime_speed = =switch_extruder_retraction_speeds
 switch_extruder_retraction_amount = =machine_heat_zone_length
 top_bottom_thickness = 1.2
-wall_line_width_x = 0.23
 wall_thickness = 1.3

resources/variants/ultimaker_s3_aa0.8.inst.cfg

@@ -9,22 +9,17 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_enabled = True
-acceleration_print = 4000
 brim_width = 7
 cool_fan_speed = 7
 cool_fan_speed_max = 100
 cool_min_speed = 5
 default_material_print_temperature = 200
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
-line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
@@ -45,7 +40,6 @@ retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_overlap = 5
-speed_equalize_flow_enabled = True
 speed_layer_0 = 20
 speed_print = 35
 speed_topbottom = =math.ceil(speed_print * 25 / 35)
@@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20
 switch_extruder_retraction_amount = 16.5
 top_bottom_thickness = 1.4
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 2

resources/variants/ultimaker_s3_bb0.8.inst.cfg

@@ -9,26 +9,23 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_enabled = True
-acceleration_print = 4000
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 brim_width = 3
 cool_fan_speed = 50
 cool_min_speed = 5
 gradual_support_infill_step_height = 1.6
 gradual_support_infill_steps = 2
-infill_line_width = =round(line_width * 0.8 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -76,7 +73,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 1.5
 support_pattern = triangles
 support_use_towers = False
@@ -87,6 +83,4 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 12
 top_bottom_thickness = 1
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 1

resources/variants/ultimaker_s3_bb04.inst.cfg

@@ -9,10 +9,10 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
 jerk_support = =math.ceil(jerk_print * 15 / 25)
@@ -43,7 +43,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 3
 support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
 support_xy_distance_overhang = =wall_line_width_0 / 2

resources/variants/ultimaker_s5_aa0.25.inst.cfg

@@ -10,9 +10,7 @@ hardware_type = nozzle
 
 [values]
 brim_width = 7
-infill_line_width = 0.23
 layer_height_0 = 0.17
-line_width = 0.23
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = AA 0.25
@@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2
 switch_extruder_prime_speed = =switch_extruder_retraction_speeds
 switch_extruder_retraction_amount = =machine_heat_zone_length
 top_bottom_thickness = 1.2
-wall_line_width_x = 0.23
 wall_thickness = 1.3
 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

resources/variants/ultimaker_s5_aa0.8.inst.cfg

@@ -9,22 +9,17 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_enabled = True
-acceleration_print = 4000
 brim_width = 7
 cool_fan_speed = 7
 cool_fan_speed_max = 100
 cool_min_speed = 5
 default_material_print_temperature = 200
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
-line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
@@ -45,7 +40,6 @@ retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_overlap = 5
-speed_equalize_flow_enabled = True
 speed_layer_0 = 20
 speed_print = 35
 speed_topbottom = =math.ceil(speed_print * 25 / 35)
@@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20
 switch_extruder_retraction_amount = 16.5
 top_bottom_thickness = 1.4
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 2

resources/variants/ultimaker_s5_bb0.8.inst.cfg

@@ -9,18 +9,15 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_enabled = True
-acceleration_print = 4000
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 brim_width = 3
 cool_fan_speed = 50
 cool_min_speed = 5
 gradual_support_infill_step_height = 1.6
 gradual_support_infill_steps = 2
-infill_line_width = =round(line_width * 0.8 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
@@ -76,17 +73,14 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 1.5
 support_pattern = triangles
 support_use_towers = False
-support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
+support_xy_distance = =wall_line_width_0
 support_xy_distance_overhang = =wall_line_width_0 / 4
 support_z_distance = 0
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 12
 top_bottom_thickness = 1
 wall_0_inset = 0
-wall_line_width_0 = =wall_line_width
-wall_line_width_x = =wall_line_width
 wall_thickness = 1

resources/variants/ultimaker_s5_bb04.inst.cfg

@@ -9,10 +9,10 @@ type = variant
 hardware_type = nozzle
 
 [values]
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support = =math.ceil(acceleration_print * 2000 / 3500)
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
-acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
+acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
 jerk_support = =math.ceil(jerk_print * 15 / 25)
@@ -43,7 +43,6 @@ support_interface_enable = True
 support_interface_height = 0.6
 support_interface_skip_height = =layer_height
 support_join_distance = 3
-support_line_width = =round(line_width * 0.4 / 0.35, 2)
 support_offset = 3
 support_xy_distance = =round(wall_line_width_0 * 0.75, 2)
 support_xy_distance_overhang = =wall_line_width_0 / 2