From 176bfc8a4ef316c3658b92e90d9178a2ca023f6d Mon Sep 17 00:00:00 2001 From: mao Date: Thu, 25 Aug 2022 13:26:41 +0800 Subject: [PATCH 01/84] Add some WEEDO printers --- resources/definitions/weedo_base.def.json | 457 ++++++++++++++++++ resources/definitions/weedo_f150s.def.json | 51 ++ resources/definitions/weedo_f152s.def.json | 48 ++ resources/definitions/weedo_f370.def.json | 48 ++ resources/definitions/weedo_hephi3s.def.json | 57 +++ resources/definitions/weedo_me40.def.json | 57 +++ .../definitions/weedo_me40_lite.def.json | 60 +++ resources/definitions/weedo_tina2.def.json | 90 ++++ resources/definitions/weedo_tina2s.def.json | 90 ++++ resources/definitions/weedo_x40v3.def.json | 85 ++++ .../extruders/weedo_base_extruder_0.def.json | 16 + .../extruders/weedo_m_extruder_left.def.json | 22 + .../extruders/weedo_m_extruder_right.def.json | 22 + .../weedo_x40v3_extruder_left.def.json | 24 + .../weedo_x40v3_extruder_right.def.json | 24 + 15 files changed, 1151 insertions(+) create mode 100644 resources/definitions/weedo_base.def.json create mode 100644 resources/definitions/weedo_f150s.def.json create mode 100644 resources/definitions/weedo_f152s.def.json create mode 100644 resources/definitions/weedo_f370.def.json create mode 100644 resources/definitions/weedo_hephi3s.def.json create mode 100644 resources/definitions/weedo_me40.def.json create mode 100644 resources/definitions/weedo_me40_lite.def.json create mode 100644 resources/definitions/weedo_tina2.def.json create mode 100644 resources/definitions/weedo_tina2s.def.json create mode 100644 resources/definitions/weedo_x40v3.def.json create mode 100644 resources/extruders/weedo_base_extruder_0.def.json create mode 100644 resources/extruders/weedo_m_extruder_left.def.json create mode 100644 resources/extruders/weedo_m_extruder_right.def.json create mode 100644 resources/extruders/weedo_x40v3_extruder_left.def.json create mode 100644 resources/extruders/weedo_x40v3_extruder_right.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json new file mode 100644 index 0000000000..a3738411f9 --- /dev/null +++ b/resources/definitions/weedo_base.def.json @@ -0,0 +1,457 @@ +{ + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": { + "author": "WEEDO", + "manufacturer": "WEEDO", + "category": "WEEDO", + "visible": false, + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_base_extruder_0" + }, + "has_materials": true, + "has_variants": false, + "has_machine_quality": false, + "preferred_quality_type": "draft", + "preferred_material": "generic_pla_175" + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO Base" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "G92 E0\nG1 E-10 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_bed_temp_wait": { + "default_value": false + }, + "material_print_temp_wait": { + "default_value": false + }, + "material_print_temp_prepend": { + "default_value": true + }, + "material_bed_temp_prepend": { + "default_value": true + }, + "machine_width": { + "default_value": 200.0 + }, + "machine_depth": { + "default_value": 150.0 + }, + "machine_height": { + "default_value": 150.0 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_always_write_active_tool": { + "default_value": false + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 1 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.8 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 2.0 + }, + "machine_min_cool_heat_time_window": { + "default_value": 1200.0 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_max_feedrate_x": { + "default_value": 200 + }, + "machine_max_feedrate_y": { + "default_value": 130 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 3000 + }, + "machine_max_acceleration_y": { + "default_value": 3000 + }, + "machine_max_acceleration_z": { + "default_value": 100 + }, + "machine_max_acceleration_e": { + "default_value": 200 + }, + "machine_acceleration": { + "default_value": 4000 + }, + "machine_max_jerk_xy": { + "default_value": 10.0 + }, + "machine_max_jerk_z": { + "default_value": 5 + }, + "machine_max_jerk_e": { + "default_value": 5.0 + }, + "layer_height_0": { + "default_value": 0.3 + }, + "line_width": { + "default_value": 0.4 + }, + "infill_line_width": { + "value": "line_width*1.25" + }, + "initial_layer_line_width_factor": { + "default_value": 100.0 + }, + "wall_thickness": { + "default_value": 0.8 + }, + "wall_0_wipe_dist": { + "value": 0.0 + }, + "wall_0_inset": { + "value": 0.0 + }, + "optimize_wall_printing_order": { + "default_value": false + }, + "inset_direction": { + "default_value": "inside_out" + }, + "roofing_layer_count": { + "default_value": 0 + }, + "z_seam_type": { + "default_value": "sharpest_corner" + }, + "z_seam_x": { + "default_value": 100.0 + }, + "z_seam_y": { + "default_value": 400.0 + }, + "z_seam_corner": { + "default_value": "z_seam_corner_weighted" + }, + "z_seam_relative": { + "default_value": false + }, + "skin_outline_count": { + "default_value": 0 + }, + "infill_sparse_density": { + "default_value": 10.0 + }, + "infill_pattern": { + "value": "'zigzag'" + }, + "infill_before_walls": { + "default_value": false + }, + "default_material_print_temperature": { + "default_value": 200.0 + }, + "material_print_temperature": { + "default_value": 200.0 + }, + "material_print_temperature_layer_0": { + "value": "material_print_temperature+15" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "default_material_bed_temperature": { + "default_value": 60.0 + }, + "material_bed_temperature": { + "value": 60.0 + }, + "material_bed_temperature_layer_0": { + "value": "material_bed_temperature" + }, + "material_flow": { + "default_value": 95.0 + }, + "material_flow_layer_0": { + "default_value": 95.0 + }, + "infill_material_flow": { + "value": "material_flow-5" + }, + "support_material_flow": { + "value": "material_flow-5" + }, + "speed_print": { + "default_value": 70.0 + }, + "speed_infill": { + "default_value": 70.0 + }, + "speed_wall": { + "value": "max(5,round(speed_print / 2-5,1))" + }, + "speed_wall_0": { + "value": "max(5,speed_wall-5)" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.65,1)" + }, + "speed_support": { + "value": "round(speed_print*0.82,1)" + }, + "speed_support_infill": { + "value": "speed_support" + }, + "speed_support_interface": { + "value": "round(speed_support*0.689,1)" + }, + "speed_prime_tower": { + "value": "speed_support" + }, + "speed_travel": { + "value": 105.0 + }, + "speed_layer_0": { + "value": 26.0 + }, + "speed_print_layer_0": { + "value": 26.0 + }, + "speed_travel_layer_0": { + "value": 80.0 + }, + "skirt_brim_speed": { + "value": 26.0 + }, + "retraction_enable": { + "default_value": true + }, + "retract_at_layer_change": { + "default_value": false + }, + "retraction_amount": { + "default_value": 3 + }, + "retraction_speed": { + "default_value": 28.0 + }, + "retraction_min_travel": { + "default_value": 0.8 + }, + "retraction_count_max": { + "default_value": 90 + }, + "retraction_extrusion_window": { + "value": 1.0 + }, + "material_standby_temperature": { + "default_value": 175.0 + }, + "switch_extruder_retraction_amount": { + "value": 16.5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 28.0 + }, + "retraction_combing": { + "default_value": "off" + }, + "retraction_hop_enabled": { + "default_value": false + }, + "retraction_hop_only_when_collides": { + "default_value": false + }, + "retraction_hop": { + "default_value": 0.0 + }, + "retraction_hop_after_extruder_switch": { + "default_value": false + }, + "cool_fan_enabled": { + "default_value": true + }, + "support_enable": { + "default_value": false + }, + "support_type": { + "default_value": "everywhere" + }, + "support_angle": { + "default_value": 60.0 + }, + "support_pattern": { + "default_value": "zigzag" + }, + "support_wall_count": { + "default_value": 0 + }, + "support_connect_zigzags": { + "default_value": false + }, + "support_infill_rate": { + "default_value": 15.0 + }, + "support_z_distance": { + "default_value": 0.2 + }, + "support_xy_distance": { + "default_value": 0.7 + }, + "support_interface_enable": { + "default_value": true + }, + "support_interface_density": { + "default_value": 60.0 + }, + "support_interface_height": { + "default_value": 0.8 + }, + "support_interface_pattern": { + "default_value": "lines" + }, + "adhesion_type": { + "default_value": "raft" + }, + "skirt_line_count": { + "default_value": 2 + }, + "skirt_gap": { + "default_value": 3.0 + }, + "brim_width": { + "default_value": 8.0 + }, + "brim_line_count": { + "default_value": 20 + }, + "raft_margin": { + "default_value": 8.0 + }, + "raft_airgap": { + "default_value": 0.19 + }, + "layer_0_z_overlap": { + "value": 0.09 + }, + "raft_surface_layers": { + "default_value": 2 + }, + "raft_surface_thickness": { + "value": 0.25 + }, + "raft_surface_line_width": { + "value": 0.4 + }, + "raft_surface_line_spacing": { + "value": "raft_surface_line_width" + }, + "raft_interface_thickness": { + "value": 0.27 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_line_spacing": { + "value": "raft_interface_line_width + 0.2" + }, + "raft_base_thickness": { + "value": 0.3 + }, + "raft_base_line_width": { + "value": "machine_nozzle_size * 2" + }, + "raft_base_line_spacing": { + "value": "raft_base_line_width * 2" + }, + "raft_surface_speed": { + "value": 40.0 + }, + "raft_interface_speed": { + "value": 33.0 + }, + "raft_base_speed": { + "value": 20.0 + }, + "raft_surface_fan_speed": { + "value": 100.0 + }, + "raft_interface_fan_speed": { + "value": 0.0 + }, + "raft_base_fan_speed": { + "value": 0.0 + }, + "prime_tower_enable": { + "default_value": false + }, + "prime_tower_size": { + "default_value": 15.0 + }, + "prime_tower_min_volume": { + "default_value": 10.0 + }, + "prime_tower_position_x": { + "default_value": 200.0 + }, + "prime_tower_position_y": { + "default_value": 200.0 + }, + "prime_tower_flow": { + "default_value": 100.0 + }, + "ooze_shield_enabled": { + "default_value": false + }, + "ooze_shield_angle": { + "default_value": 60.0 + }, + "ooze_shield_dist": { + "default_value": 2.0 + }, + "roofing_line_width": { + "default_value": 0.4 + }, + "draft_shield_enabled": { + "default_value": false + }, + "draft_shield_dist": { + "default_value": 3 + }, + "top_skin_preshrink": { + "value": 0.0 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json new file mode 100644 index 0000000000..5078beb023 --- /dev/null +++ b/resources/definitions/weedo_f150s.def.json @@ -0,0 +1,51 @@ +{ + "name": "WEEDO F150S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO F150S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO F150S\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 150 + }, + "machine_height": { + "default_value": 150 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_bed_temperature": { + "value": 35 + }, + "retraction_amount": { + "default_value": 1.2 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json new file mode 100644 index 0000000000..77390fcdba --- /dev/null +++ b/resources/definitions/weedo_f152s.def.json @@ -0,0 +1,48 @@ +{ + "name": "WEEDO F152S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO F152S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO F152S\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 185 + }, + "machine_height": { + "default_value": 195 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "retraction_amount": { + "default_value": 1.2 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json new file mode 100644 index 0000000000..ede3244afa --- /dev/null +++ b/resources/definitions/weedo_f370.def.json @@ -0,0 +1,48 @@ +{ + "name": "WEEDO F370", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO F370" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO F370\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 310 + }, + "machine_depth": { + "default_value": 310 + }, + "machine_height": { + "default_value": 370 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "retraction_amount": { + "default_value": 1.2 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json new file mode 100644 index 0000000000..fdc0bb9530 --- /dev/null +++ b/resources/definitions/weedo_hephi3s.def.json @@ -0,0 +1,57 @@ +{ + "name": "WEEDO hephi3s", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO hephi3s" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO hephi3s\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json new file mode 100644 index 0000000000..d89c4bb590 --- /dev/null +++ b/resources/definitions/weedo_me40.def.json @@ -0,0 +1,57 @@ +{ + "name": "WEEDO ME40", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO ME40\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json new file mode 100644 index 0000000000..50c1afd1ae --- /dev/null +++ b/resources/definitions/weedo_me40_lite.def.json @@ -0,0 +1,60 @@ +{ + "name": "WEEDO ME40 Lite", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40 Lite" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO ME40 Lite\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_bed_temperature": { + "value": 55 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json new file mode 100644 index 0000000000..ea04f9402c --- /dev/null +++ b/resources/definitions/weedo_tina2.def.json @@ -0,0 +1,90 @@ +{ + "name": "WEEDO TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO TINA2\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "dvalue": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json new file mode 100644 index 0000000000..6589379119 --- /dev/null +++ b/resources/definitions/weedo_tina2s.def.json @@ -0,0 +1,90 @@ +{ + "name": "WEEDO TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO TINA2S\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_bed_temperature": { + "value": 50 + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "dvalue": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json new file mode 100644 index 0000000000..9de2364e1b --- /dev/null +++ b/resources/definitions/weedo_x40v3.def.json @@ -0,0 +1,85 @@ +{ + "name": "WEEDO X40 V3+", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_x40v3_extruder_left", + "1": "weedo_x40v3_extruder_right" + }, + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO X40 V3" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO X40\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_always_write_active_tool": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.7 + }, + "material_standby_temperature": { + "value": "material_print_temperature-20" + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + }, + "switch_extruder_retraction_amount": { + "value": 0 + }, + "adhesion_type": { + "default_value": "brim" + }, + "ooze_shield_enabled": { + "default_value": true + }, + "ooze_shield_angle": { + "default_value": 0 + }, + "ooze_shield_dist": { + "default_value": 3.0 + } + } +} \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json new file mode 100644 index 0000000000..a41f999dc2 --- /dev/null +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "weedo_base_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/weedo_m_extruder_left.def.json b/resources/extruders/weedo_m_extruder_left.def.json new file mode 100644 index 0000000000..82fa372826 --- /dev/null +++ b/resources/extruders/weedo_m_extruder_left.def.json @@ -0,0 +1,22 @@ +{ + "id": "weedo_m_extruder_left", + "version": 2, + "name": "Extruder Left", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 0} + } +} diff --git a/resources/extruders/weedo_m_extruder_right.def.json b/resources/extruders/weedo_m_extruder_right.def.json new file mode 100644 index 0000000000..f7bf2ca77c --- /dev/null +++ b/resources/extruders/weedo_m_extruder_right.def.json @@ -0,0 +1,22 @@ +{ + "id": "weedo_m_extruder_right", + "version": 2, + "name": "Extruder Right", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 1} + } +} diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json new file mode 100644 index 0000000000..ae25fa4d2a --- /dev/null +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -0,0 +1,24 @@ +{ + "id": "weedo_x40v3_extruder_left", + "version": 2, + "name": "Extruder Left", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_x40v3", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 0}, + "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + } +} diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json new file mode 100644 index 0000000000..5e42a5902b --- /dev/null +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -0,0 +1,24 @@ +{ + "id": "weedo_x40v3_extruder_right", + "version": 2, + "name": "Extruder Right", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_x40v3", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 1}, + "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n"} + } +} From c2253ebac1b31a9ec9090b6d61362a959464d268 Mon Sep 17 00:00:00 2001 From: mao Date: Tue, 6 Sep 2022 14:00:09 +0800 Subject: [PATCH 02/84] Update WEEDO machine profiles Update settings and delete unnecessary settings. --- resources/definitions/weedo_base.def.json | 335 +++++++++--------- resources/definitions/weedo_f150s.def.json | 14 +- resources/definitions/weedo_f152s.def.json | 11 +- resources/definitions/weedo_f370.def.json | 11 +- resources/definitions/weedo_hephi3s.def.json | 11 +- resources/definitions/weedo_me40.def.json | 13 +- .../definitions/weedo_me40_lite.def.json | 14 +- resources/definitions/weedo_tina2.def.json | 166 ++++++++- resources/definitions/weedo_tina2s.def.json | 170 ++++++++- resources/definitions/weedo_x40v3.def.json | 5 +- .../extruders/weedo_base_extruder_0.def.json | 1 - .../extruders/weedo_m_extruder_left.def.json | 22 -- .../extruders/weedo_m_extruder_right.def.json | 22 -- .../weedo_x40v3_extruder_left.def.json | 1 - .../weedo_x40v3_extruder_right.def.json | 1 - 15 files changed, 496 insertions(+), 301 deletions(-) delete mode 100644 resources/extruders/weedo_m_extruder_left.def.json delete mode 100644 resources/extruders/weedo_m_extruder_right.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index a3738411f9..095f54f2f6 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -15,7 +15,157 @@ "has_variants": false, "has_machine_quality": false, "preferred_quality_type": "draft", - "preferred_material": "generic_pla_175" + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] }, "overrides": { "machine_name": { @@ -36,51 +186,24 @@ "material_print_temp_wait": { "default_value": false }, - "material_print_temp_prepend": { - "default_value": true - }, - "material_bed_temp_prepend": { - "default_value": true - }, - "machine_width": { - "default_value": 200.0 - }, - "machine_depth": { - "default_value": 150.0 - }, - "machine_height": { - "default_value": 150.0 - }, "machine_heated_bed": { "default_value": true }, - "machine_always_write_active_tool": { - "default_value": false - }, "machine_center_is_zero": { "default_value": false }, - "machine_extruder_count": { - "default_value": 1 - }, "machine_nozzle_tip_outer_diameter": { - "default_value": 1 + "default_value": 0.8 }, "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, "machine_nozzle_cool_down_speed": { - "default_value": 2.0 + "default_value": 0.67 }, "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, "machine_max_feedrate_x": { "default_value": 200 }, @@ -117,53 +240,20 @@ "machine_max_jerk_e": { "default_value": 5.0 }, - "layer_height_0": { - "default_value": 0.3 - }, - "line_width": { - "default_value": 0.4 - }, "infill_line_width": { "value": "line_width*1.25" }, "initial_layer_line_width_factor": { - "default_value": 100.0 - }, - "wall_thickness": { - "default_value": 0.8 + "default_value": 110.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "wall_0_inset": { - "value": 0.0 - }, - "optimize_wall_printing_order": { - "default_value": false - }, - "inset_direction": { - "default_value": "inside_out" - }, - "roofing_layer_count": { - "default_value": 0 - }, - "z_seam_type": { - "default_value": "sharpest_corner" - }, - "z_seam_x": { - "default_value": 100.0 - }, - "z_seam_y": { - "default_value": 400.0 - }, "z_seam_corner": { - "default_value": "z_seam_corner_weighted" - }, - "z_seam_relative": { - "default_value": false + "default_value": "z_seam_corner_any" }, "skin_outline_count": { - "default_value": 0 + "value": "0" }, "infill_sparse_density": { "default_value": 10.0 @@ -174,14 +264,11 @@ "infill_before_walls": { "default_value": false }, - "default_material_print_temperature": { - "default_value": 200.0 - }, "material_print_temperature": { - "default_value": 200.0 + "maximum_value": "300" }, "material_print_temperature_layer_0": { - "value": "material_print_temperature+15" + "value": "min(material_print_temperature+10,300)" }, "material_initial_print_temperature": { "value": "material_print_temperature" @@ -189,14 +276,8 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, - "default_material_bed_temperature": { - "default_value": 60.0 - }, "material_bed_temperature": { - "value": 60.0 - }, - "material_bed_temperature_layer_0": { - "value": "material_bed_temperature" + "maximum_value_warning": "96" }, "material_flow": { "default_value": 95.0 @@ -205,10 +286,10 @@ "default_value": 95.0 }, "infill_material_flow": { - "value": "material_flow-5" + "value": "max(0,material_flow-5)" }, "support_material_flow": { - "value": "material_flow-5" + "value": "max(0,material_flow-5)" }, "speed_print": { "default_value": 70.0 @@ -255,12 +336,6 @@ "skirt_brim_speed": { "value": 26.0 }, - "retraction_enable": { - "default_value": true - }, - "retract_at_layer_change": { - "default_value": false - }, "retraction_amount": { "default_value": 3 }, @@ -270,9 +345,6 @@ "retraction_min_travel": { "default_value": 0.8 }, - "retraction_count_max": { - "default_value": 90 - }, "retraction_extrusion_window": { "value": 1.0 }, @@ -286,50 +358,23 @@ "default_value": 28.0 }, "retraction_combing": { - "default_value": "off" - }, - "retraction_hop_enabled": { - "default_value": false - }, - "retraction_hop_only_when_collides": { - "default_value": false - }, - "retraction_hop": { - "default_value": 0.0 + "value": "off" }, "retraction_hop_after_extruder_switch": { "default_value": false }, - "cool_fan_enabled": { - "default_value": true - }, - "support_enable": { - "default_value": false - }, - "support_type": { - "default_value": "everywhere" - }, "support_angle": { "default_value": 60.0 }, "support_pattern": { "default_value": "zigzag" }, - "support_wall_count": { - "default_value": 0 - }, "support_connect_zigzags": { "default_value": false }, - "support_infill_rate": { - "default_value": 15.0 - }, "support_z_distance": { "default_value": 0.2 }, - "support_xy_distance": { - "default_value": 0.7 - }, "support_interface_enable": { "default_value": true }, @@ -348,15 +393,6 @@ "skirt_line_count": { "default_value": 2 }, - "skirt_gap": { - "default_value": 3.0 - }, - "brim_width": { - "default_value": 8.0 - }, - "brim_line_count": { - "default_value": 20 - }, "raft_margin": { "default_value": 8.0 }, @@ -366,36 +402,18 @@ "layer_0_z_overlap": { "value": 0.09 }, - "raft_surface_layers": { - "default_value": 2 - }, "raft_surface_thickness": { "value": 0.25 }, - "raft_surface_line_width": { - "value": 0.4 - }, - "raft_surface_line_spacing": { - "value": "raft_surface_line_width" - }, "raft_interface_thickness": { "value": 0.27 }, "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_line_spacing": { - "value": "raft_interface_line_width + 0.2" - }, "raft_base_thickness": { "value": 0.3 }, - "raft_base_line_width": { - "value": "machine_nozzle_size * 2" - }, - "raft_base_line_spacing": { - "value": "raft_base_line_width * 2" - }, "raft_surface_speed": { "value": 40.0 }, @@ -406,7 +424,7 @@ "value": 20.0 }, "raft_surface_fan_speed": { - "value": 100.0 + "value": "100.0 if cool_fan_enabled else 0.0" }, "raft_interface_fan_speed": { "value": 0.0 @@ -414,39 +432,12 @@ "raft_base_fan_speed": { "value": 0.0 }, - "prime_tower_enable": { - "default_value": false - }, "prime_tower_size": { "default_value": 15.0 }, "prime_tower_min_volume": { "default_value": 10.0 }, - "prime_tower_position_x": { - "default_value": 200.0 - }, - "prime_tower_position_y": { - "default_value": 200.0 - }, - "prime_tower_flow": { - "default_value": 100.0 - }, - "ooze_shield_enabled": { - "default_value": false - }, - "ooze_shield_angle": { - "default_value": 60.0 - }, - "ooze_shield_dist": { - "default_value": 2.0 - }, - "roofing_line_width": { - "default_value": 0.4 - }, - "draft_shield_enabled": { - "default_value": false - }, "draft_shield_dist": { "default_value": 3 }, diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json index 5078beb023..fc7660824d 100644 --- a/resources/definitions/weedo_f150s.def.json +++ b/resources/definitions/weedo_f150s.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO F150S" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO F150S\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 200 }, @@ -35,14 +32,9 @@ "machine_height": { "default_value": 150 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "material_bed_temperature": { - "value": 35 + "maximum_value_warning": "70", + "maximum_value": "90" }, "retraction_amount": { "default_value": 1.2 diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json index 77390fcdba..9ecbbafb3b 100644 --- a/resources/definitions/weedo_f152s.def.json +++ b/resources/definitions/weedo_f152s.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO F152S" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO F152S\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 200 }, @@ -35,12 +32,6 @@ "machine_height": { "default_value": 195 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "retraction_amount": { "default_value": 1.2 } diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json index ede3244afa..e2e8a9b3ed 100644 --- a/resources/definitions/weedo_f370.def.json +++ b/resources/definitions/weedo_f370.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO F370" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO F370\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 310 }, @@ -35,12 +32,6 @@ "machine_height": { "default_value": 370 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "retraction_amount": { "default_value": 1.2 } diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json index fdc0bb9530..2f8af0ac7f 100644 --- a/resources/definitions/weedo_hephi3s.def.json +++ b/resources/definitions/weedo_hephi3s.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO hephi3s" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO hephi3s\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 220 }, @@ -35,12 +32,6 @@ "machine_height": { "default_value": 250 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "speed_print": { "default_value": 60.0 }, diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json index d89c4bb590..0a5fe37017 100644 --- a/resources/definitions/weedo_me40.def.json +++ b/resources/definitions/weedo_me40.def.json @@ -18,13 +18,10 @@ "default_value": "WEEDO ME40" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO ME40\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "material_print_temp_prepend": { - "default_value": false + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, "machine_width": { "default_value": 300 @@ -35,12 +32,6 @@ "machine_height": { "default_value": 400 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "speed_print": { "default_value": 60.0 }, diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json index 50c1afd1ae..e1e14fcd2f 100644 --- a/resources/definitions/weedo_me40_lite.def.json +++ b/resources/definitions/weedo_me40_lite.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO ME40 Lite" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO ME40 Lite\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 300 }, @@ -35,14 +32,9 @@ "machine_height": { "default_value": 400 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "material_bed_temperature": { - "value": 55 + "maximum_value_warning": "70", + "maximum_value": "90" }, "speed_print": { "default_value": 60.0 diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index ea04f9402c..46feeb39f8 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -11,6 +11,164 @@ 0, 0, 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" ] }, "overrides": { @@ -18,14 +176,11 @@ "default_value": "WEEDO TINA2" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO TINA2\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 100 }, @@ -38,9 +193,6 @@ "machine_heated_bed": { "default_value": false }, - "machine_extruder_count": { - "default_value": 1 - }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index 6589379119..ed97a58edd 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -11,6 +11,162 @@ 0, 0, 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" ] }, "overrides": { @@ -18,14 +174,11 @@ "default_value": "WEEDO TINA2S" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO TINA2S\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 100 }, @@ -35,14 +188,9 @@ "machine_height": { "default_value": 100 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "material_bed_temperature": { - "value": 50 + "maximum_value_warning": "60", + "maximum_value": "65" }, "speed_print": { "value": 40.0 diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index 9de2364e1b..44c22668bf 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -22,7 +22,7 @@ "default_value": "WEEDO X40 V3" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO X40\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" }, "machine_end_gcode": { "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" @@ -54,6 +54,9 @@ "material_standby_temperature": { "value": "material_print_temperature-20" }, + "retraction_amount": { + "default_value": 4 + }, "speed_print": { "default_value": 60.0 }, diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index a41f999dc2..0cb088acdd 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "weedo_base_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/weedo_m_extruder_left.def.json b/resources/extruders/weedo_m_extruder_left.def.json deleted file mode 100644 index 82fa372826..0000000000 --- a/resources/extruders/weedo_m_extruder_left.def.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "weedo_m_extruder_left", - "version": 2, - "name": "Extruder Left", - "inherits": "fdmextruder", - "metadata": { - "machine": "weedo_base", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_cooling_fan_number": {"default_value": 0} - } -} diff --git a/resources/extruders/weedo_m_extruder_right.def.json b/resources/extruders/weedo_m_extruder_right.def.json deleted file mode 100644 index f7bf2ca77c..0000000000 --- a/resources/extruders/weedo_m_extruder_right.def.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "weedo_m_extruder_right", - "version": 2, - "name": "Extruder Right", - "inherits": "fdmextruder", - "metadata": { - "machine": "weedo_base", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_cooling_fan_number": {"default_value": 1} - } -} diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index ae25fa4d2a..dc1de46bc6 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "weedo_x40v3_extruder_left", "version": 2, "name": "Extruder Left", "inherits": "fdmextruder", diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json index 5e42a5902b..41e74a5009 100644 --- a/resources/extruders/weedo_x40v3_extruder_right.def.json +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "weedo_x40v3_extruder_right", "version": 2, "name": "Extruder Right", "inherits": "fdmextruder", From d216af7ecca0bb9e19dc424202d42970c7974600 Mon Sep 17 00:00:00 2001 From: mao Date: Mon, 19 Sep 2022 14:25:27 +0800 Subject: [PATCH 03/84] Update settings and JSON format. Use 4 spaces instead of 2 for indentation, remove the redundant settings, and add spacing to the formulas. --- resources/definitions/weedo_base.def.json | 875 +++++++++--------- resources/definitions/weedo_f150s.def.json | 78 +- resources/definitions/weedo_f152s.def.json | 70 +- resources/definitions/weedo_f370.def.json | 70 +- resources/definitions/weedo_hephi3s.def.json | 88 +- resources/definitions/weedo_me40.def.json | 88 +- .../definitions/weedo_me40_lite.def.json | 96 +- resources/definitions/weedo_tina2.def.json | 476 +++++----- resources/definitions/weedo_tina2s.def.json | 468 +++++----- resources/definitions/weedo_x40v3.def.json | 168 ++-- 10 files changed, 1231 insertions(+), 1246 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 095f54f2f6..3419c92d49 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,448 +1,433 @@ { - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": { - "author": "WEEDO", - "manufacturer": "WEEDO", - "category": "WEEDO", - "visible": false, - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_base_extruder_0" - }, - "has_materials": true, - "has_variants": false, - "has_machine_quality": false, - "preferred_quality_type": "draft", - "preferred_material": "generic_pla_175", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO Base" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "G92 E0\nG1 E-10 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_bed_temp_wait": { - "default_value": false - }, - "material_print_temp_wait": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 0.8 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.8 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.67 - }, - "machine_min_cool_heat_time_window": { - "default_value": 1200.0 - }, - "machine_max_feedrate_x": { - "default_value": 200 - }, - "machine_max_feedrate_y": { - "default_value": 130 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 200 - }, - "machine_acceleration": { - "default_value": 4000 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 5 - }, - "machine_max_jerk_e": { - "default_value": 5.0 - }, - "infill_line_width": { - "value": "line_width*1.25" - }, - "initial_layer_line_width_factor": { - "default_value": 110.0 - }, - "wall_0_wipe_dist": { - "value": 0.0 - }, - "z_seam_corner": { - "default_value": "z_seam_corner_any" - }, - "skin_outline_count": { - "value": "0" - }, - "infill_sparse_density": { - "default_value": 10.0 - }, - "infill_pattern": { - "value": "'zigzag'" - }, - "infill_before_walls": { - "default_value": false - }, - "material_print_temperature": { - "maximum_value": "300" - }, - "material_print_temperature_layer_0": { - "value": "min(material_print_temperature+10,300)" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { - "maximum_value_warning": "96" - }, - "material_flow": { - "default_value": 95.0 - }, - "material_flow_layer_0": { - "default_value": 95.0 - }, - "infill_material_flow": { - "value": "max(0,material_flow-5)" - }, - "support_material_flow": { - "value": "max(0,material_flow-5)" - }, - "speed_print": { - "default_value": 70.0 - }, - "speed_infill": { - "default_value": 70.0 - }, - "speed_wall": { - "value": "max(5,round(speed_print / 2-5,1))" - }, - "speed_wall_0": { - "value": "max(5,speed_wall-5)" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.65,1)" - }, - "speed_support": { - "value": "round(speed_print*0.82,1)" - }, - "speed_support_infill": { - "value": "speed_support" - }, - "speed_support_interface": { - "value": "round(speed_support*0.689,1)" - }, - "speed_prime_tower": { - "value": "speed_support" - }, - "speed_travel": { - "value": 105.0 - }, - "speed_layer_0": { - "value": 26.0 - }, - "speed_print_layer_0": { - "value": 26.0 - }, - "speed_travel_layer_0": { - "value": 80.0 - }, - "skirt_brim_speed": { - "value": 26.0 - }, - "retraction_amount": { - "default_value": 3 - }, - "retraction_speed": { - "default_value": 28.0 - }, - "retraction_min_travel": { - "default_value": 0.8 - }, - "retraction_extrusion_window": { - "value": 1.0 - }, - "material_standby_temperature": { - "default_value": 175.0 - }, - "switch_extruder_retraction_amount": { - "value": 16.5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 28.0 - }, - "retraction_combing": { - "value": "off" - }, - "retraction_hop_after_extruder_switch": { - "default_value": false - }, - "support_angle": { - "default_value": 60.0 - }, - "support_pattern": { - "default_value": "zigzag" - }, - "support_connect_zigzags": { - "default_value": false - }, - "support_z_distance": { - "default_value": 0.2 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_density": { - "default_value": 60.0 - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_pattern": { - "default_value": "lines" - }, - "adhesion_type": { - "default_value": "raft" - }, - "skirt_line_count": { - "default_value": 2 - }, - "raft_margin": { - "default_value": 8.0 - }, - "raft_airgap": { - "default_value": 0.19 - }, - "layer_0_z_overlap": { - "value": 0.09 - }, - "raft_surface_thickness": { - "value": 0.25 - }, - "raft_interface_thickness": { - "value": 0.27 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_base_thickness": { - "value": 0.3 - }, - "raft_surface_speed": { - "value": 40.0 - }, - "raft_interface_speed": { - "value": 33.0 - }, - "raft_base_speed": { - "value": 20.0 - }, - "raft_surface_fan_speed": { - "value": "100.0 if cool_fan_enabled else 0.0" - }, - "raft_interface_fan_speed": { - "value": 0.0 - }, - "raft_base_fan_speed": { - "value": 0.0 - }, - "prime_tower_size": { - "default_value": 15.0 - }, - "prime_tower_min_volume": { - "default_value": 10.0 - }, - "draft_shield_dist": { - "default_value": 3 - }, - "top_skin_preshrink": { - "value": 0.0 + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": { + "author": "WEEDO", + "manufacturer": "WEEDO", + "category": "WEEDO", + "visible": false, + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_base_extruder_0" + }, + "has_materials": true, + "has_variants": false, + "has_machine_quality": false, + "preferred_quality_type": "draft", + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO Base" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_bed_temp_wait": { + "default_value": false + }, + "material_print_temp_wait": { + "default_value": false + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 0.8 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.8 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 0.67 + }, + "machine_min_cool_heat_time_window": { + "default_value": 1200.0 + }, + "machine_max_feedrate_x": { + "default_value": 200 + }, + "machine_max_feedrate_y": { + "default_value": 130 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 3000 + }, + "machine_max_acceleration_y": { + "default_value": 3000 + }, + "machine_max_acceleration_z": { + "default_value": 120 + }, + "machine_max_acceleration_e": { + "default_value": 1600 + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_max_jerk_xy": { + "default_value": 10.0 + }, + "machine_max_jerk_z": { + "default_value": 5 + }, + "machine_max_jerk_e": { + "default_value": 5.1 + }, + "infill_line_width": { + "value": "line_width * 1.25" + }, + "initial_layer_line_width_factor": { + "default_value": 110.0 + }, + "wall_0_wipe_dist": { + "value": 0.0 + }, + "z_seam_corner": { + "default_value": "z_seam_corner_any" + }, + "skin_outline_count": { + "value": "0" + }, + "infill_sparse_density": { + "default_value": 10.0 + }, + "infill_pattern": { + "value": "'zigzag'" + }, + "infill_before_walls": { + "default_value": false + }, + "material_print_temperature": { + "maximum_value": "300" + }, + "material_print_temperature_layer_0": { + "value": "min(material_print_temperature + 10, 300)" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "material_bed_temperature": { + "maximum_value_warning": "96" + }, + "material_flow": { + "default_value": 95.0 + }, + "material_flow_layer_0": { + "default_value": 95.0 + }, + "infill_material_flow": { + "value": "max(0, material_flow - 5)" + }, + "support_material_flow": { + "value": "max(0, material_flow - 5)" + }, + "speed_print": { + "default_value": 70.0 + }, + "speed_wall": { + "value": "max(5, round(speed_print / 2 - 5, 1))" + }, + "speed_wall_0": { + "value": "max(5, speed_wall - 5)" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.65, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.82, 1)" + }, + "speed_support_interface": { + "value": "round(speed_support * 0.689, 1)" + }, + "speed_prime_tower": { + "value": "speed_support" + }, + "speed_travel": { + "value": 105.0 + }, + "speed_layer_0": { + "value": 26.0 + }, + "speed_travel_layer_0": { + "value": 80.0 + }, + "skirt_brim_speed": { + "value": 26.0 + }, + "retraction_amount": { + "default_value": 3 + }, + "retraction_speed": { + "default_value": 28.0 + }, + "retraction_min_travel": { + "default_value": 0.8 + }, + "retraction_extrusion_window": { + "value": 1.0 + }, + "material_standby_temperature": { + "default_value": 175.0 + }, + "switch_extruder_retraction_amount": { + "value": 16.5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 28.0 + }, + "retraction_combing": { + "value": "off" + }, + "retraction_hop_after_extruder_switch": { + "default_value": false + }, + "support_angle": { + "default_value": 60.0 + }, + "support_connect_zigzags": { + "default_value": false + }, + "support_z_distance": { + "default_value": 0.18 + }, + "support_interface_enable": { + "default_value": true + }, + "support_interface_density": { + "default_value": 60.0 + }, + "support_interface_height": { + "default_value": 0.8 + }, + "support_interface_pattern": { + "default_value": "lines" + }, + "adhesion_type": { + "default_value": "raft" + }, + "skirt_line_count": { + "default_value": 2 + }, + "raft_margin": { + "default_value": 8.0 + }, + "raft_airgap": { + "default_value": 0.19 + }, + "layer_0_z_overlap": { + "value": 0.09 + }, + "raft_surface_thickness": { + "value": 0.25 + }, + "raft_interface_thickness": { + "value": 0.27 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_base_thickness": { + "value": 0.3 + }, + "raft_surface_speed": { + "value": 40.0 + }, + "raft_interface_speed": { + "value": 33.0 + }, + "raft_base_speed": { + "value": 20.0 + }, + "raft_surface_fan_speed": { + "value": "100.0 if cool_fan_enabled else 0.0" + }, + "raft_interface_fan_speed": { + "value": 0.0 + }, + "raft_base_fan_speed": { + "value": 0.0 + }, + "prime_tower_size": { + "default_value": 15.0 + }, + "prime_tower_min_volume": { + "default_value": 10.0 + }, + "draft_shield_dist": { + "default_value": 3 + }, + "top_skin_preshrink": { + "value": 0.0 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json index fc7660824d..91b823277f 100644 --- a/resources/definitions/weedo_f150s.def.json +++ b/resources/definitions/weedo_f150s.def.json @@ -1,43 +1,43 @@ { - "name": "WEEDO F150S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F150S" + "name": "WEEDO F150S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "retraction_amount": { - "default_value": 1.2 + "overrides": { + "machine_name": { + "default_value": "WEEDO F150S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 150 + }, + "machine_height": { + "default_value": 150 + }, + "material_bed_temperature": { + "maximum_value_warning": "70", + "maximum_value": "90" + }, + "retraction_amount": { + "default_value": 1.2 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json index 9ecbbafb3b..ef8b4ed042 100644 --- a/resources/definitions/weedo_f152s.def.json +++ b/resources/definitions/weedo_f152s.def.json @@ -1,39 +1,39 @@ { - "name": "WEEDO F152S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F152S" + "name": "WEEDO F152S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 185 - }, - "machine_height": { - "default_value": 195 - }, - "retraction_amount": { - "default_value": 1.2 + "overrides": { + "machine_name": { + "default_value": "WEEDO F152S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 185 + }, + "machine_height": { + "default_value": 195 + }, + "retraction_amount": { + "default_value": 1.2 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json index e2e8a9b3ed..2487a2eb53 100644 --- a/resources/definitions/weedo_f370.def.json +++ b/resources/definitions/weedo_f370.def.json @@ -1,39 +1,39 @@ { - "name": "WEEDO F370", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F370" + "name": "WEEDO F370", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 370 - }, - "retraction_amount": { - "default_value": 1.2 + "overrides": { + "machine_name": { + "default_value": "WEEDO F370" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 310 + }, + "machine_depth": { + "default_value": 310 + }, + "machine_height": { + "default_value": 370 + }, + "retraction_amount": { + "default_value": 1.2 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json index 2f8af0ac7f..20dbfaaa72 100644 --- a/resources/definitions/weedo_hephi3s.def.json +++ b/resources/definitions/weedo_hephi3s.def.json @@ -1,48 +1,48 @@ { - "name": "WEEDO hephi3s", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO hephi3s" + "name": "WEEDO hephi3s", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" + "overrides": { + "machine_name": { + "default_value": "WEEDO hephi3s" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json index 0a5fe37017..59aaa58993 100644 --- a/resources/definitions/weedo_me40.def.json +++ b/resources/definitions/weedo_me40.def.json @@ -1,48 +1,48 @@ { - "name": "WEEDO ME40", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40" + "name": "WEEDO ME40", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json index e1e14fcd2f..c9b7cd2d28 100644 --- a/resources/definitions/weedo_me40_lite.def.json +++ b/resources/definitions/weedo_me40_lite.def.json @@ -1,52 +1,52 @@ { - "name": "WEEDO ME40 Lite", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40 Lite" + "name": "WEEDO ME40 Lite", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40 Lite" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "material_bed_temperature": { + "maximum_value_warning": "70", + "maximum_value": "90" + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index 46feeb39f8..9bf0ac8b9e 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -1,242 +1,242 @@ { - "name": "WEEDO TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2" + "name": "WEEDO TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "dvalue": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "default_value": 0.35 + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index ed97a58edd..769ad23cf7 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -1,238 +1,238 @@ { - "name": "WEEDO TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2S" + "name": "WEEDO TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "dvalue": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "default_value": 0.35 + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "material_bed_temperature": { + "maximum_value_warning": "60", + "maximum_value": "65" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index 44c22668bf..55dc6c637c 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -1,88 +1,88 @@ { - "name": "WEEDO X40 V3+", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_x40v3_extruder_left", - "1": "weedo_x40v3_extruder_right" + "name": "WEEDO X40 V3+", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_x40v3_extruder_left", + "1": "weedo_x40v3_extruder_right" + }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO X40 V3" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" - }, - "material_print_temp_prepend": { - "default_value": false - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_always_write_active_tool": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.7 - }, - "material_standby_temperature": { - "value": "material_print_temperature-20" - }, - "retraction_amount": { - "default_value": 4 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" - }, - "switch_extruder_retraction_amount": { - "value": 0 - }, - "adhesion_type": { - "default_value": "brim" - }, - "ooze_shield_enabled": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 3.0 + "overrides": { + "machine_name": { + "default_value": "WEEDO X40" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_always_write_active_tool": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.7 + }, + "material_standby_temperature": { + "value": "max(0, material_print_temperature - 20)" + }, + "retraction_amount": { + "default_value": 4 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + }, + "switch_extruder_retraction_amount": { + "value": 0 + }, + "adhesion_type": { + "default_value": "brim" + }, + "ooze_shield_enabled": { + "default_value": true + }, + "ooze_shield_angle": { + "default_value": 0 + }, + "ooze_shield_dist": { + "default_value": 3.0 + } } - } } \ No newline at end of file From dd868ee1b66badc5476b44e7a4c4bf0354cc590a Mon Sep 17 00:00:00 2001 From: mao Date: Tue, 20 Sep 2022 11:25:13 +0800 Subject: [PATCH 04/84] Delete "category" in metadata, change some default_values to values --- resources/definitions/weedo_base.def.json | 3 +-- resources/definitions/weedo_tina2.def.json | 2 +- resources/definitions/weedo_tina2s.def.json | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 3419c92d49..131eae4549 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "WEEDO", "manufacturer": "WEEDO", - "category": "WEEDO", "visible": false, "file_formats": "text/x-gcode", "machine_extruder_trains": { @@ -331,7 +330,7 @@ "default_value": 28.0 }, "retraction_min_travel": { - "default_value": 0.8 + "value": 0.8 }, "retraction_extrusion_window": { "value": 1.0 diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index 9bf0ac8b9e..555bb05d69 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -236,7 +236,7 @@ "value": 25.0 }, "raft_base_thickness": { - "default_value": 0.35 + "value": 0.35 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index 769ad23cf7..ed6a2470de 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -232,7 +232,7 @@ "value": 25.0 }, "raft_base_thickness": { - "default_value": 0.35 + "value": 0.35 } } } \ No newline at end of file From 425734301b2e39728feab513ae0b62d5a6da2d82 Mon Sep 17 00:00:00 2001 From: mao Date: Wed, 7 Dec 2022 10:16:57 +0800 Subject: [PATCH 05/84] Remove redundant value --- resources/definitions/weedo_base.def.json | 12 ------------ resources/definitions/weedo_x40v3.def.json | 3 --- resources/extruders/weedo_base_extruder_0.def.json | 1 - .../extruders/weedo_x40v3_extruder_left.def.json | 4 ---- .../extruders/weedo_x40v3_extruder_right.def.json | 3 --- 5 files changed, 23 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 131eae4549..7c2cced10c 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -392,12 +392,6 @@ "raft_interface_thickness": { "value": 0.27 }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_base_thickness": { - "value": 0.3 - }, "raft_surface_speed": { "value": 40.0 }, @@ -410,12 +404,6 @@ "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, - "raft_interface_fan_speed": { - "value": 0.0 - }, - "raft_base_fan_speed": { - "value": 0.0 - }, "prime_tower_size": { "default_value": 15.0 }, diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index 55dc6c637c..edadcd291b 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -39,9 +39,6 @@ "machine_height": { "default_value": 400 }, - "machine_heated_bed": { - "default_value": true - }, "machine_always_write_active_tool": { "default_value": true }, diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index 0cb088acdd..311a57f572 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -9,7 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index dc1de46bc6..8126207c88 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -12,11 +12,7 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_cooling_fan_number": {"default_value": 0}, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} } diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json index 41e74a5009..ffb8cb5a17 100644 --- a/resources/extruders/weedo_x40v3_extruder_right.def.json +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -12,10 +12,7 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, "machine_extruder_cooling_fan_number": {"default_value": 1}, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n"} From a7082fde2bbab87dd5998d6d50560357f5b23e9e Mon Sep 17 00:00:00 2001 From: mao Date: Wed, 18 Jan 2023 13:35:04 +0800 Subject: [PATCH 06/84] Updated json format --- resources/definitions/weedo_base.def.json | 356 +++++------------- resources/definitions/weedo_f150s.def.json | 43 +-- resources/definitions/weedo_f152s.def.json | 36 +- resources/definitions/weedo_f370.def.json | 36 +- resources/definitions/weedo_hephi3s.def.json | 48 +-- resources/definitions/weedo_me40.def.json | 48 +-- .../definitions/weedo_me40_lite.def.json | 55 +-- resources/definitions/weedo_tina2.def.json | 106 ++---- resources/definitions/weedo_tina2s.def.json | 105 ++---- resources/definitions/weedo_x40v3.def.json | 95 ++--- 10 files changed, 278 insertions(+), 650 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 7c2cced10c..22f2085659 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -2,19 +2,12 @@ "version": 2, "name": "WEEDO Base", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "WEEDO", "manufacturer": "WEEDO", - "visible": false, "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_base_extruder_0" - }, - "has_materials": true, - "has_variants": false, - "has_machine_quality": false, - "preferred_quality_type": "draft", - "preferred_material": "generic_pla_175", "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -164,257 +157,98 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, + "preferred_material": "generic_pla_175", + "preferred_quality_type": "draft" }, - "overrides": { - "machine_name": { - "default_value": "WEEDO Base" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_bed_temp_wait": { - "default_value": false - }, - "material_print_temp_wait": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 0.8 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.8 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.67 - }, - "machine_min_cool_heat_time_window": { - "default_value": 1200.0 - }, - "machine_max_feedrate_x": { - "default_value": 200 - }, - "machine_max_feedrate_y": { - "default_value": 130 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 120 - }, - "machine_max_acceleration_e": { - "default_value": 1600 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 5 - }, - "machine_max_jerk_e": { - "default_value": 5.1 - }, - "infill_line_width": { - "value": "line_width * 1.25" - }, - "initial_layer_line_width_factor": { - "default_value": 110.0 - }, - "wall_0_wipe_dist": { - "value": 0.0 - }, - "z_seam_corner": { - "default_value": "z_seam_corner_any" - }, - "skin_outline_count": { - "value": "0" - }, - "infill_sparse_density": { - "default_value": 10.0 - }, - "infill_pattern": { - "value": "'zigzag'" - }, - "infill_before_walls": { - "default_value": false - }, - "material_print_temperature": { - "maximum_value": "300" - }, - "material_print_temperature_layer_0": { - "value": "min(material_print_temperature + 10, 300)" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { - "maximum_value_warning": "96" - }, - "material_flow": { - "default_value": 95.0 - }, - "material_flow_layer_0": { - "default_value": 95.0 - }, - "infill_material_flow": { - "value": "max(0, material_flow - 5)" - }, - "support_material_flow": { - "value": "max(0, material_flow - 5)" - }, - "speed_print": { - "default_value": 70.0 - }, - "speed_wall": { - "value": "max(5, round(speed_print / 2 - 5, 1))" - }, - "speed_wall_0": { - "value": "max(5, speed_wall - 5)" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.65, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.82, 1)" - }, - "speed_support_interface": { - "value": "round(speed_support * 0.689, 1)" - }, - "speed_prime_tower": { - "value": "speed_support" - }, - "speed_travel": { - "value": 105.0 - }, - "speed_layer_0": { - "value": 26.0 - }, - "speed_travel_layer_0": { - "value": 80.0 - }, - "skirt_brim_speed": { - "value": 26.0 - }, - "retraction_amount": { - "default_value": 3 - }, - "retraction_speed": { - "default_value": 28.0 - }, - "retraction_min_travel": { - "value": 0.8 - }, - "retraction_extrusion_window": { - "value": 1.0 - }, - "material_standby_temperature": { - "default_value": 175.0 - }, - "switch_extruder_retraction_amount": { - "value": 16.5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 28.0 - }, - "retraction_combing": { - "value": "off" - }, - "retraction_hop_after_extruder_switch": { - "default_value": false - }, - "support_angle": { - "default_value": 60.0 - }, - "support_connect_zigzags": { - "default_value": false - }, - "support_z_distance": { - "default_value": 0.18 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_density": { - "default_value": 60.0 - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_pattern": { - "default_value": "lines" - }, - "adhesion_type": { - "default_value": "raft" - }, - "skirt_line_count": { - "default_value": 2 - }, - "raft_margin": { - "default_value": 8.0 - }, - "raft_airgap": { - "default_value": 0.19 - }, - "layer_0_z_overlap": { - "value": 0.09 - }, - "raft_surface_thickness": { - "value": 0.25 - }, - "raft_interface_thickness": { - "value": 0.27 - }, - "raft_surface_speed": { - "value": 40.0 - }, - "raft_interface_speed": { - "value": 33.0 - }, - "raft_base_speed": { - "value": 20.0 - }, - "raft_surface_fan_speed": { - "value": "100.0 if cool_fan_enabled else 0.0" - }, - "prime_tower_size": { - "default_value": 15.0 - }, - "prime_tower_min_volume": { - "default_value": 10.0 - }, - "draft_shield_dist": { - "default_value": 3 - }, - "top_skin_preshrink": { - "value": 0.0 - } + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "draft_shield_dist": { "default_value": 3 }, + "infill_before_walls": { "default_value": false }, + "infill_line_width": { "value": "line_width * 1.25" }, + "infill_material_flow": { "value": "max(0, material_flow - 5)" }, + "infill_pattern": { "value": "'zigzag'" }, + "infill_sparse_density": { "default_value": 10.0 }, + "initial_layer_line_width_factor": { "default_value": 110.0 }, + "layer_0_z_overlap": { "value": 0.09 }, + "machine_acceleration": { "default_value": 3000 }, + "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "default_value": 1600 }, + "machine_max_acceleration_x": { "default_value": 3000 }, + "machine_max_acceleration_y": { "default_value": 3000 }, + "machine_max_acceleration_z": { "default_value": 120 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 200 }, + "machine_max_feedrate_y": { "default_value": 130 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 5.1 }, + "machine_max_jerk_xy": { "default_value": 10.0 }, + "machine_max_jerk_z": { "default_value": 5 }, + "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, + "machine_name": { "default_value": "WEEDO Base" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.67 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, + "material_bed_temp_wait": { "default_value": false }, + "material_bed_temperature": { "maximum_value_warning": "96" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "default_value": 95.0 }, + "material_flow_layer_0": { "default_value": 95.0 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temp_wait": { "default_value": false }, + "material_print_temperature": { "maximum_value": "300" }, + "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" }, + "material_standby_temperature": { "default_value": 175.0 }, + "prime_tower_min_volume": { "default_value": 10.0 }, + "prime_tower_size": { "default_value": 15.0 }, + "raft_airgap": { "default_value": 0.19 }, + "raft_base_speed": { "value": 20.0 }, + "raft_interface_speed": { "value": 33.0 }, + "raft_interface_thickness": { "value": 0.27 }, + "raft_margin": { "default_value": 8.0 }, + "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, + "raft_surface_speed": { "value": 40.0 }, + "raft_surface_thickness": { "value": 0.25 }, + "retraction_amount": { "default_value": 3 }, + "retraction_combing": { "value": "off" }, + "retraction_extrusion_window": { "value": 1.0 }, + "retraction_hop_after_extruder_switch": { "default_value": false }, + "retraction_min_travel": { "value": 0.8 }, + "retraction_speed": { "default_value": 28.0 }, + "skin_outline_count": { "value": "0" }, + "skirt_brim_speed": { "value": 26.0 }, + "skirt_line_count": { "default_value": 2 }, + "speed_layer_0": { "value": 26.0 }, + "speed_prime_tower": { "value": "speed_support" }, + "speed_print": { "default_value": 70.0 }, + "speed_support": { "value": "round(speed_print * 0.82, 1)" }, + "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" }, + "speed_travel": { "value": 105.0 }, + "speed_travel_layer_0": { "value": 80.0 }, + "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" }, + "speed_wall_0": { "value": "max(5, speed_wall - 5)" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "default_value": 60.0 }, + "support_connect_zigzags": { "default_value": false }, + "support_interface_density": { "default_value": 60.0 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_pattern": { "default_value": "lines" }, + "support_material_flow": { "value": "max(0, material_flow - 5)" }, + "support_z_distance": { "default_value": 0.18 }, + "switch_extruder_retraction_amount": { "value": 16.5 }, + "switch_extruder_retraction_speeds": { "default_value": 28.0 }, + "top_skin_preshrink": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + "z_seam_corner": { "default_value": "z_seam_corner_any" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json index 91b823277f..05b5359cda 100644 --- a/resources/definitions/weedo_f150s.def.json +++ b/resources/definitions/weedo_f150s.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO F150S", "version": 2, + "name": "WEEDO F150S", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,31 +14,19 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F150S" + "overrides": + { + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "WEEDO F150S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" }, + "machine_width": { "default_value": 200 }, + "material_bed_temperature": + { + "maximum_value": "90", + "maximum_value_warning": "70" }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "retraction_amount": { - "default_value": 1.2 - } + "retraction_amount": { "default_value": 1.2 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json index ef8b4ed042..8da41c946e 100644 --- a/resources/definitions/weedo_f152s.def.json +++ b/resources/definitions/weedo_f152s.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO F152S", "version": 2, + "name": "WEEDO F152S", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,27 +14,14 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F152S" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 185 - }, - "machine_height": { - "default_value": 195 - }, - "retraction_amount": { - "default_value": 1.2 - } + "overrides": + { + "machine_depth": { "default_value": 185 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 195 }, + "machine_name": { "default_value": "WEEDO F152S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" }, + "machine_width": { "default_value": 200 }, + "retraction_amount": { "default_value": 1.2 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json index 2487a2eb53..a967be62d2 100644 --- a/resources/definitions/weedo_f370.def.json +++ b/resources/definitions/weedo_f370.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO F370", "version": 2, + "name": "WEEDO F370", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,27 +14,14 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F370" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 370 - }, - "retraction_amount": { - "default_value": 1.2 - } + "overrides": + { + "machine_depth": { "default_value": 310 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 370 }, + "machine_name": { "default_value": "WEEDO F370" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" }, + "machine_width": { "default_value": 310 }, + "retraction_amount": { "default_value": 1.2 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json index 20dbfaaa72..4cc1f5a41f 100644 --- a/resources/definitions/weedo_hephi3s.def.json +++ b/resources/definitions/weedo_hephi3s.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO hephi3s", "version": 2, + "name": "WEEDO hephi3s", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,36 +14,17 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO hephi3s" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - } + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "WEEDO hephi3s" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, + "machine_width": { "default_value": 220 }, + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json index 59aaa58993..348d5dc0cd 100644 --- a/resources/definitions/weedo_me40.def.json +++ b/resources/definitions/weedo_me40.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO ME40", "version": 2, + "name": "WEEDO ME40", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,36 +14,17 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - } + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "WEEDO ME40" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, + "machine_width": { "default_value": 300 }, + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json index c9b7cd2d28..2c7c809e21 100644 --- a/resources/definitions/weedo_me40_lite.def.json +++ b/resources/definitions/weedo_me40_lite.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO ME40 Lite", "version": 2, + "name": "WEEDO ME40 Lite", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,40 +14,22 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40 Lite" + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "WEEDO ME40 Lite" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, + "machine_width": { "default_value": 300 }, + "material_bed_temperature": + { + "maximum_value": "90", + "maximum_value_warning": "70" }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - } + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index 555bb05d69..7824aa3006 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -1,17 +1,13 @@ { - "name": "WEEDO TINA2", "version": 2, + "name": "WEEDO TINA2", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -169,74 +165,36 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } + "overrides": + { + "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEDO TINA2" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index ed6a2470de..5c11529854 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -1,17 +1,13 @@ { - "name": "WEEDO TINA2S", "version": 2, + "name": "WEEDO TINA2S", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -167,72 +163,39 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2S" + "overrides": + { + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEDO TINA2S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "material_bed_temperature": + { + "maximum_value": "65", + "maximum_value_warning": "60" }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index edadcd291b..47912a7f8d 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -1,13 +1,15 @@ { - "name": "WEEDO X40 V3+", "version": 2, + "name": "WEEDO X40 V3+", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", "file_formats": "text/x-gcode", - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "weedo_x40v3_extruder_left", "1": "weedo_x40v3_extruder_right" }, @@ -17,69 +19,28 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO X40" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" - }, - "material_print_temp_prepend": { - "default_value": false - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_always_write_active_tool": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.7 - }, - "material_standby_temperature": { - "value": "max(0, material_print_temperature - 20)" - }, - "retraction_amount": { - "default_value": 4 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - }, - "switch_extruder_retraction_amount": { - "value": 0 - }, - "adhesion_type": { - "default_value": "brim" - }, - "ooze_shield_enabled": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 3.0 - } + "overrides": + { + "adhesion_type": { "default_value": "brim" }, + "machine_always_write_active_tool": { "default_value": true }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "WEEDO X40" }, + "machine_nozzle_heat_up_speed": { "default_value": 1.7 }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" }, + "machine_width": { "default_value": 300 }, + "material_print_temp_prepend": { "default_value": false }, + "material_standby_temperature": { "value": "max(0, material_print_temperature - 20)" }, + "ooze_shield_angle": { "default_value": 0 }, + "ooze_shield_dist": { "default_value": 3.0 }, + "ooze_shield_enabled": { "default_value": true }, + "retraction_amount": { "default_value": 4 }, + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" }, + "switch_extruder_retraction_amount": { "value": 0 } } } \ No newline at end of file From d072c71621b1b123786f5882d43e6443ed4b8758 Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 10:05:31 +0800 Subject: [PATCH 07/84] Sync with main branch --- resources/definitions/weedo_base.def.json | 10 +++++++--- resources/extruders/weedo_x40v3_extruder_left.def.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 22f2085659..04549e6768 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -196,6 +196,10 @@ "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_steps_per_mm_e": { "default_value": 96 }, + "machine_steps_per_mm_x": { "default_value": 94 }, + "machine_steps_per_mm_y": { "default_value": 94 }, + "machine_steps_per_mm_z": { "default_value": 400 }, "material_bed_temp_wait": { "default_value": false }, "material_bed_temperature": { "maximum_value_warning": "96" }, "material_diameter": { "default_value": 1.75 }, @@ -210,15 +214,15 @@ "prime_tower_min_volume": { "default_value": 10.0 }, "prime_tower_size": { "default_value": 15.0 }, "raft_airgap": { "default_value": 0.19 }, + "raft_base_fan_speed": { "value": 0.0 }, "raft_base_speed": { "value": 20.0 }, + "raft_base_thickness": { "value": 0.3 }, "raft_interface_speed": { "value": 33.0 }, - "raft_interface_thickness": { "value": 0.27 }, "raft_margin": { "default_value": 8.0 }, - "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, "raft_surface_speed": { "value": 40.0 }, "raft_surface_thickness": { "value": 0.25 }, "retraction_amount": { "default_value": 3 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "retraction_extrusion_window": { "value": 1.0 }, "retraction_hop_after_extruder_switch": { "default_value": false }, "retraction_min_travel": { "value": 0.8 }, diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 8126207c88..26967d71d9 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -14,6 +14,6 @@ }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} } } From 2c4859d4bf622396af64a13efbc3ec1cdc24986f Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 02:06:19 +0000 Subject: [PATCH 08/84] Applied printer-linter format --- .../weedo_x40v3_extruder_left.def.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 26967d71d9..eac3309fc0 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -2,18 +2,20 @@ "version": 2, "name": "Extruder Left", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40v3", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} + "machine_extruder_end_code": { "default_value": "M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n" }, + "machine_extruder_start_code": { "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From a464cbd9f65c1f93f0d49f58f4951e20a852e78d Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 10:05:31 +0800 Subject: [PATCH 09/84] Sync with main branch --- resources/definitions/weedo_base.def.json | 254 ------------------ resources/definitions/weedo_tina2.def.json | 200 -------------- resources/definitions/weedo_tina2s.def.json | 201 -------------- .../extruders/weedo_base_extruder_0.def.json | 14 - .../weedo_x40v3_extruder_left.def.json | 2 +- 5 files changed, 1 insertion(+), 670 deletions(-) delete mode 100644 resources/definitions/weedo_base.def.json delete mode 100644 resources/definitions/weedo_tina2.def.json delete mode 100644 resources/definitions/weedo_tina2s.def.json delete mode 100644 resources/extruders/weedo_base_extruder_0.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json deleted file mode 100644 index 22f2085659..0000000000 --- a/resources/definitions/weedo_base.def.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": - { - "visible": false, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - "has_machine_quality": false, - "has_materials": true, - "has_variants": false, - "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, - "preferred_material": "generic_pla_175", - "preferred_quality_type": "draft" - }, - "overrides": - { - "adhesion_type": { "default_value": "raft" }, - "draft_shield_dist": { "default_value": 3 }, - "infill_before_walls": { "default_value": false }, - "infill_line_width": { "value": "line_width * 1.25" }, - "infill_material_flow": { "value": "max(0, material_flow - 5)" }, - "infill_pattern": { "value": "'zigzag'" }, - "infill_sparse_density": { "default_value": 10.0 }, - "initial_layer_line_width_factor": { "default_value": 110.0 }, - "layer_0_z_overlap": { "value": 0.09 }, - "machine_acceleration": { "default_value": 3000 }, - "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, - "machine_heated_bed": { "default_value": true }, - "machine_max_acceleration_e": { "default_value": 1600 }, - "machine_max_acceleration_x": { "default_value": 3000 }, - "machine_max_acceleration_y": { "default_value": 3000 }, - "machine_max_acceleration_z": { "default_value": 120 }, - "machine_max_feedrate_e": { "default_value": 50 }, - "machine_max_feedrate_x": { "default_value": 200 }, - "machine_max_feedrate_y": { "default_value": 130 }, - "machine_max_feedrate_z": { "default_value": 10 }, - "machine_max_jerk_e": { "default_value": 5.1 }, - "machine_max_jerk_xy": { "default_value": 10.0 }, - "machine_max_jerk_z": { "default_value": 5 }, - "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, - "machine_name": { "default_value": "WEEDO Base" }, - "machine_nozzle_cool_down_speed": { "default_value": 0.67 }, - "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, - "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, - "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, - "material_bed_temp_wait": { "default_value": false }, - "material_bed_temperature": { "maximum_value_warning": "96" }, - "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "default_value": 95.0 }, - "material_flow_layer_0": { "default_value": 95.0 }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_print_temp_wait": { "default_value": false }, - "material_print_temperature": { "maximum_value": "300" }, - "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" }, - "material_standby_temperature": { "default_value": 175.0 }, - "prime_tower_min_volume": { "default_value": 10.0 }, - "prime_tower_size": { "default_value": 15.0 }, - "raft_airgap": { "default_value": 0.19 }, - "raft_base_speed": { "value": 20.0 }, - "raft_interface_speed": { "value": 33.0 }, - "raft_interface_thickness": { "value": 0.27 }, - "raft_margin": { "default_value": 8.0 }, - "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, - "raft_surface_speed": { "value": 40.0 }, - "raft_surface_thickness": { "value": 0.25 }, - "retraction_amount": { "default_value": 3 }, - "retraction_combing": { "value": "off" }, - "retraction_extrusion_window": { "value": 1.0 }, - "retraction_hop_after_extruder_switch": { "default_value": false }, - "retraction_min_travel": { "value": 0.8 }, - "retraction_speed": { "default_value": 28.0 }, - "skin_outline_count": { "value": "0" }, - "skirt_brim_speed": { "value": 26.0 }, - "skirt_line_count": { "default_value": 2 }, - "speed_layer_0": { "value": 26.0 }, - "speed_prime_tower": { "value": "speed_support" }, - "speed_print": { "default_value": 70.0 }, - "speed_support": { "value": "round(speed_print * 0.82, 1)" }, - "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" }, - "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" }, - "speed_travel": { "value": 105.0 }, - "speed_travel_layer_0": { "value": 80.0 }, - "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" }, - "speed_wall_0": { "value": "max(5, speed_wall - 5)" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "default_value": 60.0 }, - "support_connect_zigzags": { "default_value": false }, - "support_interface_density": { "default_value": 60.0 }, - "support_interface_enable": { "default_value": true }, - "support_interface_height": { "default_value": 0.8 }, - "support_interface_pattern": { "default_value": "lines" }, - "support_material_flow": { "value": "max(0, material_flow - 5)" }, - "support_z_distance": { "default_value": 0.18 }, - "switch_extruder_retraction_amount": { "value": 16.5 }, - "switch_extruder_retraction_speeds": { "default_value": 28.0 }, - "top_skin_preshrink": { "value": 0.0 }, - "wall_0_wipe_dist": { "value": 0.0 }, - "z_seam_corner": { "default_value": "z_seam_corner_any" } - } -} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json deleted file mode 100644 index 7824aa3006..0000000000 --- a/resources/definitions/weedo_tina2.def.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "version": 2, - "name": "WEEDO TINA2", - "inherits": "weedo_base", - "metadata": - { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": - { - "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, - "machine_depth": { "default_value": 120 }, - "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 100 }, - "machine_name": { "default_value": "WEEDO TINA2" }, - "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, - "machine_width": { "default_value": 100 }, - "raft_base_thickness": { "value": 0.35 }, - "speed_infill": { "value": 40.0 }, - "speed_print": { "value": 40.0 }, - "speed_print_layer_0": { "value": 22.0 }, - "speed_roofing": { "value": 25.0 }, - "speed_support_bottom": { "value": 30.0 }, - "speed_support_infill": { "value": 45.0 }, - "speed_support_roof": { "value": 30.0 }, - "speed_topbottom": { "value": 30.0 }, - "speed_travel": { "value": 65.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_wall": { "value": 25.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 25.0 } - } -} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json deleted file mode 100644 index 5c11529854..0000000000 --- a/resources/definitions/weedo_tina2s.def.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "version": 2, - "name": "WEEDO TINA2S", - "inherits": "weedo_base", - "metadata": - { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": - { - "machine_depth": { "default_value": 110 }, - "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "machine_height": { "default_value": 100 }, - "machine_name": { "default_value": "WEEDO TINA2S" }, - "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, - "machine_width": { "default_value": 100 }, - "material_bed_temperature": - { - "maximum_value": "65", - "maximum_value_warning": "60" - }, - "raft_base_thickness": { "value": 0.35 }, - "speed_infill": { "value": 40.0 }, - "speed_print": { "value": 40.0 }, - "speed_print_layer_0": { "value": 22.0 }, - "speed_roofing": { "value": 25.0 }, - "speed_support_bottom": { "value": 30.0 }, - "speed_support_infill": { "value": 45.0 }, - "speed_support_roof": { "value": 30.0 }, - "speed_topbottom": { "value": 30.0 }, - "speed_travel": { "value": 65.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_wall": { "value": 25.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 25.0 } - } -} \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json deleted file mode 100644 index 311a57f572..0000000000 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "weedo_base", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } - } -} diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 8126207c88..26967d71d9 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -14,6 +14,6 @@ }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} } } From a77eabf34f9399cd727fad1455cb6a3e0599c12d Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 2 May 2024 18:59:48 +0200 Subject: [PATCH 10/84] Added PPS-CF as bundled package. PP-476 --- resources/bundled_packages/cura.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 8eac12a548..a32d1d61f6 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -1914,6 +1914,25 @@ } } }, + "UltimakerPPSCF": { + "package_info": { + "package_id": "UltimakerPPSCF", + "package_type": "material", + "display_name": "Ultimaker PPS-CF", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "1.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/factor-series-pps-carbon-fiber/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://support.ultimaker.com/s/article/How-to-print-with-UltiMaker-PPS-CF" + } + } + }, "ULTIMAKERBASCFMETHOD": { "package_info": { "package_id": "ULTIMAKERBASCFMETHOD", From c7d6c650247e3fb0fe2c0f58ff21460197ab7064 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 21 May 2024 14:29:59 +0200 Subject: [PATCH 11/84] Add CPE CFF and GFF profiles. PP-480 --- ..._f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.4_cffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.4_gffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.6_cffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.6_gffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ 8 files changed, 144 insertions(+) create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..a29540bbeb --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..01ea70dd38 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..98087f4712 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..ffe4988764 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..40f9516580 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d0dacd043c --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..74915d58be --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d6140b680a --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + From d896eb38ff278bf447df56016b7ae0e7e73e31f2 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 24 May 2024 10:52:06 +0200 Subject: [PATCH 12/84] Preventing PVA and BAM to interfer with the build plate and build volume temperature settings of the model material. PP-371 --- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg | 2 ++ 33 files changed, 66 insertions(+) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg index eb28e13dfa..1b9ef96490 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg index 6bdee60b57..fba4209699 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg index 407447f7c6..7921c1bbe7 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 0433df8c7b..49d92e473f 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 50 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index d2bf84490f..926ba15fab 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 50 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index b2ccbffdb0..80a1526bca 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 40 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index 22d5a3aedf..e8cd213610 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 9387393eaa..0521ceec69 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index fab9114a4b..f114826c4a 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index bcca24890b..e2f4bd3b41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -13,6 +13,8 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index f398a6a42d..c8625d8dc4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -13,6 +13,8 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index 522f155ad0..cccbe6e43a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -13,6 +13,8 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index acd966f3ab..9bea9c666e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -14,6 +14,8 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index 44a7379dcb..0424946cab 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -13,7 +13,9 @@ weight = 1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index 3541afe350..0f713bc4fd 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -13,7 +13,9 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index 23ac57b474..1937594899 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -13,7 +13,9 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index e12a164f80..fac2f6022b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg index 4b148bd5fd..f85e2eaf39 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg @@ -14,7 +14,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg index 563f441335..7ba8ce6b48 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg index 66e9d39a07..f15c020b2d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg @@ -13,7 +13,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg index ee6d9fce33..bf7d09c54a 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg @@ -13,7 +13,9 @@ weight = -4 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index 6b118fde63..4b1603be59 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -13,6 +13,8 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index 6422d61996..e72b2a10c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -13,6 +13,8 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index 4b82ec4068..a6ecd76664 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -13,6 +13,8 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index 6a910b3deb..2e5f7e9f18 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -14,6 +14,8 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index 79c891b513..7eddb08a1b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -13,7 +13,9 @@ weight = 1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index 0606d82159..467c991751 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -13,7 +13,9 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index a4e7838358..b89f6c0df1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -13,7 +13,9 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index 1f9754b2a2..cba8a6e47e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index 04a35d798a..f96cde019e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -14,7 +14,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg index bab8bce504..4efde670e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg index 31b316d5d2..7cf27136fb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg @@ -13,7 +13,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg index 773fae8204..00d105e435 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg @@ -13,7 +13,9 @@ weight = -4 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) From 8815f52f2a74072de714c643066c9c616f698a09 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 24 May 2024 11:54:38 +0200 Subject: [PATCH 13/84] New 0.15mm mode for the factor 4 for PVA and BAM. Needed by 0.15mm 3rd party material profiles that require support. PP-485 --- .../um_f4_aa0.4_bam_0.15mm.inst.cfg | 30 +++++++++++++++++++ .../um_f4_bb0.4_pva_0.15mm.inst.cfg | 28 +++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg new file mode 100644 index 0000000000..d7aad11dec --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_factor4 +name = Normal +version = 4 + +[metadata] +material = generic_bam +quality_type = fast +setting_version = 23 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +brim_replaces_support = False +machine_nozzle_heat_up_speed = 1.56 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +skin_material_flow = =material_flow * 0.965 +speed_print = 60 +support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_join_distance = 5 +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg new file mode 100644 index 0000000000..6fd09e5917 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_factor4 +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 23 +type = quality +variant = BB 0.4 +weight = -1 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_support_bottom = 100 +acceleration_support_interface = 1500 +brim_replaces_support = False +prime_tower_min_volume = 15 +skin_material_flow = =material_flow * 0.93 +speed_print = 50 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_z_distance = 0 + From 8632efa4ec4f5b614aca0cd771c2ef6979662ef2 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 30 May 2024 14:34:52 +0200 Subject: [PATCH 14/84] Updated PVA max. temperature to be 40C iso 70C to prevent problems with PVA in the Bowden tube. PP-333 --- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 49d92e473f..ff16fdfc12 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index 926ba15fab..ee33eb7e04 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index 80a1526bca..b71e8805df 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index e8cd213610..7c9008a463 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 0521ceec69..1af44b9b0d 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index f114826c4a..186ae845de 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 From e1d64b4fc66df819778e1c7beb272e4da5f4539c Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 5 Jun 2024 10:01:47 +0200 Subject: [PATCH 15/84] Reduce the build plate, build volume and print temperature of the T-PLA 0.2mm engineering mode with 5C to improve the overhang quality. Strength and dimensional accuarcy were not affected by this change. PP-488 --- .../um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg index 9dd0190dbc..0aa1fc3d6d 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -12,10 +12,8 @@ type = intent variant = AA 0.4 [values] -build_volume_temperature = 35 jerk_print = 30 -material_bed_temperature = =default_material_bed_temperature + 5 -material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature = =default_material_print_temperature + 10 speed_print = 80 wall_thickness = =line_width * 3 From 03c5eccc73281f67567cef64bc508d49700da106 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:09:36 +0200 Subject: [PATCH 16/84] Changed max. temperature for break away to 50C PP-371 --- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg index 1b9ef96490..4d19af3298 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg @@ -16,7 +16,7 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 material_print_temperature = =default_material_print_temperature - 5 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg index fba4209699..bb057c5cda 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg @@ -16,7 +16,7 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg index 7921c1bbe7..7203764593 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg @@ -16,7 +16,7 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index e2f4bd3b41..205434e462 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -13,7 +13,7 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index c8625d8dc4..0e7c3a6500 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -13,7 +13,7 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index cccbe6e43a..51e698affa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -13,7 +13,7 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index 9bea9c666e..348f6de988 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -14,7 +14,7 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index 4b1603be59..808bdd3de3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -13,7 +13,7 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index e72b2a10c7..4d30a7c10d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -13,7 +13,7 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index a6ecd76664..65f11b5736 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -13,7 +13,7 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index 2e5f7e9f18..c4bf1775bb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -14,7 +14,7 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 From 5cfb3dbf7fa21f413d24abc6dc13639333e3d69c Mon Sep 17 00:00:00 2001 From: "Justin F. Hallett" Date: Fri, 7 Jun 2024 15:49:09 -0600 Subject: [PATCH 17/84] Add DraftShift Design Voron2 based StealthChanger profiles --- .../voron2_stealthchanger_250.def.json | 18 ++++++++++++ .../voron2_stealthchanger_300.def.json | 18 ++++++++++++ .../voron2_stealthchanger_350.def.json | 18 ++++++++++++ .../voron2_stealthchanger_base.def.json | 29 +++++++++++++++++++ .../voron2_stealthchanger_extruder_0.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_1.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_2.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_3.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_4.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_5.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_6.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_7.def.json | 25 ++++++++++++++++ ...voron2_stealthchanger_250_v6_0.25.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.30.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.35.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.40.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.50.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.60.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_0.40.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_0.60.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_1.00.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_1.20.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.25.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.30.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.35.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.40.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.50.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.60.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_0.40.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_0.60.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_1.00.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_1.20.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.25.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.30.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.35.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.40.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.50.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.60.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_0.40.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_0.60.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_1.00.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_1.20.inst.cfg | 13 +++++++++ 48 files changed, 751 insertions(+) create mode 100644 resources/definitions/voron2_stealthchanger_250.def.json create mode 100644 resources/definitions/voron2_stealthchanger_300.def.json create mode 100644 resources/definitions/voron2_stealthchanger_350.def.json create mode 100644 resources/definitions/voron2_stealthchanger_base.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_0.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_1.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_2.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_3.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_4.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_5.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_6.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_7.def.json create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg diff --git a/resources/definitions/voron2_stealthchanger_250.def.json b/resources/definitions/voron2_stealthchanger_250.def.json new file mode 100644 index 0000000000..123852a661 --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_250.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger 250", + "inherits": "voron2_stealthchanger_base", + "metadata": + { + "visible": true, + "platform": "voron2_250_bed.3mf", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "VORON2 StealthChanger 250" }, + "machine_width": { "default_value": 250 } + } +} diff --git a/resources/definitions/voron2_stealthchanger_300.def.json b/resources/definitions/voron2_stealthchanger_300.def.json new file mode 100644 index 0000000000..bc079a1714 --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_300.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger 300", + "inherits": "voron2_stealthchanger_base", + "metadata": + { + "visible": true, + "platform": "voron2_300_bed.3mf", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "VORON2 StealthChanger 300" }, + "machine_width": { "default_value": 300 } + } +} diff --git a/resources/definitions/voron2_stealthchanger_350.def.json b/resources/definitions/voron2_stealthchanger_350.def.json new file mode 100644 index 0000000000..a73e274809 --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_350.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger 350", + "inherits": "voron2_stealthchanger_base", + "metadata": + { + "visible": true, + "platform": "voron2_350_bed.3mf", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_depth": { "default_value": 350 }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "VORON2 StealthChanger 350" }, + "machine_width": { "default_value": 350 } + } +} diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json new file mode 100644 index 0000000000..3eabc3e04e --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger Base", + "inherits": "voron2_base", + "metadata": + { + "visible": false, + "author": "Thessien", + "manufacturer": "DraftShift Design", + "machine_extruder_trains": + { + "0": "voron2_stealthchanger_extruder_0", + "1": "voron2_stealthchanger_extruder_1", + "2": "voron2_stealthchanger_extruder_2", + "3": "voron2_stealthchanger_extruder_3", + "4": "voron2_stealthchanger_extruder_4", + "5": "voron2_stealthchanger_extruder_5", + "6": "voron2_stealthchanger_extruder_6", + "7": "voron2_stealthchanger_extruder_7" + } + }, + "overrides": + { + "machine_name": { "default_value": "VORON2 StealthChanger" }, + "machine_end_gcode": { "default_value": "PRINT_END" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json new file mode 100644 index 0000000000..887ab01349 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 0", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json new file mode 100644 index 0000000000..4342d4ba55 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json new file mode 100644 index 0000000000..3dd2955b2a --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "2" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 2, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json new file mode 100644 index 0000000000..9eeb9702eb --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 3", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "3" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 3, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json new file mode 100644 index 0000000000..6641620313 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 4", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "4" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 4, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json new file mode 100644 index 0000000000..fe8c86cd6b --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 5", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "5" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 5, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json new file mode 100644 index 0000000000..e8aac016c4 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 6", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "6" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 6, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json new file mode 100644 index 0000000000..9e98525f90 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 7", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "7" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 7, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg new file mode 100644 index 0000000000..d9dc67d195 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.25 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg new file mode 100644 index 0000000000..348f1c0f8b --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.30mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.30 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg new file mode 100644 index 0000000000..d56e3c80e3 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.35mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.35 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg new file mode 100644 index 0000000000..817bccacfe --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg new file mode 100644 index 0000000000..30774fcf86 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg new file mode 100644 index 0000000000..06841a8187 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg new file mode 100644 index 0000000000..037414e04c --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg new file mode 100644 index 0000000000..8b2e14dde6 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg new file mode 100644 index 0000000000..0bd7fca9eb --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg new file mode 100644 index 0000000000..7b6a99d012 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg new file mode 100644 index 0000000000..79a110a357 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 1.00mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg new file mode 100644 index 0000000000..b30a6d2b22 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 1.20mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.2 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg new file mode 100644 index 0000000000..91cfe55050 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.25 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg new file mode 100644 index 0000000000..a01d46ea83 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.30mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.30 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg new file mode 100644 index 0000000000..f7b96d3913 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.35mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.35 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg new file mode 100644 index 0000000000..4d533d6923 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg new file mode 100644 index 0000000000..7732cae34c --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg new file mode 100644 index 0000000000..65343c2314 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg new file mode 100644 index 0000000000..eef2b9b5cc --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg new file mode 100644 index 0000000000..e2924355a5 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg new file mode 100644 index 0000000000..e95b345f1c --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg new file mode 100644 index 0000000000..3a088ec895 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg new file mode 100644 index 0000000000..423c53a7af --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 1.00mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg new file mode 100644 index 0000000000..682d0f32b4 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 1.20mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.2 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg new file mode 100644 index 0000000000..00ee1e22de --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.25 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg new file mode 100644 index 0000000000..50b48831f8 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.30mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.30 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg new file mode 100644 index 0000000000..d6a356a046 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.35mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.35 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg new file mode 100644 index 0000000000..b6cea8053e --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg new file mode 100644 index 0000000000..3b382dee7d --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg new file mode 100644 index 0000000000..327b8f2233 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg new file mode 100644 index 0000000000..b1db27ccd8 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg new file mode 100644 index 0000000000..f9ebd89d4a --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg new file mode 100644 index 0000000000..1dc02511a7 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg new file mode 100644 index 0000000000..3857baf3a3 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg new file mode 100644 index 0000000000..79a110a357 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 1.00mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg new file mode 100644 index 0000000000..33c94db3e8 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 1.20mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.2 + From 6d1233b48b80f7b456f189bdf77b11d2ff47f8e2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 13 Jun 2024 10:47:30 +0200 Subject: [PATCH 18/84] Add settings to customize raft flow CURA-11947 --- resources/definitions/fdmprinter.def.json | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9211528b54..8d8c5fe49d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6822,6 +6822,63 @@ "limit_to_extruder": "raft_surface_extruder_nr" } } + }, + "raft_flow": + { + "label": "Raft Flow", + "description": "The amount of material, relative to a normal extrusion line, to extrude during raft printing. Having an increased flow may improve adhesion and raft structural strength.", + "type": "float", + "unit": "%", + "default_value": 100.0, + "minimum_value": "10", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "children": + { + "raft_base_flow": + { + "label": "Raft Base Flow", + "description": "The amount of material, relative to a normal extrusion line, to extrude during raft base printing. Having an increased flow may improve adhesion and raft structural strength.", + "type": "float", + "unit": "%", + "default_value": 100.0, + "value": "raft_flow", + "minimum_value": "10", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_base_extruder_nr" + }, + "raft_interface_flow": + { + "label": "Raft Interface Flow", + "description": "The amount of material, relative to a normal extrusion line, to extrude during raft interface printing. Having an increased flow may improve adhesion and raft structural strength.", + "type": "float", + "unit": "%", + "default_value": 100.0, + "value": "raft_flow", + "minimum_value": "10", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_interface_extruder_nr" + }, + "raft_surface_flow": + { + "label": "Raft Surface Flow", + "description": "The amount of material, relative to a normal extrusion line, to extrude during raft surface printing. Having an increased flow may improve adhesion and raft structural strength.", + "type": "float", + "unit": "%", + "default_value": 100.0, + "value": "raft_flow", + "minimum_value": "10", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_surface_extruder_nr" + } + } } } }, From db3e0bd8947954f212ccfa401b5ed36a8c5e20ad Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 13 Jun 2024 13:01:53 +0200 Subject: [PATCH 19/84] Add setting to customize support first layer CURA-11947 --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8d8c5fe49d..c5dfd906d2 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5118,6 +5118,18 @@ } } }, + "support_infill_density_multiplier_layer_0": + { + "label": "Support Infill Density Multiplier First Layer", + "description": "Multiplier for the infill on the first layers of the support. Increasing this may help for bed adhesion.", + "type": "int", + "minimum_value": "1", + "default_value": 1, + "enabled": "support_enable or support_meshes_present", + "limit_to_extruder": "support_extruder_nr_layer_0", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "support_infill_angles": { "label": "Support Infill Line Directions", From 1f1412d8b3089ce4ced8935444078b1abf4da24c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 13 Jun 2024 13:40:34 +0200 Subject: [PATCH 20/84] Add settings to customize raft layers adhesion CURA-11947 --- resources/definitions/fdmprinter.def.json | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c5dfd906d2..6b8af47d8a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6459,6 +6459,22 @@ "settable_per_extruder": true, "limit_to_extruder": "raft_interface_extruder_nr" }, + "raft_interface_z_offset": + { + "label": "Raft Interface Z Offset", + "description": "When printing the first layer of the raft interface, translate by this offset to customize the adhesion between base and interface. A negative offset should improve the adhesion.", + "unit": "mm", + "type": "float", + "default_value": 0.0, + "minimum_value_warning": "-raft_interface_thickness / 2", + "minimum_value": "-raft_interface_thickness", + "maximum_value_warning": "raft_interface_thickness / 2", + "maximum_value": "raft_interface_thickness", + "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_interface_layers > 0", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_interface_extruder_nr" + }, "raft_surface_layers": { "label": "Raft Top Layers", @@ -6520,6 +6536,22 @@ "settable_per_extruder": true, "limit_to_extruder": "raft_surface_extruder_nr" }, + "raft_surface_z_offset": + { + "label": "Raft Surface Z Offset", + "description": "When printing the first layer of the raft surface, translate by this offset to customize the adhesion between interface and surface. A negative offset should improve the adhesion.", + "unit": "mm", + "type": "float", + "default_value": 0.0, + "minimum_value_warning": "-raft_surface_thickness / 2", + "minimum_value": "-raft_surface_thickness", + "maximum_value_warning": "raft_surface_thickness / 2", + "maximum_value": "raft_surface_thickness", + "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_surface_extruder_nr" + }, "raft_surface_monotonic": { "label": "Monotonic Raft Top Surface Order", From 262b6f1458777b055e4cdd879e2b3398f7fdfcbb Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:19:52 +0200 Subject: [PATCH 21/84] Improve PVA printing reliability. Increase linewidth at first layer, enable prime tower, increase print speed PVA. PP-429 --- resources/definitions/ultimaker.def.json | 4 ++++ .../ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg | 5 +++++ .../quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg | 5 +++++ .../quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg | 5 +++++ .../quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg | 1 - 73 files changed, 96 insertions(+), 59 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97bb099ea4..918db0d0ea 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -89,6 +89,9 @@ }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, "raft_base_speed": { "value": "raft_speed" }, "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" }, "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" }, @@ -126,6 +129,7 @@ "support_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_tower_maximum_supported_diameter": { "value": "support_tower_diameter" }, "support_tower_roof_angle": { "value": "0 if support_interface_enable else 65" }, + "support_use_towers": { "value": false }, "support_wall_count": { "value": "1 if support_structure == 'tree' else 0" }, "support_xy_distance_overhang": { "value": "0.2" }, "support_z_distance": { "value": "0" }, diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 0433df8c7b..2c99c484c9 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 50 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index d2bf84490f..f0aeb24746 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 50 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index b2ccbffdb0..1856bda292 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 40 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index 22d5a3aedf..f51bdb596a 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 9387393eaa..e39b921c31 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index fab9114a4b..aa36cd2fd2 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg index 042058d1f0..d7bd9816ed 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg @@ -41,7 +41,6 @@ machine_nozzle_cool_down_speed = 1.3 machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg index 9b2325250c..ae9436c02e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg @@ -15,7 +15,6 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg index caf4248a91..f51a43350a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg @@ -14,7 +14,6 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg index 3e79a33e69..ea29968088 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg @@ -14,7 +14,6 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed support_bottom_distance = =support_z_distance diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg index 3e814754e4..ab6b521213 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg index 87eeb609a7..8f535a445c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg @@ -22,7 +22,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg index 00c4be354f..40b74593fa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg index 432f722013..a52bc4173d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg @@ -43,7 +43,6 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg index 39aa770c10..0fe2f9f4a1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg index 8a2a5b19a7..c6206182fb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg @@ -45,7 +45,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg index 1851be3eab..8044b7141f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg index 87b1b64804..f1d084d5b9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg index 75b5ddfd5f..7d3603b7b2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg index 5eccf9bef4..8345c85825 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg index 336beaf117..23ebb75153 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg @@ -47,7 +47,6 @@ material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg index 07641eb84a..ee0f35b386 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg index 880ac666d7..6e481a3a94 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index 44a7379dcb..e5369b467e 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index 3541afe350..bad46d3573 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index 23ac57b474..8424914a2d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 0 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index e12a164f80..fc34184c72 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg index 4b148bd5fd..184f40a74d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg @@ -13,11 +13,16 @@ variant = BB 0.4 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg index 563f441335..9477268780 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg @@ -12,9 +12,14 @@ variant = BB 0.8 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg index 66e9d39a07..58a4a1901f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg @@ -12,11 +12,16 @@ variant = BB 0.8 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg index ee6d9fce33..a7817b224b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg @@ -12,10 +12,15 @@ variant = BB 0.8 weight = -4 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg index b45c225162..f6f2b8bacd 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg index ed0186e5d0..b71b3f481d 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg index f5077c90db..f1d114fe46 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg index 70a278ea32..ea1a1021a7 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg index 9c1570ee8f..f5398069b1 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg index 0ed8088a9b..a0822a4be1 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg index 2a596778ff..d83764aefa 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg index 6ecdf06d8f..e289c8c014 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg index fec58e9d8c..5948b72f7d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg @@ -41,7 +41,6 @@ machine_nozzle_cool_down_speed = 1.3 machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg index a06de49699..786701bf52 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg @@ -15,7 +15,6 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg index de3e873bd7..7889fa288c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg @@ -14,7 +14,6 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg index f6b0cc0a72..d5d07d2118 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg @@ -14,7 +14,6 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed support_bottom_distance = =support_z_distance diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg index c520a270cd..9d616ae31a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg index 3d7d7bf0e8..67b52cb861 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg @@ -22,7 +22,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg index dc83ca3836..2ee13388b9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg index 05ace5503b..faeca1fc2d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg @@ -43,7 +43,6 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg index 9c47aedd1b..a5b4aa9aac 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg index f88ae2633f..b7f21f2449 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg @@ -45,7 +45,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg index ff6107a869..b4f500cd29 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg index a91d523213..16856d2826 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg index 8a0f863da8..44d9b20567 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg index c9aa0476a2..b490c59430 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg index 0736e60059..bbc57e29d9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg @@ -47,7 +47,6 @@ material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg index 5c7b8fa441..f3e8ca0332 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg index 1f2e30f402..c5c7bc2732 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index 79c891b513..f22a56d0b7 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index 0606d82159..b2e541697c 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index a4e7838358..d3ca3ea07f 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 0 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index 1f9754b2a2..eb0293dd11 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index 04a35d798a..b87724042c 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -13,12 +13,16 @@ variant = BB 0.4 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg index bab8bce504..9940bab26a 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg @@ -12,9 +12,14 @@ variant = BB 0.8 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg index 31b316d5d2..d2e6410596 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg @@ -12,11 +12,16 @@ variant = BB 0.8 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg index 773fae8204..07e4d926ac 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg @@ -12,10 +12,15 @@ variant = BB 0.8 weight = -4 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg index 0797ce3a74..ee7e43e2b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg index 5efec81bb2..52bf2b2bb5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg index ceedc5958d..3c9ad8f923 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg index 9cd74fd0b2..aa57f9bc05 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg index b5258d9288..ba11a298b7 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg index eac67e08c8..945ee51843 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg index f4b98360cb..479bc2693f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg index 2e5abe5101..281689ebbb 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) From a71784a8c564e58abff7cd1e4667ca1c55ca15d2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 18 Jun 2024 11:41:02 +0200 Subject: [PATCH 22/84] Add setting for minimal prime tower shell thickness --- resources/definitions/fdmprinter.def.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c76617ec17..d12823e020 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6902,6 +6902,20 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "prime_tower_min_shell_thickness": + { + "label": "Prime Tower Minimum Shell Thickness", + "description": "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger.", + "unit": "mm", + "type": "float", + "default_value": 0.4, + "minimum_value": "max(extruderValues('prime_tower_line_width'))", + "maximum_value_warning": "10.0", + "enabled": "prime_tower_enable and resolveOrValue('prime_tower_mode') == 'interleaved'", + "resolve": "max(extruderValues('prime_tower_line_width'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, "prime_tower_position_x": { "label": "Prime Tower X Position", From 96d233fa8cf10ca199094cec829c3111a0ceca6b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 18 Jun 2024 11:47:05 +0200 Subject: [PATCH 23/84] Add prime_tower_min_shell_thickness to expert settings --- resources/setting_visibility/expert.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index dee3188dd5..5257da75e8 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -371,6 +371,7 @@ prime_tower_base_height prime_tower_base_curve_magnitude prime_tower_raft_base_line_spacing prime_tower_max_bridging_distance +prime_tower_min_shell_thickness ooze_shield_enabled ooze_shield_angle ooze_shield_dist From 4c65d96c6a2c75ba982a46d0455ea891ef1b61f4 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 18 Jun 2024 20:27:47 +0200 Subject: [PATCH 24/84] Merge latest changes from main branch. PP-480 --- resources/definitions/fdmprinter.def.json | 19 +- resources/definitions/ultimaker.def.json | 1 + .../ultimaker_method_base.def.json | 14 +- .../definitions/ultimaker_methodx.def.json | 17 +- .../definitions/ultimaker_methodxl.def.json | 6 - .../definitions/ultimaker_sketch.def.json | 206 ++++-------------- .../ultimaker_sketch_large.def.json | 37 ++++ ...um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg} | 6 +- ...tch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg} | 6 +- .../ultimaker_sketch_large_0.4mm.inst.cfg | 15 ++ 10 files changed, 125 insertions(+), 202 deletions(-) create mode 100644 resources/definitions/ultimaker_sketch_large.def.json rename resources/quality/ultimaker_sketch/{um_sketch__pla-175_0.2mm.inst.cfg => um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg} (52%) rename resources/quality/ultimaker_sketch/{um_sketch__tough-pla-175_0.2mm.inst.cfg => um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg} (51%) create mode 100644 resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 124ba37967..c76617ec17 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6208,6 +6208,7 @@ "type": "bool", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false, "children": @@ -6220,6 +6221,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_base_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6231,6 +6233,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_interface_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6242,6 +6245,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_surface_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false } @@ -6845,7 +6849,7 @@ "label": "Prime Tower Type", "description": "How to generate the prime tower:
  • Normal: create a bucket in which secondary materials are primed
  • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
", "type": "enum", - "resolve": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", + "resolve": "'interleaved' if all(mode == 'interleaved' for mode in extruderValues('prime_tower_mode')) else 'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", "options": { "normal": "Normal", @@ -8021,6 +8025,19 @@ "default_value": 90, "settable_per_mesh": true }, + "seam_overhang_angle": + { + "label": "Seam Overhanging Wall Angle", + "description": "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging.", + "unit": "\u00b0", + "type": "float", + "minimum_value": "0", + "minimum_value_warning": "2", + "maximum_value": "90", + "default_value": 90, + "value": "wall_overhang_angle", + "settable_per_mesh": true + }, "wall_overhang_speed_factor": { "label": "Overhanging Wall Speed", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 3821fdefd6..97bb099ea4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -80,6 +80,7 @@ "maximum_value_warning": "120", "minimum_value": "0" }, + "material_print_temp_wait": { "value": false }, "material_print_temperature": { "minimum_value": "0" }, "material_standby_temperature": { diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..92b9729fdf 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -23,12 +23,8 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_pc_175", + "generic_", "ultimaker_rapidrinse_175", - "generic_tpu_175", "goofoo_", "ideagen3D_", "imade3d_", @@ -59,13 +55,7 @@ "1": "ultimaker_method_extruder_right" }, "nozzle_offsetting_for_disallowed_areas": false, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", - "preferred_material": "generic_pla_175", + "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "fast", "preferred_variant_name": "1A", "supports_network_connection": true, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 9828ba96f2..3f02a30235 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -48,6 +36,8 @@ "polywood_pla", "redd_", "tizyx_", + "ultimaker_pla_175", + "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", @@ -70,7 +60,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", "preferred_quality_type": "draft", "preferred_variant_name": "1XA", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 6c12218b51..098586df68 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -18,12 +18,6 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 05e506c3b6..03d31fba0b 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "UltiMaker Sketch", + "name": "MakerBot Sketch", "inherits": "ultimaker", "metadata": { @@ -10,189 +10,60 @@ "file_formats": "application/x-makerbot-sketch", "platform": "ultimaker_sketch_platform.obj", "exclude_materials": [ - "dsm_175_novamidid1030cf", - "Essentium_175_UltrafuseZPCTG", - "imade3d_petg_175", - "imade3d_pla_175", - "imade3d_petg_green", - "imade3d_pla_green", - "imade3d_petg_pink", - "imade3d_pla_pink", - "chromatik_pla", - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_asa_175", - "generic_abs_175", - "generic_absr_175", + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", "generic_bvoh_175", "generic_cpe_175", - "generic_cffpa_175", "generic_hips_175", - "generic_nylon_175", "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_rapidrinse_175", - "generic_sr30_175", + "ultimaker_rapidrinse_175", "generic_tpu_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "ideagen3D_ToughPLA", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petgcarbone_ultra", - "volumic_petg_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_pahtcf15", - "xyzprinting_pc", - "xyzprinting_petcf15", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_ppgf30", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla", - "octofiber_pla", - "fiberlogy_hd_pla" + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_", + "generic_", + "ultimaker_asa", + "ultimaker_abs", + "ultimaker_nylon", + "ultimaker_rapidrinse", + "ultimaker_sr30" ], "has_machine_quality": true, "has_materials": true, - "has_variants": false, + "has_variants": true, "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotSketch.png", "preferred_quality_type": "draft", "preferred_variant_name": "0.4mm", "reference_machine_id": "sketch", "supports_network_connection": true, "supports_usb_connection": false, - "variant_definition": "ultimaker_sketch", "variants_name": "Extruder", "weight": -1 }, @@ -202,6 +73,7 @@ "adhesion_type": { "value": "'raft'" }, "brim_width": { "value": "3" }, "cool_fan_speed": { "value": "100" }, + "cool_min_layer_time": { "value": 3 }, "extruder_prime_pos_abs": { "default_value": true }, "gantry_height": { "value": "60" }, "infill_overlap": { "value": 15 }, @@ -221,7 +93,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "machine_name": { "default_value": "UltiMaker Sketch" }, + "machine_name": { "default_value": "Makerbot Sketch" }, "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" }, diff --git a/resources/definitions/ultimaker_sketch_large.def.json b/resources/definitions/ultimaker_sketch_large.def.json new file mode 100644 index 0000000000..ca1ef73e4d --- /dev/null +++ b/resources/definitions/ultimaker_sketch_large.def.json @@ -0,0 +1,37 @@ +{ + "version": 2, + "name": "MakerBot Sketch Large", + "inherits": "ultimaker_sketch", + "metadata": + { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot-sketch", + "platform": "ultimaker_sketch_large_platform.obj", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "draft", + "preferred_variant_name": "0.4mm", + "quality_definition": "ultimaker_sketch", + "reference_machine_id": "sketch_large", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Makerbot Sketch Large" }, + "machine_width": { "default_value": 220 }, + "material_flow": { "default_value": 94 }, + "retraction_amount": { "value": 6 }, + "speed_print": { "value": 50 }, + "speed_travel": { "value": 100 } + } +} \ No newline at end of file diff --git a/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg similarity index 52% rename from resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg index 17de71876a..79d4211834 100644 --- a/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,15 @@ name = Fast version = 4 [metadata] -material = generic_pla_175 +material = ultimaker_pla_175 quality_type = draft setting_version = 23 type = quality +variant = 0.4mm weight = -2 [values] +retraction_min_travel = =2*line_width +support_structure = tree +support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg similarity index 51% rename from resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg index 444ad58aab..64b16d0e07 100644 --- a/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -4,11 +4,15 @@ name = Fast version = 4 [metadata] -material = generic_tough_pla_175 +material = ultimaker_tough_pla_175 quality_type = draft setting_version = 23 type = quality +variant = 0.4mm weight = -2 [values] +retraction_min_travel = =2*line_width +support_structure = tree +support_z_distance = =layer_height diff --git a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg new file mode 100644 index 0000000000..3d9edf5382 --- /dev/null +++ b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_large +name = 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = sketch_l_extruder +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 0.4mm +machine_nozzle_size = 0.4 + From 6476bce50d491f4b360dc33b142b27223234a323 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 19 Jun 2024 13:53:46 +0200 Subject: [PATCH 25/84] Add settings to customize raft infill overlap --- resources/definitions/fdmprinter.def.json | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6b8af47d8a..c23500bfd4 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6398,6 +6398,38 @@ "settable_per_extruder": true, "limit_to_extruder": "raft_base_extruder_nr" }, + "raft_base_infill_overlap": + { + "label": "Raft Base Infill Overlap Percentage", + "description": "The amount of overlap between the infill and the walls of the raft base, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "%", + "type": "float", + "default_value": 0, + "minimum_value_warning": "-50", + "maximum_value_warning": "100", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_base_extruder_nr", + "children": + { + "raft_base_infill_overlap_mm": + { + "label": "Raft Base Infill Overlap", + "description": "The amount of overlap between the infill and the walls of the raft base. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "mm", + "type": "float", + "default_value": 0.0, + "minimum_value_warning": "-0.5 * machine_nozzle_size", + "maximum_value_warning": "machine_nozzle_size", + "value": "raft_base_line_width * raft_base_infill_overlap / 100", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_base_extruder_nr" + } + } + }, "raft_interface_layers": { "label": "Raft Middle Layers", @@ -6475,6 +6507,38 @@ "settable_per_extruder": true, "limit_to_extruder": "raft_interface_extruder_nr" }, + "raft_interface_infill_overlap": + { + "label": "Raft Interface Infill Overlap Percentage", + "description": "The amount of overlap between the infill and the walls of the raft interface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "%", + "type": "float", + "default_value": 0, + "minimum_value_warning": "-50", + "maximum_value_warning": "100", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_interface_extruder_nr", + "children": + { + "raft_interface_infill_overlap_mm": + { + "label": "Raft Interface Infill Overlap", + "description": "The amount of overlap between the infill and the walls of the raft interface. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "mm", + "type": "float", + "default_value": 0.0, + "minimum_value_warning": "-0.5 * machine_nozzle_size", + "maximum_value_warning": "machine_nozzle_size", + "value": "raft_interface_line_width * raft_interface_infill_overlap / 100", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_interface_extruder_nr" + } + } + }, "raft_surface_layers": { "label": "Raft Top Layers", @@ -6564,6 +6628,38 @@ "settable_per_extruder": true, "limit_to_extruder": "raft_surface_extruder_nr" }, + "raft_surface_infill_overlap": + { + "label": "Raft Surface Infill Overlap Percentage", + "description": "The amount of overlap between the infill and the walls of the raft surface, as a percentage of the infill line width. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "%", + "type": "float", + "default_value": 0, + "minimum_value_warning": "-50", + "maximum_value_warning": "100", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_surface_extruder_nr", + "children": + { + "raft_surface_infill_overlap_mm": + { + "label": "Raft Surface Infill Overlap", + "description": "The amount of overlap between the infill and the walls of the raft surface. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "mm", + "type": "float", + "default_value": 0.0, + "minimum_value_warning": "-0.5 * machine_nozzle_size", + "maximum_value_warning": "machine_nozzle_size", + "value": "raft_surface_line_width * raft_surface_infill_overlap / 100", + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "raft_surface_extruder_nr" + } + } + }, "raft_wall_count": { "label": "Raft Wall Count", From a235bef965f9743932c45b10accf48738ed2d8f4 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 21 Jun 2024 08:26:10 +0200 Subject: [PATCH 26/84] Remove Sketch machine for Cura 5.8 release. PP-333 --- .../definitions/ultimaker_sketch.def.json | 259 - .../ultimaker_sketch_extruder.def.json | 22 - .../meshes/ultimaker_sketch_platform.obj | 12393 ---------------- .../um_sketch__pla-175_0.2mm.inst.cfg | 14 - .../um_sketch__tough-pla-175_0.2mm.inst.cfg | 14 - .../variants/ultimaker_sketch_0.4mm.inst.cfg | 15 - 6 files changed, 12717 deletions(-) delete mode 100644 resources/definitions/ultimaker_sketch.def.json delete mode 100644 resources/extruders/ultimaker_sketch_extruder.def.json delete mode 100644 resources/meshes/ultimaker_sketch_platform.obj delete mode 100644 resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg delete mode 100644 resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg delete mode 100644 resources/variants/ultimaker_sketch_0.4mm.inst.cfg diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json deleted file mode 100644 index 05e506c3b6..0000000000 --- a/resources/definitions/ultimaker_sketch.def.json +++ /dev/null @@ -1,259 +0,0 @@ -{ - "version": 2, - "name": "UltiMaker Sketch", - "inherits": "ultimaker", - "metadata": - { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot-sketch", - "platform": "ultimaker_sketch_platform.obj", - "exclude_materials": [ - "dsm_175_novamidid1030cf", - "Essentium_175_UltrafuseZPCTG", - "imade3d_petg_175", - "imade3d_pla_175", - "imade3d_petg_green", - "imade3d_pla_green", - "imade3d_petg_pink", - "imade3d_pla_pink", - "chromatik_pla", - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_asa_175", - "generic_abs_175", - "generic_absr_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_cffpa_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_rapidrinse_175", - "generic_sr30_175", - "generic_tpu_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "ideagen3D_ToughPLA", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petgcarbone_ultra", - "volumic_petg_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_pahtcf15", - "xyzprinting_pc", - "xyzprinting_petcf15", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_ppgf30", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla", - "octofiber_pla", - "fiberlogy_hd_pla" - ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": false, - "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotSketch.png", - "preferred_quality_type": "draft", - "preferred_variant_name": "0.4mm", - "reference_machine_id": "sketch", - "supports_network_connection": true, - "supports_usb_connection": false, - "variant_definition": "ultimaker_sketch", - "variants_name": "Extruder", - "weight": -1 - }, - "overrides": - { - "acceleration_enabled": { "value": false }, - "adhesion_type": { "value": "'raft'" }, - "brim_width": { "value": "3" }, - "cool_fan_speed": { "value": "100" }, - "extruder_prime_pos_abs": { "default_value": true }, - "gantry_height": { "value": "60" }, - "infill_overlap": { "value": 15 }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, - "infill_sparse_density": { "value": 15 }, - "jerk_enabled": { "value": false }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 150 }, - "machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 150 }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_min_cool_heat_time_window": { "value": "15" }, - "machine_name": { "default_value": "UltiMaker Sketch" }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" }, - "machine_width": { "default_value": 150 }, - "material_diameter": { "default_value": 1.75 }, - "material_flow": { "default_value": 109 }, - "multiple_mesh_overlap": { "value": "0" }, - "optimize_wall_printing_order": { "value": "True" }, - "prime_blob_enable": - { - "default_value": true, - "enabled": true, - "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" - }, - "raft_margin": { "value": "5" }, - "retraction_amount": { "value": "5.5" }, - "retraction_prime_speed": { "value": "15" }, - "retraction_speed": { "value": "25" }, - "speed_print": { "value": 60 }, - "speed_support": { "value": "0.7 * speed_print" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "0.7 * speed_print" }, - "speed_travel": { "value": 80 }, - "speed_wall": { "value": "0.7 * speed_print" }, - "speed_wall_0": { "value": "0.5 * speed_print " }, - "speed_wall_x": { "value": "speed_wall" }, - "speed_z_hop": { "value": 7 }, - "support_angle": { "value": "45" }, - "top_bottom_thickness": { "value": "4 * layer_height" }, - "travel_avoid_distance": { "value": "machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "wall_0_inset": { "value": "0" }, - "wall_thickness": { "value": "2 * machine_nozzle_size" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } - } -} \ No newline at end of file diff --git a/resources/extruders/ultimaker_sketch_extruder.def.json b/resources/extruders/ultimaker_sketch_extruder.def.json deleted file mode 100644 index 5f6c3054ac..0000000000 --- a/resources/extruders/ultimaker_sketch_extruder.def.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 2, - "name": "Extruder", - "inherits": "fdmextruder", - "metadata": - { - "machine": "ultimaker_sketch", - "position": "0" - }, - "overrides": - { - "extruder_nr": - { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file diff --git a/resources/meshes/ultimaker_sketch_platform.obj b/resources/meshes/ultimaker_sketch_platform.obj deleted file mode 100644 index 1653bcc574..0000000000 --- a/resources/meshes/ultimaker_sketch_platform.obj +++ /dev/null @@ -1,12393 +0,0 @@ -v 100 150.91 46.268 -v -100 150.91 46.268 -v 100 150.91 -7.35 -v -100 150.91 -7.35 -v -128.5 -109.75 -0.6 -v -128.5 109.25 -0.6 -v -128.5 -109.75 -4.6 -v -128.5 109.25 -4.6 -v 123.5 -114.75 -0.6 -v -123.5 -114.75 -0.6 -v 123.5 -114.75 -4.6 -v -123.5 -114.75 -4.6 -v 128.5 109.25 -4.6 -v 128.5 109.25 -0.6 -v 128.5 -109.75 -4.6 -v 128.5 -109.75 -0.6 -v 123.5 114.25 -0.6 -v 123.5 114.25 -4.6 -v -123.5 114.25 -0.6 -v -123.5 114.25 -4.6 -v 128.48 -110.186 -0.6 -v 128.5 -109.75 -0.6 -v 123.5 -114.75 -0.6 -v 128.5 109.25 -0.6 -v 123.5 114.25 -0.6 -v 123.936 114.23 -0.6 -v 128.48 109.686 -0.6 -v 128.424 110.118 -0.6 -v 128.33 110.544 -0.6 -v 128.198 110.96 -0.6 -v 128.032 111.363 -0.6 -v 127.83 111.75 -0.6 -v 127.596 112.118 -0.6 -v 127.33 112.464 -0.6 -v 127.036 112.786 -0.6 -v 126.714 113.08 -0.6 -v 126.368 113.346 -0.6 -v 126 113.58 -0.6 -v 125.613 113.782 -0.6 -v 125.21 113.948 -0.6 -v 124.794 114.08 -0.6 -v 124.368 114.174 -0.6 -v -123.5 114.25 -0.6 -v -123.5 -114.75 -0.6 -v -128.5 109.25 -0.6 -v -123.936 114.23 -0.6 -v -124.368 114.174 -0.6 -v -124.794 114.08 -0.6 -v -125.21 113.948 -0.6 -v -125.613 113.782 -0.6 -v -126 113.58 -0.6 -v -126.368 113.346 -0.6 -v -126.714 113.08 -0.6 -v -127.036 112.786 -0.6 -v -127.33 112.464 -0.6 -v -127.596 112.118 -0.6 -v -127.83 111.75 -0.6 -v -128.032 111.363 -0.6 -v -128.198 110.96 -0.6 -v -128.33 110.544 -0.6 -v -128.424 110.118 -0.6 -v -128.48 109.686 -0.6 -v -128.5 -109.75 -0.6 -v -128.48 -110.186 -0.6 -v -128.424 -110.618 -0.6 -v -128.33 -111.044 -0.6 -v -128.198 -111.46 -0.6 -v -128.032 -111.863 -0.6 -v -127.83 -112.25 -0.6 -v -127.596 -112.618 -0.6 -v -127.33 -112.964 -0.6 -v -127.036 -113.286 -0.6 -v -126.714 -113.58 -0.6 -v -126.368 -113.846 -0.6 -v -126 -114.08 -0.6 -v -125.613 -114.282 -0.6 -v -125.21 -114.448 -0.6 -v -124.794 -114.58 -0.6 -v -124.368 -114.674 -0.6 -v -123.936 -114.73 -0.6 -v 123.936 -114.73 -0.6 -v 124.368 -114.674 -0.6 -v 124.794 -114.58 -0.6 -v 125.21 -114.448 -0.6 -v 125.613 -114.282 -0.6 -v 126 -114.08 -0.6 -v 126.368 -113.846 -0.6 -v 126.714 -113.58 -0.6 -v 127.036 -113.286 -0.6 -v 127.33 -112.964 -0.6 -v 127.596 -112.618 -0.6 -v 127.83 -112.25 -0.6 -v 128.032 -111.863 -0.6 -v 128.198 -111.46 -0.6 -v 128.33 -111.044 -0.6 -v 128.424 -110.618 -0.6 -v 128.5 109.25 -4.6 -v 123.5 -114.75 -4.6 -v 123.5 114.25 -4.6 -v -123.5 -114.75 -4.6 -v -123.5 114.25 -4.6 -v -128.5 109.25 -4.6 -v -123.936 114.23 -4.6 -v -124.368 114.174 -4.6 -v 123.936 114.23 -4.6 -v 124.368 114.174 -4.6 -v 124.794 114.08 -4.6 -v 125.21 113.948 -4.6 -v 125.613 113.782 -4.6 -v 126 113.58 -4.6 -v 126.368 113.346 -4.6 -v 126.714 113.08 -4.6 -v 127.036 112.786 -4.6 -v 127.33 112.464 -4.6 -v 127.596 112.118 -4.6 -v 127.83 111.75 -4.6 -v 128.032 111.363 -4.6 -v 128.198 110.96 -4.6 -v 128.33 110.544 -4.6 -v 128.424 110.118 -4.6 -v 128.48 109.686 -4.6 -v 128.5 -109.75 -4.6 -v 128.48 -110.186 -4.6 -v 128.424 -110.618 -4.6 -v 128.33 -111.044 -4.6 -v 128.198 -111.46 -4.6 -v 128.032 -111.863 -4.6 -v 127.83 -112.25 -4.6 -v 127.596 -112.618 -4.6 -v 127.33 -112.964 -4.6 -v 127.036 -113.286 -4.6 -v 126.714 -113.58 -4.6 -v 126.368 -113.846 -4.6 -v 126 -114.08 -4.6 -v 125.613 -114.282 -4.6 -v 125.21 -114.448 -4.6 -v 124.794 -114.58 -4.6 -v 124.368 -114.674 -4.6 -v 123.936 -114.73 -4.6 -v -123.936 -114.73 -4.6 -v -124.368 -114.674 -4.6 -v -124.794 -114.58 -4.6 -v -125.21 -114.448 -4.6 -v -125.613 -114.282 -4.6 -v -126 -114.08 -4.6 -v -126.368 -113.846 -4.6 -v -126.714 -113.58 -4.6 -v -127.036 -113.286 -4.6 -v -127.33 -112.964 -4.6 -v -127.596 -112.618 -4.6 -v -127.83 -112.25 -4.6 -v -128.032 -111.863 -4.6 -v -128.198 -111.46 -4.6 -v -128.33 -111.044 -4.6 -v -128.424 -110.618 -4.6 -v -128.48 -110.186 -4.6 -v -128.5 -109.75 -4.6 -v -128.48 109.686 -4.6 -v -128.424 110.118 -4.6 -v -128.33 110.544 -4.6 -v -128.198 110.96 -4.6 -v -128.032 111.363 -4.6 -v -127.83 111.75 -4.6 -v -127.596 112.118 -4.6 -v -127.33 112.464 -4.6 -v -127.036 112.786 -4.6 -v -126.714 113.08 -4.6 -v -126.368 113.346 -4.6 -v -126 113.58 -4.6 -v -125.613 113.782 -4.6 -v -125.21 113.948 -4.6 -v -124.794 114.08 -4.6 -v 123.936 114.23 -0.6 -v 123.936 114.23 -4.6 -v 124.368 114.174 -0.6 -v 124.368 114.174 -4.6 -v 124.794 114.08 -0.6 -v 124.794 114.08 -4.6 -v 125.21 113.948 -0.6 -v 125.21 113.948 -4.6 -v 125.613 113.782 -0.6 -v 125.613 113.782 -4.6 -v 126 113.58 -0.6 -v 126 113.58 -4.6 -v 126.368 113.346 -0.6 -v 126.368 113.346 -4.6 -v 126.714 113.08 -0.6 -v 126.714 113.08 -4.6 -v 127.036 112.786 -0.6 -v 127.036 112.786 -4.6 -v 127.33 112.464 -0.6 -v 127.33 112.464 -4.6 -v 127.596 112.118 -0.6 -v 127.596 112.118 -4.6 -v 127.83 111.75 -0.6 -v 127.83 111.75 -4.6 -v 128.032 111.363 -0.6 -v 128.032 111.363 -4.6 -v 128.198 110.96 -0.6 -v 128.198 110.96 -4.6 -v 128.33 110.544 -0.6 -v 128.33 110.544 -4.6 -v 128.424 110.118 -0.6 -v 128.424 110.118 -4.6 -v 128.48 109.686 -0.6 -v 128.48 109.686 -4.6 -v -128.48 109.686 -0.6 -v -128.48 109.686 -4.6 -v -128.424 110.118 -0.6 -v -128.424 110.118 -4.6 -v -128.33 110.544 -0.6 -v -128.33 110.544 -4.6 -v -128.198 110.96 -0.6 -v -128.198 110.96 -4.6 -v -128.032 111.363 -0.6 -v -128.032 111.363 -4.6 -v -127.83 111.75 -0.6 -v -127.83 111.75 -4.6 -v -127.596 112.118 -0.6 -v -127.596 112.118 -4.6 -v -127.33 112.464 -0.6 -v -127.33 112.464 -4.6 -v -127.036 112.786 -0.6 -v -127.036 112.786 -4.6 -v -126.714 113.08 -0.6 -v -126.714 113.08 -4.6 -v -126.368 113.346 -0.6 -v -126.368 113.346 -4.6 -v -126 113.58 -0.6 -v -126 113.58 -4.6 -v -125.613 113.782 -0.6 -v -125.613 113.782 -4.6 -v -125.21 113.948 -0.6 -v -125.21 113.948 -4.6 -v -124.794 114.08 -0.6 -v -124.794 114.08 -4.6 -v -124.368 114.174 -0.6 -v -124.368 114.174 -4.6 -v -123.936 114.23 -0.6 -v -123.936 114.23 -4.6 -v -123.936 -114.73 -0.6 -v -123.936 -114.73 -4.6 -v -124.368 -114.674 -0.6 -v -124.368 -114.674 -4.6 -v -124.794 -114.58 -0.6 -v -124.794 -114.58 -4.6 -v -125.21 -114.448 -0.6 -v -125.21 -114.448 -4.6 -v -125.613 -114.282 -0.6 -v -125.613 -114.282 -4.6 -v -126 -114.08 -0.6 -v -126 -114.08 -4.6 -v -126.368 -113.846 -0.6 -v -126.368 -113.846 -4.6 -v -126.714 -113.58 -0.6 -v -126.714 -113.58 -4.6 -v -127.036 -113.286 -0.6 -v -127.036 -113.286 -4.6 -v -127.33 -112.964 -0.6 -v -127.33 -112.964 -4.6 -v -127.596 -112.618 -0.6 -v -127.596 -112.618 -4.6 -v -127.83 -112.25 -0.6 -v -127.83 -112.25 -4.6 -v -128.032 -111.863 -0.6 -v -128.032 -111.863 -4.6 -v -128.198 -111.46 -0.6 -v -128.198 -111.46 -4.6 -v -128.33 -111.044 -0.6 -v -128.33 -111.044 -4.6 -v -128.424 -110.618 -0.6 -v -128.424 -110.618 -4.6 -v -128.48 -110.186 -0.6 -v -128.48 -110.186 -4.6 -v 128.48 -110.186 -0.6 -v 128.48 -110.186 -4.6 -v 128.424 -110.618 -0.6 -v 128.424 -110.618 -4.6 -v 128.33 -111.044 -0.6 -v 128.33 -111.044 -4.6 -v 128.198 -111.46 -0.6 -v 128.198 -111.46 -4.6 -v 128.032 -111.863 -0.6 -v 128.032 -111.863 -4.6 -v 127.83 -112.25 -0.6 -v 127.83 -112.25 -4.6 -v 127.596 -112.618 -0.6 -v 127.596 -112.618 -4.6 -v 127.33 -112.964 -0.6 -v 127.33 -112.964 -4.6 -v 127.036 -113.286 -0.6 -v 127.036 -113.286 -4.6 -v 126.714 -113.58 -0.6 -v 126.714 -113.58 -4.6 -v 126.368 -113.846 -0.6 -v 126.368 -113.846 -4.6 -v 126 -114.08 -0.6 -v 126 -114.08 -4.6 -v 125.613 -114.282 -0.6 -v 125.613 -114.282 -4.6 -v 125.21 -114.448 -0.6 -v 125.21 -114.448 -4.6 -v 124.794 -114.58 -0.6 -v 124.794 -114.58 -4.6 -v 124.368 -114.674 -0.6 -v 124.368 -114.674 -4.6 -v 123.936 -114.73 -0.6 -v 123.936 -114.73 -4.6 -v -100 150.902 -7.524 -v 100 150.902 -7.524 -v -100 150.88 -7.697 -v 100 150.88 -7.697 -v -100 150.842 -7.868 -v 100 150.842 -7.868 -v -100 150.79 -8.034 -v 100 150.79 -8.034 -v -100 150.723 -8.195 -v 100 150.723 -8.195 -v -100 150.642 -8.35 -v 100 150.642 -8.35 -v -100 150.548 -8.497 -v 100 150.548 -8.497 -v -100 150.442 -8.636 -v 100 150.442 -8.636 -v -100 150.324 -8.764 -v 100 150.324 -8.764 -v -100 150.196 -8.882 -v 100 150.196 -8.882 -v -100 150.057 -8.988 -v 100 150.057 -8.988 -v -100 149.91 -9.082 -v 100 149.91 -9.082 -v -100 149.755 -9.163 -v 100 149.755 -9.163 -v -100 149.594 -9.23 -v 100 149.594 -9.23 -v -100 149.428 -9.282 -v 100 149.428 -9.282 -v -100 149.257 -9.32 -v 100 149.257 -9.32 -v -100 149.084 -9.342 -v 100 149.084 -9.342 -v -100 148.91 -9.35 -v 100 148.91 -9.35 -v -100 152.865 48.268 -v -100 152.693 48.256 -v 100 152.865 48.268 -v 100 152.693 48.256 -v -100 152.523 48.23 -v 100 152.523 48.23 -v -100 152.356 48.19 -v 100 152.356 48.19 -v -100 152.193 48.135 -v 100 152.193 48.135 -v -100 152.035 48.067 -v 100 152.035 48.067 -v -100 151.884 47.985 -v 100 151.884 47.985 -v -100 151.74 47.89 -v 100 151.74 47.89 -v -100 151.605 47.784 -v 100 151.605 47.784 -v -100 151.48 47.666 -v 100 151.48 47.666 -v -100 151.365 47.538 -v 100 151.365 47.538 -v -100 151.262 47.4 -v 100 151.262 47.4 -v -100 151.17 47.255 -v 100 151.17 47.255 -v -100 151.092 47.102 -v 100 151.092 47.102 -v -100 151.027 46.943 -v 100 151.027 46.943 -v -100 150.976 46.78 -v 100 150.976 46.78 -v -100 150.94 46.61 -v 100 150.94 46.61 -v -100 150.917 46.44 -v 100 150.917 46.44 -v 100 157.01 -13.35 -v -100 157.01 -13.35 -v 100 157.01 48.36 -v -100 157.01 48.36 -v 100 152.693 48.256 -v 100 152.523 48.23 -v 100 152.865 48.268 -v 100 152.356 48.19 -v 100 152.193 48.135 -v 100 152.035 48.067 -v 100 151.884 47.985 -v 100 151.74 47.89 -v 100 151.605 47.784 -v 100 151.48 47.666 -v 100 151.365 47.538 -v 100 151.262 47.4 -v 100 151.17 47.255 -v 100 151.092 47.102 -v 100 151.027 46.943 -v 100 150.976 46.78 -v 100 150.94 46.61 -v 100 150.917 46.44 -v 100 150.91 46.268 -v 100 157.01 48.36 -v 100 150.91 -7.35 -v 100 157.01 -13.35 -v 100 150.902 -7.524 -v 100 150.88 -7.697 -v 100 150.842 -7.868 -v 100 150.79 -8.034 -v 100 150.723 -8.195 -v 100 150.642 -8.35 -v 100 150.548 -8.497 -v 100 150.442 -8.636 -v 100 150.324 -8.764 -v 100 150.196 -8.882 -v 100 150.057 -8.988 -v 100 149.91 -9.082 -v 100 149.755 -9.163 -v 100 149.594 -9.23 -v 100 145.626 -13.35 -v 100 149.428 -9.282 -v 100 149.257 -9.32 -v 100 149.084 -9.342 -v 100 148.91 -9.35 -v 100 145.626 -9.35 -v -100 150.917 46.44 -v -100 150.94 46.61 -v -100 150.91 46.268 -v -100 150.976 46.78 -v -100 151.027 46.943 -v -100 151.092 47.102 -v -100 151.17 47.255 -v -100 151.262 47.4 -v -100 151.365 47.538 -v -100 151.48 47.666 -v -100 151.605 47.784 -v -100 151.74 47.89 -v -100 151.884 47.985 -v -100 152.035 48.067 -v -100 152.193 48.135 -v -100 152.356 48.19 -v -100 152.523 48.23 -v -100 152.693 48.256 -v -100 152.865 48.268 -v -100 157.01 48.36 -v -100 150.91 -7.35 -v -100 157.01 -13.35 -v -100 150.902 -7.524 -v -100 150.88 -7.697 -v -100 149.257 -9.32 -v -100 149.428 -9.282 -v -100 145.626 -13.35 -v -100 149.594 -9.23 -v -100 149.755 -9.163 -v -100 149.91 -9.082 -v -100 145.626 -9.35 -v -100 148.91 -9.35 -v -100 149.084 -9.342 -v -100 150.057 -8.988 -v -100 150.196 -8.882 -v -100 150.324 -8.764 -v -100 150.442 -8.636 -v -100 150.548 -8.497 -v -100 150.642 -8.35 -v -100 150.723 -8.195 -v -100 150.79 -8.034 -v -100 150.842 -7.868 -v 100 145.626 -9.35 -v -100 145.626 -9.35 -v 100.016 145.228 -9.35 -v -100.016 145.228 -9.35 -v 100.063 144.832 -9.35 -v -100.064 144.832 -9.35 -v 100.143 144.44 -9.35 -v -100.143 144.44 -9.35 -v 100.252 144.058 -9.35 -v -100.252 144.058 -9.35 -v 100.393 143.684 -9.35 -v -100.393 143.684 -9.35 -v 100.562 143.323 -9.35 -v -100.562 143.323 -9.35 -v 100.76 142.977 -9.35 -v -100.76 142.977 -9.35 -v 100.984 142.647 -9.35 -v -100.984 142.647 -9.35 -v 101.234 142.337 -9.35 -v -101.235 142.337 -9.35 -v 128.5 108.5 -9.35 -v -128.5 108.5 -9.35 -v 123.5 -114.75 -9.35 -v -123.5 -114.75 -9.35 -v -126.772 113.105 -9.35 -v -128.478 109.057 -9.35 -v -127.122 112.67 -9.35 -v -127.436 112.21 -9.35 -v -127.713 111.724 -9.35 -v -127.95 111.218 -9.35 -v -128.147 110.696 -9.35 -v -128.3 110.16 -9.35 -v -128.41 109.612 -9.35 -v -128.5 -109.75 -9.35 -v -123.936 -114.73 -9.35 -v -128.48 -110.186 -9.35 -v -128.424 -110.618 -9.35 -v -128.33 -111.044 -9.35 -v -128.198 -111.46 -9.35 -v -128.032 -111.863 -9.35 -v -127.83 -112.25 -9.35 -v -127.596 -112.618 -9.35 -v -127.33 -112.964 -9.35 -v -127.036 -113.286 -9.35 -v -126.714 -113.58 -9.35 -v -126.368 -113.846 -9.35 -v -126 -114.08 -9.35 -v -125.613 -114.282 -9.35 -v -125.21 -114.448 -9.35 -v -124.794 -114.58 -9.35 -v -124.368 -114.674 -9.35 -v 128.5 -109.75 -9.35 -v 123.936 -114.73 -9.35 -v 124.368 -114.674 -9.35 -v 124.794 -114.58 -9.35 -v 125.21 -114.448 -9.35 -v 125.613 -114.282 -9.35 -v 126 -114.08 -9.35 -v 126.368 -113.846 -9.35 -v 126.714 -113.58 -9.35 -v 127.036 -113.286 -9.35 -v 127.33 -112.964 -9.35 -v 127.596 -112.618 -9.35 -v 127.83 -112.25 -9.35 -v 128.032 -111.863 -9.35 -v 128.198 -111.46 -9.35 -v 128.33 -111.044 -9.35 -v 128.424 -110.618 -9.35 -v 128.48 -110.186 -9.35 -v 126.772 113.105 -9.35 -v 128.478 109.057 -9.35 -v 128.41 109.612 -9.35 -v 128.3 110.16 -9.35 -v 128.147 110.696 -9.35 -v 127.95 111.218 -9.35 -v 127.713 111.724 -9.35 -v 127.436 112.21 -9.35 -v 127.122 112.67 -9.35 -v -100 157.01 -13.35 -v 100 157.01 -13.35 -v -100 145.626 -13.35 -v 100 145.626 -13.35 -v -100.016 145.228 -13.35 -v 100.016 145.228 -13.35 -v -100.064 144.832 -13.35 -v 100.063 144.832 -13.35 -v -100.143 144.44 -13.35 -v 100.143 144.44 -13.35 -v -100.252 144.058 -13.35 -v 100.252 144.058 -13.35 -v -100.393 143.684 -13.35 -v 100.393 143.684 -13.35 -v -100.562 143.323 -13.35 -v 100.562 143.323 -13.35 -v -100.76 142.977 -13.35 -v 100.76 142.977 -13.35 -v -100.984 142.647 -13.35 -v 100.984 142.647 -13.35 -v -101.235 142.337 -13.35 -v 101.234 142.337 -13.35 -v -128.5 108.5 -13.35 -v 128.5 108.5 -13.35 -v -123.5 -114.75 -13.35 -v 123.5 -114.75 -13.35 -v 126.772 113.105 -13.35 -v 128.478 109.057 -13.35 -v 127.122 112.67 -13.35 -v 127.436 112.21 -13.35 -v 127.713 111.724 -13.35 -v 127.95 111.218 -13.35 -v 128.147 110.696 -13.35 -v 128.3 110.16 -13.35 -v 128.41 109.612 -13.35 -v 128.5 -109.75 -13.35 -v 123.936 -114.73 -13.35 -v 128.48 -110.186 -13.35 -v 128.424 -110.618 -13.35 -v 128.33 -111.044 -13.35 -v 128.198 -111.46 -13.35 -v 128.032 -111.863 -13.35 -v 127.83 -112.25 -13.35 -v 127.596 -112.618 -13.35 -v 127.33 -112.964 -13.35 -v 127.036 -113.286 -13.35 -v 126.714 -113.58 -13.35 -v 126.368 -113.846 -13.35 -v 126 -114.08 -13.35 -v 125.613 -114.282 -13.35 -v 125.21 -114.448 -13.35 -v 124.794 -114.58 -13.35 -v 124.368 -114.674 -13.35 -v -128.5 -109.75 -13.35 -v -123.936 -114.73 -13.35 -v -124.368 -114.674 -13.35 -v -124.794 -114.58 -13.35 -v -125.21 -114.448 -13.35 -v -125.613 -114.282 -13.35 -v -126 -114.08 -13.35 -v -126.368 -113.846 -13.35 -v -126.714 -113.58 -13.35 -v -127.036 -113.286 -13.35 -v -127.33 -112.964 -13.35 -v -127.596 -112.618 -13.35 -v -127.83 -112.25 -13.35 -v -128.032 -111.863 -13.35 -v -128.198 -111.46 -13.35 -v -128.33 -111.044 -13.35 -v -128.424 -110.618 -13.35 -v -128.48 -110.186 -13.35 -v -126.772 113.105 -13.35 -v -128.478 109.057 -13.35 -v -128.41 109.612 -13.35 -v -128.3 110.16 -13.35 -v -128.147 110.696 -13.35 -v -127.95 111.218 -13.35 -v -127.713 111.724 -13.35 -v -127.436 112.21 -13.35 -v -127.122 112.67 -13.35 -v -126.772 113.105 -13.35 -v -126.772 113.105 -9.35 -v -101.235 142.337 -13.35 -v -101.235 142.337 -9.35 -v -128.5 -109.75 -9.35 -v -128.5 108.5 -9.35 -v -128.5 -109.75 -13.35 -v -128.5 108.5 -13.35 -v -123.5 -114.75 -9.35 -v -123.5 -114.75 -13.35 -v 123.5 -114.75 -9.35 -v 123.5 -114.75 -13.35 -v -123.936 -114.73 -9.35 -v -123.936 -114.73 -13.35 -v -124.368 -114.674 -9.35 -v -124.368 -114.674 -13.35 -v -124.794 -114.58 -9.35 -v -124.794 -114.58 -13.35 -v -125.21 -114.448 -9.35 -v -125.21 -114.448 -13.35 -v -125.613 -114.282 -9.35 -v -125.613 -114.282 -13.35 -v -126 -114.08 -9.35 -v -126 -114.08 -13.35 -v -126.368 -113.846 -9.35 -v -126.368 -113.846 -13.35 -v -126.714 -113.58 -9.35 -v -126.714 -113.58 -13.35 -v -127.036 -113.286 -9.35 -v -127.036 -113.286 -13.35 -v -127.33 -112.964 -9.35 -v -127.33 -112.964 -13.35 -v -127.596 -112.618 -9.35 -v -127.596 -112.618 -13.35 -v -127.83 -112.25 -9.35 -v -127.83 -112.25 -13.35 -v -128.032 -111.863 -9.35 -v -128.032 -111.863 -13.35 -v -128.198 -111.46 -9.35 -v -128.198 -111.46 -13.35 -v -128.33 -111.044 -9.35 -v -128.33 -111.044 -13.35 -v -128.424 -110.618 -9.35 -v -128.424 -110.618 -13.35 -v -128.48 -110.186 -9.35 -v -128.48 -110.186 -13.35 -v -128.478 109.057 -9.35 -v -128.478 109.057 -13.35 -v -128.41 109.612 -9.35 -v -128.41 109.612 -13.35 -v -128.3 110.16 -9.35 -v -128.3 110.16 -13.35 -v -128.147 110.696 -9.35 -v -128.147 110.696 -13.35 -v -127.95 111.218 -9.35 -v -127.95 111.218 -13.35 -v -127.713 111.724 -9.35 -v -127.713 111.724 -13.35 -v -127.436 112.21 -9.35 -v -127.436 112.21 -13.35 -v -127.122 112.67 -9.35 -v -127.122 112.67 -13.35 -v -100.984 142.647 -9.35 -v -100.984 142.647 -13.35 -v -100.76 142.977 -9.35 -v -100.76 142.977 -13.35 -v -100.562 143.323 -9.35 -v -100.562 143.323 -13.35 -v -100.393 143.684 -9.35 -v -100.393 143.684 -13.35 -v -100.252 144.058 -9.35 -v -100.252 144.058 -13.35 -v -100.143 144.44 -9.35 -v -100.143 144.44 -13.35 -v -100.064 144.832 -9.35 -v -100.064 144.832 -13.35 -v -100.016 145.228 -9.35 -v -100.016 145.228 -13.35 -v 101.234 142.337 -13.35 -v 101.234 142.337 -9.35 -v 126.772 113.105 -13.35 -v 126.772 113.105 -9.35 -v 128.5 -109.75 -9.35 -v 128.5 -109.75 -13.35 -v 128.5 108.5 -9.35 -v 128.5 108.5 -13.35 -v 128.48 -110.186 -9.35 -v 128.48 -110.186 -13.35 -v 128.424 -110.618 -9.35 -v 128.424 -110.618 -13.35 -v 128.33 -111.044 -9.35 -v 128.33 -111.044 -13.35 -v 128.198 -111.46 -9.35 -v 128.198 -111.46 -13.35 -v 128.032 -111.863 -9.35 -v 128.032 -111.863 -13.35 -v 127.83 -112.25 -9.35 -v 127.83 -112.25 -13.35 -v 127.596 -112.618 -9.35 -v 127.596 -112.618 -13.35 -v 127.33 -112.964 -9.35 -v 127.33 -112.964 -13.35 -v 127.036 -113.286 -9.35 -v 127.036 -113.286 -13.35 -v 126.714 -113.58 -9.35 -v 126.714 -113.58 -13.35 -v 126.368 -113.846 -9.35 -v 126.368 -113.846 -13.35 -v 126 -114.08 -9.35 -v 126 -114.08 -13.35 -v 125.613 -114.282 -9.35 -v 125.613 -114.282 -13.35 -v 125.21 -114.448 -9.35 -v 125.21 -114.448 -13.35 -v 124.794 -114.58 -9.35 -v 124.794 -114.58 -13.35 -v 124.368 -114.674 -9.35 -v 124.368 -114.674 -13.35 -v 123.936 -114.73 -9.35 -v 123.936 -114.73 -13.35 -v 127.122 112.67 -9.35 -v 127.122 112.67 -13.35 -v 127.436 112.21 -9.35 -v 127.436 112.21 -13.35 -v 127.713 111.724 -9.35 -v 127.713 111.724 -13.35 -v 127.95 111.218 -9.35 -v 127.95 111.218 -13.35 -v 128.147 110.696 -9.35 -v 128.147 110.696 -13.35 -v 128.3 110.16 -9.35 -v 128.3 110.16 -13.35 -v 128.41 109.612 -9.35 -v 128.41 109.612 -13.35 -v 128.478 109.057 -9.35 -v 128.478 109.057 -13.35 -v 100.016 145.228 -9.35 -v 100.016 145.228 -13.35 -v 100.063 144.832 -9.35 -v 100.063 144.832 -13.35 -v 100.143 144.44 -9.35 -v 100.143 144.44 -13.35 -v 100.252 144.058 -9.35 -v 100.252 144.058 -13.35 -v 100.393 143.684 -9.35 -v 100.393 143.684 -13.35 -v 100.562 143.323 -9.35 -v 100.562 143.323 -13.35 -v 100.76 142.977 -9.35 -v 100.76 142.977 -13.35 -v 100.984 142.647 -9.35 -v 100.984 142.647 -13.35 -v -100 157.01 48.36 -v 100 157.01 48.36 -v -102.15 -115.422 -4.6 -v -102.117 -115.44 -4.6 -v -102.324 -115.725 -4.6 -v -102.292 -115.743 -4.6 -v -102.26 -115.762 -4.596 -v -102.085 -115.46 -4.596 -v -102.053 -115.477 -4.592 -v -102.228 -115.78 -4.592 -v -102.022 -115.495 -4.586 -v -102.197 -115.798 -4.586 -v -101.99 -115.513 -4.578 -v -102.166 -115.816 -4.578 -v -101.96 -115.53 -4.568 -v -102.135 -115.834 -4.568 -v -102.105 -115.85 -4.556 -v -101.93 -115.548 -4.556 -v -101.9 -115.565 -4.543 -v -102.075 -115.87 -4.543 -v -101.87 -115.582 -4.528 -v -102.046 -115.885 -4.528 -v -101.842 -115.6 -4.51 -v -102.017 -115.902 -4.51 -v -101.815 -115.615 -4.493 -v -101.99 -115.918 -4.493 -v -101.963 -115.933 -4.474 -v -101.788 -115.63 -4.474 -v -101.762 -115.645 -4.452 -v -101.937 -115.948 -4.452 -v -101.737 -115.66 -4.43 -v -101.912 -115.963 -4.43 -v -101.712 -115.674 -4.406 -v -101.887 -115.977 -4.406 -v -101.864 -115.99 -4.38 -v -101.69 -115.687 -4.38 -v -101.842 -116.003 -4.354 -v -101.667 -115.7 -4.354 -v -101.647 -115.712 -4.326 -v -101.822 -116.015 -4.326 -v -101.627 -115.723 -4.297 -v -101.802 -116.026 -4.297 -v -101.61 -115.734 -4.267 -v -101.784 -116.037 -4.267 -v -101.767 -116.047 -4.236 -v -101.592 -115.744 -4.236 -v -101.576 -115.753 -4.204 -v -101.75 -116.056 -4.204 -v -101.562 -115.76 -4.17 -v -101.737 -116.064 -4.17 -v -101.55 -115.768 -4.137 -v -101.724 -116.07 -4.137 -v -101.537 -115.775 -4.103 -v -101.712 -116.078 -4.103 -v -101.702 -116.084 -4.068 -v -101.527 -115.78 -4.068 -v -101.52 -115.786 -4.032 -v -101.694 -116.09 -4.032 -v -101.512 -115.79 -3.996 -v -101.687 -116.093 -3.996 -v -101.506 -115.793 -3.96 -v -101.68 -116.096 -3.96 -v -101.502 -115.795 -3.924 -v -101.677 -116.098 -3.924 -v -101.675 -116.1 -3.887 -v -101.5 -115.796 -3.887 -v -101.5 -115.797 -3.85 -v -101.674 -116.1 -3.85 -v -119.676 -115.725 -4.6 -v -119.708 -115.743 -4.6 -v -119.85 -115.422 -4.6 -v -119.883 -115.44 -4.6 -v -119.915 -115.46 -4.596 -v -119.74 -115.762 -4.596 -v -119.772 -115.78 -4.592 -v -119.947 -115.477 -4.592 -v -119.803 -115.798 -4.586 -v -119.978 -115.495 -4.586 -v -119.834 -115.816 -4.578 -v -120.01 -115.513 -4.578 -v -119.865 -115.834 -4.568 -v -120.04 -115.53 -4.568 -v -120.07 -115.548 -4.556 -v -119.895 -115.85 -4.556 -v -119.925 -115.87 -4.543 -v -120.1 -115.565 -4.543 -v -119.954 -115.885 -4.528 -v -120.13 -115.582 -4.528 -v -119.982 -115.902 -4.51 -v -120.157 -115.6 -4.51 -v -120.01 -115.918 -4.493 -v -120.185 -115.615 -4.493 -v -120.212 -115.63 -4.474 -v -120.037 -115.933 -4.474 -v -120.063 -115.948 -4.452 -v -120.238 -115.645 -4.452 -v -120.088 -115.963 -4.43 -v -120.263 -115.66 -4.43 -v -120.112 -115.977 -4.406 -v -120.287 -115.674 -4.406 -v -120.31 -115.687 -4.38 -v -120.136 -115.99 -4.38 -v -120.333 -115.7 -4.354 -v -120.158 -116.003 -4.354 -v -120.178 -116.015 -4.326 -v -120.353 -115.712 -4.326 -v -120.198 -116.026 -4.297 -v -120.373 -115.723 -4.297 -v -120.216 -116.037 -4.267 -v -120.39 -115.734 -4.267 -v -120.408 -115.744 -4.236 -v -120.233 -116.047 -4.236 -v -120.25 -116.056 -4.204 -v -120.424 -115.753 -4.204 -v -120.263 -116.064 -4.17 -v -120.438 -115.76 -4.17 -v -120.276 -116.07 -4.137 -v -120.45 -115.768 -4.137 -v -120.288 -116.078 -4.103 -v -120.463 -115.775 -4.103 -v -120.473 -115.78 -4.068 -v -120.298 -116.084 -4.068 -v -120.306 -116.09 -4.032 -v -120.48 -115.786 -4.032 -v -120.313 -116.093 -3.996 -v -120.488 -115.79 -3.996 -v -120.32 -116.096 -3.96 -v -120.494 -115.793 -3.96 -v -120.323 -116.098 -3.924 -v -120.498 -115.795 -3.924 -v -120.5 -115.796 -3.887 -v -120.325 -116.1 -3.887 -v -120.326 -116.1 -3.85 -v -120.5 -115.797 -3.85 -v -102.292 -115.743 -4.6 -v -102.26 -115.762 -4.596 -v -102.324 -115.725 -4.6 -v -102.228 -115.78 -4.592 -v -102.197 -115.798 -4.586 -v -102.166 -115.816 -4.578 -v -102.135 -115.834 -4.568 -v -102.105 -115.85 -4.556 -v -102.075 -115.87 -4.543 -v -102.046 -115.885 -4.528 -v -102.017 -115.902 -4.51 -v -101.99 -115.918 -4.493 -v -101.963 -115.933 -4.474 -v -101.937 -115.948 -4.452 -v -101.912 -115.963 -4.43 -v -101.887 -115.977 -4.406 -v -101.864 -115.99 -4.38 -v -101.842 -116.003 -4.354 -v -101.822 -116.015 -4.326 -v -101.802 -116.026 -4.297 -v -101.784 -116.037 -4.267 -v -101.767 -116.047 -4.236 -v -101.75 -116.056 -4.204 -v -101.737 -116.064 -4.17 -v -101.724 -116.07 -4.137 -v -101.712 -116.078 -4.103 -v -101.702 -116.084 -4.068 -v -101.694 -116.09 -4.032 -v -101.687 -116.093 -3.996 -v -101.68 -116.096 -3.96 -v -101.677 -116.098 -3.924 -v -101.675 -116.1 -3.887 -v -101.674 -116.1 -3.85 -v -103.325 -115.147 -4.6 -v -103.325 -115.147 -1.84 -v -101.674 -116.1 -1.84 -v -101.674 -116.1 0.167 -v -101.675 -116.1 0.204 -v -102.324 -115.725 0.917 -v -103.325 -115.147 0.917 -v -101.677 -116.098 0.24 -v -101.68 -116.096 0.277 -v -101.687 -116.093 0.314 -v -101.694 -116.09 0.35 -v -101.702 -116.084 0.385 -v -101.712 -116.078 0.42 -v -101.724 -116.07 0.454 -v -101.737 -116.064 0.488 -v -101.75 -116.056 0.52 -v -101.767 -116.047 0.553 -v -101.784 -116.037 0.584 -v -101.802 -116.026 0.614 -v -101.822 -116.015 0.643 -v -101.842 -116.003 0.67 -v -101.864 -115.99 0.698 -v -101.887 -115.977 0.723 -v -101.912 -115.963 0.747 -v -101.937 -115.948 0.77 -v -101.963 -115.933 0.79 -v -101.99 -115.918 0.81 -v -102.017 -115.902 0.83 -v -102.046 -115.885 0.845 -v -102.075 -115.87 0.86 -v -102.105 -115.85 0.873 -v -102.135 -115.834 0.885 -v -102.166 -115.816 0.895 -v -102.197 -115.798 0.903 -v -102.228 -115.78 0.91 -v -102.26 -115.762 0.914 -v -102.292 -115.743 0.916 -v -103.15 -114.844 -4.6 -v -103.325 -115.147 -4.6 -v -103.345 -115.136 -4.6 -v -118.5 -115.1 -4.6 -v -118.5 -114.75 -4.6 -v -103.5 -115.1 -4.6 -v -103.5 -114.75 -4.6 -v -103.477 -115.1 -4.6 -v -103.454 -114.752 -4.6 -v -103.454 -115.103 -4.6 -v -103.41 -114.756 -4.6 -v -103.432 -115.107 -4.6 -v -103.363 -114.763 -4.6 -v -103.41 -115.112 -4.6 -v -103.32 -114.774 -4.6 -v -103.387 -115.12 -4.6 -v -103.275 -114.787 -4.6 -v -103.366 -115.127 -4.6 -v -103.232 -114.803 -4.6 -v -103.19 -114.822 -4.6 -v -118.523 -115.1 -4.6 -v -118.546 -114.752 -4.6 -v -118.546 -115.103 -4.6 -v -118.59 -114.756 -4.6 -v -118.568 -115.107 -4.6 -v -118.637 -114.763 -4.6 -v -118.59 -115.112 -4.6 -v -118.68 -114.774 -4.6 -v -118.612 -115.12 -4.6 -v -118.725 -114.787 -4.6 -v -118.634 -115.127 -4.6 -v -118.768 -114.803 -4.6 -v -118.655 -115.136 -4.6 -v -118.81 -114.822 -4.6 -v -118.675 -115.147 -4.6 -v -118.85 -114.844 -4.6 -v -119.883 -115.44 -4.6 -v -119.915 -115.46 -4.596 -v -119.85 -115.422 -4.6 -v -119.947 -115.477 -4.592 -v -119.978 -115.495 -4.586 -v -120.01 -115.513 -4.578 -v -120.04 -115.53 -4.568 -v -120.07 -115.548 -4.556 -v -120.1 -115.565 -4.543 -v -120.13 -115.582 -4.528 -v -120.157 -115.6 -4.51 -v -120.185 -115.615 -4.493 -v -120.212 -115.63 -4.474 -v -120.238 -115.645 -4.452 -v -120.263 -115.66 -4.43 -v -120.287 -115.674 -4.406 -v -120.31 -115.687 -4.38 -v -120.333 -115.7 -4.354 -v -120.353 -115.712 -4.326 -v -120.373 -115.723 -4.297 -v -120.39 -115.734 -4.267 -v -120.408 -115.744 -4.236 -v -120.424 -115.753 -4.204 -v -120.438 -115.76 -4.17 -v -120.45 -115.768 -4.137 -v -120.463 -115.775 -4.103 -v -120.473 -115.78 -4.068 -v -120.48 -115.786 -4.032 -v -120.488 -115.79 -3.996 -v -120.494 -115.793 -3.96 -v -120.498 -115.795 -3.924 -v -120.5 -115.796 -3.887 -v -120.5 -115.797 -3.85 -v -118.85 -114.844 -4.6 -v -118.85 -114.844 -1.84 -v -120.5 -115.797 -1.84 -v -120.5 -115.797 0.167 -v -120.5 -115.796 0.204 -v -119.85 -115.422 0.917 -v -118.85 -114.844 0.917 -v -120.498 -115.795 0.24 -v -120.494 -115.793 0.277 -v -120.488 -115.79 0.314 -v -120.48 -115.786 0.35 -v -120.473 -115.78 0.385 -v -120.463 -115.775 0.42 -v -120.45 -115.768 0.454 -v -120.438 -115.76 0.488 -v -120.424 -115.753 0.52 -v -120.408 -115.744 0.553 -v -120.39 -115.734 0.584 -v -120.373 -115.723 0.614 -v -120.353 -115.712 0.643 -v -120.333 -115.7 0.67 -v -120.31 -115.687 0.698 -v -120.287 -115.674 0.723 -v -120.263 -115.66 0.747 -v -120.238 -115.645 0.77 -v -120.212 -115.63 0.79 -v -120.185 -115.615 0.81 -v -120.157 -115.6 0.83 -v -120.13 -115.582 0.845 -v -120.1 -115.565 0.86 -v -120.07 -115.548 0.873 -v -120.04 -115.53 0.885 -v -120.01 -115.513 0.895 -v -119.978 -115.495 0.903 -v -119.947 -115.477 0.91 -v -119.915 -115.46 0.914 -v -119.883 -115.44 0.916 -v -101.674 -116.1 -1.84 -v -101.5 -115.797 -1.84 -v -101.674 -116.1 0.167 -v -101.5 -115.797 0.167 -v -101.5 -115.796 -3.887 -v -102.15 -115.422 -4.6 -v -101.5 -115.797 -3.85 -v -103.15 -114.844 -4.6 -v -103.15 -114.844 -1.84 -v -101.502 -115.795 -3.924 -v -101.506 -115.793 -3.96 -v -101.512 -115.79 -3.996 -v -101.52 -115.786 -4.032 -v -101.527 -115.78 -4.068 -v -101.537 -115.775 -4.103 -v -101.55 -115.768 -4.137 -v -101.562 -115.76 -4.17 -v -101.576 -115.753 -4.204 -v -101.592 -115.744 -4.236 -v -101.61 -115.734 -4.267 -v -101.627 -115.723 -4.297 -v -101.647 -115.712 -4.326 -v -101.667 -115.7 -4.354 -v -101.69 -115.687 -4.38 -v -101.712 -115.674 -4.406 -v -101.737 -115.66 -4.43 -v -101.762 -115.645 -4.452 -v -101.788 -115.63 -4.474 -v -101.815 -115.615 -4.493 -v -101.842 -115.6 -4.51 -v -101.87 -115.582 -4.528 -v -101.9 -115.565 -4.543 -v -101.93 -115.548 -4.556 -v -101.96 -115.53 -4.568 -v -101.99 -115.513 -4.578 -v -102.022 -115.495 -4.586 -v -102.053 -115.477 -4.592 -v -102.085 -115.46 -4.596 -v -102.117 -115.44 -4.6 -v -103.15 -114.844 0.917 -v -101.5 -115.797 0.167 -v -101.5 -115.797 -1.84 -v -102.15 -115.422 0.917 -v -101.5 -115.796 0.204 -v -102.117 -115.44 0.916 -v -102.085 -115.46 0.914 -v -102.053 -115.477 0.91 -v -102.022 -115.495 0.903 -v -101.99 -115.513 0.895 -v -101.96 -115.53 0.885 -v -101.93 -115.548 0.873 -v -101.9 -115.565 0.86 -v -101.87 -115.582 0.845 -v -101.842 -115.6 0.83 -v -101.815 -115.615 0.81 -v -101.788 -115.63 0.79 -v -101.762 -115.645 0.77 -v -101.737 -115.66 0.747 -v -101.712 -115.674 0.723 -v -101.69 -115.687 0.698 -v -101.667 -115.7 0.67 -v -101.647 -115.712 0.643 -v -101.627 -115.723 0.614 -v -101.61 -115.734 0.584 -v -101.592 -115.744 0.553 -v -101.576 -115.753 0.52 -v -101.562 -115.76 0.488 -v -101.55 -115.768 0.454 -v -101.537 -115.775 0.42 -v -101.527 -115.78 0.385 -v -101.52 -115.786 0.35 -v -101.512 -115.79 0.314 -v -101.506 -115.793 0.277 -v -101.502 -115.795 0.24 -v -103.5 -114.75 -4.6 -v -103.5 -114.75 -1.84 -v -103.454 -114.752 -4.6 -v -103.454 -114.752 0.917 -v -103.41 -114.756 0.917 -v -103.5 -114.75 0.917 -v -103.41 -114.756 -4.6 -v -103.363 -114.763 0.917 -v -103.363 -114.763 -4.6 -v -103.32 -114.774 0.917 -v -103.32 -114.774 -4.6 -v -103.275 -114.787 0.917 -v -103.275 -114.787 -4.6 -v -103.232 -114.803 0.917 -v -103.232 -114.803 -4.6 -v -103.19 -114.822 0.917 -v -103.19 -114.822 -4.6 -v -118.5 -114.75 0.917 -v -118.5 -114.75 -1.84 -v -118.5 -114.75 -4.6 -v -118.546 -114.752 0.917 -v -118.546 -114.752 -4.6 -v -118.59 -114.756 -4.6 -v -118.59 -114.756 0.917 -v -118.637 -114.763 -4.6 -v -118.637 -114.763 0.917 -v -118.68 -114.774 -4.6 -v -118.68 -114.774 0.917 -v -118.725 -114.787 -4.6 -v -118.725 -114.787 0.917 -v -118.768 -114.803 -4.6 -v -118.768 -114.803 0.917 -v -118.81 -114.822 -4.6 -v -118.81 -114.822 0.917 -v -120.326 -116.1 -1.84 -v -120.5 -115.797 -1.84 -v -120.326 -116.1 0.167 -v -120.5 -115.797 0.167 -v -120.325 -116.1 -3.887 -v -119.676 -115.725 -4.6 -v -120.326 -116.1 -3.85 -v -118.675 -115.147 -4.6 -v -118.675 -115.147 -1.84 -v -120.323 -116.098 -3.924 -v -120.32 -116.096 -3.96 -v -120.313 -116.093 -3.996 -v -120.306 -116.09 -4.032 -v -120.298 -116.084 -4.068 -v -120.288 -116.078 -4.103 -v -120.276 -116.07 -4.137 -v -120.263 -116.064 -4.17 -v -120.25 -116.056 -4.204 -v -120.233 -116.047 -4.236 -v -120.216 -116.037 -4.267 -v -120.198 -116.026 -4.297 -v -120.178 -116.015 -4.326 -v -120.158 -116.003 -4.354 -v -120.136 -115.99 -4.38 -v -120.112 -115.977 -4.406 -v -120.088 -115.963 -4.43 -v -120.063 -115.948 -4.452 -v -120.037 -115.933 -4.474 -v -120.01 -115.918 -4.493 -v -119.982 -115.902 -4.51 -v -119.954 -115.885 -4.528 -v -119.925 -115.87 -4.543 -v -119.895 -115.85 -4.556 -v -119.865 -115.834 -4.568 -v -119.834 -115.816 -4.578 -v -119.803 -115.798 -4.586 -v -119.772 -115.78 -4.592 -v -119.74 -115.762 -4.596 -v -119.708 -115.743 -4.6 -v -118.675 -115.147 0.917 -v -120.326 -116.1 0.167 -v -120.326 -116.1 -1.84 -v -119.676 -115.725 0.917 -v -120.325 -116.1 0.204 -v -119.708 -115.743 0.916 -v -119.74 -115.762 0.914 -v -119.772 -115.78 0.91 -v -119.803 -115.798 0.903 -v -119.834 -115.816 0.895 -v -119.865 -115.834 0.885 -v -119.895 -115.85 0.873 -v -119.925 -115.87 0.86 -v -119.954 -115.885 0.845 -v -119.982 -115.902 0.83 -v -120.01 -115.918 0.81 -v -120.037 -115.933 0.79 -v -120.063 -115.948 0.77 -v -120.088 -115.963 0.747 -v -120.112 -115.977 0.723 -v -120.136 -115.99 0.698 -v -120.158 -116.003 0.67 -v -120.178 -116.015 0.643 -v -120.198 -116.026 0.614 -v -120.216 -116.037 0.584 -v -120.233 -116.047 0.553 -v -120.25 -116.056 0.52 -v -120.263 -116.064 0.488 -v -120.276 -116.07 0.454 -v -120.288 -116.078 0.42 -v -120.298 -116.084 0.385 -v -120.306 -116.09 0.35 -v -120.313 -116.093 0.314 -v -120.32 -116.096 0.277 -v -120.323 -116.098 0.24 -v -118.5 -115.1 0.917 -v -118.523 -115.1 0.917 -v -118.5 -115.1 -1.84 -v -118.523 -115.1 -4.6 -v -118.5 -115.1 -4.6 -v -118.546 -115.103 0.917 -v -118.546 -115.103 -4.6 -v -118.568 -115.107 0.917 -v -118.568 -115.107 -4.6 -v -118.59 -115.112 0.917 -v -118.59 -115.112 -4.6 -v -118.612 -115.12 0.917 -v -118.612 -115.12 -4.6 -v -118.634 -115.127 0.917 -v -118.634 -115.127 -4.6 -v -118.655 -115.136 0.917 -v -118.655 -115.136 -4.6 -v -103.5 -115.1 -4.6 -v -103.5 -115.1 -1.84 -v -103.5 -115.1 0.917 -v -103.477 -115.1 0.917 -v -103.477 -115.1 -4.6 -v -103.454 -115.103 -4.6 -v -103.454 -115.103 0.917 -v -103.432 -115.107 -4.6 -v -103.432 -115.107 0.917 -v -103.41 -115.112 -4.6 -v -103.41 -115.112 0.917 -v -103.387 -115.12 -4.6 -v -103.387 -115.12 0.917 -v -103.366 -115.127 -4.6 -v -103.366 -115.127 0.917 -v -103.345 -115.136 -4.6 -v -103.345 -115.136 0.917 -v -117.75 -106.91 1.21 -v -111 -106.91 1.21 -v -117.75 -106.75 0.9 -v -111 -106.75 0.9 -v -104.25 -106.91 1.21 -v -104.25 -106.75 0.9 -v -119.85 -115.422 0.917 -v -119.883 -115.44 0.916 -v -119.676 -115.725 0.917 -v -119.708 -115.743 0.916 -v -119.915 -115.46 0.914 -v -119.74 -115.762 0.914 -v -119.772 -115.78 0.91 -v -119.947 -115.477 0.91 -v -119.978 -115.495 0.903 -v -119.803 -115.798 0.903 -v -120.01 -115.513 0.895 -v -119.834 -115.816 0.895 -v -120.04 -115.53 0.885 -v -119.865 -115.834 0.885 -v -120.07 -115.548 0.873 -v -119.895 -115.85 0.873 -v -119.925 -115.87 0.86 -v -120.1 -115.565 0.86 -v -120.13 -115.582 0.845 -v -119.954 -115.885 0.845 -v -120.157 -115.6 0.83 -v -119.982 -115.902 0.83 -v -120.185 -115.615 0.81 -v -120.01 -115.918 0.81 -v -120.212 -115.63 0.79 -v -120.037 -115.933 0.79 -v -120.063 -115.948 0.77 -v -120.238 -115.645 0.77 -v -120.263 -115.66 0.747 -v -120.088 -115.963 0.747 -v -120.287 -115.674 0.723 -v -120.112 -115.977 0.723 -v -120.31 -115.687 0.698 -v -120.136 -115.99 0.698 -v -120.333 -115.7 0.67 -v -120.158 -116.003 0.67 -v -120.178 -116.015 0.643 -v -120.353 -115.712 0.643 -v -120.373 -115.723 0.614 -v -120.198 -116.026 0.614 -v -120.39 -115.734 0.584 -v -120.216 -116.037 0.584 -v -120.408 -115.744 0.553 -v -120.233 -116.047 0.553 -v -120.424 -115.753 0.52 -v -120.25 -116.056 0.52 -v -120.263 -116.064 0.488 -v -120.438 -115.76 0.488 -v -120.45 -115.768 0.454 -v -120.276 -116.07 0.454 -v -120.463 -115.775 0.42 -v -120.288 -116.078 0.42 -v -120.473 -115.78 0.385 -v -120.298 -116.084 0.385 -v -120.48 -115.786 0.35 -v -120.306 -116.09 0.35 -v -120.313 -116.093 0.314 -v -120.488 -115.79 0.314 -v -120.494 -115.793 0.277 -v -120.32 -116.096 0.277 -v -120.498 -115.795 0.24 -v -120.323 -116.098 0.24 -v -120.5 -115.796 0.204 -v -120.325 -116.1 0.204 -v -101.675 -116.1 0.204 -v -101.5 -115.796 0.204 -v -101.502 -115.795 0.24 -v -101.677 -116.098 0.24 -v -101.506 -115.793 0.277 -v -101.68 -116.096 0.277 -v -101.512 -115.79 0.314 -v -101.687 -116.093 0.314 -v -101.694 -116.09 0.35 -v -101.52 -115.786 0.35 -v -101.527 -115.78 0.385 -v -101.702 -116.084 0.385 -v -101.537 -115.775 0.42 -v -101.712 -116.078 0.42 -v -101.55 -115.768 0.454 -v -101.724 -116.07 0.454 -v -101.562 -115.76 0.488 -v -101.737 -116.064 0.488 -v -101.75 -116.056 0.52 -v -101.576 -115.753 0.52 -v -101.592 -115.744 0.553 -v -101.767 -116.047 0.553 -v -101.61 -115.734 0.584 -v -101.784 -116.037 0.584 -v -101.627 -115.723 0.614 -v -101.802 -116.026 0.614 -v -101.647 -115.712 0.643 -v -101.822 -116.015 0.643 -v -101.842 -116.003 0.67 -v -101.667 -115.7 0.67 -v -101.69 -115.687 0.698 -v -101.864 -115.99 0.698 -v -101.712 -115.674 0.723 -v -101.887 -115.977 0.723 -v -101.737 -115.66 0.747 -v -101.912 -115.963 0.747 -v -101.762 -115.645 0.77 -v -101.937 -115.948 0.77 -v -101.963 -115.933 0.79 -v -101.788 -115.63 0.79 -v -101.815 -115.615 0.81 -v -101.99 -115.918 0.81 -v -101.842 -115.6 0.83 -v -102.017 -115.902 0.83 -v -101.87 -115.582 0.845 -v -102.046 -115.885 0.845 -v -101.9 -115.565 0.86 -v -102.075 -115.87 0.86 -v -102.105 -115.85 0.873 -v -101.93 -115.548 0.873 -v -101.96 -115.53 0.885 -v -102.135 -115.834 0.885 -v -101.99 -115.513 0.895 -v -102.166 -115.816 0.895 -v -102.022 -115.495 0.903 -v -102.197 -115.798 0.903 -v -102.053 -115.477 0.91 -v -102.228 -115.78 0.91 -v -102.26 -115.762 0.914 -v -102.085 -115.46 0.914 -v -102.117 -115.44 0.916 -v -102.292 -115.743 0.916 -v -102.15 -115.422 0.917 -v -102.324 -115.725 0.917 -v -118.5 -107.415 0.554 -v -118.5 -107.577 0.865 -v -118.5 -107.383 0.57 -v -118.5 -107.544 0.88 -v -118.496 -107.512 0.898 -v -118.496 -107.35 0.588 -v -118.492 -107.48 0.915 -v -118.492 -107.318 0.605 -v -118.486 -107.447 0.932 -v -118.486 -107.286 0.62 -v -118.478 -107.415 0.95 -v -118.478 -107.254 0.638 -v -118.468 -107.222 0.654 -v -118.468 -107.384 0.965 -v -118.456 -107.353 0.98 -v -118.456 -107.19 0.67 -v -118.443 -107.322 0.997 -v -118.443 -107.16 0.686 -v -118.428 -107.292 1.012 -v -118.428 -107.13 0.702 -v -118.41 -107.263 1.028 -v -118.41 -107.102 0.717 -v -118.393 -107.073 0.732 -v -118.393 -107.235 1.042 -v -118.374 -107.207 1.057 -v -118.374 -107.046 0.746 -v -118.352 -107.18 1.07 -v -118.352 -107.02 0.76 -v -118.33 -107.155 1.084 -v -118.33 -106.993 0.774 -v -118.306 -107.13 1.097 -v -118.306 -106.97 0.786 -v -118.28 -106.945 0.8 -v -118.28 -107.106 1.11 -v -118.254 -106.922 0.81 -v -118.254 -107.084 1.12 -v -118.226 -107.063 1.132 -v -118.226 -106.9 0.82 -v -118.197 -107.042 1.142 -v -118.197 -106.88 0.832 -v -118.167 -107.024 1.152 -v -118.167 -106.862 0.842 -v -118.136 -107.006 1.16 -v -118.136 -106.845 0.85 -v -118.104 -106.83 0.86 -v -118.104 -106.99 1.17 -v -118.07 -106.975 1.177 -v -118.07 -106.814 0.867 -v -118.037 -106.962 1.184 -v -118.037 -106.8 0.874 -v -118.003 -106.95 1.19 -v -118.003 -106.79 0.88 -v -117.968 -106.94 1.196 -v -117.968 -106.78 0.885 -v -117.932 -106.77 0.89 -v -117.932 -106.93 1.2 -v -117.896 -106.924 1.204 -v -117.896 -106.763 0.893 -v -117.86 -106.92 1.207 -v -117.86 -106.757 0.896 -v -117.824 -106.915 1.21 -v -117.824 -106.753 0.898 -v -117.787 -106.912 1.21 -v -117.787 -106.75 0.9 -v -118.5 -114.182 1.582 -v -118.5 -114.222 1.594 -v -103.5 -114.182 1.582 -v -103.5 -114.222 1.594 -v -118.5 -114.262 1.603 -v -103.5 -114.262 1.603 -v -118.5 -114.303 1.61 -v -103.5 -114.303 1.61 -v -118.5 -114.344 1.615 -v -103.5 -114.344 1.615 -v -118.5 -114.385 1.617 -v -103.5 -114.385 1.617 -v -118.5 -114.426 1.617 -v -103.5 -114.426 1.617 -v -118.5 -114.467 1.614 -v -103.5 -114.467 1.614 -v -118.5 -114.508 1.61 -v -103.5 -114.508 1.61 -v -118.5 -114.55 1.6 -v -103.5 -114.55 1.6 -v -118.5 -114.59 1.59 -v -103.5 -114.59 1.59 -v -118.5 -114.628 1.58 -v -103.5 -114.628 1.58 -v -118.5 -114.667 1.564 -v -103.5 -114.667 1.564 -v -118.5 -114.705 1.547 -v -103.5 -114.705 1.547 -v -118.5 -114.74 1.528 -v -103.5 -114.74 1.528 -v -118.5 -114.777 1.507 -v -103.5 -114.777 1.507 -v -118.5 -114.81 1.484 -v -103.5 -114.81 1.484 -v -118.5 -114.844 1.46 -v -103.5 -114.844 1.46 -v -118.5 -114.875 1.432 -v -103.5 -114.875 1.432 -v -118.5 -114.904 1.403 -v -103.5 -114.904 1.403 -v -118.5 -114.932 1.372 -v -103.5 -114.932 1.372 -v -103.5 -114.958 1.34 -v -118.5 -114.958 1.34 -v -118.5 -114.982 1.306 -v -103.5 -114.982 1.306 -v -118.5 -115.004 1.272 -v -103.5 -115.004 1.272 -v -118.5 -115.024 1.235 -v -103.5 -115.024 1.235 -v -118.5 -115.04 1.198 -v -103.5 -115.04 1.198 -v -118.5 -115.057 1.16 -v -103.5 -115.057 1.16 -v -118.5 -115.07 1.12 -v -103.5 -115.07 1.12 -v -118.5 -115.08 1.08 -v -103.5 -115.08 1.08 -v -118.5 -115.09 1.04 -v -103.5 -115.09 1.04 -v -118.5 -115.095 1 -v -103.5 -115.095 1 -v -118.5 -115.1 0.958 -v -103.5 -115.1 0.958 -v -118.5 -109.42 0.024 -v -111 -109.42 0.024 -v -103.5 -109.42 0.024 -v -118.5 -109.15 0.046 -v -118.5 -109.166 0.04 -v -111 -109.15 0.046 -v -103.5 -109.166 0.04 -v -103.5 -109.15 0.046 -v -103.5 -109.182 0.032 -v -118.5 -109.182 0.032 -v -118.5 -109.198 0.026 -v -103.5 -109.198 0.026 -v -118.5 -109.215 0.02 -v -103.5 -109.215 0.02 -v -118.5 -109.232 0.016 -v -103.5 -109.232 0.016 -v -118.5 -109.25 0.013 -v -103.5 -109.25 0.013 -v -103.5 -109.266 0.01 -v -118.5 -109.266 0.01 -v -118.5 -109.283 0.008 -v -103.5 -109.283 0.008 -v -118.5 -109.3 0.007 -v -103.5 -109.3 0.007 -v -103.5 -109.318 0.007 -v -118.5 -109.318 0.007 -v -118.5 -109.336 0.008 -v -103.5 -109.336 0.008 -v -103.5 -109.353 0.01 -v -118.5 -109.353 0.01 -v -118.5 -109.37 0.012 -v -103.5 -109.37 0.012 -v -118.5 -109.387 0.015 -v -103.5 -109.387 0.015 -v -118.5 -109.404 0.02 -v -103.5 -109.404 0.02 -v -118.5 -107.577 0.865 -v -117.75 -106.91 1.21 -v -111 -106.91 1.21 -v -104.25 -106.91 1.21 -v -103.5 -107.577 0.865 -v -103.5 -107.544 0.88 -v -103.504 -107.512 0.898 -v -103.508 -107.48 0.915 -v -103.514 -107.447 0.932 -v -103.522 -107.415 0.95 -v -103.532 -107.384 0.965 -v -103.544 -107.353 0.98 -v -103.557 -107.322 0.997 -v -103.572 -107.292 1.012 -v -103.59 -107.263 1.028 -v -103.607 -107.235 1.042 -v -103.626 -107.207 1.057 -v -103.648 -107.18 1.07 -v -103.67 -107.155 1.084 -v -103.694 -107.13 1.097 -v -103.72 -107.106 1.11 -v -103.746 -107.084 1.12 -v -103.774 -107.063 1.132 -v -103.803 -107.042 1.142 -v -103.833 -107.024 1.152 -v -103.864 -107.006 1.16 -v -103.896 -106.99 1.17 -v -103.93 -106.975 1.177 -v -103.963 -106.962 1.184 -v -103.997 -106.95 1.19 -v -104.032 -106.94 1.196 -v -104.068 -106.93 1.2 -v -104.104 -106.924 1.204 -v -104.14 -106.92 1.207 -v -104.176 -106.915 1.21 -v -104.213 -106.912 1.21 -v -117.787 -106.912 1.21 -v -117.824 -106.915 1.21 -v -117.86 -106.92 1.207 -v -117.896 -106.924 1.204 -v -117.932 -106.93 1.2 -v -117.968 -106.94 1.196 -v -118.003 -106.95 1.19 -v -118.037 -106.962 1.184 -v -118.07 -106.975 1.177 -v -118.104 -106.99 1.17 -v -118.136 -107.006 1.16 -v -118.167 -107.024 1.152 -v -118.197 -107.042 1.142 -v -118.226 -107.063 1.132 -v -118.254 -107.084 1.12 -v -118.28 -107.106 1.11 -v -118.306 -107.13 1.097 -v -118.33 -107.155 1.084 -v -118.352 -107.18 1.07 -v -118.374 -107.207 1.057 -v -118.393 -107.235 1.042 -v -118.41 -107.263 1.028 -v -118.428 -107.292 1.012 -v -118.443 -107.322 0.997 -v -118.456 -107.353 0.98 -v -118.468 -107.384 0.965 -v -118.478 -107.415 0.95 -v -118.486 -107.447 0.932 -v -118.492 -107.48 0.915 -v -118.496 -107.512 0.898 -v -118.5 -107.544 0.88 -v -104.213 -106.75 0.9 -v -104.213 -106.912 1.21 -v -104.176 -106.915 1.21 -v -104.176 -106.753 0.898 -v -104.14 -106.92 1.207 -v -104.14 -106.757 0.896 -v -104.104 -106.924 1.204 -v -104.104 -106.763 0.893 -v -104.068 -106.77 0.89 -v -104.068 -106.93 1.2 -v -104.032 -106.94 1.196 -v -104.032 -106.78 0.885 -v -103.997 -106.95 1.19 -v -103.997 -106.79 0.88 -v -103.963 -106.962 1.184 -v -103.963 -106.8 0.874 -v -103.93 -106.975 1.177 -v -103.93 -106.814 0.867 -v -103.896 -106.83 0.86 -v -103.896 -106.99 1.17 -v -103.864 -107.006 1.16 -v -103.864 -106.845 0.85 -v -103.833 -107.024 1.152 -v -103.833 -106.862 0.842 -v -103.803 -107.042 1.142 -v -103.803 -106.88 0.832 -v -103.774 -107.063 1.132 -v -103.774 -106.9 0.82 -v -103.746 -106.922 0.81 -v -103.746 -107.084 1.12 -v -103.72 -107.106 1.11 -v -103.72 -106.945 0.8 -v -103.694 -107.13 1.097 -v -103.694 -106.97 0.786 -v -103.67 -107.155 1.084 -v -103.67 -106.993 0.774 -v -103.648 -107.18 1.07 -v -103.648 -107.02 0.76 -v -103.626 -107.046 0.746 -v -103.626 -107.207 1.057 -v -103.607 -107.235 1.042 -v -103.607 -107.073 0.732 -v -103.59 -107.263 1.028 -v -103.59 -107.102 0.717 -v -103.572 -107.292 1.012 -v -103.572 -107.13 0.702 -v -103.557 -107.322 0.997 -v -103.557 -107.16 0.686 -v -103.544 -107.19 0.67 -v -103.544 -107.353 0.98 -v -103.532 -107.384 0.965 -v -103.532 -107.222 0.654 -v -103.522 -107.415 0.95 -v -103.522 -107.254 0.638 -v -103.514 -107.447 0.932 -v -103.514 -107.286 0.62 -v -103.508 -107.48 0.915 -v -103.508 -107.318 0.605 -v -103.504 -107.35 0.588 -v -103.504 -107.512 0.898 -v -103.5 -107.544 0.88 -v -103.5 -107.383 0.57 -v -103.5 -107.577 0.865 -v -103.5 -107.415 0.554 -v -103.5 -107.383 0.57 -v -103.5 -107.415 0.554 -v -104.25 -106.75 0.9 -v -103.5 -108.99 -0.264 -v -111 -106.75 0.9 -v -118.5 -108.99 -0.264 -v -117.75 -106.75 0.9 -v -118.5 -107.415 0.554 -v -118.5 -107.383 0.57 -v -104.213 -106.75 0.9 -v -104.176 -106.753 0.898 -v -104.14 -106.757 0.896 -v -104.104 -106.763 0.893 -v -104.068 -106.77 0.89 -v -104.032 -106.78 0.885 -v -103.997 -106.79 0.88 -v -103.963 -106.8 0.874 -v -103.93 -106.814 0.867 -v -103.896 -106.83 0.86 -v -103.864 -106.845 0.85 -v -103.833 -106.862 0.842 -v -103.803 -106.88 0.832 -v -103.774 -106.9 0.82 -v -103.746 -106.922 0.81 -v -103.72 -106.945 0.8 -v -103.694 -106.97 0.786 -v -103.67 -106.993 0.774 -v -103.648 -107.02 0.76 -v -103.626 -107.046 0.746 -v -103.607 -107.073 0.732 -v -103.59 -107.102 0.717 -v -103.572 -107.13 0.702 -v -103.557 -107.16 0.686 -v -103.544 -107.19 0.67 -v -103.532 -107.222 0.654 -v -103.522 -107.254 0.638 -v -103.514 -107.286 0.62 -v -103.508 -107.318 0.605 -v -103.504 -107.35 0.588 -v -118.496 -107.35 0.588 -v -118.492 -107.318 0.605 -v -118.486 -107.286 0.62 -v -118.478 -107.254 0.638 -v -118.468 -107.222 0.654 -v -118.456 -107.19 0.67 -v -118.443 -107.16 0.686 -v -118.428 -107.13 0.702 -v -118.41 -107.102 0.717 -v -118.393 -107.073 0.732 -v -118.374 -107.046 0.746 -v -118.352 -107.02 0.76 -v -118.33 -106.993 0.774 -v -118.306 -106.97 0.786 -v -118.28 -106.945 0.8 -v -118.254 -106.922 0.81 -v -118.226 -106.9 0.82 -v -118.197 -106.88 0.832 -v -118.167 -106.862 0.842 -v -118.136 -106.845 0.85 -v -118.104 -106.83 0.86 -v -118.07 -106.814 0.867 -v -118.037 -106.8 0.874 -v -118.003 -106.79 0.88 -v -117.968 -106.78 0.885 -v -117.932 -106.77 0.89 -v -117.896 -106.763 0.893 -v -117.86 -106.757 0.896 -v -117.824 -106.753 0.898 -v -117.787 -106.75 0.9 -v -103.5 -109.02 -0.28 -v -118.5 -109.02 -0.28 -v -118.5 -109.052 -0.293 -v -103.5 -109.052 -0.293 -v -103.5 -109.085 -0.305 -v -118.5 -109.085 -0.305 -v -103.5 -109.118 -0.316 -v -118.5 -109.118 -0.316 -v -103.5 -109.152 -0.325 -v -118.5 -109.152 -0.325 -v -103.5 -109.186 -0.332 -v -118.5 -109.186 -0.332 -v -118.5 -109.22 -0.337 -v -103.5 -109.22 -0.337 -v -103.5 -109.255 -0.34 -v -118.5 -109.255 -0.34 -v -103.5 -109.29 -0.343 -v -118.5 -109.29 -0.343 -v -118.5 -109.324 -0.343 -v -103.5 -109.324 -0.343 -v -103.5 -109.36 -0.342 -v -118.5 -109.36 -0.342 -v -118.5 -109.394 -0.338 -v -103.5 -109.394 -0.338 -v -103.5 -109.428 -0.333 -v -118.5 -109.428 -0.333 -v -103.5 -109.462 -0.327 -v -118.5 -109.462 -0.327 -v -103.5 -109.496 -0.318 -v -118.5 -109.496 -0.318 -v -103.5 -109.53 -0.308 -v -118.5 -109.53 -0.308 -v -118.675 -115.147 0.917 -v -118.85 -114.844 0.917 -v -118.655 -115.136 0.917 -v -118.81 -114.822 0.917 -v -118.634 -115.127 0.917 -v -118.768 -114.803 0.917 -v -118.612 -115.12 0.917 -v -118.725 -114.787 0.917 -v -118.59 -115.112 0.917 -v -118.68 -114.774 0.917 -v -118.568 -115.107 0.917 -v -118.637 -114.763 0.917 -v -118.546 -115.103 0.917 -v -118.59 -114.756 0.917 -v -118.523 -115.1 0.917 -v -118.546 -114.752 0.917 -v -118.5 -115.1 0.917 -v -118.5 -114.75 0.917 -v -103.5 -114.75 0.917 -v -103.5 -115.1 0.917 -v -103.454 -114.752 0.917 -v -103.477 -115.1 0.917 -v -103.454 -115.103 0.917 -v -103.41 -114.756 0.917 -v -103.432 -115.107 0.917 -v -103.363 -114.763 0.917 -v -103.41 -115.112 0.917 -v -103.32 -114.774 0.917 -v -103.387 -115.12 0.917 -v -103.275 -114.787 0.917 -v -103.366 -115.127 0.917 -v -103.232 -114.803 0.917 -v -103.345 -115.136 0.917 -v -103.19 -114.822 0.917 -v -103.15 -114.844 0.917 -v -103.325 -115.147 0.917 -v -103.5 -114.29 1.25 -v -118.5 -114.29 1.25 -v -118.5 -114.393 1.267 -v -118.5 -114.385 1.617 -v -118.5 -114.372 1.266 -v -118.5 -114.344 1.615 -v -118.5 -114.35 1.264 -v -118.5 -114.303 1.61 -v -118.5 -114.33 1.26 -v -118.5 -114.262 1.603 -v -118.5 -114.31 1.256 -v -118.5 -114.222 1.594 -v -118.5 -114.29 1.25 -v -118.5 -114.182 1.582 -v -118.5 -109.53 -0.308 -v -118.5 -109.42 0.024 -v -118.5 -109.496 -0.318 -v -118.5 -109.404 0.02 -v -118.5 -109.462 -0.327 -v -118.5 -109.387 0.015 -v -118.5 -109.428 -0.333 -v -118.5 -109.37 0.012 -v -118.5 -109.394 -0.338 -v -118.5 -109.353 0.01 -v -118.5 -109.36 -0.342 -v -118.5 -109.336 0.008 -v -118.5 -109.324 -0.343 -v -118.5 -109.318 0.007 -v -118.5 -109.29 -0.343 -v -118.5 -109.3 0.007 -v -118.5 -109.283 0.008 -v -118.5 -114.413 1.267 -v -118.5 -114.426 1.617 -v -118.5 -114.434 1.266 -v -118.5 -114.467 1.614 -v -118.5 -114.454 1.263 -v -118.5 -114.508 1.61 -v -118.5 -114.474 1.26 -v -118.5 -114.55 1.6 -v -118.5 -114.495 1.254 -v -118.5 -114.59 1.59 -v -118.5 -114.514 1.248 -v -118.5 -114.628 1.58 -v -118.5 -114.534 1.24 -v -118.5 -114.667 1.564 -v -118.5 -114.552 1.232 -v -118.5 -114.705 1.547 -v -118.5 -114.57 1.223 -v -118.5 -114.74 1.528 -v -118.5 -114.588 1.212 -v -118.5 -114.777 1.507 -v -118.5 -114.605 1.2 -v -118.5 -114.81 1.484 -v -118.5 -114.622 1.188 -v -118.5 -114.844 1.46 -v -118.5 -114.637 1.174 -v -118.5 -114.875 1.432 -v -118.5 -114.652 1.16 -v -118.5 -114.904 1.403 -v -118.5 -114.666 1.145 -v -118.5 -114.932 1.372 -v -118.5 -114.68 1.13 -v -118.5 -114.958 1.34 -v -118.5 -114.69 1.112 -v -118.5 -114.982 1.306 -v -118.5 -114.702 1.094 -v -118.5 -115.004 1.272 -v -118.5 -114.712 1.076 -v -118.5 -115.024 1.235 -v -118.5 -114.72 1.058 -v -118.5 -115.04 1.198 -v -118.5 -114.728 1.038 -v -118.5 -115.057 1.16 -v -118.5 -114.735 1.02 -v -118.5 -115.07 1.12 -v -118.5 -114.74 1 -v -118.5 -115.08 1.08 -v -118.5 -114.745 0.98 -v -118.5 -115.09 1.04 -v -118.5 -114.748 0.958 -v -118.5 -115.095 1 -v -118.5 -114.75 0.938 -v -118.5 -115.1 0.958 -v -118.5 -114.75 0.917 -v -118.5 -115.1 0.917 -v -118.5 -109.255 -0.34 -v -118.5 -109.266 0.01 -v -118.5 -109.22 -0.337 -v -118.5 -109.25 0.013 -v -118.5 -109.186 -0.332 -v -118.5 -109.232 0.016 -v -118.5 -109.152 -0.325 -v -118.5 -109.215 0.02 -v -118.5 -109.118 -0.316 -v -118.5 -109.198 0.026 -v -118.5 -109.085 -0.305 -v -118.5 -109.182 0.032 -v -118.5 -109.052 -0.293 -v -118.5 -109.166 0.04 -v -118.5 -109.02 -0.28 -v -118.5 -109.15 0.046 -v -118.5 -108.99 -0.264 -v -103.5 -115.1 0.917 -v -103.5 -114.75 0.917 -v -103.5 -115.1 0.958 -v -103.5 -114.75 0.938 -v -103.5 -114.748 0.958 -v -103.5 -115.095 1 -v -103.5 -114.745 0.98 -v -103.5 -115.09 1.04 -v -103.5 -114.74 1 -v -103.5 -115.08 1.08 -v -103.5 -114.735 1.02 -v -103.5 -115.07 1.12 -v -103.5 -114.728 1.038 -v -103.5 -115.057 1.16 -v -103.5 -114.72 1.058 -v -103.5 -115.04 1.198 -v -103.5 -114.712 1.076 -v -103.5 -115.024 1.235 -v -103.5 -114.702 1.094 -v -103.5 -115.004 1.272 -v -103.5 -114.69 1.112 -v -103.5 -114.982 1.306 -v -103.5 -114.68 1.13 -v -103.5 -114.958 1.34 -v -103.5 -114.666 1.145 -v -103.5 -114.932 1.372 -v -103.5 -114.652 1.16 -v -103.5 -114.904 1.403 -v -103.5 -114.637 1.174 -v -103.5 -114.875 1.432 -v -103.5 -114.622 1.188 -v -103.5 -114.844 1.46 -v -103.5 -114.605 1.2 -v -103.5 -114.81 1.484 -v -103.5 -114.588 1.212 -v -103.5 -114.777 1.507 -v -103.5 -114.57 1.223 -v -103.5 -114.74 1.528 -v -103.5 -114.552 1.232 -v -103.5 -114.705 1.547 -v -103.5 -114.534 1.24 -v -103.5 -114.667 1.564 -v -103.5 -114.514 1.248 -v -103.5 -114.628 1.58 -v -103.5 -114.495 1.254 -v -103.5 -114.59 1.59 -v -103.5 -114.474 1.26 -v -103.5 -114.55 1.6 -v -103.5 -114.454 1.263 -v -103.5 -114.508 1.61 -v -103.5 -114.434 1.266 -v -103.5 -114.467 1.614 -v -103.5 -114.413 1.267 -v -103.5 -114.393 1.267 -v -103.5 -114.344 1.615 -v -103.5 -114.372 1.266 -v -103.5 -114.303 1.61 -v -103.5 -114.35 1.264 -v -103.5 -114.262 1.603 -v -103.5 -114.33 1.26 -v -103.5 -114.222 1.594 -v -103.5 -114.31 1.256 -v -103.5 -114.182 1.582 -v -103.5 -114.29 1.25 -v -103.5 -109.42 0.024 -v -103.5 -109.53 -0.308 -v -103.5 -109.496 -0.318 -v -103.5 -109.404 0.02 -v -103.5 -109.462 -0.327 -v -103.5 -109.387 0.015 -v -103.5 -109.428 -0.333 -v -103.5 -109.37 0.012 -v -103.5 -109.394 -0.338 -v -103.5 -109.353 0.01 -v -103.5 -109.36 -0.342 -v -103.5 -109.336 0.008 -v -103.5 -109.324 -0.343 -v -103.5 -109.318 0.007 -v -103.5 -109.29 -0.343 -v -103.5 -109.3 0.007 -v -103.5 -109.255 -0.34 -v -103.5 -109.283 0.008 -v -103.5 -109.22 -0.337 -v -103.5 -109.266 0.01 -v -103.5 -109.186 -0.332 -v -103.5 -109.25 0.013 -v -103.5 -109.152 -0.325 -v -103.5 -109.232 0.016 -v -103.5 -109.118 -0.316 -v -103.5 -109.215 0.02 -v -103.5 -109.085 -0.305 -v -103.5 -109.198 0.026 -v -103.5 -109.052 -0.293 -v -103.5 -109.182 0.032 -v -103.5 -109.02 -0.28 -v -103.5 -109.166 0.04 -v -103.5 -108.99 -0.264 -v -103.5 -109.15 0.046 -v -103.5 -114.385 1.617 -v -103.5 -114.426 1.617 -v -103.5 -114.31 1.256 -v -118.5 -114.31 1.256 -v -103.5 -114.33 1.26 -v -118.5 -114.33 1.26 -v -103.5 -114.35 1.264 -v -118.5 -114.35 1.264 -v -103.5 -114.372 1.266 -v -118.5 -114.372 1.266 -v -103.5 -114.393 1.267 -v -118.5 -114.393 1.267 -v -103.5 -114.413 1.267 -v -118.5 -114.413 1.267 -v -103.5 -114.434 1.266 -v -118.5 -114.434 1.266 -v -103.5 -114.454 1.263 -v -118.5 -114.454 1.263 -v -103.5 -114.474 1.26 -v -118.5 -114.474 1.26 -v -103.5 -114.495 1.254 -v -118.5 -114.495 1.254 -v -103.5 -114.514 1.248 -v -118.5 -114.514 1.248 -v -103.5 -114.534 1.24 -v -118.5 -114.534 1.24 -v -103.5 -114.552 1.232 -v -118.5 -114.552 1.232 -v -103.5 -114.57 1.223 -v -118.5 -114.57 1.223 -v -103.5 -114.588 1.212 -v -118.5 -114.588 1.212 -v -103.5 -114.605 1.2 -v -118.5 -114.605 1.2 -v -103.5 -114.622 1.188 -v -118.5 -114.622 1.188 -v -103.5 -114.637 1.174 -v -118.5 -114.637 1.174 -v -103.5 -114.652 1.16 -v -118.5 -114.652 1.16 -v -103.5 -114.666 1.145 -v -118.5 -114.666 1.145 -v -118.5 -114.68 1.13 -v -103.5 -114.68 1.13 -v -103.5 -114.69 1.112 -v -118.5 -114.69 1.112 -v -103.5 -114.702 1.094 -v -118.5 -114.702 1.094 -v -103.5 -114.712 1.076 -v -118.5 -114.712 1.076 -v -103.5 -114.72 1.058 -v -118.5 -114.72 1.058 -v -103.5 -114.728 1.038 -v -118.5 -114.728 1.038 -v -103.5 -114.735 1.02 -v -118.5 -114.735 1.02 -v -103.5 -114.74 1 -v -118.5 -114.74 1 -v -103.5 -114.745 0.98 -v -118.5 -114.745 0.98 -v -103.5 -114.748 0.958 -v -118.5 -114.748 0.958 -v -103.5 -114.75 0.938 -v -118.5 -114.75 0.938 -v 119.676 -115.725 -4.6 -v 119.85 -115.422 -4.6 -v 119.708 -115.743 -4.6 -v 119.883 -115.44 -4.6 -v 119.915 -115.46 -4.596 -v 119.74 -115.762 -4.596 -v 119.947 -115.477 -4.592 -v 119.772 -115.78 -4.592 -v 119.978 -115.495 -4.586 -v 119.803 -115.798 -4.586 -v 120.01 -115.513 -4.578 -v 119.834 -115.816 -4.578 -v 119.865 -115.834 -4.568 -v 120.04 -115.53 -4.568 -v 120.07 -115.548 -4.556 -v 119.895 -115.85 -4.556 -v 120.1 -115.565 -4.543 -v 119.925 -115.868 -4.543 -v 120.13 -115.582 -4.528 -v 119.954 -115.885 -4.528 -v 120.158 -115.6 -4.51 -v 119.983 -115.902 -4.51 -v 120.01 -115.918 -4.493 -v 120.185 -115.615 -4.493 -v 120.212 -115.63 -4.474 -v 120.037 -115.933 -4.474 -v 120.238 -115.645 -4.452 -v 120.063 -115.948 -4.452 -v 120.263 -115.66 -4.43 -v 120.088 -115.963 -4.43 -v 120.288 -115.674 -4.406 -v 120.113 -115.977 -4.406 -v 120.136 -115.99 -4.38 -v 120.31 -115.687 -4.38 -v 120.158 -116.003 -4.354 -v 120.333 -115.7 -4.354 -v 120.353 -115.712 -4.326 -v 120.178 -116.015 -4.326 -v 120.373 -115.723 -4.297 -v 120.198 -116.026 -4.297 -v 120.39 -115.734 -4.267 -v 120.216 -116.037 -4.267 -v 120.408 -115.744 -4.236 -v 120.233 -116.047 -4.236 -v 120.25 -116.056 -4.204 -v 120.424 -115.753 -4.204 -v 120.438 -115.76 -4.17 -v 120.263 -116.064 -4.17 -v 120.45 -115.768 -4.137 -v 120.276 -116.07 -4.137 -v 120.463 -115.775 -4.103 -v 120.288 -116.078 -4.103 -v 120.473 -115.78 -4.068 -v 120.298 -116.084 -4.068 -v 120.306 -116.09 -4.032 -v 120.48 -115.786 -4.032 -v 120.488 -115.79 -3.996 -v 120.313 -116.093 -3.996 -v 120.494 -115.793 -3.96 -v 120.32 -116.096 -3.96 -v 120.498 -115.795 -3.924 -v 120.323 -116.098 -3.924 -v 120.5 -115.796 -3.887 -v 120.325 -116.1 -3.887 -v 120.326 -116.1 -3.85 -v 120.5 -115.797 -3.85 -v 102.15 -115.422 -4.6 -v 102.324 -115.725 -4.6 -v 102.117 -115.44 -4.6 -v 102.292 -115.743 -4.6 -v 102.26 -115.762 -4.596 -v 102.085 -115.46 -4.596 -v 102.228 -115.78 -4.592 -v 102.053 -115.477 -4.592 -v 102.197 -115.798 -4.586 -v 102.022 -115.495 -4.586 -v 102.166 -115.816 -4.578 -v 101.99 -115.513 -4.578 -v 101.96 -115.53 -4.568 -v 102.135 -115.834 -4.568 -v 102.105 -115.85 -4.556 -v 101.93 -115.548 -4.556 -v 102.075 -115.868 -4.543 -v 101.9 -115.565 -4.543 -v 102.046 -115.885 -4.528 -v 101.87 -115.582 -4.528 -v 102.018 -115.902 -4.51 -v 101.843 -115.6 -4.51 -v 101.815 -115.615 -4.493 -v 101.99 -115.918 -4.493 -v 101.963 -115.933 -4.474 -v 101.788 -115.63 -4.474 -v 101.937 -115.948 -4.452 -v 101.762 -115.645 -4.452 -v 101.912 -115.963 -4.43 -v 101.737 -115.66 -4.43 -v 101.888 -115.977 -4.406 -v 101.713 -115.674 -4.406 -v 101.69 -115.687 -4.38 -v 101.864 -115.99 -4.38 -v 101.667 -115.7 -4.354 -v 101.842 -116.003 -4.354 -v 101.822 -116.015 -4.326 -v 101.647 -115.712 -4.326 -v 101.802 -116.026 -4.297 -v 101.627 -115.723 -4.297 -v 101.784 -116.037 -4.267 -v 101.61 -115.734 -4.267 -v 101.767 -116.047 -4.236 -v 101.592 -115.744 -4.236 -v 101.576 -115.753 -4.204 -v 101.75 -116.056 -4.204 -v 101.737 -116.064 -4.17 -v 101.562 -115.76 -4.17 -v 101.724 -116.07 -4.137 -v 101.55 -115.768 -4.137 -v 101.712 -116.078 -4.103 -v 101.537 -115.775 -4.103 -v 101.702 -116.084 -4.068 -v 101.527 -115.78 -4.068 -v 101.52 -115.786 -4.032 -v 101.694 -116.09 -4.032 -v 101.687 -116.093 -3.996 -v 101.512 -115.79 -3.996 -v 101.68 -116.096 -3.96 -v 101.506 -115.793 -3.96 -v 101.677 -116.098 -3.924 -v 101.502 -115.795 -3.924 -v 101.675 -116.1 -3.887 -v 101.5 -115.796 -3.887 -v 101.5 -115.797 -3.85 -v 101.674 -116.1 -3.85 -v 119.708 -115.743 -4.6 -v 119.74 -115.762 -4.596 -v 119.676 -115.725 -4.6 -v 119.772 -115.78 -4.592 -v 119.803 -115.798 -4.586 -v 119.834 -115.816 -4.578 -v 119.865 -115.834 -4.568 -v 119.895 -115.85 -4.556 -v 119.925 -115.868 -4.543 -v 119.954 -115.885 -4.528 -v 119.983 -115.902 -4.51 -v 120.01 -115.918 -4.493 -v 120.037 -115.933 -4.474 -v 120.063 -115.948 -4.452 -v 120.088 -115.963 -4.43 -v 120.113 -115.977 -4.406 -v 120.136 -115.99 -4.38 -v 120.158 -116.003 -4.354 -v 120.178 -116.015 -4.326 -v 120.198 -116.026 -4.297 -v 120.216 -116.037 -4.267 -v 120.233 -116.047 -4.236 -v 120.25 -116.056 -4.204 -v 120.263 -116.064 -4.17 -v 120.276 -116.07 -4.137 -v 120.288 -116.078 -4.103 -v 120.298 -116.084 -4.068 -v 120.306 -116.09 -4.032 -v 120.313 -116.093 -3.996 -v 120.32 -116.096 -3.96 -v 120.323 -116.098 -3.924 -v 120.325 -116.1 -3.887 -v 120.326 -116.1 -3.85 -v 118.675 -115.147 -4.6 -v 118.675 -115.147 -1.84 -v 120.326 -116.1 -1.84 -v 120.326 -116.1 0.167 -v 120.325 -116.1 0.204 -v 119.676 -115.725 0.917 -v 118.675 -115.147 0.917 -v 120.323 -116.098 0.24 -v 120.32 -116.096 0.277 -v 120.313 -116.093 0.314 -v 120.306 -116.09 0.35 -v 120.298 -116.084 0.385 -v 120.288 -116.078 0.42 -v 120.276 -116.07 0.454 -v 120.263 -116.064 0.488 -v 120.25 -116.056 0.52 -v 120.233 -116.047 0.553 -v 120.216 -116.037 0.584 -v 120.198 -116.026 0.614 -v 120.178 -116.015 0.643 -v 120.158 -116.003 0.67 -v 120.136 -115.99 0.698 -v 120.113 -115.977 0.723 -v 120.088 -115.963 0.747 -v 120.063 -115.948 0.77 -v 120.037 -115.933 0.79 -v 120.01 -115.918 0.81 -v 119.983 -115.902 0.83 -v 119.954 -115.885 0.845 -v 119.925 -115.868 0.86 -v 119.895 -115.85 0.873 -v 119.865 -115.834 0.885 -v 119.834 -115.816 0.895 -v 119.803 -115.798 0.903 -v 119.772 -115.78 0.91 -v 119.74 -115.762 0.914 -v 119.708 -115.743 0.916 -v 118.85 -114.844 -4.6 -v 118.675 -115.147 -4.6 -v 118.655 -115.136 -4.6 -v 103.5 -115.1 -4.6 -v 103.5 -114.75 -4.6 -v 118.5 -115.1 -4.6 -v 118.5 -114.75 -4.6 -v 118.523 -115.1 -4.6 -v 118.546 -114.75 -4.6 -v 118.546 -115.103 -4.6 -v 118.59 -114.756 -4.6 -v 118.568 -115.107 -4.6 -v 118.637 -114.763 -4.6 -v 118.59 -115.112 -4.6 -v 118.68 -114.774 -4.6 -v 118.613 -115.12 -4.6 -v 118.725 -114.787 -4.6 -v 118.634 -115.127 -4.6 -v 118.768 -114.803 -4.6 -v 118.81 -114.822 -4.6 -v 103.477 -115.1 -4.6 -v 103.454 -114.75 -4.6 -v 103.454 -115.103 -4.6 -v 103.41 -114.756 -4.6 -v 103.432 -115.107 -4.6 -v 103.363 -114.763 -4.6 -v 103.41 -115.112 -4.6 -v 103.32 -114.774 -4.6 -v 103.388 -115.12 -4.6 -v 103.275 -114.787 -4.6 -v 103.366 -115.127 -4.6 -v 103.232 -114.803 -4.6 -v 103.345 -115.136 -4.6 -v 103.19 -114.822 -4.6 -v 103.325 -115.147 -4.6 -v 103.15 -114.844 -4.6 -v 102.117 -115.44 -4.6 -v 102.085 -115.46 -4.596 -v 102.15 -115.422 -4.6 -v 102.053 -115.477 -4.592 -v 102.022 -115.495 -4.586 -v 101.99 -115.513 -4.578 -v 101.96 -115.53 -4.568 -v 101.93 -115.548 -4.556 -v 101.9 -115.565 -4.543 -v 101.87 -115.582 -4.528 -v 101.843 -115.6 -4.51 -v 101.815 -115.615 -4.493 -v 101.788 -115.63 -4.474 -v 101.762 -115.645 -4.452 -v 101.737 -115.66 -4.43 -v 101.713 -115.674 -4.406 -v 101.69 -115.687 -4.38 -v 101.667 -115.7 -4.354 -v 101.647 -115.712 -4.326 -v 101.627 -115.723 -4.297 -v 101.61 -115.734 -4.267 -v 101.592 -115.744 -4.236 -v 101.576 -115.753 -4.204 -v 101.562 -115.76 -4.17 -v 101.55 -115.768 -4.137 -v 101.537 -115.775 -4.103 -v 101.527 -115.78 -4.068 -v 101.52 -115.786 -4.032 -v 101.512 -115.79 -3.996 -v 101.506 -115.793 -3.96 -v 101.502 -115.795 -3.924 -v 101.5 -115.796 -3.887 -v 101.5 -115.797 -3.85 -v 103.15 -114.844 -4.6 -v 103.15 -114.844 -1.84 -v 101.5 -115.797 -1.84 -v 101.5 -115.797 0.167 -v 101.5 -115.796 0.204 -v 102.15 -115.422 0.917 -v 103.15 -114.844 0.917 -v 101.502 -115.795 0.24 -v 101.506 -115.793 0.277 -v 101.512 -115.79 0.314 -v 101.52 -115.786 0.35 -v 101.527 -115.78 0.385 -v 101.537 -115.775 0.42 -v 101.55 -115.768 0.454 -v 101.562 -115.76 0.488 -v 101.576 -115.753 0.52 -v 101.592 -115.744 0.553 -v 101.61 -115.734 0.584 -v 101.627 -115.723 0.614 -v 101.647 -115.712 0.643 -v 101.667 -115.7 0.67 -v 101.69 -115.687 0.698 -v 101.713 -115.674 0.723 -v 101.737 -115.66 0.747 -v 101.762 -115.645 0.77 -v 101.788 -115.63 0.79 -v 101.815 -115.615 0.81 -v 101.843 -115.6 0.83 -v 101.87 -115.582 0.845 -v 101.9 -115.565 0.86 -v 101.93 -115.548 0.873 -v 101.96 -115.53 0.885 -v 101.99 -115.513 0.895 -v 102.022 -115.495 0.903 -v 102.053 -115.477 0.91 -v 102.085 -115.46 0.914 -v 102.117 -115.44 0.916 -v 120.326 -116.1 -1.84 -v 120.5 -115.797 -1.84 -v 120.326 -116.1 0.167 -v 120.5 -115.797 0.167 -v 120.5 -115.796 -3.887 -v 119.85 -115.422 -4.6 -v 120.5 -115.797 -3.85 -v 118.85 -114.844 -4.6 -v 118.85 -114.844 -1.84 -v 120.498 -115.795 -3.924 -v 120.494 -115.793 -3.96 -v 120.488 -115.79 -3.996 -v 120.48 -115.786 -4.032 -v 120.473 -115.78 -4.068 -v 120.463 -115.775 -4.103 -v 120.45 -115.768 -4.137 -v 120.438 -115.76 -4.17 -v 120.424 -115.753 -4.204 -v 120.408 -115.744 -4.236 -v 120.39 -115.734 -4.267 -v 120.373 -115.723 -4.297 -v 120.353 -115.712 -4.326 -v 120.333 -115.7 -4.354 -v 120.31 -115.687 -4.38 -v 120.288 -115.674 -4.406 -v 120.263 -115.66 -4.43 -v 120.238 -115.645 -4.452 -v 120.212 -115.63 -4.474 -v 120.185 -115.615 -4.493 -v 120.158 -115.6 -4.51 -v 120.13 -115.582 -4.528 -v 120.1 -115.565 -4.543 -v 120.07 -115.548 -4.556 -v 120.04 -115.53 -4.568 -v 120.01 -115.513 -4.578 -v 119.978 -115.495 -4.586 -v 119.947 -115.477 -4.592 -v 119.915 -115.46 -4.596 -v 119.883 -115.44 -4.6 -v 118.85 -114.844 0.917 -v 120.5 -115.797 0.167 -v 120.5 -115.797 -1.84 -v 119.85 -115.422 0.917 -v 120.5 -115.796 0.204 -v 119.883 -115.44 0.916 -v 119.915 -115.46 0.914 -v 119.947 -115.477 0.91 -v 119.978 -115.495 0.903 -v 120.01 -115.513 0.895 -v 120.04 -115.53 0.885 -v 120.07 -115.548 0.873 -v 120.1 -115.565 0.86 -v 120.13 -115.582 0.845 -v 120.158 -115.6 0.83 -v 120.185 -115.615 0.81 -v 120.212 -115.63 0.79 -v 120.238 -115.645 0.77 -v 120.263 -115.66 0.747 -v 120.288 -115.674 0.723 -v 120.31 -115.687 0.698 -v 120.333 -115.7 0.67 -v 120.353 -115.712 0.643 -v 120.373 -115.723 0.614 -v 120.39 -115.734 0.584 -v 120.408 -115.744 0.553 -v 120.424 -115.753 0.52 -v 120.438 -115.76 0.488 -v 120.45 -115.768 0.454 -v 120.463 -115.775 0.42 -v 120.473 -115.78 0.385 -v 120.48 -115.786 0.35 -v 120.488 -115.79 0.314 -v 120.494 -115.793 0.277 -v 120.498 -115.795 0.24 -v 118.5 -114.75 -4.6 -v 118.5 -114.75 -1.84 -v 118.546 -114.75 -4.6 -v 118.546 -114.75 0.917 -v 118.59 -114.756 0.917 -v 118.5 -114.75 0.917 -v 118.59 -114.756 -4.6 -v 118.637 -114.763 0.917 -v 118.637 -114.763 -4.6 -v 118.68 -114.774 0.917 -v 118.68 -114.774 -4.6 -v 118.725 -114.787 0.917 -v 118.725 -114.787 -4.6 -v 118.768 -114.803 0.917 -v 118.768 -114.803 -4.6 -v 118.81 -114.822 0.917 -v 118.81 -114.822 -4.6 -v 103.5 -114.75 0.917 -v 103.5 -114.75 -1.84 -v 103.5 -114.75 -4.6 -v 103.454 -114.75 0.917 -v 103.454 -114.75 -4.6 -v 103.41 -114.756 -4.6 -v 103.41 -114.756 0.917 -v 103.363 -114.763 -4.6 -v 103.363 -114.763 0.917 -v 103.32 -114.774 -4.6 -v 103.32 -114.774 0.917 -v 103.275 -114.787 -4.6 -v 103.275 -114.787 0.917 -v 103.232 -114.803 -4.6 -v 103.232 -114.803 0.917 -v 103.19 -114.822 -4.6 -v 103.19 -114.822 0.917 -v 101.674 -116.1 -1.84 -v 101.5 -115.797 -1.84 -v 101.674 -116.1 0.167 -v 101.5 -115.797 0.167 -v 101.675 -116.1 -3.887 -v 102.324 -115.725 -4.6 -v 101.674 -116.1 -3.85 -v 103.325 -115.147 -4.6 -v 103.325 -115.147 -1.84 -v 101.677 -116.098 -3.924 -v 101.68 -116.096 -3.96 -v 101.687 -116.093 -3.996 -v 101.694 -116.09 -4.032 -v 101.702 -116.084 -4.068 -v 101.712 -116.078 -4.103 -v 101.724 -116.07 -4.137 -v 101.737 -116.064 -4.17 -v 101.75 -116.056 -4.204 -v 101.767 -116.047 -4.236 -v 101.784 -116.037 -4.267 -v 101.802 -116.026 -4.297 -v 101.822 -116.015 -4.326 -v 101.842 -116.003 -4.354 -v 101.864 -115.99 -4.38 -v 101.888 -115.977 -4.406 -v 101.912 -115.963 -4.43 -v 101.937 -115.948 -4.452 -v 101.963 -115.933 -4.474 -v 101.99 -115.918 -4.493 -v 102.018 -115.902 -4.51 -v 102.046 -115.885 -4.528 -v 102.075 -115.868 -4.543 -v 102.105 -115.85 -4.556 -v 102.135 -115.834 -4.568 -v 102.166 -115.816 -4.578 -v 102.197 -115.798 -4.586 -v 102.228 -115.78 -4.592 -v 102.26 -115.762 -4.596 -v 102.292 -115.743 -4.6 -v 103.325 -115.147 0.917 -v 101.674 -116.1 0.167 -v 101.674 -116.1 -1.84 -v 102.324 -115.725 0.917 -v 101.675 -116.1 0.204 -v 102.292 -115.743 0.916 -v 102.26 -115.762 0.914 -v 102.228 -115.78 0.91 -v 102.197 -115.798 0.903 -v 102.166 -115.816 0.895 -v 102.135 -115.834 0.885 -v 102.105 -115.85 0.873 -v 102.075 -115.868 0.86 -v 102.046 -115.885 0.845 -v 102.018 -115.902 0.83 -v 101.99 -115.918 0.81 -v 101.963 -115.933 0.79 -v 101.937 -115.948 0.77 -v 101.912 -115.963 0.747 -v 101.888 -115.977 0.723 -v 101.864 -115.99 0.698 -v 101.842 -116.003 0.67 -v 101.822 -116.015 0.643 -v 101.802 -116.026 0.614 -v 101.784 -116.037 0.584 -v 101.767 -116.047 0.553 -v 101.75 -116.056 0.52 -v 101.737 -116.064 0.488 -v 101.724 -116.07 0.454 -v 101.712 -116.078 0.42 -v 101.702 -116.084 0.385 -v 101.694 -116.09 0.35 -v 101.687 -116.093 0.314 -v 101.68 -116.096 0.277 -v 101.677 -116.098 0.24 -v 103.5 -115.1 0.917 -v 103.477 -115.1 0.917 -v 103.5 -115.1 -1.84 -v 103.477 -115.1 -4.6 -v 103.5 -115.1 -4.6 -v 103.454 -115.103 0.917 -v 103.454 -115.103 -4.6 -v 103.432 -115.107 0.917 -v 103.432 -115.107 -4.6 -v 103.41 -115.112 0.917 -v 103.41 -115.112 -4.6 -v 103.388 -115.12 0.917 -v 103.388 -115.12 -4.6 -v 103.366 -115.127 0.917 -v 103.366 -115.127 -4.6 -v 103.345 -115.136 0.917 -v 103.345 -115.136 -4.6 -v 118.5 -115.1 -4.6 -v 118.5 -115.1 -1.84 -v 118.5 -115.1 0.917 -v 118.523 -115.1 0.917 -v 118.523 -115.1 -4.6 -v 118.546 -115.103 -4.6 -v 118.546 -115.103 0.917 -v 118.568 -115.107 -4.6 -v 118.568 -115.107 0.917 -v 118.59 -115.112 -4.6 -v 118.59 -115.112 0.917 -v 118.613 -115.12 -4.6 -v 118.613 -115.12 0.917 -v 118.634 -115.127 -4.6 -v 118.634 -115.127 0.917 -v 118.655 -115.136 -4.6 -v 118.655 -115.136 0.917 -v 104.25 -106.91 1.21 -v 111 -106.91 1.21 -v 104.25 -106.75 0.9 -v 111 -106.75 0.9 -v 117.75 -106.91 1.21 -v 117.75 -106.75 0.9 -v 102.324 -115.725 0.917 -v 102.15 -115.422 0.917 -v 102.292 -115.743 0.916 -v 102.117 -115.44 0.916 -v 102.085 -115.46 0.914 -v 102.26 -115.762 0.914 -v 102.053 -115.477 0.91 -v 102.228 -115.78 0.91 -v 102.022 -115.495 0.903 -v 102.197 -115.798 0.903 -v 101.99 -115.513 0.895 -v 102.166 -115.816 0.895 -v 102.135 -115.834 0.885 -v 101.96 -115.53 0.885 -v 101.93 -115.548 0.873 -v 102.105 -115.85 0.873 -v 101.9 -115.565 0.86 -v 102.075 -115.868 0.86 -v 101.87 -115.582 0.845 -v 102.046 -115.885 0.845 -v 101.843 -115.6 0.83 -v 102.018 -115.902 0.83 -v 101.99 -115.918 0.81 -v 101.815 -115.615 0.81 -v 101.788 -115.63 0.79 -v 101.963 -115.933 0.79 -v 101.762 -115.645 0.77 -v 101.937 -115.948 0.77 -v 101.737 -115.66 0.747 -v 101.912 -115.963 0.747 -v 101.713 -115.674 0.723 -v 101.888 -115.977 0.723 -v 101.864 -115.99 0.698 -v 101.69 -115.687 0.698 -v 101.842 -116.003 0.67 -v 101.667 -115.7 0.67 -v 101.647 -115.712 0.643 -v 101.822 -116.015 0.643 -v 101.627 -115.723 0.614 -v 101.802 -116.026 0.614 -v 101.61 -115.734 0.584 -v 101.784 -116.037 0.584 -v 101.592 -115.744 0.553 -v 101.767 -116.047 0.553 -v 101.75 -116.056 0.52 -v 101.576 -115.753 0.52 -v 101.562 -115.76 0.488 -v 101.737 -116.064 0.488 -v 101.55 -115.768 0.454 -v 101.724 -116.07 0.454 -v 101.537 -115.775 0.42 -v 101.712 -116.078 0.42 -v 101.527 -115.78 0.385 -v 101.702 -116.084 0.385 -v 101.694 -116.09 0.35 -v 101.52 -115.786 0.35 -v 101.512 -115.79 0.314 -v 101.687 -116.093 0.314 -v 101.506 -115.793 0.277 -v 101.68 -116.096 0.277 -v 101.502 -115.795 0.24 -v 101.677 -116.098 0.24 -v 101.5 -115.796 0.204 -v 101.675 -116.1 0.204 -v 120.325 -116.1 0.204 -v 120.5 -115.796 0.204 -v 120.498 -115.795 0.24 -v 120.323 -116.098 0.24 -v 120.494 -115.793 0.277 -v 120.32 -116.096 0.277 -v 120.488 -115.79 0.314 -v 120.313 -116.093 0.314 -v 120.48 -115.786 0.35 -v 120.306 -116.09 0.35 -v 120.298 -116.084 0.385 -v 120.473 -115.78 0.385 -v 120.463 -115.775 0.42 -v 120.288 -116.078 0.42 -v 120.45 -115.768 0.454 -v 120.276 -116.07 0.454 -v 120.438 -115.76 0.488 -v 120.263 -116.064 0.488 -v 120.424 -115.753 0.52 -v 120.25 -116.056 0.52 -v 120.233 -116.047 0.553 -v 120.408 -115.744 0.553 -v 120.39 -115.734 0.584 -v 120.216 -116.037 0.584 -v 120.373 -115.723 0.614 -v 120.198 -116.026 0.614 -v 120.353 -115.712 0.643 -v 120.178 -116.015 0.643 -v 120.333 -115.7 0.67 -v 120.158 -116.003 0.67 -v 120.136 -115.99 0.698 -v 120.31 -115.687 0.698 -v 120.113 -115.977 0.723 -v 120.288 -115.674 0.723 -v 120.263 -115.66 0.747 -v 120.088 -115.963 0.747 -v 120.238 -115.645 0.77 -v 120.063 -115.948 0.77 -v 120.212 -115.63 0.79 -v 120.037 -115.933 0.79 -v 120.185 -115.615 0.81 -v 120.01 -115.918 0.81 -v 119.983 -115.902 0.83 -v 120.158 -115.6 0.83 -v 120.13 -115.582 0.845 -v 119.954 -115.885 0.845 -v 120.1 -115.565 0.86 -v 119.925 -115.868 0.86 -v 120.07 -115.548 0.873 -v 119.895 -115.85 0.873 -v 120.04 -115.53 0.885 -v 119.865 -115.834 0.885 -v 119.834 -115.816 0.895 -v 120.01 -115.513 0.895 -v 119.978 -115.495 0.903 -v 119.803 -115.798 0.903 -v 119.947 -115.477 0.91 -v 119.772 -115.78 0.91 -v 119.915 -115.46 0.914 -v 119.74 -115.762 0.914 -v 119.883 -115.44 0.916 -v 119.708 -115.743 0.916 -v 119.676 -115.725 0.917 -v 119.85 -115.422 0.917 -v 103.5 -107.415 0.554 -v 103.5 -107.577 0.865 -v 103.5 -107.383 0.57 -v 103.5 -107.544 0.88 -v 103.504 -107.512 0.898 -v 103.504 -107.35 0.588 -v 103.508 -107.48 0.915 -v 103.508 -107.318 0.605 -v 103.514 -107.447 0.932 -v 103.514 -107.286 0.62 -v 103.522 -107.415 0.95 -v 103.522 -107.254 0.638 -v 103.532 -107.222 0.654 -v 103.532 -107.384 0.965 -v 103.544 -107.353 0.98 -v 103.544 -107.19 0.67 -v 103.557 -107.322 0.997 -v 103.557 -107.16 0.686 -v 103.572 -107.292 1.012 -v 103.572 -107.13 0.702 -v 103.59 -107.263 1.028 -v 103.59 -107.102 0.717 -v 103.607 -107.073 0.732 -v 103.607 -107.235 1.042 -v 103.626 -107.207 1.057 -v 103.626 -107.046 0.746 -v 103.648 -107.18 1.07 -v 103.648 -107.02 0.76 -v 103.67 -107.155 1.084 -v 103.67 -106.993 0.774 -v 103.694 -107.13 1.097 -v 103.694 -106.97 0.786 -v 103.72 -106.945 0.8 -v 103.72 -107.106 1.11 -v 103.746 -106.922 0.81 -v 103.746 -107.084 1.12 -v 103.774 -107.063 1.132 -v 103.774 -106.9 0.82 -v 103.803 -107.042 1.142 -v 103.803 -106.88 0.832 -v 103.833 -107.024 1.152 -v 103.833 -106.862 0.842 -v 103.864 -107.006 1.16 -v 103.864 -106.845 0.85 -v 103.896 -106.83 0.86 -v 103.896 -106.99 1.17 -v 103.93 -106.975 1.177 -v 103.93 -106.814 0.867 -v 103.963 -106.962 1.184 -v 103.963 -106.8 0.874 -v 103.997 -106.95 1.19 -v 103.997 -106.79 0.88 -v 104.032 -106.94 1.196 -v 104.032 -106.78 0.885 -v 104.068 -106.77 0.89 -v 104.068 -106.93 1.2 -v 104.104 -106.924 1.204 -v 104.104 -106.763 0.893 -v 104.14 -106.92 1.207 -v 104.14 -106.757 0.896 -v 104.176 -106.915 1.21 -v 104.176 -106.753 0.898 -v 104.213 -106.912 1.21 -v 104.213 -106.75 0.9 -v 118.5 -114.182 1.582 -v 103.5 -114.182 1.582 -v 118.5 -114.222 1.594 -v 103.5 -114.222 1.594 -v 103.5 -114.262 1.603 -v 118.5 -114.262 1.603 -v 103.5 -114.303 1.61 -v 118.5 -114.303 1.61 -v 103.5 -114.344 1.615 -v 118.5 -114.344 1.615 -v 103.5 -114.385 1.617 -v 118.5 -114.385 1.617 -v 103.5 -114.426 1.617 -v 118.5 -114.426 1.617 -v 103.5 -114.467 1.614 -v 118.5 -114.467 1.614 -v 103.5 -114.508 1.61 -v 118.5 -114.508 1.61 -v 103.5 -114.55 1.6 -v 118.5 -114.55 1.6 -v 103.5 -114.59 1.59 -v 118.5 -114.59 1.59 -v 103.5 -114.628 1.58 -v 118.5 -114.628 1.58 -v 103.5 -114.667 1.564 -v 118.5 -114.667 1.564 -v 103.5 -114.705 1.547 -v 118.5 -114.705 1.547 -v 103.5 -114.74 1.528 -v 118.5 -114.74 1.528 -v 103.5 -114.777 1.507 -v 118.5 -114.777 1.507 -v 103.5 -114.81 1.484 -v 118.5 -114.81 1.484 -v 103.5 -114.844 1.46 -v 118.5 -114.844 1.46 -v 103.5 -114.875 1.432 -v 118.5 -114.875 1.432 -v 103.5 -114.904 1.403 -v 118.5 -114.904 1.403 -v 103.5 -114.932 1.372 -v 118.5 -114.932 1.372 -v 103.5 -114.958 1.34 -v 118.5 -114.958 1.34 -v 103.5 -114.982 1.306 -v 118.5 -114.982 1.306 -v 103.5 -115.004 1.272 -v 118.5 -115.004 1.272 -v 103.5 -115.024 1.235 -v 118.5 -115.024 1.235 -v 103.5 -115.04 1.198 -v 118.5 -115.04 1.198 -v 103.5 -115.057 1.16 -v 118.5 -115.057 1.16 -v 103.5 -115.07 1.12 -v 118.5 -115.07 1.12 -v 103.5 -115.08 1.08 -v 118.5 -115.08 1.08 -v 103.5 -115.09 1.04 -v 118.5 -115.09 1.04 -v 103.5 -115.095 1 -v 118.5 -115.095 1 -v 103.5 -115.1 0.958 -v 118.5 -115.1 0.958 -v 103.5 -109.42 0.024 -v 111 -109.42 0.024 -v 118.5 -109.42 0.024 -v 103.5 -109.15 0.046 -v 103.5 -109.166 0.04 -v 111 -109.15 0.046 -v 118.5 -109.166 0.04 -v 118.5 -109.15 0.046 -v 118.5 -109.182 0.032 -v 103.5 -109.182 0.032 -v 103.5 -109.198 0.026 -v 118.5 -109.198 0.026 -v 103.5 -109.215 0.02 -v 118.5 -109.215 0.02 -v 103.5 -109.232 0.016 -v 118.5 -109.232 0.016 -v 103.5 -109.25 0.013 -v 118.5 -109.25 0.013 -v 118.5 -109.266 0.01 -v 103.5 -109.266 0.01 -v 103.5 -109.283 0.008 -v 118.5 -109.283 0.008 -v 103.5 -109.3 0.007 -v 118.5 -109.3 0.007 -v 118.5 -109.318 0.007 -v 103.5 -109.318 0.007 -v 103.5 -109.336 0.008 -v 118.5 -109.336 0.008 -v 118.5 -109.353 0.01 -v 103.5 -109.353 0.01 -v 103.5 -109.37 0.012 -v 118.5 -109.37 0.012 -v 103.5 -109.387 0.015 -v 118.5 -109.387 0.015 -v 103.5 -109.404 0.02 -v 118.5 -109.404 0.02 -v 103.5 -107.577 0.865 -v 104.25 -106.91 1.21 -v 111 -106.91 1.21 -v 117.75 -106.91 1.21 -v 118.5 -107.577 0.865 -v 118.5 -107.544 0.88 -v 118.496 -107.512 0.898 -v 118.492 -107.48 0.915 -v 118.486 -107.447 0.932 -v 118.478 -107.415 0.95 -v 118.468 -107.384 0.965 -v 118.456 -107.353 0.98 -v 118.443 -107.322 0.997 -v 118.428 -107.292 1.012 -v 118.41 -107.263 1.028 -v 118.393 -107.235 1.042 -v 118.374 -107.207 1.057 -v 118.352 -107.18 1.07 -v 118.33 -107.155 1.084 -v 118.306 -107.13 1.097 -v 118.28 -107.106 1.11 -v 118.254 -107.084 1.12 -v 118.226 -107.063 1.132 -v 118.197 -107.042 1.142 -v 118.167 -107.024 1.152 -v 118.136 -107.006 1.16 -v 118.104 -106.99 1.17 -v 118.07 -106.975 1.177 -v 118.037 -106.962 1.184 -v 118.003 -106.95 1.19 -v 117.968 -106.94 1.196 -v 117.932 -106.93 1.2 -v 117.896 -106.924 1.204 -v 117.86 -106.92 1.207 -v 117.824 -106.915 1.21 -v 117.787 -106.912 1.21 -v 104.213 -106.912 1.21 -v 104.176 -106.915 1.21 -v 104.14 -106.92 1.207 -v 104.104 -106.924 1.204 -v 104.068 -106.93 1.2 -v 104.032 -106.94 1.196 -v 103.997 -106.95 1.19 -v 103.963 -106.962 1.184 -v 103.93 -106.975 1.177 -v 103.896 -106.99 1.17 -v 103.864 -107.006 1.16 -v 103.833 -107.024 1.152 -v 103.803 -107.042 1.142 -v 103.774 -107.063 1.132 -v 103.746 -107.084 1.12 -v 103.72 -107.106 1.11 -v 103.694 -107.13 1.097 -v 103.67 -107.155 1.084 -v 103.648 -107.18 1.07 -v 103.626 -107.207 1.057 -v 103.607 -107.235 1.042 -v 103.59 -107.263 1.028 -v 103.572 -107.292 1.012 -v 103.557 -107.322 0.997 -v 103.544 -107.353 0.98 -v 103.532 -107.384 0.965 -v 103.522 -107.415 0.95 -v 103.514 -107.447 0.932 -v 103.508 -107.48 0.915 -v 103.504 -107.512 0.898 -v 103.5 -107.544 0.88 -v 117.787 -106.75 0.9 -v 117.787 -106.912 1.21 -v 117.824 -106.915 1.21 -v 117.824 -106.753 0.898 -v 117.86 -106.92 1.207 -v 117.86 -106.757 0.896 -v 117.896 -106.924 1.204 -v 117.896 -106.763 0.893 -v 117.932 -106.93 1.2 -v 117.932 -106.77 0.89 -v 117.968 -106.78 0.885 -v 117.968 -106.94 1.196 -v 118.003 -106.95 1.19 -v 118.003 -106.79 0.88 -v 118.037 -106.962 1.184 -v 118.037 -106.8 0.874 -v 118.07 -106.975 1.177 -v 118.07 -106.814 0.867 -v 118.104 -106.99 1.17 -v 118.104 -106.83 0.86 -v 118.136 -106.845 0.85 -v 118.136 -107.006 1.16 -v 118.167 -107.024 1.152 -v 118.167 -106.862 0.842 -v 118.197 -107.042 1.142 -v 118.197 -106.88 0.832 -v 118.226 -107.063 1.132 -v 118.226 -106.9 0.82 -v 118.254 -107.084 1.12 -v 118.254 -106.922 0.81 -v 118.28 -106.945 0.8 -v 118.28 -107.106 1.11 -v 118.306 -106.97 0.786 -v 118.306 -107.13 1.097 -v 118.33 -107.155 1.084 -v 118.33 -106.993 0.774 -v 118.352 -107.18 1.07 -v 118.352 -107.02 0.76 -v 118.374 -107.207 1.057 -v 118.374 -107.046 0.746 -v 118.393 -107.235 1.042 -v 118.393 -107.073 0.732 -v 118.41 -107.102 0.717 -v 118.41 -107.263 1.028 -v 118.428 -107.292 1.012 -v 118.428 -107.13 0.702 -v 118.443 -107.322 0.997 -v 118.443 -107.16 0.686 -v 118.456 -107.353 0.98 -v 118.456 -107.19 0.67 -v 118.468 -107.384 0.965 -v 118.468 -107.222 0.654 -v 118.478 -107.254 0.638 -v 118.478 -107.415 0.95 -v 118.486 -107.447 0.932 -v 118.486 -107.286 0.62 -v 118.492 -107.48 0.915 -v 118.492 -107.318 0.605 -v 118.496 -107.512 0.898 -v 118.496 -107.35 0.588 -v 118.5 -107.544 0.88 -v 118.5 -107.383 0.57 -v 118.5 -107.415 0.554 -v 118.5 -107.577 0.865 -v 118.5 -107.383 0.57 -v 118.5 -107.415 0.554 -v 117.75 -106.75 0.9 -v 118.5 -108.99 -0.264 -v 111 -106.75 0.9 -v 103.5 -108.99 -0.264 -v 104.25 -106.75 0.9 -v 103.5 -107.415 0.554 -v 103.5 -107.383 0.57 -v 117.787 -106.75 0.9 -v 117.824 -106.753 0.898 -v 117.86 -106.757 0.896 -v 117.896 -106.763 0.893 -v 117.932 -106.77 0.89 -v 117.968 -106.78 0.885 -v 118.003 -106.79 0.88 -v 118.037 -106.8 0.874 -v 118.07 -106.814 0.867 -v 118.104 -106.83 0.86 -v 118.136 -106.845 0.85 -v 118.167 -106.862 0.842 -v 118.197 -106.88 0.832 -v 118.226 -106.9 0.82 -v 118.254 -106.922 0.81 -v 118.28 -106.945 0.8 -v 118.306 -106.97 0.786 -v 118.33 -106.993 0.774 -v 118.352 -107.02 0.76 -v 118.374 -107.046 0.746 -v 118.393 -107.073 0.732 -v 118.41 -107.102 0.717 -v 118.428 -107.13 0.702 -v 118.443 -107.16 0.686 -v 118.456 -107.19 0.67 -v 118.468 -107.222 0.654 -v 118.478 -107.254 0.638 -v 118.486 -107.286 0.62 -v 118.492 -107.318 0.605 -v 118.496 -107.35 0.588 -v 103.504 -107.35 0.588 -v 103.508 -107.318 0.605 -v 103.514 -107.286 0.62 -v 103.522 -107.254 0.638 -v 103.532 -107.222 0.654 -v 103.544 -107.19 0.67 -v 103.557 -107.16 0.686 -v 103.572 -107.13 0.702 -v 103.59 -107.102 0.717 -v 103.607 -107.073 0.732 -v 103.626 -107.046 0.746 -v 103.648 -107.02 0.76 -v 103.67 -106.993 0.774 -v 103.694 -106.97 0.786 -v 103.72 -106.945 0.8 -v 103.746 -106.922 0.81 -v 103.774 -106.9 0.82 -v 103.803 -106.88 0.832 -v 103.833 -106.862 0.842 -v 103.864 -106.845 0.85 -v 103.896 -106.83 0.86 -v 103.93 -106.814 0.867 -v 103.963 -106.8 0.874 -v 103.997 -106.79 0.88 -v 104.032 -106.78 0.885 -v 104.068 -106.77 0.89 -v 104.104 -106.763 0.893 -v 104.14 -106.757 0.896 -v 104.176 -106.753 0.898 -v 104.213 -106.75 0.9 -v 118.5 -109.02 -0.28 -v 103.5 -109.02 -0.28 -v 103.5 -109.052 -0.293 -v 118.5 -109.052 -0.293 -v 118.5 -109.085 -0.305 -v 103.5 -109.085 -0.305 -v 118.5 -109.118 -0.316 -v 103.5 -109.118 -0.316 -v 118.5 -109.152 -0.325 -v 103.5 -109.152 -0.325 -v 118.5 -109.186 -0.332 -v 103.5 -109.186 -0.332 -v 103.5 -109.22 -0.337 -v 118.5 -109.22 -0.337 -v 118.5 -109.255 -0.34 -v 103.5 -109.255 -0.34 -v 118.5 -109.29 -0.343 -v 103.5 -109.29 -0.343 -v 103.5 -109.324 -0.343 -v 118.5 -109.324 -0.343 -v 118.5 -109.36 -0.342 -v 103.5 -109.36 -0.342 -v 103.5 -109.394 -0.338 -v 118.5 -109.394 -0.338 -v 118.5 -109.428 -0.333 -v 103.5 -109.428 -0.333 -v 118.5 -109.462 -0.327 -v 103.5 -109.462 -0.327 -v 118.5 -109.496 -0.318 -v 103.5 -109.496 -0.318 -v 118.5 -109.53 -0.308 -v 103.5 -109.53 -0.308 -v 103.325 -115.147 0.917 -v 103.15 -114.844 0.917 -v 103.345 -115.136 0.917 -v 103.19 -114.822 0.917 -v 103.366 -115.127 0.917 -v 103.232 -114.803 0.917 -v 103.388 -115.12 0.917 -v 103.275 -114.787 0.917 -v 103.41 -115.112 0.917 -v 103.32 -114.774 0.917 -v 103.432 -115.107 0.917 -v 103.363 -114.763 0.917 -v 103.454 -115.103 0.917 -v 103.41 -114.756 0.917 -v 103.477 -115.1 0.917 -v 103.454 -114.75 0.917 -v 103.5 -115.1 0.917 -v 103.5 -114.75 0.917 -v 118.5 -114.75 0.917 -v 118.5 -115.1 0.917 -v 118.546 -114.75 0.917 -v 118.523 -115.1 0.917 -v 118.546 -115.103 0.917 -v 118.59 -114.756 0.917 -v 118.568 -115.107 0.917 -v 118.637 -114.763 0.917 -v 118.59 -115.112 0.917 -v 118.68 -114.774 0.917 -v 118.613 -115.12 0.917 -v 118.725 -114.787 0.917 -v 118.634 -115.127 0.917 -v 118.768 -114.803 0.917 -v 118.655 -115.136 0.917 -v 118.81 -114.822 0.917 -v 118.85 -114.844 0.917 -v 118.675 -115.147 0.917 -v 118.5 -114.29 1.25 -v 103.5 -114.29 1.25 -v 103.5 -114.392 1.267 -v 103.5 -114.385 1.617 -v 103.5 -114.372 1.266 -v 103.5 -114.344 1.615 -v 103.5 -114.35 1.264 -v 103.5 -114.303 1.61 -v 103.5 -114.33 1.26 -v 103.5 -114.262 1.603 -v 103.5 -114.31 1.256 -v 103.5 -114.222 1.594 -v 103.5 -114.29 1.25 -v 103.5 -114.182 1.582 -v 103.5 -109.53 -0.308 -v 103.5 -109.42 0.024 -v 103.5 -109.496 -0.318 -v 103.5 -109.404 0.02 -v 103.5 -109.462 -0.327 -v 103.5 -109.387 0.015 -v 103.5 -109.428 -0.333 -v 103.5 -109.37 0.012 -v 103.5 -109.394 -0.338 -v 103.5 -109.353 0.01 -v 103.5 -109.36 -0.342 -v 103.5 -109.336 0.008 -v 103.5 -109.324 -0.343 -v 103.5 -109.318 0.007 -v 103.5 -109.29 -0.343 -v 103.5 -109.3 0.007 -v 103.5 -109.283 0.008 -v 103.5 -114.413 1.267 -v 103.5 -114.426 1.617 -v 103.5 -114.434 1.266 -v 103.5 -114.467 1.614 -v 103.5 -114.454 1.263 -v 103.5 -114.508 1.61 -v 103.5 -114.474 1.26 -v 103.5 -114.55 1.6 -v 103.5 -114.494 1.254 -v 103.5 -114.59 1.59 -v 103.5 -114.514 1.248 -v 103.5 -114.628 1.58 -v 103.5 -114.534 1.24 -v 103.5 -114.667 1.564 -v 103.5 -114.552 1.232 -v 103.5 -114.705 1.547 -v 103.5 -114.57 1.223 -v 103.5 -114.74 1.528 -v 103.5 -114.588 1.212 -v 103.5 -114.777 1.507 -v 103.5 -114.605 1.2 -v 103.5 -114.81 1.484 -v 103.5 -114.622 1.188 -v 103.5 -114.844 1.46 -v 103.5 -114.637 1.174 -v 103.5 -114.875 1.432 -v 103.5 -114.652 1.16 -v 103.5 -114.904 1.403 -v 103.5 -114.666 1.145 -v 103.5 -114.932 1.372 -v 103.5 -114.68 1.13 -v 103.5 -114.958 1.34 -v 103.5 -114.69 1.112 -v 103.5 -114.982 1.306 -v 103.5 -114.702 1.094 -v 103.5 -115.004 1.272 -v 103.5 -114.712 1.076 -v 103.5 -115.024 1.235 -v 103.5 -114.72 1.058 -v 103.5 -115.04 1.198 -v 103.5 -114.728 1.038 -v 103.5 -115.057 1.16 -v 103.5 -114.735 1.02 -v 103.5 -115.07 1.12 -v 103.5 -114.74 1 -v 103.5 -115.08 1.08 -v 103.5 -114.745 0.98 -v 103.5 -115.09 1.04 -v 103.5 -114.748 0.958 -v 103.5 -115.095 1 -v 103.5 -114.75 0.938 -v 103.5 -115.1 0.958 -v 103.5 -114.75 0.917 -v 103.5 -115.1 0.917 -v 103.5 -109.255 -0.34 -v 103.5 -109.266 0.01 -v 103.5 -109.22 -0.337 -v 103.5 -109.25 0.013 -v 103.5 -109.186 -0.332 -v 103.5 -109.232 0.016 -v 103.5 -109.152 -0.325 -v 103.5 -109.215 0.02 -v 103.5 -109.118 -0.316 -v 103.5 -109.198 0.026 -v 103.5 -109.085 -0.305 -v 103.5 -109.182 0.032 -v 103.5 -109.052 -0.293 -v 103.5 -109.166 0.04 -v 103.5 -109.02 -0.28 -v 103.5 -109.15 0.046 -v 103.5 -108.99 -0.264 -v 118.5 -115.1 0.917 -v 118.5 -114.75 0.917 -v 118.5 -115.1 0.958 -v 118.5 -114.75 0.938 -v 118.5 -114.748 0.958 -v 118.5 -115.095 1 -v 118.5 -114.745 0.98 -v 118.5 -115.09 1.04 -v 118.5 -114.74 1 -v 118.5 -115.08 1.08 -v 118.5 -114.735 1.02 -v 118.5 -115.07 1.12 -v 118.5 -114.728 1.038 -v 118.5 -115.057 1.16 -v 118.5 -114.72 1.058 -v 118.5 -115.04 1.198 -v 118.5 -114.712 1.076 -v 118.5 -115.024 1.235 -v 118.5 -114.702 1.094 -v 118.5 -115.004 1.272 -v 118.5 -114.69 1.112 -v 118.5 -114.982 1.306 -v 118.5 -114.68 1.13 -v 118.5 -114.958 1.34 -v 118.5 -114.666 1.145 -v 118.5 -114.932 1.372 -v 118.5 -114.652 1.16 -v 118.5 -114.904 1.403 -v 118.5 -114.637 1.174 -v 118.5 -114.875 1.432 -v 118.5 -114.622 1.188 -v 118.5 -114.844 1.46 -v 118.5 -114.605 1.2 -v 118.5 -114.81 1.484 -v 118.5 -114.588 1.212 -v 118.5 -114.777 1.507 -v 118.5 -114.57 1.223 -v 118.5 -114.74 1.528 -v 118.5 -114.552 1.232 -v 118.5 -114.705 1.547 -v 118.5 -114.534 1.24 -v 118.5 -114.667 1.564 -v 118.5 -114.514 1.248 -v 118.5 -114.628 1.58 -v 118.5 -114.494 1.254 -v 118.5 -114.59 1.59 -v 118.5 -114.474 1.26 -v 118.5 -114.55 1.6 -v 118.5 -114.454 1.263 -v 118.5 -114.508 1.61 -v 118.5 -114.434 1.266 -v 118.5 -114.467 1.614 -v 118.5 -114.413 1.267 -v 118.5 -114.392 1.267 -v 118.5 -114.344 1.615 -v 118.5 -114.372 1.266 -v 118.5 -114.303 1.61 -v 118.5 -114.35 1.264 -v 118.5 -114.262 1.603 -v 118.5 -114.33 1.26 -v 118.5 -114.222 1.594 -v 118.5 -114.31 1.256 -v 118.5 -114.182 1.582 -v 118.5 -114.29 1.25 -v 118.5 -109.42 0.024 -v 118.5 -109.53 -0.308 -v 118.5 -109.496 -0.318 -v 118.5 -109.404 0.02 -v 118.5 -109.462 -0.327 -v 118.5 -109.387 0.015 -v 118.5 -109.428 -0.333 -v 118.5 -109.37 0.012 -v 118.5 -109.394 -0.338 -v 118.5 -109.353 0.01 -v 118.5 -109.36 -0.342 -v 118.5 -109.336 0.008 -v 118.5 -109.324 -0.343 -v 118.5 -109.318 0.007 -v 118.5 -109.29 -0.343 -v 118.5 -109.3 0.007 -v 118.5 -109.255 -0.34 -v 118.5 -109.283 0.008 -v 118.5 -109.22 -0.337 -v 118.5 -109.266 0.01 -v 118.5 -109.186 -0.332 -v 118.5 -109.25 0.013 -v 118.5 -109.152 -0.325 -v 118.5 -109.232 0.016 -v 118.5 -109.118 -0.316 -v 118.5 -109.215 0.02 -v 118.5 -109.085 -0.305 -v 118.5 -109.198 0.026 -v 118.5 -109.052 -0.293 -v 118.5 -109.182 0.032 -v 118.5 -109.02 -0.28 -v 118.5 -109.166 0.04 -v 118.5 -108.99 -0.264 -v 118.5 -109.15 0.046 -v 118.5 -114.385 1.617 -v 118.5 -114.426 1.617 -v 103.5 -114.31 1.256 -v 118.5 -114.31 1.256 -v 118.5 -114.33 1.26 -v 103.5 -114.33 1.26 -v 118.5 -114.35 1.264 -v 103.5 -114.35 1.264 -v 118.5 -114.372 1.266 -v 103.5 -114.372 1.266 -v 118.5 -114.392 1.267 -v 103.5 -114.392 1.267 -v 118.5 -114.413 1.267 -v 103.5 -114.413 1.267 -v 118.5 -114.434 1.266 -v 103.5 -114.434 1.266 -v 118.5 -114.454 1.263 -v 103.5 -114.454 1.263 -v 118.5 -114.474 1.26 -v 103.5 -114.474 1.26 -v 118.5 -114.494 1.254 -v 103.5 -114.494 1.254 -v 118.5 -114.514 1.248 -v 103.5 -114.514 1.248 -v 118.5 -114.534 1.24 -v 103.5 -114.534 1.24 -v 118.5 -114.552 1.232 -v 103.5 -114.552 1.232 -v 118.5 -114.57 1.223 -v 103.5 -114.57 1.223 -v 118.5 -114.588 1.212 -v 103.5 -114.588 1.212 -v 118.5 -114.605 1.2 -v 103.5 -114.605 1.2 -v 118.5 -114.622 1.188 -v 103.5 -114.622 1.188 -v 118.5 -114.637 1.174 -v 103.5 -114.637 1.174 -v 118.5 -114.652 1.16 -v 103.5 -114.652 1.16 -v 118.5 -114.666 1.145 -v 103.5 -114.666 1.145 -v 118.5 -114.68 1.13 -v 103.5 -114.68 1.13 -v 118.5 -114.69 1.112 -v 103.5 -114.69 1.112 -v 118.5 -114.702 1.094 -v 103.5 -114.702 1.094 -v 118.5 -114.712 1.076 -v 103.5 -114.712 1.076 -v 118.5 -114.72 1.058 -v 103.5 -114.72 1.058 -v 118.5 -114.728 1.038 -v 103.5 -114.728 1.038 -v 118.5 -114.735 1.02 -v 103.5 -114.735 1.02 -v 118.5 -114.74 1 -v 103.5 -114.74 1 -v 118.5 -114.745 0.98 -v 103.5 -114.745 0.98 -v 118.5 -114.748 0.958 -v 103.5 -114.748 0.958 -v 118.5 -114.75 0.938 -v 103.5 -114.75 0.938 -v -119.676 115.225 -4.6 -v -119.85 114.922 -4.6 -v -119.708 115.243 -4.6 -v -119.883 114.94 -4.6 -v -119.915 114.96 -4.596 -v -119.74 115.262 -4.596 -v -119.947 114.977 -4.592 -v -119.772 115.28 -4.592 -v -119.978 114.995 -4.586 -v -119.803 115.298 -4.586 -v -120.01 115.013 -4.578 -v -119.834 115.316 -4.578 -v -119.865 115.334 -4.568 -v -120.04 115.03 -4.568 -v -120.07 115.048 -4.556 -v -119.895 115.35 -4.556 -v -120.1 115.065 -4.543 -v -119.925 115.368 -4.543 -v -120.13 115.082 -4.528 -v -119.954 115.385 -4.528 -v -120.158 115.1 -4.51 -v -119.983 115.402 -4.51 -v -120.01 115.418 -4.493 -v -120.185 115.115 -4.493 -v -120.212 115.13 -4.474 -v -120.037 115.433 -4.474 -v -120.238 115.145 -4.452 -v -120.063 115.448 -4.452 -v -120.263 115.16 -4.43 -v -120.088 115.463 -4.43 -v -120.288 115.174 -4.406 -v -120.113 115.477 -4.406 -v -120.136 115.49 -4.38 -v -120.31 115.187 -4.38 -v -120.158 115.503 -4.354 -v -120.333 115.2 -4.354 -v -120.353 115.212 -4.326 -v -120.178 115.515 -4.326 -v -120.373 115.223 -4.297 -v -120.198 115.526 -4.297 -v -120.39 115.234 -4.267 -v -120.216 115.537 -4.267 -v -120.408 115.244 -4.236 -v -120.233 115.547 -4.236 -v -120.25 115.556 -4.204 -v -120.424 115.253 -4.204 -v -120.438 115.26 -4.17 -v -120.263 115.564 -4.17 -v -120.45 115.268 -4.137 -v -120.276 115.57 -4.137 -v -120.463 115.275 -4.103 -v -120.288 115.578 -4.103 -v -120.473 115.28 -4.068 -v -120.298 115.584 -4.068 -v -120.306 115.59 -4.032 -v -120.48 115.286 -4.032 -v -120.488 115.29 -3.996 -v -120.313 115.593 -3.996 -v -120.494 115.293 -3.96 -v -120.32 115.596 -3.96 -v -120.498 115.295 -3.924 -v -120.323 115.598 -3.924 -v -120.5 115.296 -3.887 -v -120.325 115.6 -3.887 -v -120.326 115.6 -3.85 -v -120.5 115.297 -3.85 -v -102.15 114.922 -4.6 -v -102.324 115.225 -4.6 -v -102.117 114.94 -4.6 -v -102.292 115.243 -4.6 -v -102.26 115.262 -4.596 -v -102.085 114.96 -4.596 -v -102.228 115.28 -4.592 -v -102.053 114.977 -4.592 -v -102.197 115.298 -4.586 -v -102.022 114.995 -4.586 -v -102.166 115.316 -4.578 -v -101.99 115.013 -4.578 -v -101.96 115.03 -4.568 -v -102.135 115.334 -4.568 -v -102.105 115.35 -4.556 -v -101.93 115.048 -4.556 -v -102.075 115.368 -4.543 -v -101.9 115.065 -4.543 -v -102.046 115.385 -4.528 -v -101.87 115.082 -4.528 -v -102.018 115.402 -4.51 -v -101.843 115.1 -4.51 -v -101.815 115.115 -4.493 -v -101.99 115.418 -4.493 -v -101.963 115.433 -4.474 -v -101.788 115.13 -4.474 -v -101.937 115.448 -4.452 -v -101.762 115.145 -4.452 -v -101.912 115.463 -4.43 -v -101.737 115.16 -4.43 -v -101.888 115.477 -4.406 -v -101.713 115.174 -4.406 -v -101.69 115.187 -4.38 -v -101.864 115.49 -4.38 -v -101.667 115.2 -4.354 -v -101.842 115.503 -4.354 -v -101.822 115.515 -4.326 -v -101.647 115.212 -4.326 -v -101.802 115.526 -4.297 -v -101.627 115.223 -4.297 -v -101.784 115.537 -4.267 -v -101.61 115.234 -4.267 -v -101.767 115.547 -4.236 -v -101.592 115.244 -4.236 -v -101.576 115.253 -4.204 -v -101.75 115.556 -4.204 -v -101.737 115.564 -4.17 -v -101.562 115.26 -4.17 -v -101.724 115.57 -4.137 -v -101.55 115.268 -4.137 -v -101.712 115.578 -4.103 -v -101.537 115.275 -4.103 -v -101.702 115.584 -4.068 -v -101.527 115.28 -4.068 -v -101.52 115.286 -4.032 -v -101.694 115.59 -4.032 -v -101.687 115.593 -3.996 -v -101.512 115.29 -3.996 -v -101.68 115.596 -3.96 -v -101.506 115.293 -3.96 -v -101.677 115.598 -3.924 -v -101.502 115.295 -3.924 -v -101.675 115.6 -3.887 -v -101.5 115.296 -3.887 -v -101.5 115.297 -3.85 -v -101.674 115.6 -3.85 -v -119.708 115.243 -4.6 -v -119.74 115.262 -4.596 -v -119.676 115.225 -4.6 -v -119.772 115.28 -4.592 -v -119.803 115.298 -4.586 -v -119.834 115.316 -4.578 -v -119.865 115.334 -4.568 -v -119.895 115.35 -4.556 -v -119.925 115.368 -4.543 -v -119.954 115.385 -4.528 -v -119.983 115.402 -4.51 -v -120.01 115.418 -4.493 -v -120.037 115.433 -4.474 -v -120.063 115.448 -4.452 -v -120.088 115.463 -4.43 -v -120.113 115.477 -4.406 -v -120.136 115.49 -4.38 -v -120.158 115.503 -4.354 -v -120.178 115.515 -4.326 -v -120.198 115.526 -4.297 -v -120.216 115.537 -4.267 -v -120.233 115.547 -4.236 -v -120.25 115.556 -4.204 -v -120.263 115.564 -4.17 -v -120.276 115.57 -4.137 -v -120.288 115.578 -4.103 -v -120.298 115.584 -4.068 -v -120.306 115.59 -4.032 -v -120.313 115.593 -3.996 -v -120.32 115.596 -3.96 -v -120.323 115.598 -3.924 -v -120.325 115.6 -3.887 -v -120.326 115.6 -3.85 -v -118.675 114.647 -4.6 -v -118.675 114.647 -1.84 -v -120.326 115.6 -1.84 -v -120.326 115.6 0.167 -v -120.325 115.6 0.204 -v -119.676 115.225 0.917 -v -118.675 114.647 0.917 -v -120.323 115.598 0.24 -v -120.32 115.596 0.277 -v -120.313 115.593 0.314 -v -120.306 115.59 0.35 -v -120.298 115.584 0.385 -v -120.288 115.578 0.42 -v -120.276 115.57 0.454 -v -120.263 115.564 0.488 -v -120.25 115.556 0.52 -v -120.233 115.547 0.553 -v -120.216 115.537 0.584 -v -120.198 115.526 0.614 -v -120.178 115.515 0.643 -v -120.158 115.503 0.67 -v -120.136 115.49 0.698 -v -120.113 115.477 0.723 -v -120.088 115.463 0.747 -v -120.063 115.448 0.77 -v -120.037 115.433 0.79 -v -120.01 115.418 0.81 -v -119.983 115.402 0.83 -v -119.954 115.385 0.845 -v -119.925 115.368 0.86 -v -119.895 115.35 0.873 -v -119.865 115.334 0.885 -v -119.834 115.316 0.895 -v -119.803 115.298 0.903 -v -119.772 115.28 0.91 -v -119.74 115.262 0.914 -v -119.708 115.243 0.916 -v -118.85 114.344 -4.6 -v -118.675 114.647 -4.6 -v -118.655 114.636 -4.6 -v -103.5 114.6 -4.6 -v -103.5 114.25 -4.6 -v -118.5 114.6 -4.6 -v -118.5 114.25 -4.6 -v -118.523 114.6 -4.6 -v -118.546 114.25 -4.6 -v -118.546 114.603 -4.6 -v -118.59 114.256 -4.6 -v -118.568 114.607 -4.6 -v -118.637 114.263 -4.6 -v -118.59 114.612 -4.6 -v -118.68 114.274 -4.6 -v -118.613 114.62 -4.6 -v -118.725 114.287 -4.6 -v -118.634 114.627 -4.6 -v -118.768 114.303 -4.6 -v -118.81 114.322 -4.6 -v -103.477 114.6 -4.6 -v -103.454 114.25 -4.6 -v -103.454 114.603 -4.6 -v -103.41 114.256 -4.6 -v -103.432 114.607 -4.6 -v -103.363 114.263 -4.6 -v -103.41 114.612 -4.6 -v -103.32 114.274 -4.6 -v -103.388 114.62 -4.6 -v -103.275 114.287 -4.6 -v -103.366 114.627 -4.6 -v -103.232 114.303 -4.6 -v -103.345 114.636 -4.6 -v -103.19 114.322 -4.6 -v -103.325 114.647 -4.6 -v -103.15 114.344 -4.6 -v -102.117 114.94 -4.6 -v -102.085 114.96 -4.596 -v -102.15 114.922 -4.6 -v -102.053 114.977 -4.592 -v -102.022 114.995 -4.586 -v -101.99 115.013 -4.578 -v -101.96 115.03 -4.568 -v -101.93 115.048 -4.556 -v -101.9 115.065 -4.543 -v -101.87 115.082 -4.528 -v -101.843 115.1 -4.51 -v -101.815 115.115 -4.493 -v -101.788 115.13 -4.474 -v -101.762 115.145 -4.452 -v -101.737 115.16 -4.43 -v -101.713 115.174 -4.406 -v -101.69 115.187 -4.38 -v -101.667 115.2 -4.354 -v -101.647 115.212 -4.326 -v -101.627 115.223 -4.297 -v -101.61 115.234 -4.267 -v -101.592 115.244 -4.236 -v -101.576 115.253 -4.204 -v -101.562 115.26 -4.17 -v -101.55 115.268 -4.137 -v -101.537 115.275 -4.103 -v -101.527 115.28 -4.068 -v -101.52 115.286 -4.032 -v -101.512 115.29 -3.996 -v -101.506 115.293 -3.96 -v -101.502 115.295 -3.924 -v -101.5 115.296 -3.887 -v -101.5 115.297 -3.85 -v -103.15 114.344 -4.6 -v -103.15 114.344 -1.84 -v -101.5 115.297 -1.84 -v -101.5 115.297 0.167 -v -101.5 115.296 0.204 -v -102.15 114.922 0.917 -v -103.15 114.344 0.917 -v -101.502 115.295 0.24 -v -101.506 115.293 0.277 -v -101.512 115.29 0.314 -v -101.52 115.286 0.35 -v -101.527 115.28 0.385 -v -101.537 115.275 0.42 -v -101.55 115.268 0.454 -v -101.562 115.26 0.488 -v -101.576 115.253 0.52 -v -101.592 115.244 0.553 -v -101.61 115.234 0.584 -v -101.627 115.223 0.614 -v -101.647 115.212 0.643 -v -101.667 115.2 0.67 -v -101.69 115.187 0.698 -v -101.713 115.174 0.723 -v -101.737 115.16 0.747 -v -101.762 115.145 0.77 -v -101.788 115.13 0.79 -v -101.815 115.115 0.81 -v -101.843 115.1 0.83 -v -101.87 115.082 0.845 -v -101.9 115.065 0.86 -v -101.93 115.048 0.873 -v -101.96 115.03 0.885 -v -101.99 115.013 0.895 -v -102.022 114.995 0.903 -v -102.053 114.977 0.91 -v -102.085 114.96 0.914 -v -102.117 114.94 0.916 -v -120.326 115.6 -1.84 -v -120.5 115.297 -1.84 -v -120.326 115.6 0.167 -v -120.5 115.297 0.167 -v -120.5 115.296 -3.887 -v -119.85 114.922 -4.6 -v -120.5 115.297 -3.85 -v -118.85 114.344 -4.6 -v -118.85 114.344 -1.84 -v -120.498 115.295 -3.924 -v -120.494 115.293 -3.96 -v -120.488 115.29 -3.996 -v -120.48 115.286 -4.032 -v -120.473 115.28 -4.068 -v -120.463 115.275 -4.103 -v -120.45 115.268 -4.137 -v -120.438 115.26 -4.17 -v -120.424 115.253 -4.204 -v -120.408 115.244 -4.236 -v -120.39 115.234 -4.267 -v -120.373 115.223 -4.297 -v -120.353 115.212 -4.326 -v -120.333 115.2 -4.354 -v -120.31 115.187 -4.38 -v -120.288 115.174 -4.406 -v -120.263 115.16 -4.43 -v -120.238 115.145 -4.452 -v -120.212 115.13 -4.474 -v -120.185 115.115 -4.493 -v -120.158 115.1 -4.51 -v -120.13 115.082 -4.528 -v -120.1 115.065 -4.543 -v -120.07 115.048 -4.556 -v -120.04 115.03 -4.568 -v -120.01 115.013 -4.578 -v -119.978 114.995 -4.586 -v -119.947 114.977 -4.592 -v -119.915 114.96 -4.596 -v -119.883 114.94 -4.6 -v -118.85 114.344 0.917 -v -120.5 115.297 0.167 -v -120.5 115.297 -1.84 -v -119.85 114.922 0.917 -v -120.5 115.296 0.204 -v -119.883 114.94 0.916 -v -119.915 114.96 0.914 -v -119.947 114.977 0.91 -v -119.978 114.995 0.903 -v -120.01 115.013 0.895 -v -120.04 115.03 0.885 -v -120.07 115.048 0.873 -v -120.1 115.065 0.86 -v -120.13 115.082 0.845 -v -120.158 115.1 0.83 -v -120.185 115.115 0.81 -v -120.212 115.13 0.79 -v -120.238 115.145 0.77 -v -120.263 115.16 0.747 -v -120.288 115.174 0.723 -v -120.31 115.187 0.698 -v -120.333 115.2 0.67 -v -120.353 115.212 0.643 -v -120.373 115.223 0.614 -v -120.39 115.234 0.584 -v -120.408 115.244 0.553 -v -120.424 115.253 0.52 -v -120.438 115.26 0.488 -v -120.45 115.268 0.454 -v -120.463 115.275 0.42 -v -120.473 115.28 0.385 -v -120.48 115.286 0.35 -v -120.488 115.29 0.314 -v -120.494 115.293 0.277 -v -120.498 115.295 0.24 -v -118.5 114.25 -4.6 -v -118.5 114.25 -1.84 -v -118.546 114.25 -4.6 -v -118.546 114.25 0.917 -v -118.59 114.256 0.917 -v -118.5 114.25 0.917 -v -118.59 114.256 -4.6 -v -118.637 114.263 0.917 -v -118.637 114.263 -4.6 -v -118.68 114.274 0.917 -v -118.68 114.274 -4.6 -v -118.725 114.287 0.917 -v -118.725 114.287 -4.6 -v -118.768 114.303 0.917 -v -118.768 114.303 -4.6 -v -118.81 114.322 0.917 -v -118.81 114.322 -4.6 -v -103.5 114.25 0.917 -v -103.5 114.25 -1.84 -v -103.5 114.25 -4.6 -v -103.454 114.25 0.917 -v -103.454 114.25 -4.6 -v -103.41 114.256 -4.6 -v -103.41 114.256 0.917 -v -103.363 114.263 -4.6 -v -103.363 114.263 0.917 -v -103.32 114.274 -4.6 -v -103.32 114.274 0.917 -v -103.275 114.287 -4.6 -v -103.275 114.287 0.917 -v -103.232 114.303 -4.6 -v -103.232 114.303 0.917 -v -103.19 114.322 -4.6 -v -103.19 114.322 0.917 -v -101.674 115.6 -1.84 -v -101.5 115.297 -1.84 -v -101.674 115.6 0.167 -v -101.5 115.297 0.167 -v -101.675 115.6 -3.887 -v -102.324 115.225 -4.6 -v -101.674 115.6 -3.85 -v -103.325 114.647 -4.6 -v -103.325 114.647 -1.84 -v -101.677 115.598 -3.924 -v -101.68 115.596 -3.96 -v -101.687 115.593 -3.996 -v -101.694 115.59 -4.032 -v -101.702 115.584 -4.068 -v -101.712 115.578 -4.103 -v -101.724 115.57 -4.137 -v -101.737 115.564 -4.17 -v -101.75 115.556 -4.204 -v -101.767 115.547 -4.236 -v -101.784 115.537 -4.267 -v -101.802 115.526 -4.297 -v -101.822 115.515 -4.326 -v -101.842 115.503 -4.354 -v -101.864 115.49 -4.38 -v -101.888 115.477 -4.406 -v -101.912 115.463 -4.43 -v -101.937 115.448 -4.452 -v -101.963 115.433 -4.474 -v -101.99 115.418 -4.493 -v -102.018 115.402 -4.51 -v -102.046 115.385 -4.528 -v -102.075 115.368 -4.543 -v -102.105 115.35 -4.556 -v -102.135 115.334 -4.568 -v -102.166 115.316 -4.578 -v -102.197 115.298 -4.586 -v -102.228 115.28 -4.592 -v -102.26 115.262 -4.596 -v -102.292 115.243 -4.6 -v -103.325 114.647 0.917 -v -101.674 115.6 0.167 -v -101.674 115.6 -1.84 -v -102.324 115.225 0.917 -v -101.675 115.6 0.204 -v -102.292 115.243 0.916 -v -102.26 115.262 0.914 -v -102.228 115.28 0.91 -v -102.197 115.298 0.903 -v -102.166 115.316 0.895 -v -102.135 115.334 0.885 -v -102.105 115.35 0.873 -v -102.075 115.368 0.86 -v -102.046 115.385 0.845 -v -102.018 115.402 0.83 -v -101.99 115.418 0.81 -v -101.963 115.433 0.79 -v -101.937 115.448 0.77 -v -101.912 115.463 0.747 -v -101.888 115.477 0.723 -v -101.864 115.49 0.698 -v -101.842 115.503 0.67 -v -101.822 115.515 0.643 -v -101.802 115.526 0.614 -v -101.784 115.537 0.584 -v -101.767 115.547 0.553 -v -101.75 115.556 0.52 -v -101.737 115.564 0.488 -v -101.724 115.57 0.454 -v -101.712 115.578 0.42 -v -101.702 115.584 0.385 -v -101.694 115.59 0.35 -v -101.687 115.593 0.314 -v -101.68 115.596 0.277 -v -101.677 115.598 0.24 -v -103.5 114.6 0.917 -v -103.477 114.6 0.917 -v -103.5 114.6 -1.84 -v -103.477 114.6 -4.6 -v -103.5 114.6 -4.6 -v -103.454 114.603 0.917 -v -103.454 114.603 -4.6 -v -103.432 114.607 0.917 -v -103.432 114.607 -4.6 -v -103.41 114.612 0.917 -v -103.41 114.612 -4.6 -v -103.388 114.62 0.917 -v -103.388 114.62 -4.6 -v -103.366 114.627 0.917 -v -103.366 114.627 -4.6 -v -103.345 114.636 0.917 -v -103.345 114.636 -4.6 -v -118.5 114.6 -4.6 -v -118.5 114.6 -1.84 -v -118.5 114.6 0.917 -v -118.523 114.6 0.917 -v -118.523 114.6 -4.6 -v -118.546 114.603 -4.6 -v -118.546 114.603 0.917 -v -118.568 114.607 -4.6 -v -118.568 114.607 0.917 -v -118.59 114.612 -4.6 -v -118.59 114.612 0.917 -v -118.613 114.62 -4.6 -v -118.613 114.62 0.917 -v -118.634 114.627 -4.6 -v -118.634 114.627 0.917 -v -118.655 114.636 -4.6 -v -118.655 114.636 0.917 -v -104.25 106.41 1.21 -v -111 106.41 1.21 -v -104.25 106.25 0.9 -v -111 106.25 0.9 -v -117.75 106.41 1.21 -v -117.75 106.25 0.9 -v -102.324 115.225 0.917 -v -102.15 114.922 0.917 -v -102.292 115.243 0.916 -v -102.117 114.94 0.916 -v -102.085 114.96 0.914 -v -102.26 115.262 0.914 -v -102.053 114.977 0.91 -v -102.228 115.28 0.91 -v -102.022 114.995 0.903 -v -102.197 115.298 0.903 -v -101.99 115.013 0.895 -v -102.166 115.316 0.895 -v -102.135 115.334 0.885 -v -101.96 115.03 0.885 -v -101.93 115.048 0.873 -v -102.105 115.35 0.873 -v -101.9 115.065 0.86 -v -102.075 115.368 0.86 -v -101.87 115.082 0.845 -v -102.046 115.385 0.845 -v -101.843 115.1 0.83 -v -102.018 115.402 0.83 -v -101.99 115.418 0.81 -v -101.815 115.115 0.81 -v -101.788 115.13 0.79 -v -101.963 115.433 0.79 -v -101.762 115.145 0.77 -v -101.937 115.448 0.77 -v -101.737 115.16 0.747 -v -101.912 115.463 0.747 -v -101.713 115.174 0.723 -v -101.888 115.477 0.723 -v -101.864 115.49 0.698 -v -101.69 115.187 0.698 -v -101.842 115.503 0.67 -v -101.667 115.2 0.67 -v -101.647 115.212 0.643 -v -101.822 115.515 0.643 -v -101.627 115.223 0.614 -v -101.802 115.526 0.614 -v -101.61 115.234 0.584 -v -101.784 115.537 0.584 -v -101.592 115.244 0.553 -v -101.767 115.547 0.553 -v -101.75 115.556 0.52 -v -101.576 115.253 0.52 -v -101.562 115.26 0.488 -v -101.737 115.564 0.488 -v -101.55 115.268 0.454 -v -101.724 115.57 0.454 -v -101.537 115.275 0.42 -v -101.712 115.578 0.42 -v -101.527 115.28 0.385 -v -101.702 115.584 0.385 -v -101.694 115.59 0.35 -v -101.52 115.286 0.35 -v -101.512 115.29 0.314 -v -101.687 115.593 0.314 -v -101.506 115.293 0.277 -v -101.68 115.596 0.277 -v -101.502 115.295 0.24 -v -101.677 115.598 0.24 -v -101.5 115.296 0.204 -v -101.675 115.6 0.204 -v -120.325 115.6 0.204 -v -120.5 115.296 0.204 -v -120.498 115.295 0.24 -v -120.323 115.598 0.24 -v -120.494 115.293 0.277 -v -120.32 115.596 0.277 -v -120.488 115.29 0.314 -v -120.313 115.593 0.314 -v -120.48 115.286 0.35 -v -120.306 115.59 0.35 -v -120.298 115.584 0.385 -v -120.473 115.28 0.385 -v -120.463 115.275 0.42 -v -120.288 115.578 0.42 -v -120.45 115.268 0.454 -v -120.276 115.57 0.454 -v -120.438 115.26 0.488 -v -120.263 115.564 0.488 -v -120.424 115.253 0.52 -v -120.25 115.556 0.52 -v -120.233 115.547 0.553 -v -120.408 115.244 0.553 -v -120.39 115.234 0.584 -v -120.216 115.537 0.584 -v -120.373 115.223 0.614 -v -120.198 115.526 0.614 -v -120.353 115.212 0.643 -v -120.178 115.515 0.643 -v -120.333 115.2 0.67 -v -120.158 115.503 0.67 -v -120.136 115.49 0.698 -v -120.31 115.187 0.698 -v -120.113 115.477 0.723 -v -120.288 115.174 0.723 -v -120.263 115.16 0.747 -v -120.088 115.463 0.747 -v -120.238 115.145 0.77 -v -120.063 115.448 0.77 -v -120.212 115.13 0.79 -v -120.037 115.433 0.79 -v -120.185 115.115 0.81 -v -120.01 115.418 0.81 -v -119.983 115.402 0.83 -v -120.158 115.1 0.83 -v -120.13 115.082 0.845 -v -119.954 115.385 0.845 -v -120.1 115.065 0.86 -v -119.925 115.368 0.86 -v -120.07 115.048 0.873 -v -119.895 115.35 0.873 -v -120.04 115.03 0.885 -v -119.865 115.334 0.885 -v -119.834 115.316 0.895 -v -120.01 115.013 0.895 -v -119.978 114.995 0.903 -v -119.803 115.298 0.903 -v -119.947 114.977 0.91 -v -119.772 115.28 0.91 -v -119.915 114.96 0.914 -v -119.74 115.262 0.914 -v -119.883 114.94 0.916 -v -119.708 115.243 0.916 -v -119.676 115.225 0.917 -v -119.85 114.922 0.917 -v -103.5 106.915 0.554 -v -103.5 107.077 0.865 -v -103.5 106.883 0.57 -v -103.5 107.044 0.88 -v -103.504 107.012 0.898 -v -103.504 106.85 0.588 -v -103.508 106.98 0.915 -v -103.508 106.818 0.605 -v -103.514 106.947 0.932 -v -103.514 106.786 0.622 -v -103.522 106.915 0.95 -v -103.522 106.754 0.638 -v -103.532 106.722 0.654 -v -103.532 106.884 0.965 -v -103.544 106.853 0.98 -v -103.544 106.69 0.67 -v -103.557 106.822 0.997 -v -103.557 106.66 0.686 -v -103.572 106.792 1.012 -v -103.572 106.63 0.702 -v -103.59 106.763 1.028 -v -103.59 106.602 0.717 -v -103.607 106.573 0.732 -v -103.607 106.735 1.042 -v -103.626 106.707 1.057 -v -103.626 106.546 0.746 -v -103.648 106.68 1.07 -v -103.648 106.52 0.76 -v -103.67 106.655 1.084 -v -103.67 106.493 0.774 -v -103.694 106.63 1.097 -v -103.694 106.47 0.786 -v -103.72 106.445 0.8 -v -103.72 106.606 1.11 -v -103.746 106.422 0.81 -v -103.746 106.584 1.12 -v -103.774 106.563 1.132 -v -103.774 106.4 0.82 -v -103.803 106.542 1.142 -v -103.803 106.38 0.832 -v -103.833 106.524 1.152 -v -103.833 106.362 0.842 -v -103.864 106.506 1.16 -v -103.864 106.345 0.85 -v -103.896 106.33 0.86 -v -103.896 106.49 1.17 -v -103.93 106.475 1.177 -v -103.93 106.314 0.867 -v -103.963 106.462 1.184 -v -103.963 106.3 0.874 -v -103.997 106.45 1.19 -v -103.997 106.29 0.88 -v -104.032 106.44 1.196 -v -104.032 106.28 0.885 -v -104.068 106.27 0.89 -v -104.068 106.43 1.2 -v -104.104 106.424 1.204 -v -104.104 106.263 0.893 -v -104.14 106.42 1.207 -v -104.14 106.257 0.896 -v -104.176 106.415 1.21 -v -104.176 106.253 0.898 -v -104.213 106.412 1.21 -v -104.213 106.25 0.9 -v -118.5 113.682 1.582 -v -103.5 113.682 1.582 -v -118.5 113.722 1.594 -v -103.5 113.722 1.594 -v -103.5 113.762 1.603 -v -118.5 113.762 1.603 -v -103.5 113.803 1.61 -v -118.5 113.803 1.61 -v -103.5 113.844 1.615 -v -118.5 113.844 1.615 -v -103.5 113.885 1.617 -v -118.5 113.885 1.617 -v -103.5 113.926 1.617 -v -118.5 113.926 1.617 -v -103.5 113.967 1.614 -v -118.5 113.967 1.614 -v -103.5 114.008 1.61 -v -118.5 114.008 1.61 -v -103.5 114.05 1.6 -v -118.5 114.05 1.6 -v -103.5 114.09 1.59 -v -118.5 114.09 1.59 -v -103.5 114.128 1.58 -v -118.5 114.128 1.58 -v -103.5 114.167 1.564 -v -118.5 114.167 1.564 -v -103.5 114.205 1.547 -v -118.5 114.205 1.547 -v -103.5 114.24 1.528 -v -118.5 114.24 1.528 -v -103.5 114.277 1.507 -v -118.5 114.277 1.507 -v -103.5 114.31 1.484 -v -118.5 114.31 1.484 -v -103.5 114.344 1.46 -v -118.5 114.344 1.46 -v -103.5 114.375 1.432 -v -118.5 114.375 1.432 -v -103.5 114.404 1.403 -v -118.5 114.404 1.403 -v -103.5 114.432 1.372 -v -118.5 114.432 1.372 -v -103.5 114.458 1.34 -v -118.5 114.458 1.34 -v -103.5 114.482 1.306 -v -118.5 114.482 1.306 -v -103.5 114.504 1.272 -v -118.5 114.504 1.272 -v -103.5 114.524 1.235 -v -118.5 114.524 1.235 -v -103.5 114.54 1.198 -v -118.5 114.54 1.198 -v -103.5 114.557 1.16 -v -118.5 114.557 1.16 -v -103.5 114.57 1.12 -v -118.5 114.57 1.12 -v -103.5 114.58 1.08 -v -118.5 114.58 1.08 -v -103.5 114.59 1.04 -v -118.5 114.59 1.04 -v -103.5 114.595 1 -v -118.5 114.595 1 -v -103.5 114.6 0.958 -v -118.5 114.6 0.958 -v -103.5 108.92 0.024 -v -111 108.92 0.024 -v -118.5 108.92 0.024 -v -103.5 108.65 0.046 -v -103.5 108.666 0.04 -v -111 108.65 0.046 -v -118.5 108.666 0.04 -v -118.5 108.65 0.046 -v -118.5 108.682 0.032 -v -103.5 108.682 0.032 -v -103.5 108.698 0.026 -v -118.5 108.698 0.026 -v -103.5 108.715 0.02 -v -118.5 108.715 0.02 -v -103.5 108.732 0.016 -v -118.5 108.732 0.016 -v -103.5 108.75 0.013 -v -118.5 108.75 0.013 -v -118.5 108.766 0.01 -v -103.5 108.766 0.01 -v -103.5 108.783 0.008 -v -118.5 108.783 0.008 -v -103.5 108.8 0.007 -v -118.5 108.8 0.007 -v -118.5 108.818 0.007 -v -103.5 108.818 0.007 -v -103.5 108.836 0.008 -v -118.5 108.836 0.008 -v -118.5 108.853 0.01 -v -103.5 108.853 0.01 -v -103.5 108.87 0.012 -v -118.5 108.87 0.012 -v -103.5 108.887 0.015 -v -118.5 108.887 0.015 -v -103.5 108.904 0.02 -v -118.5 108.904 0.02 -v -103.5 107.077 0.865 -v -104.25 106.41 1.21 -v -111 106.41 1.21 -v -117.75 106.41 1.21 -v -118.5 107.077 0.865 -v -118.5 107.044 0.88 -v -118.496 107.012 0.898 -v -118.492 106.98 0.915 -v -118.486 106.947 0.932 -v -118.478 106.915 0.95 -v -118.468 106.884 0.965 -v -118.456 106.853 0.98 -v -118.443 106.822 0.997 -v -118.428 106.792 1.012 -v -118.41 106.763 1.028 -v -118.393 106.735 1.042 -v -118.374 106.707 1.057 -v -118.352 106.68 1.07 -v -118.33 106.655 1.084 -v -118.306 106.63 1.097 -v -118.28 106.606 1.11 -v -118.254 106.584 1.12 -v -118.226 106.563 1.132 -v -118.197 106.542 1.142 -v -118.167 106.524 1.152 -v -118.136 106.506 1.16 -v -118.104 106.49 1.17 -v -118.07 106.475 1.177 -v -118.037 106.462 1.184 -v -118.003 106.45 1.19 -v -117.968 106.44 1.196 -v -117.932 106.43 1.2 -v -117.896 106.424 1.204 -v -117.86 106.42 1.207 -v -117.824 106.415 1.21 -v -117.787 106.412 1.21 -v -104.213 106.412 1.21 -v -104.176 106.415 1.21 -v -104.14 106.42 1.207 -v -104.104 106.424 1.204 -v -104.068 106.43 1.2 -v -104.032 106.44 1.196 -v -103.997 106.45 1.19 -v -103.963 106.462 1.184 -v -103.93 106.475 1.177 -v -103.896 106.49 1.17 -v -103.864 106.506 1.16 -v -103.833 106.524 1.152 -v -103.803 106.542 1.142 -v -103.774 106.563 1.132 -v -103.746 106.584 1.12 -v -103.72 106.606 1.11 -v -103.694 106.63 1.097 -v -103.67 106.655 1.084 -v -103.648 106.68 1.07 -v -103.626 106.707 1.057 -v -103.607 106.735 1.042 -v -103.59 106.763 1.028 -v -103.572 106.792 1.012 -v -103.557 106.822 0.997 -v -103.544 106.853 0.98 -v -103.532 106.884 0.965 -v -103.522 106.915 0.95 -v -103.514 106.947 0.932 -v -103.508 106.98 0.915 -v -103.504 107.012 0.898 -v -103.5 107.044 0.88 -v -117.787 106.25 0.9 -v -117.787 106.412 1.21 -v -117.824 106.415 1.21 -v -117.824 106.253 0.898 -v -117.86 106.42 1.207 -v -117.86 106.257 0.896 -v -117.896 106.424 1.204 -v -117.896 106.263 0.893 -v -117.932 106.43 1.2 -v -117.932 106.27 0.89 -v -117.968 106.28 0.885 -v -117.968 106.44 1.196 -v -118.003 106.45 1.19 -v -118.003 106.29 0.88 -v -118.037 106.462 1.184 -v -118.037 106.3 0.874 -v -118.07 106.475 1.177 -v -118.07 106.314 0.867 -v -118.104 106.49 1.17 -v -118.104 106.33 0.86 -v -118.136 106.345 0.85 -v -118.136 106.506 1.16 -v -118.167 106.524 1.152 -v -118.167 106.362 0.842 -v -118.197 106.542 1.142 -v -118.197 106.38 0.832 -v -118.226 106.563 1.132 -v -118.226 106.4 0.82 -v -118.254 106.584 1.12 -v -118.254 106.422 0.81 -v -118.28 106.445 0.8 -v -118.28 106.606 1.11 -v -118.306 106.47 0.786 -v -118.306 106.63 1.097 -v -118.33 106.655 1.084 -v -118.33 106.493 0.774 -v -118.352 106.68 1.07 -v -118.352 106.52 0.76 -v -118.374 106.707 1.057 -v -118.374 106.546 0.746 -v -118.393 106.735 1.042 -v -118.393 106.573 0.732 -v -118.41 106.602 0.717 -v -118.41 106.763 1.028 -v -118.428 106.792 1.012 -v -118.428 106.63 0.702 -v -118.443 106.822 0.997 -v -118.443 106.66 0.686 -v -118.456 106.853 0.98 -v -118.456 106.69 0.67 -v -118.468 106.884 0.965 -v -118.468 106.722 0.654 -v -118.478 106.754 0.638 -v -118.478 106.915 0.95 -v -118.486 106.947 0.932 -v -118.486 106.786 0.622 -v -118.492 106.98 0.915 -v -118.492 106.818 0.605 -v -118.496 107.012 0.898 -v -118.496 106.85 0.588 -v -118.5 107.044 0.88 -v -118.5 106.883 0.57 -v -118.5 106.915 0.554 -v -118.5 107.077 0.865 -v -118.5 106.883 0.57 -v -118.5 106.915 0.554 -v -117.75 106.25 0.9 -v -118.5 108.49 -0.264 -v -111 106.25 0.9 -v -103.5 108.49 -0.264 -v -104.25 106.25 0.9 -v -103.5 106.915 0.554 -v -103.5 106.883 0.57 -v -117.787 106.25 0.9 -v -117.824 106.253 0.898 -v -117.86 106.257 0.896 -v -117.896 106.263 0.893 -v -117.932 106.27 0.89 -v -117.968 106.28 0.885 -v -118.003 106.29 0.88 -v -118.037 106.3 0.874 -v -118.07 106.314 0.867 -v -118.104 106.33 0.86 -v -118.136 106.345 0.85 -v -118.167 106.362 0.842 -v -118.197 106.38 0.832 -v -118.226 106.4 0.82 -v -118.254 106.422 0.81 -v -118.28 106.445 0.8 -v -118.306 106.47 0.786 -v -118.33 106.493 0.774 -v -118.352 106.52 0.76 -v -118.374 106.546 0.746 -v -118.393 106.573 0.732 -v -118.41 106.602 0.717 -v -118.428 106.63 0.702 -v -118.443 106.66 0.686 -v -118.456 106.69 0.67 -v -118.468 106.722 0.654 -v -118.478 106.754 0.638 -v -118.486 106.786 0.622 -v -118.492 106.818 0.605 -v -118.496 106.85 0.588 -v -103.504 106.85 0.588 -v -103.508 106.818 0.605 -v -103.514 106.786 0.622 -v -103.522 106.754 0.638 -v -103.532 106.722 0.654 -v -103.544 106.69 0.67 -v -103.557 106.66 0.686 -v -103.572 106.63 0.702 -v -103.59 106.602 0.717 -v -103.607 106.573 0.732 -v -103.626 106.546 0.746 -v -103.648 106.52 0.76 -v -103.67 106.493 0.774 -v -103.694 106.47 0.786 -v -103.72 106.445 0.8 -v -103.746 106.422 0.81 -v -103.774 106.4 0.82 -v -103.803 106.38 0.832 -v -103.833 106.362 0.842 -v -103.864 106.345 0.85 -v -103.896 106.33 0.86 -v -103.93 106.314 0.867 -v -103.963 106.3 0.874 -v -103.997 106.29 0.88 -v -104.032 106.28 0.885 -v -104.068 106.27 0.89 -v -104.104 106.263 0.893 -v -104.14 106.257 0.896 -v -104.176 106.253 0.898 -v -104.213 106.25 0.9 -v -118.5 108.52 -0.28 -v -103.5 108.52 -0.28 -v -103.5 108.552 -0.293 -v -118.5 108.552 -0.293 -v -118.5 108.585 -0.305 -v -103.5 108.585 -0.305 -v -118.5 108.618 -0.316 -v -103.5 108.618 -0.316 -v -118.5 108.652 -0.325 -v -103.5 108.652 -0.325 -v -118.5 108.686 -0.332 -v -103.5 108.686 -0.332 -v -103.5 108.72 -0.337 -v -118.5 108.72 -0.337 -v -118.5 108.755 -0.34 -v -103.5 108.755 -0.34 -v -118.5 108.79 -0.343 -v -103.5 108.79 -0.343 -v -103.5 108.824 -0.343 -v -118.5 108.824 -0.343 -v -118.5 108.86 -0.342 -v -103.5 108.86 -0.342 -v -103.5 108.894 -0.338 -v -118.5 108.894 -0.338 -v -118.5 108.928 -0.333 -v -103.5 108.928 -0.333 -v -118.5 108.962 -0.327 -v -103.5 108.962 -0.327 -v -118.5 108.996 -0.318 -v -103.5 108.996 -0.318 -v -118.5 109.03 -0.308 -v -103.5 109.03 -0.308 -v -103.325 114.647 0.917 -v -103.15 114.344 0.917 -v -103.345 114.636 0.917 -v -103.19 114.322 0.917 -v -103.366 114.627 0.917 -v -103.232 114.303 0.917 -v -103.388 114.62 0.917 -v -103.275 114.287 0.917 -v -103.41 114.612 0.917 -v -103.32 114.274 0.917 -v -103.432 114.607 0.917 -v -103.363 114.263 0.917 -v -103.454 114.603 0.917 -v -103.41 114.256 0.917 -v -103.477 114.6 0.917 -v -103.454 114.25 0.917 -v -103.5 114.6 0.917 -v -103.5 114.25 0.917 -v -118.5 114.25 0.917 -v -118.5 114.6 0.917 -v -118.546 114.25 0.917 -v -118.523 114.6 0.917 -v -118.546 114.603 0.917 -v -118.59 114.256 0.917 -v -118.568 114.607 0.917 -v -118.637 114.263 0.917 -v -118.59 114.612 0.917 -v -118.68 114.274 0.917 -v -118.613 114.62 0.917 -v -118.725 114.287 0.917 -v -118.634 114.627 0.917 -v -118.768 114.303 0.917 -v -118.655 114.636 0.917 -v -118.81 114.322 0.917 -v -118.85 114.344 0.917 -v -118.675 114.647 0.917 -v -118.5 113.79 1.25 -v -103.5 113.79 1.25 -v -103.5 113.892 1.267 -v -103.5 113.885 1.617 -v -103.5 113.872 1.266 -v -103.5 113.844 1.615 -v -103.5 113.85 1.264 -v -103.5 113.803 1.61 -v -103.5 113.83 1.26 -v -103.5 113.762 1.603 -v -103.5 113.81 1.256 -v -103.5 113.722 1.594 -v -103.5 113.79 1.25 -v -103.5 113.682 1.582 -v -103.5 109.03 -0.308 -v -103.5 108.92 0.024 -v -103.5 108.996 -0.318 -v -103.5 108.904 0.02 -v -103.5 108.962 -0.327 -v -103.5 108.887 0.015 -v -103.5 108.928 -0.333 -v -103.5 108.87 0.012 -v -103.5 108.894 -0.338 -v -103.5 108.853 0.01 -v -103.5 108.86 -0.342 -v -103.5 108.836 0.008 -v -103.5 108.824 -0.343 -v -103.5 108.818 0.007 -v -103.5 108.79 -0.343 -v -103.5 108.8 0.007 -v -103.5 108.783 0.008 -v -103.5 113.913 1.267 -v -103.5 113.926 1.617 -v -103.5 113.934 1.266 -v -103.5 113.967 1.614 -v -103.5 113.954 1.263 -v -103.5 114.008 1.61 -v -103.5 113.974 1.26 -v -103.5 114.05 1.6 -v -103.5 113.995 1.254 -v -103.5 114.09 1.59 -v -103.5 114.014 1.248 -v -103.5 114.128 1.58 -v -103.5 114.034 1.24 -v -103.5 114.167 1.564 -v -103.5 114.052 1.232 -v -103.5 114.205 1.547 -v -103.5 114.07 1.223 -v -103.5 114.24 1.528 -v -103.5 114.088 1.212 -v -103.5 114.277 1.507 -v -103.5 114.105 1.2 -v -103.5 114.31 1.484 -v -103.5 114.122 1.188 -v -103.5 114.344 1.46 -v -103.5 114.137 1.174 -v -103.5 114.375 1.432 -v -103.5 114.152 1.16 -v -103.5 114.404 1.403 -v -103.5 114.166 1.145 -v -103.5 114.432 1.372 -v -103.5 114.18 1.13 -v -103.5 114.458 1.34 -v -103.5 114.19 1.112 -v -103.5 114.482 1.306 -v -103.5 114.202 1.094 -v -103.5 114.504 1.272 -v -103.5 114.212 1.076 -v -103.5 114.524 1.235 -v -103.5 114.22 1.058 -v -103.5 114.54 1.198 -v -103.5 114.228 1.038 -v -103.5 114.557 1.16 -v -103.5 114.235 1.02 -v -103.5 114.57 1.12 -v -103.5 114.24 1 -v -103.5 114.58 1.08 -v -103.5 114.245 0.98 -v -103.5 114.59 1.04 -v -103.5 114.248 0.958 -v -103.5 114.595 1 -v -103.5 114.25 0.938 -v -103.5 114.6 0.958 -v -103.5 114.25 0.917 -v -103.5 114.6 0.917 -v -103.5 108.755 -0.34 -v -103.5 108.766 0.01 -v -103.5 108.72 -0.337 -v -103.5 108.75 0.013 -v -103.5 108.686 -0.332 -v -103.5 108.732 0.016 -v -103.5 108.652 -0.325 -v -103.5 108.715 0.02 -v -103.5 108.618 -0.316 -v -103.5 108.698 0.026 -v -103.5 108.585 -0.305 -v -103.5 108.682 0.032 -v -103.5 108.552 -0.293 -v -103.5 108.666 0.04 -v -103.5 108.52 -0.28 -v -103.5 108.65 0.046 -v -103.5 108.49 -0.264 -v -118.5 114.6 0.917 -v -118.5 114.25 0.917 -v -118.5 114.6 0.958 -v -118.5 114.25 0.938 -v -118.5 114.248 0.958 -v -118.5 114.595 1 -v -118.5 114.245 0.98 -v -118.5 114.59 1.04 -v -118.5 114.24 1 -v -118.5 114.58 1.08 -v -118.5 114.235 1.02 -v -118.5 114.57 1.12 -v -118.5 114.228 1.038 -v -118.5 114.557 1.16 -v -118.5 114.22 1.058 -v -118.5 114.54 1.198 -v -118.5 114.212 1.076 -v -118.5 114.524 1.235 -v -118.5 114.202 1.094 -v -118.5 114.504 1.272 -v -118.5 114.19 1.112 -v -118.5 114.482 1.306 -v -118.5 114.18 1.13 -v -118.5 114.458 1.34 -v -118.5 114.166 1.145 -v -118.5 114.432 1.372 -v -118.5 114.152 1.16 -v -118.5 114.404 1.403 -v -118.5 114.137 1.174 -v -118.5 114.375 1.432 -v -118.5 114.122 1.188 -v -118.5 114.344 1.46 -v -118.5 114.105 1.2 -v -118.5 114.31 1.484 -v -118.5 114.088 1.212 -v -118.5 114.277 1.507 -v -118.5 114.07 1.223 -v -118.5 114.24 1.528 -v -118.5 114.052 1.232 -v -118.5 114.205 1.547 -v -118.5 114.034 1.24 -v -118.5 114.167 1.564 -v -118.5 114.014 1.248 -v -118.5 114.128 1.58 -v -118.5 113.995 1.254 -v -118.5 114.09 1.59 -v -118.5 113.974 1.26 -v -118.5 114.05 1.6 -v -118.5 113.954 1.263 -v -118.5 114.008 1.61 -v -118.5 113.934 1.266 -v -118.5 113.967 1.614 -v -118.5 113.913 1.267 -v -118.5 113.892 1.267 -v -118.5 113.844 1.615 -v -118.5 113.872 1.266 -v -118.5 113.803 1.61 -v -118.5 113.85 1.264 -v -118.5 113.762 1.603 -v -118.5 113.83 1.26 -v -118.5 113.722 1.594 -v -118.5 113.81 1.256 -v -118.5 113.682 1.582 -v -118.5 113.79 1.25 -v -118.5 108.92 0.024 -v -118.5 109.03 -0.308 -v -118.5 108.996 -0.318 -v -118.5 108.904 0.02 -v -118.5 108.962 -0.327 -v -118.5 108.887 0.015 -v -118.5 108.928 -0.333 -v -118.5 108.87 0.012 -v -118.5 108.894 -0.338 -v -118.5 108.853 0.01 -v -118.5 108.86 -0.342 -v -118.5 108.836 0.008 -v -118.5 108.824 -0.343 -v -118.5 108.818 0.007 -v -118.5 108.79 -0.343 -v -118.5 108.8 0.007 -v -118.5 108.755 -0.34 -v -118.5 108.783 0.008 -v -118.5 108.72 -0.337 -v -118.5 108.766 0.01 -v -118.5 108.686 -0.332 -v -118.5 108.75 0.013 -v -118.5 108.652 -0.325 -v -118.5 108.732 0.016 -v -118.5 108.618 -0.316 -v -118.5 108.715 0.02 -v -118.5 108.585 -0.305 -v -118.5 108.698 0.026 -v -118.5 108.552 -0.293 -v -118.5 108.682 0.032 -v -118.5 108.52 -0.28 -v -118.5 108.666 0.04 -v -118.5 108.49 -0.264 -v -118.5 108.65 0.046 -v -118.5 113.885 1.617 -v -118.5 113.926 1.617 -v -103.5 113.81 1.256 -v -118.5 113.81 1.256 -v -118.5 113.83 1.26 -v -103.5 113.83 1.26 -v -118.5 113.85 1.264 -v -103.5 113.85 1.264 -v -118.5 113.872 1.266 -v -103.5 113.872 1.266 -v -118.5 113.892 1.267 -v -103.5 113.892 1.267 -v -118.5 113.913 1.267 -v -103.5 113.913 1.267 -v -118.5 113.934 1.266 -v -103.5 113.934 1.266 -v -118.5 113.954 1.263 -v -103.5 113.954 1.263 -v -118.5 113.974 1.26 -v -103.5 113.974 1.26 -v -118.5 113.995 1.254 -v -103.5 113.995 1.254 -v -118.5 114.014 1.248 -v -103.5 114.014 1.248 -v -118.5 114.034 1.24 -v -103.5 114.034 1.24 -v -118.5 114.052 1.232 -v -103.5 114.052 1.232 -v -118.5 114.07 1.223 -v -103.5 114.07 1.223 -v -118.5 114.088 1.212 -v -103.5 114.088 1.212 -v -118.5 114.105 1.2 -v -103.5 114.105 1.2 -v -118.5 114.122 1.188 -v -103.5 114.122 1.188 -v -118.5 114.137 1.174 -v -103.5 114.137 1.174 -v -118.5 114.152 1.16 -v -103.5 114.152 1.16 -v -118.5 114.166 1.145 -v -103.5 114.166 1.145 -v -118.5 114.18 1.13 -v -103.5 114.18 1.13 -v -118.5 114.19 1.112 -v -103.5 114.19 1.112 -v -118.5 114.202 1.094 -v -103.5 114.202 1.094 -v -118.5 114.212 1.076 -v -103.5 114.212 1.076 -v -118.5 114.22 1.058 -v -103.5 114.22 1.058 -v -118.5 114.228 1.038 -v -103.5 114.228 1.038 -v -118.5 114.235 1.02 -v -103.5 114.235 1.02 -v -118.5 114.24 1 -v -103.5 114.24 1 -v -118.5 114.245 0.98 -v -103.5 114.245 0.98 -v -118.5 114.248 0.958 -v -103.5 114.248 0.958 -v -118.5 114.25 0.938 -v -103.5 114.25 0.938 -v 102.324 115.225 -4.6 -v 102.15 114.922 -4.6 -v 102.292 115.243 -4.6 -v 102.117 114.94 -4.6 -v 102.085 114.96 -4.596 -v 102.26 115.262 -4.596 -v 102.053 114.977 -4.592 -v 102.228 115.28 -4.592 -v 102.022 114.995 -4.586 -v 102.197 115.298 -4.586 -v 101.99 115.013 -4.578 -v 102.166 115.316 -4.578 -v 102.135 115.334 -4.568 -v 101.96 115.03 -4.568 -v 101.93 115.048 -4.556 -v 102.105 115.35 -4.556 -v 101.9 115.065 -4.543 -v 102.075 115.37 -4.543 -v 101.87 115.082 -4.528 -v 102.046 115.385 -4.528 -v 101.842 115.1 -4.51 -v 102.017 115.402 -4.51 -v 101.99 115.418 -4.493 -v 101.815 115.115 -4.493 -v 101.788 115.13 -4.474 -v 101.963 115.433 -4.474 -v 101.762 115.145 -4.452 -v 101.937 115.448 -4.452 -v 101.737 115.16 -4.43 -v 101.912 115.463 -4.43 -v 101.712 115.174 -4.406 -v 101.887 115.477 -4.406 -v 101.864 115.49 -4.38 -v 101.69 115.187 -4.38 -v 101.842 115.503 -4.354 -v 101.667 115.2 -4.354 -v 101.647 115.212 -4.326 -v 101.822 115.515 -4.326 -v 101.627 115.223 -4.297 -v 101.802 115.526 -4.297 -v 101.61 115.234 -4.267 -v 101.784 115.537 -4.267 -v 101.592 115.244 -4.236 -v 101.767 115.547 -4.236 -v 101.75 115.556 -4.204 -v 101.576 115.253 -4.204 -v 101.562 115.26 -4.17 -v 101.737 115.564 -4.17 -v 101.55 115.268 -4.137 -v 101.724 115.57 -4.137 -v 101.537 115.275 -4.103 -v 101.712 115.578 -4.103 -v 101.527 115.28 -4.068 -v 101.702 115.584 -4.068 -v 101.694 115.59 -4.032 -v 101.52 115.286 -4.032 -v 101.512 115.29 -3.996 -v 101.687 115.593 -3.996 -v 101.506 115.293 -3.96 -v 101.68 115.596 -3.96 -v 101.502 115.295 -3.924 -v 101.677 115.598 -3.924 -v 101.5 115.296 -3.887 -v 101.675 115.6 -3.887 -v 101.674 115.6 -3.85 -v 101.5 115.297 -3.85 -v 119.85 114.922 -4.6 -v 119.676 115.225 -4.6 -v 119.883 114.94 -4.6 -v 119.708 115.243 -4.6 -v 119.74 115.262 -4.596 -v 119.915 114.96 -4.596 -v 119.772 115.28 -4.592 -v 119.947 114.977 -4.592 -v 119.803 115.298 -4.586 -v 119.978 114.995 -4.586 -v 119.834 115.316 -4.578 -v 120.01 115.013 -4.578 -v 120.04 115.03 -4.568 -v 119.865 115.334 -4.568 -v 119.895 115.35 -4.556 -v 120.07 115.048 -4.556 -v 119.925 115.37 -4.543 -v 120.1 115.065 -4.543 -v 119.954 115.385 -4.528 -v 120.13 115.082 -4.528 -v 119.982 115.402 -4.51 -v 120.157 115.1 -4.51 -v 120.185 115.115 -4.493 -v 120.01 115.418 -4.493 -v 120.037 115.433 -4.474 -v 120.212 115.13 -4.474 -v 120.063 115.448 -4.452 -v 120.238 115.145 -4.452 -v 120.088 115.463 -4.43 -v 120.263 115.16 -4.43 -v 120.112 115.477 -4.406 -v 120.287 115.174 -4.406 -v 120.31 115.187 -4.38 -v 120.136 115.49 -4.38 -v 120.333 115.2 -4.354 -v 120.158 115.503 -4.354 -v 120.178 115.515 -4.326 -v 120.353 115.212 -4.326 -v 120.198 115.526 -4.297 -v 120.373 115.223 -4.297 -v 120.216 115.537 -4.267 -v 120.39 115.234 -4.267 -v 120.233 115.547 -4.236 -v 120.408 115.244 -4.236 -v 120.424 115.253 -4.204 -v 120.25 115.556 -4.204 -v 120.263 115.564 -4.17 -v 120.438 115.26 -4.17 -v 120.276 115.57 -4.137 -v 120.45 115.268 -4.137 -v 120.288 115.578 -4.103 -v 120.463 115.275 -4.103 -v 120.298 115.584 -4.068 -v 120.473 115.28 -4.068 -v 120.48 115.286 -4.032 -v 120.306 115.59 -4.032 -v 120.313 115.593 -3.996 -v 120.488 115.29 -3.996 -v 120.32 115.596 -3.96 -v 120.494 115.293 -3.96 -v 120.323 115.598 -3.924 -v 120.498 115.295 -3.924 -v 120.325 115.6 -3.887 -v 120.5 115.296 -3.887 -v 120.5 115.297 -3.85 -v 120.326 115.6 -3.85 -v 102.292 115.243 -4.6 -v 102.26 115.262 -4.596 -v 102.324 115.225 -4.6 -v 102.228 115.28 -4.592 -v 102.197 115.298 -4.586 -v 102.166 115.316 -4.578 -v 102.135 115.334 -4.568 -v 102.105 115.35 -4.556 -v 102.075 115.37 -4.543 -v 102.046 115.385 -4.528 -v 102.017 115.402 -4.51 -v 101.99 115.418 -4.493 -v 101.963 115.433 -4.474 -v 101.937 115.448 -4.452 -v 101.912 115.463 -4.43 -v 101.887 115.477 -4.406 -v 101.864 115.49 -4.38 -v 101.842 115.503 -4.354 -v 101.822 115.515 -4.326 -v 101.802 115.526 -4.297 -v 101.784 115.537 -4.267 -v 101.767 115.547 -4.236 -v 101.75 115.556 -4.204 -v 101.737 115.564 -4.17 -v 101.724 115.57 -4.137 -v 101.712 115.578 -4.103 -v 101.702 115.584 -4.068 -v 101.694 115.59 -4.032 -v 101.687 115.593 -3.996 -v 101.68 115.596 -3.96 -v 101.677 115.598 -3.924 -v 101.675 115.6 -3.887 -v 101.674 115.6 -3.85 -v 103.325 114.647 -4.6 -v 103.325 114.647 -1.84 -v 101.674 115.6 -1.84 -v 101.674 115.6 0.167 -v 101.675 115.6 0.204 -v 102.324 115.225 0.917 -v 103.325 114.647 0.917 -v 101.677 115.598 0.24 -v 101.68 115.596 0.277 -v 101.687 115.593 0.314 -v 101.694 115.59 0.35 -v 101.702 115.584 0.385 -v 101.712 115.578 0.42 -v 101.724 115.57 0.454 -v 101.737 115.564 0.488 -v 101.75 115.556 0.52 -v 101.767 115.547 0.553 -v 101.784 115.537 0.584 -v 101.802 115.526 0.614 -v 101.822 115.515 0.643 -v 101.842 115.503 0.67 -v 101.864 115.49 0.698 -v 101.887 115.477 0.723 -v 101.912 115.463 0.747 -v 101.937 115.448 0.77 -v 101.963 115.433 0.79 -v 101.99 115.418 0.81 -v 102.017 115.402 0.83 -v 102.046 115.385 0.845 -v 102.075 115.37 0.86 -v 102.105 115.35 0.873 -v 102.135 115.334 0.885 -v 102.166 115.316 0.895 -v 102.197 115.298 0.903 -v 102.228 115.28 0.91 -v 102.26 115.262 0.914 -v 102.292 115.243 0.916 -v 103.15 114.344 -4.6 -v 103.325 114.647 -4.6 -v 103.345 114.636 -4.6 -v 118.5 114.6 -4.6 -v 118.5 114.25 -4.6 -v 103.5 114.6 -4.6 -v 103.5 114.25 -4.6 -v 103.477 114.6 -4.6 -v 103.454 114.252 -4.6 -v 103.454 114.603 -4.6 -v 103.41 114.256 -4.6 -v 103.432 114.607 -4.6 -v 103.363 114.263 -4.6 -v 103.41 114.612 -4.6 -v 103.32 114.274 -4.6 -v 103.387 114.62 -4.6 -v 103.275 114.287 -4.6 -v 103.366 114.627 -4.6 -v 103.232 114.303 -4.6 -v 103.19 114.322 -4.6 -v 118.523 114.6 -4.6 -v 118.546 114.252 -4.6 -v 118.546 114.603 -4.6 -v 118.59 114.256 -4.6 -v 118.568 114.607 -4.6 -v 118.637 114.263 -4.6 -v 118.59 114.612 -4.6 -v 118.68 114.274 -4.6 -v 118.612 114.62 -4.6 -v 118.725 114.287 -4.6 -v 118.634 114.627 -4.6 -v 118.768 114.303 -4.6 -v 118.655 114.636 -4.6 -v 118.81 114.322 -4.6 -v 118.675 114.647 -4.6 -v 118.85 114.344 -4.6 -v 119.883 114.94 -4.6 -v 119.915 114.96 -4.596 -v 119.85 114.922 -4.6 -v 119.947 114.977 -4.592 -v 119.978 114.995 -4.586 -v 120.01 115.013 -4.578 -v 120.04 115.03 -4.568 -v 120.07 115.048 -4.556 -v 120.1 115.065 -4.543 -v 120.13 115.082 -4.528 -v 120.157 115.1 -4.51 -v 120.185 115.115 -4.493 -v 120.212 115.13 -4.474 -v 120.238 115.145 -4.452 -v 120.263 115.16 -4.43 -v 120.287 115.174 -4.406 -v 120.31 115.187 -4.38 -v 120.333 115.2 -4.354 -v 120.353 115.212 -4.326 -v 120.373 115.223 -4.297 -v 120.39 115.234 -4.267 -v 120.408 115.244 -4.236 -v 120.424 115.253 -4.204 -v 120.438 115.26 -4.17 -v 120.45 115.268 -4.137 -v 120.463 115.275 -4.103 -v 120.473 115.28 -4.068 -v 120.48 115.286 -4.032 -v 120.488 115.29 -3.996 -v 120.494 115.293 -3.96 -v 120.498 115.295 -3.924 -v 120.5 115.296 -3.887 -v 120.5 115.297 -3.85 -v 118.85 114.344 -4.6 -v 118.85 114.344 -1.84 -v 120.5 115.297 -1.84 -v 120.5 115.297 0.167 -v 120.5 115.296 0.204 -v 119.85 114.922 0.917 -v 118.85 114.344 0.917 -v 120.498 115.295 0.24 -v 120.494 115.293 0.277 -v 120.488 115.29 0.314 -v 120.48 115.286 0.35 -v 120.473 115.28 0.385 -v 120.463 115.275 0.42 -v 120.45 115.268 0.454 -v 120.438 115.26 0.488 -v 120.424 115.253 0.52 -v 120.408 115.244 0.553 -v 120.39 115.234 0.584 -v 120.373 115.223 0.614 -v 120.353 115.212 0.643 -v 120.333 115.2 0.67 -v 120.31 115.187 0.698 -v 120.287 115.174 0.723 -v 120.263 115.16 0.747 -v 120.238 115.145 0.77 -v 120.212 115.13 0.79 -v 120.185 115.115 0.81 -v 120.157 115.1 0.83 -v 120.13 115.082 0.845 -v 120.1 115.065 0.86 -v 120.07 115.048 0.873 -v 120.04 115.03 0.885 -v 120.01 115.013 0.895 -v 119.978 114.995 0.903 -v 119.947 114.977 0.91 -v 119.915 114.96 0.914 -v 119.883 114.94 0.916 -v 101.674 115.6 -1.84 -v 101.5 115.297 -1.84 -v 101.674 115.6 0.167 -v 101.5 115.297 0.167 -v 101.5 115.296 -3.887 -v 102.15 114.922 -4.6 -v 101.5 115.297 -3.85 -v 103.15 114.344 -4.6 -v 103.15 114.344 -1.84 -v 101.502 115.295 -3.924 -v 101.506 115.293 -3.96 -v 101.512 115.29 -3.996 -v 101.52 115.286 -4.032 -v 101.527 115.28 -4.068 -v 101.537 115.275 -4.103 -v 101.55 115.268 -4.137 -v 101.562 115.26 -4.17 -v 101.576 115.253 -4.204 -v 101.592 115.244 -4.236 -v 101.61 115.234 -4.267 -v 101.627 115.223 -4.297 -v 101.647 115.212 -4.326 -v 101.667 115.2 -4.354 -v 101.69 115.187 -4.38 -v 101.712 115.174 -4.406 -v 101.737 115.16 -4.43 -v 101.762 115.145 -4.452 -v 101.788 115.13 -4.474 -v 101.815 115.115 -4.493 -v 101.842 115.1 -4.51 -v 101.87 115.082 -4.528 -v 101.9 115.065 -4.543 -v 101.93 115.048 -4.556 -v 101.96 115.03 -4.568 -v 101.99 115.013 -4.578 -v 102.022 114.995 -4.586 -v 102.053 114.977 -4.592 -v 102.085 114.96 -4.596 -v 102.117 114.94 -4.6 -v 103.15 114.344 0.917 -v 101.5 115.297 0.167 -v 101.5 115.297 -1.84 -v 102.15 114.922 0.917 -v 101.5 115.296 0.204 -v 102.117 114.94 0.916 -v 102.085 114.96 0.914 -v 102.053 114.977 0.91 -v 102.022 114.995 0.903 -v 101.99 115.013 0.895 -v 101.96 115.03 0.885 -v 101.93 115.048 0.873 -v 101.9 115.065 0.86 -v 101.87 115.082 0.845 -v 101.842 115.1 0.83 -v 101.815 115.115 0.81 -v 101.788 115.13 0.79 -v 101.762 115.145 0.77 -v 101.737 115.16 0.747 -v 101.712 115.174 0.723 -v 101.69 115.187 0.698 -v 101.667 115.2 0.67 -v 101.647 115.212 0.643 -v 101.627 115.223 0.614 -v 101.61 115.234 0.584 -v 101.592 115.244 0.553 -v 101.576 115.253 0.52 -v 101.562 115.26 0.488 -v 101.55 115.268 0.454 -v 101.537 115.275 0.42 -v 101.527 115.28 0.385 -v 101.52 115.286 0.35 -v 101.512 115.29 0.314 -v 101.506 115.293 0.277 -v 101.502 115.295 0.24 -v 103.5 114.25 -4.6 -v 103.5 114.25 -1.84 -v 103.454 114.252 -4.6 -v 103.454 114.252 0.917 -v 103.41 114.256 0.917 -v 103.5 114.25 0.917 -v 103.41 114.256 -4.6 -v 103.363 114.263 0.917 -v 103.363 114.263 -4.6 -v 103.32 114.274 0.917 -v 103.32 114.274 -4.6 -v 103.275 114.287 0.917 -v 103.275 114.287 -4.6 -v 103.232 114.303 0.917 -v 103.232 114.303 -4.6 -v 103.19 114.322 0.917 -v 103.19 114.322 -4.6 -v 118.5 114.25 0.917 -v 118.5 114.25 -1.84 -v 118.5 114.25 -4.6 -v 118.546 114.252 0.917 -v 118.546 114.252 -4.6 -v 118.59 114.256 -4.6 -v 118.59 114.256 0.917 -v 118.637 114.263 -4.6 -v 118.637 114.263 0.917 -v 118.68 114.274 -4.6 -v 118.68 114.274 0.917 -v 118.725 114.287 -4.6 -v 118.725 114.287 0.917 -v 118.768 114.303 -4.6 -v 118.768 114.303 0.917 -v 118.81 114.322 -4.6 -v 118.81 114.322 0.917 -v 120.326 115.6 -1.84 -v 120.5 115.297 -1.84 -v 120.326 115.6 0.167 -v 120.5 115.297 0.167 -v 120.325 115.6 -3.887 -v 119.676 115.225 -4.6 -v 120.326 115.6 -3.85 -v 118.675 114.647 -4.6 -v 118.675 114.647 -1.84 -v 120.323 115.598 -3.924 -v 120.32 115.596 -3.96 -v 120.313 115.593 -3.996 -v 120.306 115.59 -4.032 -v 120.298 115.584 -4.068 -v 120.288 115.578 -4.103 -v 120.276 115.57 -4.137 -v 120.263 115.564 -4.17 -v 120.25 115.556 -4.204 -v 120.233 115.547 -4.236 -v 120.216 115.537 -4.267 -v 120.198 115.526 -4.297 -v 120.178 115.515 -4.326 -v 120.158 115.503 -4.354 -v 120.136 115.49 -4.38 -v 120.112 115.477 -4.406 -v 120.088 115.463 -4.43 -v 120.063 115.448 -4.452 -v 120.037 115.433 -4.474 -v 120.01 115.418 -4.493 -v 119.982 115.402 -4.51 -v 119.954 115.385 -4.528 -v 119.925 115.37 -4.543 -v 119.895 115.35 -4.556 -v 119.865 115.334 -4.568 -v 119.834 115.316 -4.578 -v 119.803 115.298 -4.586 -v 119.772 115.28 -4.592 -v 119.74 115.262 -4.596 -v 119.708 115.243 -4.6 -v 118.675 114.647 0.917 -v 120.326 115.6 0.167 -v 120.326 115.6 -1.84 -v 119.676 115.225 0.917 -v 120.325 115.6 0.204 -v 119.708 115.243 0.916 -v 119.74 115.262 0.914 -v 119.772 115.28 0.91 -v 119.803 115.298 0.903 -v 119.834 115.316 0.895 -v 119.865 115.334 0.885 -v 119.895 115.35 0.873 -v 119.925 115.37 0.86 -v 119.954 115.385 0.845 -v 119.982 115.402 0.83 -v 120.01 115.418 0.81 -v 120.037 115.433 0.79 -v 120.063 115.448 0.77 -v 120.088 115.463 0.747 -v 120.112 115.477 0.723 -v 120.136 115.49 0.698 -v 120.158 115.503 0.67 -v 120.178 115.515 0.643 -v 120.198 115.526 0.614 -v 120.216 115.537 0.584 -v 120.233 115.547 0.553 -v 120.25 115.556 0.52 -v 120.263 115.564 0.488 -v 120.276 115.57 0.454 -v 120.288 115.578 0.42 -v 120.298 115.584 0.385 -v 120.306 115.59 0.35 -v 120.313 115.593 0.314 -v 120.32 115.596 0.277 -v 120.323 115.598 0.24 -v 118.5 114.6 0.917 -v 118.523 114.6 0.917 -v 118.5 114.6 -1.84 -v 118.523 114.6 -4.6 -v 118.5 114.6 -4.6 -v 118.546 114.603 0.917 -v 118.546 114.603 -4.6 -v 118.568 114.607 0.917 -v 118.568 114.607 -4.6 -v 118.59 114.612 0.917 -v 118.59 114.612 -4.6 -v 118.612 114.62 0.917 -v 118.612 114.62 -4.6 -v 118.634 114.627 0.917 -v 118.634 114.627 -4.6 -v 118.655 114.636 0.917 -v 118.655 114.636 -4.6 -v 103.5 114.6 -4.6 -v 103.5 114.6 -1.84 -v 103.5 114.6 0.917 -v 103.477 114.6 0.917 -v 103.477 114.6 -4.6 -v 103.454 114.603 -4.6 -v 103.454 114.603 0.917 -v 103.432 114.607 -4.6 -v 103.432 114.607 0.917 -v 103.41 114.612 -4.6 -v 103.41 114.612 0.917 -v 103.387 114.62 -4.6 -v 103.387 114.62 0.917 -v 103.366 114.627 -4.6 -v 103.366 114.627 0.917 -v 103.345 114.636 -4.6 -v 103.345 114.636 0.917 -v 117.75 106.41 1.21 -v 111 106.41 1.21 -v 117.75 106.25 0.9 -v 111 106.25 0.9 -v 104.25 106.41 1.21 -v 104.25 106.25 0.9 -v 119.676 115.225 0.917 -v 119.85 114.922 0.917 -v 119.708 115.243 0.916 -v 119.883 114.94 0.916 -v 119.915 114.96 0.914 -v 119.74 115.262 0.914 -v 119.947 114.977 0.91 -v 119.772 115.28 0.91 -v 119.978 114.995 0.903 -v 119.803 115.298 0.903 -v 120.01 115.013 0.895 -v 119.834 115.316 0.895 -v 119.865 115.334 0.885 -v 120.04 115.03 0.885 -v 120.07 115.048 0.873 -v 119.895 115.35 0.873 -v 120.1 115.065 0.86 -v 119.925 115.37 0.86 -v 120.13 115.082 0.845 -v 119.954 115.385 0.845 -v 120.157 115.1 0.83 -v 119.982 115.402 0.83 -v 120.01 115.418 0.81 -v 120.185 115.115 0.81 -v 120.212 115.13 0.79 -v 120.037 115.433 0.79 -v 120.238 115.145 0.77 -v 120.063 115.448 0.77 -v 120.263 115.16 0.747 -v 120.088 115.463 0.747 -v 120.287 115.174 0.723 -v 120.112 115.477 0.723 -v 120.136 115.49 0.698 -v 120.31 115.187 0.698 -v 120.158 115.503 0.67 -v 120.333 115.2 0.67 -v 120.353 115.212 0.643 -v 120.178 115.515 0.643 -v 120.373 115.223 0.614 -v 120.198 115.526 0.614 -v 120.39 115.234 0.584 -v 120.216 115.537 0.584 -v 120.408 115.244 0.553 -v 120.233 115.547 0.553 -v 120.25 115.556 0.52 -v 120.424 115.253 0.52 -v 120.438 115.26 0.488 -v 120.263 115.564 0.488 -v 120.45 115.268 0.454 -v 120.276 115.57 0.454 -v 120.463 115.275 0.42 -v 120.288 115.578 0.42 -v 120.473 115.28 0.385 -v 120.298 115.584 0.385 -v 120.306 115.59 0.35 -v 120.48 115.286 0.35 -v 120.488 115.29 0.314 -v 120.313 115.593 0.314 -v 120.494 115.293 0.277 -v 120.32 115.596 0.277 -v 120.498 115.295 0.24 -v 120.323 115.598 0.24 -v 120.5 115.296 0.204 -v 120.325 115.6 0.204 -v 101.675 115.6 0.204 -v 101.5 115.296 0.204 -v 101.502 115.295 0.24 -v 101.677 115.598 0.24 -v 101.506 115.293 0.277 -v 101.68 115.596 0.277 -v 101.512 115.29 0.314 -v 101.687 115.593 0.314 -v 101.52 115.286 0.35 -v 101.694 115.59 0.35 -v 101.702 115.584 0.385 -v 101.527 115.28 0.385 -v 101.537 115.275 0.42 -v 101.712 115.578 0.42 -v 101.55 115.268 0.454 -v 101.724 115.57 0.454 -v 101.562 115.26 0.488 -v 101.737 115.564 0.488 -v 101.576 115.253 0.52 -v 101.75 115.556 0.52 -v 101.767 115.547 0.553 -v 101.592 115.244 0.553 -v 101.61 115.234 0.584 -v 101.784 115.537 0.584 -v 101.627 115.223 0.614 -v 101.802 115.526 0.614 -v 101.647 115.212 0.643 -v 101.822 115.515 0.643 -v 101.667 115.2 0.67 -v 101.842 115.503 0.67 -v 101.864 115.49 0.698 -v 101.69 115.187 0.698 -v 101.887 115.477 0.723 -v 101.712 115.174 0.723 -v 101.737 115.16 0.747 -v 101.912 115.463 0.747 -v 101.762 115.145 0.77 -v 101.937 115.448 0.77 -v 101.788 115.13 0.79 -v 101.963 115.433 0.79 -v 101.815 115.115 0.81 -v 101.99 115.418 0.81 -v 102.017 115.402 0.83 -v 101.842 115.1 0.83 -v 101.87 115.082 0.845 -v 102.046 115.385 0.845 -v 101.9 115.065 0.86 -v 102.075 115.37 0.86 -v 101.93 115.048 0.873 -v 102.105 115.35 0.873 -v 101.96 115.03 0.885 -v 102.135 115.334 0.885 -v 102.166 115.316 0.895 -v 101.99 115.013 0.895 -v 102.022 114.995 0.903 -v 102.197 115.298 0.903 -v 102.053 114.977 0.91 -v 102.228 115.28 0.91 -v 102.085 114.96 0.914 -v 102.26 115.262 0.914 -v 102.117 114.94 0.916 -v 102.292 115.243 0.916 -v 102.324 115.225 0.917 -v 102.15 114.922 0.917 -v 118.5 106.915 0.554 -v 118.5 107.077 0.865 -v 118.5 106.883 0.57 -v 118.5 107.044 0.88 -v 118.496 107.012 0.898 -v 118.496 106.85 0.588 -v 118.492 106.98 0.915 -v 118.492 106.818 0.605 -v 118.486 106.947 0.932 -v 118.486 106.786 0.622 -v 118.478 106.915 0.95 -v 118.478 106.754 0.638 -v 118.468 106.722 0.654 -v 118.468 106.884 0.965 -v 118.456 106.853 0.98 -v 118.456 106.69 0.67 -v 118.443 106.822 0.997 -v 118.443 106.66 0.686 -v 118.428 106.792 1.012 -v 118.428 106.63 0.702 -v 118.41 106.763 1.028 -v 118.41 106.602 0.717 -v 118.393 106.573 0.732 -v 118.393 106.735 1.042 -v 118.374 106.707 1.057 -v 118.374 106.546 0.746 -v 118.352 106.68 1.07 -v 118.352 106.52 0.76 -v 118.33 106.655 1.084 -v 118.33 106.493 0.774 -v 118.306 106.63 1.097 -v 118.306 106.47 0.786 -v 118.28 106.445 0.8 -v 118.28 106.606 1.11 -v 118.254 106.422 0.81 -v 118.254 106.584 1.12 -v 118.226 106.563 1.132 -v 118.226 106.4 0.82 -v 118.197 106.542 1.142 -v 118.197 106.38 0.832 -v 118.167 106.524 1.152 -v 118.167 106.362 0.842 -v 118.136 106.506 1.16 -v 118.136 106.345 0.85 -v 118.104 106.33 0.86 -v 118.104 106.49 1.17 -v 118.07 106.475 1.177 -v 118.07 106.314 0.867 -v 118.037 106.462 1.184 -v 118.037 106.3 0.874 -v 118.003 106.45 1.19 -v 118.003 106.29 0.88 -v 117.968 106.44 1.196 -v 117.968 106.28 0.885 -v 117.932 106.27 0.89 -v 117.932 106.43 1.2 -v 117.896 106.424 1.204 -v 117.896 106.263 0.893 -v 117.86 106.42 1.207 -v 117.86 106.257 0.896 -v 117.824 106.415 1.21 -v 117.824 106.253 0.898 -v 117.787 106.412 1.21 -v 117.787 106.25 0.9 -v 103.5 113.682 1.582 -v 118.5 113.682 1.582 -v 103.5 113.722 1.594 -v 118.5 113.722 1.594 -v 118.5 113.762 1.603 -v 103.5 113.762 1.603 -v 118.5 113.803 1.61 -v 103.5 113.803 1.61 -v 118.5 113.844 1.615 -v 103.5 113.844 1.615 -v 118.5 113.885 1.617 -v 103.5 113.885 1.617 -v 118.5 113.926 1.617 -v 103.5 113.926 1.617 -v 118.5 113.967 1.614 -v 103.5 113.967 1.614 -v 118.5 114.008 1.61 -v 103.5 114.008 1.61 -v 118.5 114.05 1.6 -v 103.5 114.05 1.6 -v 118.5 114.09 1.59 -v 103.5 114.09 1.59 -v 118.5 114.128 1.58 -v 103.5 114.128 1.58 -v 118.5 114.167 1.564 -v 103.5 114.167 1.564 -v 118.5 114.205 1.547 -v 103.5 114.205 1.547 -v 118.5 114.24 1.528 -v 103.5 114.24 1.528 -v 118.5 114.277 1.507 -v 103.5 114.277 1.507 -v 118.5 114.31 1.484 -v 103.5 114.31 1.484 -v 118.5 114.344 1.46 -v 103.5 114.344 1.46 -v 118.5 114.375 1.432 -v 103.5 114.375 1.432 -v 118.5 114.404 1.403 -v 103.5 114.404 1.403 -v 118.5 114.432 1.372 -v 103.5 114.432 1.372 -v 118.5 114.458 1.34 -v 103.5 114.458 1.34 -v 118.5 114.482 1.306 -v 103.5 114.482 1.306 -v 118.5 114.504 1.272 -v 103.5 114.504 1.272 -v 118.5 114.524 1.235 -v 103.5 114.524 1.235 -v 118.5 114.54 1.198 -v 103.5 114.54 1.198 -v 118.5 114.557 1.16 -v 103.5 114.557 1.16 -v 118.5 114.57 1.12 -v 103.5 114.57 1.12 -v 118.5 114.58 1.08 -v 103.5 114.58 1.08 -v 118.5 114.59 1.04 -v 103.5 114.59 1.04 -v 118.5 114.595 1 -v 103.5 114.595 1 -v 118.5 114.6 0.958 -v 103.5 114.6 0.958 -v 118.5 108.92 0.024 -v 111 108.92 0.024 -v 103.5 108.92 0.024 -v 118.5 108.65 0.046 -v 118.5 108.666 0.04 -v 111 108.65 0.046 -v 103.5 108.666 0.04 -v 103.5 108.65 0.046 -v 103.5 108.682 0.032 -v 118.5 108.682 0.032 -v 118.5 108.698 0.026 -v 103.5 108.698 0.026 -v 118.5 108.715 0.02 -v 103.5 108.715 0.02 -v 118.5 108.732 0.016 -v 103.5 108.732 0.016 -v 118.5 108.75 0.013 -v 103.5 108.75 0.013 -v 103.5 108.766 0.01 -v 118.5 108.766 0.01 -v 118.5 108.783 0.008 -v 103.5 108.783 0.008 -v 118.5 108.8 0.007 -v 103.5 108.8 0.007 -v 103.5 108.818 0.007 -v 118.5 108.818 0.007 -v 118.5 108.836 0.008 -v 103.5 108.836 0.008 -v 103.5 108.853 0.01 -v 118.5 108.853 0.01 -v 118.5 108.87 0.012 -v 103.5 108.87 0.012 -v 118.5 108.887 0.015 -v 103.5 108.887 0.015 -v 118.5 108.904 0.02 -v 103.5 108.904 0.02 -v 118.5 107.077 0.865 -v 117.75 106.41 1.21 -v 111 106.41 1.21 -v 104.25 106.41 1.21 -v 103.5 107.077 0.865 -v 103.5 107.044 0.88 -v 103.504 107.012 0.898 -v 103.508 106.98 0.915 -v 103.514 106.947 0.932 -v 103.522 106.915 0.95 -v 103.532 106.884 0.965 -v 103.544 106.853 0.98 -v 103.557 106.822 0.997 -v 103.572 106.792 1.012 -v 103.59 106.763 1.028 -v 103.607 106.735 1.042 -v 103.626 106.707 1.057 -v 103.648 106.68 1.07 -v 103.67 106.655 1.084 -v 103.694 106.63 1.097 -v 103.72 106.606 1.11 -v 103.746 106.584 1.12 -v 103.774 106.563 1.132 -v 103.803 106.542 1.142 -v 103.833 106.524 1.152 -v 103.864 106.506 1.16 -v 103.896 106.49 1.17 -v 103.93 106.475 1.177 -v 103.963 106.462 1.184 -v 103.997 106.45 1.19 -v 104.032 106.44 1.196 -v 104.068 106.43 1.2 -v 104.104 106.424 1.204 -v 104.14 106.42 1.207 -v 104.176 106.415 1.21 -v 104.213 106.412 1.21 -v 117.787 106.412 1.21 -v 117.824 106.415 1.21 -v 117.86 106.42 1.207 -v 117.896 106.424 1.204 -v 117.932 106.43 1.2 -v 117.968 106.44 1.196 -v 118.003 106.45 1.19 -v 118.037 106.462 1.184 -v 118.07 106.475 1.177 -v 118.104 106.49 1.17 -v 118.136 106.506 1.16 -v 118.167 106.524 1.152 -v 118.197 106.542 1.142 -v 118.226 106.563 1.132 -v 118.254 106.584 1.12 -v 118.28 106.606 1.11 -v 118.306 106.63 1.097 -v 118.33 106.655 1.084 -v 118.352 106.68 1.07 -v 118.374 106.707 1.057 -v 118.393 106.735 1.042 -v 118.41 106.763 1.028 -v 118.428 106.792 1.012 -v 118.443 106.822 0.997 -v 118.456 106.853 0.98 -v 118.468 106.884 0.965 -v 118.478 106.915 0.95 -v 118.486 106.947 0.932 -v 118.492 106.98 0.915 -v 118.496 107.012 0.898 -v 118.5 107.044 0.88 -v 104.213 106.25 0.9 -v 104.213 106.412 1.21 -v 104.176 106.415 1.21 -v 104.176 106.253 0.898 -v 104.14 106.42 1.207 -v 104.14 106.257 0.896 -v 104.104 106.424 1.204 -v 104.104 106.263 0.893 -v 104.068 106.43 1.2 -v 104.068 106.27 0.89 -v 104.032 106.28 0.885 -v 104.032 106.44 1.196 -v 103.997 106.45 1.19 -v 103.997 106.29 0.88 -v 103.963 106.462 1.184 -v 103.963 106.3 0.874 -v 103.93 106.475 1.177 -v 103.93 106.314 0.867 -v 103.896 106.49 1.17 -v 103.896 106.33 0.86 -v 103.864 106.345 0.85 -v 103.864 106.506 1.16 -v 103.833 106.524 1.152 -v 103.833 106.362 0.842 -v 103.803 106.542 1.142 -v 103.803 106.38 0.832 -v 103.774 106.563 1.132 -v 103.774 106.4 0.82 -v 103.746 106.584 1.12 -v 103.746 106.422 0.81 -v 103.72 106.445 0.8 -v 103.72 106.606 1.11 -v 103.694 106.47 0.786 -v 103.694 106.63 1.097 -v 103.67 106.655 1.084 -v 103.67 106.493 0.774 -v 103.648 106.68 1.07 -v 103.648 106.52 0.76 -v 103.626 106.707 1.057 -v 103.626 106.546 0.746 -v 103.607 106.735 1.042 -v 103.607 106.573 0.732 -v 103.59 106.602 0.717 -v 103.59 106.763 1.028 -v 103.572 106.792 1.012 -v 103.572 106.63 0.702 -v 103.557 106.822 0.997 -v 103.557 106.66 0.686 -v 103.544 106.853 0.98 -v 103.544 106.69 0.67 -v 103.532 106.884 0.965 -v 103.532 106.722 0.654 -v 103.522 106.754 0.638 -v 103.522 106.915 0.95 -v 103.514 106.947 0.932 -v 103.514 106.786 0.622 -v 103.508 106.98 0.915 -v 103.508 106.818 0.605 -v 103.504 107.012 0.898 -v 103.504 106.85 0.588 -v 103.5 107.044 0.88 -v 103.5 106.883 0.57 -v 103.5 106.915 0.554 -v 103.5 107.077 0.865 -v 103.5 106.883 0.57 -v 103.5 106.915 0.554 -v 104.25 106.25 0.9 -v 103.5 108.49 -0.264 -v 111 106.25 0.9 -v 118.5 108.49 -0.264 -v 117.75 106.25 0.9 -v 118.5 106.915 0.554 -v 118.5 106.883 0.57 -v 104.213 106.25 0.9 -v 104.176 106.253 0.898 -v 104.14 106.257 0.896 -v 104.104 106.263 0.893 -v 104.068 106.27 0.89 -v 104.032 106.28 0.885 -v 103.997 106.29 0.88 -v 103.963 106.3 0.874 -v 103.93 106.314 0.867 -v 103.896 106.33 0.86 -v 103.864 106.345 0.85 -v 103.833 106.362 0.842 -v 103.803 106.38 0.832 -v 103.774 106.4 0.82 -v 103.746 106.422 0.81 -v 103.72 106.445 0.8 -v 103.694 106.47 0.786 -v 103.67 106.493 0.774 -v 103.648 106.52 0.76 -v 103.626 106.546 0.746 -v 103.607 106.573 0.732 -v 103.59 106.602 0.717 -v 103.572 106.63 0.702 -v 103.557 106.66 0.686 -v 103.544 106.69 0.67 -v 103.532 106.722 0.654 -v 103.522 106.754 0.638 -v 103.514 106.786 0.622 -v 103.508 106.818 0.605 -v 103.504 106.85 0.588 -v 118.496 106.85 0.588 -v 118.492 106.818 0.605 -v 118.486 106.786 0.622 -v 118.478 106.754 0.638 -v 118.468 106.722 0.654 -v 118.456 106.69 0.67 -v 118.443 106.66 0.686 -v 118.428 106.63 0.702 -v 118.41 106.602 0.717 -v 118.393 106.573 0.732 -v 118.374 106.546 0.746 -v 118.352 106.52 0.76 -v 118.33 106.493 0.774 -v 118.306 106.47 0.786 -v 118.28 106.445 0.8 -v 118.254 106.422 0.81 -v 118.226 106.4 0.82 -v 118.197 106.38 0.832 -v 118.167 106.362 0.842 -v 118.136 106.345 0.85 -v 118.104 106.33 0.86 -v 118.07 106.314 0.867 -v 118.037 106.3 0.874 -v 118.003 106.29 0.88 -v 117.968 106.28 0.885 -v 117.932 106.27 0.89 -v 117.896 106.263 0.893 -v 117.86 106.257 0.896 -v 117.824 106.253 0.898 -v 117.787 106.25 0.9 -v 103.5 108.52 -0.28 -v 118.5 108.52 -0.28 -v 118.5 108.552 -0.293 -v 103.5 108.552 -0.293 -v 103.5 108.585 -0.305 -v 118.5 108.585 -0.305 -v 103.5 108.618 -0.316 -v 118.5 108.618 -0.316 -v 103.5 108.652 -0.325 -v 118.5 108.652 -0.325 -v 103.5 108.686 -0.332 -v 118.5 108.686 -0.332 -v 118.5 108.72 -0.337 -v 103.5 108.72 -0.337 -v 103.5 108.755 -0.34 -v 118.5 108.755 -0.34 -v 103.5 108.79 -0.343 -v 118.5 108.79 -0.343 -v 118.5 108.824 -0.343 -v 103.5 108.824 -0.343 -v 103.5 108.86 -0.342 -v 118.5 108.86 -0.342 -v 118.5 108.894 -0.338 -v 103.5 108.894 -0.338 -v 103.5 108.928 -0.333 -v 118.5 108.928 -0.333 -v 103.5 108.962 -0.327 -v 118.5 108.962 -0.327 -v 103.5 108.996 -0.318 -v 118.5 108.996 -0.318 -v 103.5 109.03 -0.308 -v 118.5 109.03 -0.308 -v 118.675 114.647 0.917 -v 118.85 114.344 0.917 -v 118.655 114.636 0.917 -v 118.81 114.322 0.917 -v 118.634 114.627 0.917 -v 118.768 114.303 0.917 -v 118.612 114.62 0.917 -v 118.725 114.287 0.917 -v 118.59 114.612 0.917 -v 118.68 114.274 0.917 -v 118.568 114.607 0.917 -v 118.637 114.263 0.917 -v 118.546 114.603 0.917 -v 118.59 114.256 0.917 -v 118.523 114.6 0.917 -v 118.546 114.252 0.917 -v 118.5 114.6 0.917 -v 118.5 114.25 0.917 -v 103.5 114.25 0.917 -v 103.5 114.6 0.917 -v 103.454 114.252 0.917 -v 103.477 114.6 0.917 -v 103.454 114.603 0.917 -v 103.41 114.256 0.917 -v 103.432 114.607 0.917 -v 103.363 114.263 0.917 -v 103.41 114.612 0.917 -v 103.32 114.274 0.917 -v 103.387 114.62 0.917 -v 103.275 114.287 0.917 -v 103.366 114.627 0.917 -v 103.232 114.303 0.917 -v 103.345 114.636 0.917 -v 103.19 114.322 0.917 -v 103.15 114.344 0.917 -v 103.325 114.647 0.917 -v 103.5 113.79 1.25 -v 118.5 113.79 1.25 -v 118.5 113.893 1.267 -v 118.5 113.885 1.617 -v 118.5 113.872 1.266 -v 118.5 113.844 1.615 -v 118.5 113.85 1.264 -v 118.5 113.803 1.61 -v 118.5 113.83 1.26 -v 118.5 113.762 1.603 -v 118.5 113.81 1.256 -v 118.5 113.722 1.594 -v 118.5 113.79 1.25 -v 118.5 113.682 1.582 -v 118.5 109.03 -0.308 -v 118.5 108.92 0.024 -v 118.5 108.996 -0.318 -v 118.5 108.904 0.02 -v 118.5 108.962 -0.327 -v 118.5 108.887 0.015 -v 118.5 108.928 -0.333 -v 118.5 108.87 0.012 -v 118.5 108.894 -0.338 -v 118.5 108.853 0.01 -v 118.5 108.86 -0.342 -v 118.5 108.836 0.008 -v 118.5 108.824 -0.343 -v 118.5 108.818 0.007 -v 118.5 108.79 -0.343 -v 118.5 108.8 0.007 -v 118.5 108.783 0.008 -v 118.5 113.913 1.267 -v 118.5 113.926 1.617 -v 118.5 113.934 1.266 -v 118.5 113.967 1.614 -v 118.5 113.954 1.263 -v 118.5 114.008 1.61 -v 118.5 113.974 1.26 -v 118.5 114.05 1.6 -v 118.5 113.995 1.254 -v 118.5 114.09 1.59 -v 118.5 114.014 1.248 -v 118.5 114.128 1.58 -v 118.5 114.034 1.24 -v 118.5 114.167 1.564 -v 118.5 114.052 1.232 -v 118.5 114.205 1.547 -v 118.5 114.07 1.223 -v 118.5 114.24 1.528 -v 118.5 114.088 1.212 -v 118.5 114.277 1.507 -v 118.5 114.105 1.2 -v 118.5 114.31 1.484 -v 118.5 114.122 1.188 -v 118.5 114.344 1.46 -v 118.5 114.137 1.174 -v 118.5 114.375 1.432 -v 118.5 114.152 1.16 -v 118.5 114.404 1.403 -v 118.5 114.166 1.145 -v 118.5 114.432 1.372 -v 118.5 114.18 1.13 -v 118.5 114.458 1.34 -v 118.5 114.19 1.112 -v 118.5 114.482 1.306 -v 118.5 114.202 1.094 -v 118.5 114.504 1.272 -v 118.5 114.212 1.076 -v 118.5 114.524 1.235 -v 118.5 114.22 1.058 -v 118.5 114.54 1.198 -v 118.5 114.228 1.038 -v 118.5 114.557 1.16 -v 118.5 114.235 1.02 -v 118.5 114.57 1.12 -v 118.5 114.24 1 -v 118.5 114.58 1.08 -v 118.5 114.245 0.98 -v 118.5 114.59 1.04 -v 118.5 114.248 0.958 -v 118.5 114.595 1 -v 118.5 114.25 0.938 -v 118.5 114.6 0.958 -v 118.5 114.25 0.917 -v 118.5 114.6 0.917 -v 118.5 108.755 -0.34 -v 118.5 108.766 0.01 -v 118.5 108.72 -0.337 -v 118.5 108.75 0.013 -v 118.5 108.686 -0.332 -v 118.5 108.732 0.016 -v 118.5 108.652 -0.325 -v 118.5 108.715 0.02 -v 118.5 108.618 -0.316 -v 118.5 108.698 0.026 -v 118.5 108.585 -0.305 -v 118.5 108.682 0.032 -v 118.5 108.552 -0.293 -v 118.5 108.666 0.04 -v 118.5 108.52 -0.28 -v 118.5 108.65 0.046 -v 118.5 108.49 -0.264 -v 103.5 114.6 0.917 -v 103.5 114.25 0.917 -v 103.5 114.6 0.958 -v 103.5 114.25 0.938 -v 103.5 114.248 0.958 -v 103.5 114.595 1 -v 103.5 114.245 0.98 -v 103.5 114.59 1.04 -v 103.5 114.24 1 -v 103.5 114.58 1.08 -v 103.5 114.235 1.02 -v 103.5 114.57 1.12 -v 103.5 114.228 1.038 -v 103.5 114.557 1.16 -v 103.5 114.22 1.058 -v 103.5 114.54 1.198 -v 103.5 114.212 1.076 -v 103.5 114.524 1.235 -v 103.5 114.202 1.094 -v 103.5 114.504 1.272 -v 103.5 114.19 1.112 -v 103.5 114.482 1.306 -v 103.5 114.18 1.13 -v 103.5 114.458 1.34 -v 103.5 114.166 1.145 -v 103.5 114.432 1.372 -v 103.5 114.152 1.16 -v 103.5 114.404 1.403 -v 103.5 114.137 1.174 -v 103.5 114.375 1.432 -v 103.5 114.122 1.188 -v 103.5 114.344 1.46 -v 103.5 114.105 1.2 -v 103.5 114.31 1.484 -v 103.5 114.088 1.212 -v 103.5 114.277 1.507 -v 103.5 114.07 1.223 -v 103.5 114.24 1.528 -v 103.5 114.052 1.232 -v 103.5 114.205 1.547 -v 103.5 114.034 1.24 -v 103.5 114.167 1.564 -v 103.5 114.014 1.248 -v 103.5 114.128 1.58 -v 103.5 113.995 1.254 -v 103.5 114.09 1.59 -v 103.5 113.974 1.26 -v 103.5 114.05 1.6 -v 103.5 113.954 1.263 -v 103.5 114.008 1.61 -v 103.5 113.934 1.266 -v 103.5 113.967 1.614 -v 103.5 113.913 1.267 -v 103.5 113.893 1.267 -v 103.5 113.844 1.615 -v 103.5 113.872 1.266 -v 103.5 113.803 1.61 -v 103.5 113.85 1.264 -v 103.5 113.762 1.603 -v 103.5 113.83 1.26 -v 103.5 113.722 1.594 -v 103.5 113.81 1.256 -v 103.5 113.682 1.582 -v 103.5 113.79 1.25 -v 103.5 108.92 0.024 -v 103.5 109.03 -0.308 -v 103.5 108.996 -0.318 -v 103.5 108.904 0.02 -v 103.5 108.962 -0.327 -v 103.5 108.887 0.015 -v 103.5 108.928 -0.333 -v 103.5 108.87 0.012 -v 103.5 108.894 -0.338 -v 103.5 108.853 0.01 -v 103.5 108.86 -0.342 -v 103.5 108.836 0.008 -v 103.5 108.824 -0.343 -v 103.5 108.818 0.007 -v 103.5 108.79 -0.343 -v 103.5 108.8 0.007 -v 103.5 108.755 -0.34 -v 103.5 108.783 0.008 -v 103.5 108.72 -0.337 -v 103.5 108.766 0.01 -v 103.5 108.686 -0.332 -v 103.5 108.75 0.013 -v 103.5 108.652 -0.325 -v 103.5 108.732 0.016 -v 103.5 108.618 -0.316 -v 103.5 108.715 0.02 -v 103.5 108.585 -0.305 -v 103.5 108.698 0.026 -v 103.5 108.552 -0.293 -v 103.5 108.682 0.032 -v 103.5 108.52 -0.28 -v 103.5 108.666 0.04 -v 103.5 108.49 -0.264 -v 103.5 108.65 0.046 -v 103.5 113.885 1.617 -v 103.5 113.926 1.617 -v 118.5 113.81 1.256 -v 103.5 113.81 1.256 -v 103.5 113.83 1.26 -v 118.5 113.83 1.26 -v 103.5 113.85 1.264 -v 118.5 113.85 1.264 -v 103.5 113.872 1.266 -v 118.5 113.872 1.266 -v 103.5 113.893 1.267 -v 118.5 113.893 1.267 -v 103.5 113.913 1.267 -v 118.5 113.913 1.267 -v 103.5 113.934 1.266 -v 118.5 113.934 1.266 -v 103.5 113.954 1.263 -v 118.5 113.954 1.263 -v 103.5 113.974 1.26 -v 118.5 113.974 1.26 -v 103.5 113.995 1.254 -v 118.5 113.995 1.254 -v 103.5 114.014 1.248 -v 118.5 114.014 1.248 -v 103.5 114.034 1.24 -v 118.5 114.034 1.24 -v 103.5 114.052 1.232 -v 118.5 114.052 1.232 -v 103.5 114.07 1.223 -v 118.5 114.07 1.223 -v 103.5 114.088 1.212 -v 118.5 114.088 1.212 -v 103.5 114.105 1.2 -v 118.5 114.105 1.2 -v 103.5 114.122 1.188 -v 118.5 114.122 1.188 -v 103.5 114.137 1.174 -v 118.5 114.137 1.174 -v 103.5 114.152 1.16 -v 118.5 114.152 1.16 -v 103.5 114.166 1.145 -v 118.5 114.166 1.145 -v 103.5 114.18 1.13 -v 118.5 114.18 1.13 -v 103.5 114.19 1.112 -v 118.5 114.19 1.112 -v 103.5 114.202 1.094 -v 118.5 114.202 1.094 -v 103.5 114.212 1.076 -v 118.5 114.212 1.076 -v 103.5 114.22 1.058 -v 118.5 114.22 1.058 -v 103.5 114.228 1.038 -v 118.5 114.228 1.038 -v 103.5 114.235 1.02 -v 118.5 114.235 1.02 -v 103.5 114.24 1 -v 118.5 114.24 1 -v 103.5 114.245 0.98 -v 118.5 114.245 0.98 -v 103.5 114.248 0.958 -v 118.5 114.248 0.958 -v 103.5 114.25 0.938 -v 118.5 114.25 0.938 -vt 1 1.014 -vt -0 1.014 -vt 1 0 -vt 0 0 -vt 0 0 -f 1/1 2/2 3/3 -f 3/3 2/2 4/4 -f 5/5 6/5 7/5 -f 7/5 6/5 8/5 -f 9/5 10/5 11/5 -f 11/5 10/5 12/5 -f 13/5 14/5 15/5 -f 15/5 14/5 16/5 -f 17/5 18/5 19/5 -f 19/5 18/5 20/5 -f 21/5 22/5 23/5 -f 23/5 22/5 24/5 -f 23/5 24/5 25/5 -f 25/5 24/5 26/5 -f 27/5 28/5 24/5 -f 24/5 28/5 29/5 -f 24/5 29/5 30/5 -f 30/5 31/5 24/5 -f 24/5 31/5 32/5 -f 24/5 32/5 33/5 -f 33/5 34/5 24/5 -f 24/5 34/5 35/5 -f 24/5 35/5 36/5 -f 36/5 37/5 24/5 -f 24/5 37/5 38/5 -f 24/5 38/5 39/5 -f 39/5 40/5 24/5 -f 24/5 40/5 41/5 -f 24/5 41/5 42/5 -f 42/5 26/5 24/5 -f 25/5 43/5 23/5 -f 23/5 43/5 44/5 -f 44/5 43/5 45/5 -f 45/5 43/5 46/5 -f 45/5 46/5 47/5 -f 47/5 48/5 45/5 -f 45/5 48/5 49/5 -f 45/5 49/5 50/5 -f 50/5 51/5 45/5 -f 45/5 51/5 52/5 -f 45/5 52/5 53/5 -f 53/5 54/5 45/5 -f 45/5 54/5 55/5 -f 45/5 55/5 56/5 -f 56/5 57/5 45/5 -f 45/5 57/5 58/5 -f 45/5 58/5 59/5 -f 59/5 60/5 45/5 -f 45/5 60/5 61/5 -f 45/5 61/5 62/5 -f 45/5 63/5 44/5 -f 44/5 63/5 64/5 -f 44/5 64/5 65/5 -f 65/5 66/5 44/5 -f 44/5 66/5 67/5 -f 44/5 67/5 68/5 -f 68/5 69/5 44/5 -f 44/5 69/5 70/5 -f 44/5 70/5 71/5 -f 71/5 72/5 44/5 -f 44/5 72/5 73/5 -f 44/5 73/5 74/5 -f 74/5 75/5 44/5 -f 44/5 75/5 76/5 -f 44/5 76/5 77/5 -f 77/5 78/5 44/5 -f 44/5 78/5 79/5 -f 44/5 79/5 80/5 -f 81/5 82/5 23/5 -f 23/5 82/5 83/5 -f 23/5 83/5 84/5 -f 84/5 85/5 23/5 -f 23/5 85/5 86/5 -f 23/5 86/5 87/5 -f 87/5 88/5 23/5 -f 23/5 88/5 89/5 -f 23/5 89/5 90/5 -f 90/5 91/5 23/5 -f 23/5 91/5 92/5 -f 23/5 92/5 93/5 -f 93/5 94/5 23/5 -f 23/5 94/5 95/5 -f 23/5 95/5 96/5 -f 96/5 21/5 23/5 -f 97/5 98/5 99/5 -f 99/5 98/5 100/5 -f 99/5 100/5 101/5 -f 101/5 100/5 102/5 -f 101/5 102/5 103/5 -f 103/5 102/5 104/5 -f 99/5 105/5 97/5 -f 97/5 105/5 106/5 -f 97/5 106/5 107/5 -f 107/5 108/5 97/5 -f 97/5 108/5 109/5 -f 97/5 109/5 110/5 -f 110/5 111/5 97/5 -f 97/5 111/5 112/5 -f 97/5 112/5 113/5 -f 113/5 114/5 97/5 -f 97/5 114/5 115/5 -f 97/5 115/5 116/5 -f 116/5 117/5 97/5 -f 97/5 117/5 118/5 -f 97/5 118/5 119/5 -f 119/5 120/5 97/5 -f 97/5 120/5 121/5 -f 97/5 122/5 98/5 -f 98/5 122/5 123/5 -f 98/5 123/5 124/5 -f 124/5 125/5 98/5 -f 98/5 125/5 126/5 -f 98/5 126/5 127/5 -f 127/5 128/5 98/5 -f 98/5 128/5 129/5 -f 98/5 129/5 130/5 -f 130/5 131/5 98/5 -f 98/5 131/5 132/5 -f 98/5 132/5 133/5 -f 133/5 134/5 98/5 -f 98/5 134/5 135/5 -f 98/5 135/5 136/5 -f 136/5 137/5 98/5 -f 98/5 137/5 138/5 -f 98/5 138/5 139/5 -f 140/5 141/5 100/5 -f 100/5 141/5 142/5 -f 100/5 142/5 143/5 -f 143/5 144/5 100/5 -f 100/5 144/5 145/5 -f 100/5 145/5 146/5 -f 146/5 147/5 100/5 -f 100/5 147/5 148/5 -f 100/5 148/5 149/5 -f 149/5 150/5 100/5 -f 100/5 150/5 151/5 -f 100/5 151/5 152/5 -f 152/5 153/5 100/5 -f 100/5 153/5 154/5 -f 100/5 154/5 155/5 -f 155/5 156/5 100/5 -f 100/5 156/5 157/5 -f 100/5 157/5 102/5 -f 158/5 159/5 102/5 -f 102/5 159/5 160/5 -f 102/5 160/5 161/5 -f 161/5 162/5 102/5 -f 102/5 162/5 163/5 -f 102/5 163/5 164/5 -f 164/5 165/5 102/5 -f 102/5 165/5 166/5 -f 102/5 166/5 167/5 -f 167/5 168/5 102/5 -f 102/5 168/5 169/5 -f 102/5 169/5 170/5 -f 170/5 171/5 102/5 -f 102/5 171/5 172/5 -f 102/5 172/5 104/5 -f 17/5 173/5 18/5 -f 18/5 173/5 174/5 -f 173/5 175/5 174/5 -f 174/5 175/5 176/5 -f 175/5 177/5 176/5 -f 176/5 177/5 178/5 -f 177/5 179/5 178/5 -f 178/5 179/5 180/5 -f 179/5 181/5 180/5 -f 180/5 181/5 182/5 -f 181/5 183/5 182/5 -f 182/5 183/5 184/5 -f 183/5 185/5 184/5 -f 184/5 185/5 186/5 -f 185/5 187/5 186/5 -f 186/5 187/5 188/5 -f 187/5 189/5 188/5 -f 188/5 189/5 190/5 -f 189/5 191/5 190/5 -f 190/5 191/5 192/5 -f 191/5 193/5 192/5 -f 192/5 193/5 194/5 -f 193/5 195/5 194/5 -f 194/5 195/5 196/5 -f 195/5 197/5 196/5 -f 196/5 197/5 198/5 -f 197/5 199/5 198/5 -f 198/5 199/5 200/5 -f 199/5 201/5 200/5 -f 200/5 201/5 202/5 -f 201/5 203/5 202/5 -f 202/5 203/5 204/5 -f 203/5 205/5 204/5 -f 204/5 205/5 206/5 -f 205/5 14/5 206/5 -f 206/5 14/5 13/5 -f 6/5 207/5 8/5 -f 8/5 207/5 208/5 -f 207/5 209/5 208/5 -f 208/5 209/5 210/5 -f 209/5 211/5 210/5 -f 210/5 211/5 212/5 -f 211/5 213/5 212/5 -f 212/5 213/5 214/5 -f 213/5 215/5 214/5 -f 214/5 215/5 216/5 -f 215/5 217/5 216/5 -f 216/5 217/5 218/5 -f 217/5 219/5 218/5 -f 218/5 219/5 220/5 -f 219/5 221/5 220/5 -f 220/5 221/5 222/5 -f 221/5 223/5 222/5 -f 222/5 223/5 224/5 -f 223/5 225/5 224/5 -f 224/5 225/5 226/5 -f 225/5 227/5 226/5 -f 226/5 227/5 228/5 -f 227/5 229/5 228/5 -f 228/5 229/5 230/5 -f 229/5 231/5 230/5 -f 230/5 231/5 232/5 -f 231/5 233/5 232/5 -f 232/5 233/5 234/5 -f 233/5 235/5 234/5 -f 234/5 235/5 236/5 -f 235/5 237/5 236/5 -f 236/5 237/5 238/5 -f 237/5 239/5 238/5 -f 238/5 239/5 240/5 -f 239/5 19/5 240/5 -f 240/5 19/5 20/5 -f 10/5 241/5 12/5 -f 12/5 241/5 242/5 -f 241/5 243/5 242/5 -f 242/5 243/5 244/5 -f 243/5 245/5 244/5 -f 244/5 245/5 246/5 -f 245/5 247/5 246/5 -f 246/5 247/5 248/5 -f 247/5 249/5 248/5 -f 248/5 249/5 250/5 -f 249/5 251/5 250/5 -f 250/5 251/5 252/5 -f 251/5 253/5 252/5 -f 252/5 253/5 254/5 -f 253/5 255/5 254/5 -f 254/5 255/5 256/5 -f 255/5 257/5 256/5 -f 256/5 257/5 258/5 -f 257/5 259/5 258/5 -f 258/5 259/5 260/5 -f 259/5 261/5 260/5 -f 260/5 261/5 262/5 -f 261/5 263/5 262/5 -f 262/5 263/5 264/5 -f 263/5 265/5 264/5 -f 264/5 265/5 266/5 -f 265/5 267/5 266/5 -f 266/5 267/5 268/5 -f 267/5 269/5 268/5 -f 268/5 269/5 270/5 -f 269/5 271/5 270/5 -f 270/5 271/5 272/5 -f 271/5 273/5 272/5 -f 272/5 273/5 274/5 -f 273/5 5/5 274/5 -f 274/5 5/5 7/5 -f 16/5 275/5 15/5 -f 15/5 275/5 276/5 -f 275/5 277/5 276/5 -f 276/5 277/5 278/5 -f 277/5 279/5 278/5 -f 278/5 279/5 280/5 -f 279/5 281/5 280/5 -f 280/5 281/5 282/5 -f 281/5 283/5 282/5 -f 282/5 283/5 284/5 -f 283/5 285/5 284/5 -f 284/5 285/5 286/5 -f 285/5 287/5 286/5 -f 286/5 287/5 288/5 -f 287/5 289/5 288/5 -f 288/5 289/5 290/5 -f 289/5 291/5 290/5 -f 290/5 291/5 292/5 -f 291/5 293/5 292/5 -f 292/5 293/5 294/5 -f 293/5 295/5 294/5 -f 294/5 295/5 296/5 -f 295/5 297/5 296/5 -f 296/5 297/5 298/5 -f 297/5 299/5 298/5 -f 298/5 299/5 300/5 -f 299/5 301/5 300/5 -f 300/5 301/5 302/5 -f 301/5 303/5 302/5 -f 302/5 303/5 304/5 -f 303/5 305/5 304/5 -f 304/5 305/5 306/5 -f 305/5 307/5 306/5 -f 306/5 307/5 308/5 -f 307/5 9/5 308/5 -f 308/5 9/5 11/5 -f 4/5 309/5 3/5 -f 3/5 309/5 310/5 -f 309/5 311/5 310/5 -f 310/5 311/5 312/5 -f 311/5 313/5 312/5 -f 312/5 313/5 314/5 -f 313/5 315/5 314/5 -f 314/5 315/5 316/5 -f 315/5 317/5 316/5 -f 316/5 317/5 318/5 -f 317/5 319/5 318/5 -f 318/5 319/5 320/5 -f 319/5 321/5 320/5 -f 320/5 321/5 322/5 -f 321/5 323/5 322/5 -f 322/5 323/5 324/5 -f 323/5 325/5 324/5 -f 324/5 325/5 326/5 -f 325/5 327/5 326/5 -f 326/5 327/5 328/5 -f 327/5 329/5 328/5 -f 328/5 329/5 330/5 -f 329/5 331/5 330/5 -f 330/5 331/5 332/5 -f 331/5 333/5 332/5 -f 332/5 333/5 334/5 -f 333/5 335/5 334/5 -f 334/5 335/5 336/5 -f 335/5 337/5 336/5 -f 336/5 337/5 338/5 -f 337/5 339/5 338/5 -f 338/5 339/5 340/5 -f 339/5 341/5 340/5 -f 340/5 341/5 342/5 -f 341/5 343/5 342/5 -f 342/5 343/5 344/5 -f 345/5 346/5 347/5 -f 347/5 346/5 348/5 -f 346/5 349/5 348/5 -f 348/5 349/5 350/5 -f 349/5 351/5 350/5 -f 350/5 351/5 352/5 -f 351/5 353/5 352/5 -f 352/5 353/5 354/5 -f 353/5 355/5 354/5 -f 354/5 355/5 356/5 -f 355/5 357/5 356/5 -f 356/5 357/5 358/5 -f 357/5 359/5 358/5 -f 358/5 359/5 360/5 -f 359/5 361/5 360/5 -f 360/5 361/5 362/5 -f 361/5 363/5 362/5 -f 362/5 363/5 364/5 -f 363/5 365/5 364/5 -f 364/5 365/5 366/5 -f 365/5 367/5 366/5 -f 366/5 367/5 368/5 -f 367/5 369/5 368/5 -f 368/5 369/5 370/5 -f 369/5 371/5 370/5 -f 370/5 371/5 372/5 -f 371/5 373/5 372/5 -f 372/5 373/5 374/5 -f 373/5 375/5 374/5 -f 374/5 375/5 376/5 -f 375/5 377/5 376/5 -f 376/5 377/5 378/5 -f 377/5 379/5 378/5 -f 378/5 379/5 380/5 -f 379/5 2/5 380/5 -f 380/5 2/5 1/5 -f 381/5 382/5 383/5 -f 383/5 382/5 384/5 -f 385/5 386/5 387/5 -f 387/5 386/5 388/5 -f 387/5 388/5 389/5 -f 389/5 390/5 387/5 -f 387/5 390/5 391/5 -f 387/5 391/5 392/5 -f 392/5 393/5 387/5 -f 387/5 393/5 394/5 -f 387/5 394/5 395/5 -f 395/5 396/5 387/5 -f 387/5 396/5 397/5 -f 387/5 397/5 398/5 -f 398/5 399/5 387/5 -f 387/5 399/5 400/5 -f 387/5 400/5 401/5 -f 401/5 402/5 387/5 -f 387/5 402/5 403/5 -f 387/5 403/5 404/5 -f 404/5 403/5 405/5 -f 404/5 405/5 406/5 -f 406/5 405/5 407/5 -f 406/5 407/5 408/5 -f 408/5 409/5 406/5 -f 406/5 409/5 410/5 -f 406/5 410/5 411/5 -f 411/5 412/5 406/5 -f 406/5 412/5 413/5 -f 406/5 413/5 414/5 -f 414/5 415/5 406/5 -f 406/5 415/5 416/5 -f 406/5 416/5 417/5 -f 417/5 418/5 406/5 -f 406/5 418/5 419/5 -f 406/5 419/5 420/5 -f 406/5 420/5 421/5 -f 421/5 420/5 422/5 -f 421/5 422/5 423/5 -f 423/5 424/5 421/5 -f 421/5 424/5 425/5 -f 421/5 425/5 426/5 -f 427/5 428/5 429/5 -f 429/5 428/5 430/5 -f 429/5 430/5 431/5 -f 431/5 432/5 429/5 -f 429/5 432/5 433/5 -f 429/5 433/5 434/5 -f 434/5 435/5 429/5 -f 429/5 435/5 436/5 -f 429/5 436/5 437/5 -f 437/5 438/5 429/5 -f 429/5 438/5 439/5 -f 429/5 439/5 440/5 -f 440/5 441/5 429/5 -f 429/5 441/5 442/5 -f 429/5 442/5 443/5 -f 443/5 444/5 429/5 -f 429/5 444/5 445/5 -f 429/5 445/5 446/5 -f 429/5 446/5 447/5 -f 447/5 446/5 448/5 -f 447/5 448/5 449/5 -f 449/5 448/5 450/5 -f 451/5 452/5 453/5 -f 453/5 452/5 454/5 -f 453/5 454/5 448/5 -f 448/5 454/5 455/5 -f 448/5 455/5 456/5 -f 457/5 458/5 453/5 -f 453/5 458/5 459/5 -f 453/5 459/5 451/5 -f 456/5 460/5 448/5 -f 448/5 460/5 461/5 -f 448/5 461/5 462/5 -f 462/5 463/5 448/5 -f 448/5 463/5 464/5 -f 448/5 464/5 465/5 -f 465/5 466/5 448/5 -f 448/5 466/5 467/5 -f 448/5 467/5 468/5 -f 468/5 450/5 448/5 -f 344/5 343/5 469/5 -f 469/5 343/5 470/5 -f 469/5 470/5 471/5 -f 471/5 470/5 472/5 -f 471/5 472/5 473/5 -f 473/5 472/5 474/5 -f 473/5 474/5 475/5 -f 475/5 474/5 476/5 -f 475/5 476/5 477/5 -f 477/5 476/5 478/5 -f 477/5 478/5 479/5 -f 479/5 478/5 480/5 -f 479/5 480/5 481/5 -f 481/5 480/5 482/5 -f 481/5 482/5 483/5 -f 483/5 482/5 484/5 -f 483/5 484/5 485/5 -f 485/5 484/5 486/5 -f 485/5 486/5 487/5 -f 487/5 486/5 488/5 -f 487/5 488/5 489/5 -f 489/5 488/5 490/5 -f 489/5 490/5 491/5 -f 491/5 490/5 492/5 -f 488/5 493/5 490/5 -f 490/5 493/5 494/5 -f 495/5 496/5 493/5 -f 493/5 496/5 497/5 -f 493/5 497/5 498/5 -f 498/5 499/5 493/5 -f 493/5 499/5 500/5 -f 493/5 500/5 501/5 -f 501/5 494/5 493/5 -f 490/5 502/5 492/5 -f 492/5 502/5 503/5 -f 504/5 505/5 502/5 -f 502/5 505/5 506/5 -f 502/5 506/5 507/5 -f 507/5 508/5 502/5 -f 502/5 508/5 509/5 -f 502/5 509/5 510/5 -f 510/5 511/5 502/5 -f 502/5 511/5 512/5 -f 502/5 512/5 513/5 -f 513/5 514/5 502/5 -f 502/5 514/5 515/5 -f 502/5 515/5 516/5 -f 516/5 517/5 502/5 -f 502/5 517/5 518/5 -f 502/5 518/5 519/5 -f 519/5 503/5 502/5 -f 489/5 491/5 520/5 -f 520/5 491/5 521/5 -f 520/5 521/5 522/5 -f 522/5 523/5 520/5 -f 520/5 523/5 524/5 -f 520/5 524/5 525/5 -f 525/5 526/5 520/5 -f 520/5 526/5 527/5 -f 520/5 527/5 528/5 -f 528/5 529/5 520/5 -f 520/5 529/5 530/5 -f 520/5 530/5 531/5 -f 531/5 532/5 520/5 -f 520/5 532/5 533/5 -f 520/5 533/5 534/5 -f 534/5 535/5 520/5 -f 520/5 535/5 536/5 -f 520/5 536/5 537/5 -f 487/5 489/5 538/5 -f 538/5 489/5 539/5 -f 538/5 539/5 540/5 -f 540/5 541/5 538/5 -f 538/5 541/5 542/5 -f 538/5 542/5 543/5 -f 543/5 544/5 538/5 -f 538/5 544/5 545/5 -f 538/5 545/5 546/5 -f 547/5 548/5 549/5 -f 549/5 548/5 550/5 -f 549/5 550/5 551/5 -f 551/5 550/5 552/5 -f 551/5 552/5 553/5 -f 553/5 552/5 554/5 -f 553/5 554/5 555/5 -f 555/5 554/5 556/5 -f 555/5 556/5 557/5 -f 557/5 556/5 558/5 -f 557/5 558/5 559/5 -f 559/5 558/5 560/5 -f 559/5 560/5 561/5 -f 561/5 560/5 562/5 -f 561/5 562/5 563/5 -f 563/5 562/5 564/5 -f 563/5 564/5 565/5 -f 565/5 564/5 566/5 -f 565/5 566/5 567/5 -f 567/5 566/5 568/5 -f 567/5 568/5 569/5 -f 569/5 568/5 570/5 -f 569/5 570/5 571/5 -f 571/5 570/5 572/5 -f 568/5 573/5 570/5 -f 570/5 573/5 574/5 -f 575/5 576/5 573/5 -f 573/5 576/5 577/5 -f 573/5 577/5 578/5 -f 578/5 579/5 573/5 -f 573/5 579/5 580/5 -f 573/5 580/5 581/5 -f 581/5 574/5 573/5 -f 570/5 582/5 572/5 -f 572/5 582/5 583/5 -f 584/5 585/5 582/5 -f 582/5 585/5 586/5 -f 582/5 586/5 587/5 -f 587/5 588/5 582/5 -f 582/5 588/5 589/5 -f 582/5 589/5 590/5 -f 590/5 591/5 582/5 -f 582/5 591/5 592/5 -f 582/5 592/5 593/5 -f 593/5 594/5 582/5 -f 582/5 594/5 595/5 -f 582/5 595/5 596/5 -f 596/5 597/5 582/5 -f 582/5 597/5 598/5 -f 582/5 598/5 599/5 -f 599/5 583/5 582/5 -f 569/5 571/5 600/5 -f 600/5 571/5 601/5 -f 600/5 601/5 602/5 -f 602/5 603/5 600/5 -f 600/5 603/5 604/5 -f 600/5 604/5 605/5 -f 605/5 606/5 600/5 -f 600/5 606/5 607/5 -f 600/5 607/5 608/5 -f 608/5 609/5 600/5 -f 600/5 609/5 610/5 -f 600/5 610/5 611/5 -f 611/5 612/5 600/5 -f 600/5 612/5 613/5 -f 600/5 613/5 614/5 -f 614/5 615/5 600/5 -f 600/5 615/5 616/5 -f 600/5 616/5 617/5 -f 567/5 569/5 618/5 -f 618/5 569/5 619/5 -f 618/5 619/5 620/5 -f 620/5 621/5 618/5 -f 618/5 621/5 622/5 -f 618/5 622/5 623/5 -f 623/5 624/5 618/5 -f 618/5 624/5 625/5 -f 618/5 625/5 626/5 -f 627/5 628/5 629/5 -f 629/5 628/5 630/5 -f 631/5 632/5 633/5 -f 633/5 632/5 634/5 -f 635/5 636/5 637/5 -f 637/5 636/5 638/5 -f 635/5 639/5 636/5 -f 636/5 639/5 640/5 -f 639/5 641/5 640/5 -f 640/5 641/5 642/5 -f 641/5 643/5 642/5 -f 642/5 643/5 644/5 -f 643/5 645/5 644/5 -f 644/5 645/5 646/5 -f 645/5 647/5 646/5 -f 646/5 647/5 648/5 -f 647/5 649/5 648/5 -f 648/5 649/5 650/5 -f 649/5 651/5 650/5 -f 650/5 651/5 652/5 -f 651/5 653/5 652/5 -f 652/5 653/5 654/5 -f 653/5 655/5 654/5 -f 654/5 655/5 656/5 -f 655/5 657/5 656/5 -f 656/5 657/5 658/5 -f 657/5 659/5 658/5 -f 658/5 659/5 660/5 -f 659/5 661/5 660/5 -f 660/5 661/5 662/5 -f 661/5 663/5 662/5 -f 662/5 663/5 664/5 -f 663/5 665/5 664/5 -f 664/5 665/5 666/5 -f 665/5 667/5 666/5 -f 666/5 667/5 668/5 -f 667/5 669/5 668/5 -f 668/5 669/5 670/5 -f 669/5 671/5 670/5 -f 670/5 671/5 672/5 -f 671/5 631/5 672/5 -f 672/5 631/5 633/5 -f 632/5 673/5 634/5 -f 634/5 673/5 674/5 -f 673/5 675/5 674/5 -f 674/5 675/5 676/5 -f 675/5 677/5 676/5 -f 676/5 677/5 678/5 -f 677/5 679/5 678/5 -f 678/5 679/5 680/5 -f 679/5 681/5 680/5 -f 680/5 681/5 682/5 -f 681/5 683/5 682/5 -f 682/5 683/5 684/5 -f 683/5 685/5 684/5 -f 684/5 685/5 686/5 -f 685/5 687/5 686/5 -f 686/5 687/5 688/5 -f 687/5 628/5 688/5 -f 688/5 628/5 627/5 -f 630/5 689/5 629/5 -f 629/5 689/5 690/5 -f 689/5 691/5 690/5 -f 690/5 691/5 692/5 -f 691/5 693/5 692/5 -f 692/5 693/5 694/5 -f 693/5 695/5 694/5 -f 694/5 695/5 696/5 -f 695/5 697/5 696/5 -f 696/5 697/5 698/5 -f 697/5 699/5 698/5 -f 698/5 699/5 700/5 -f 699/5 701/5 700/5 -f 700/5 701/5 702/5 -f 701/5 703/5 702/5 -f 702/5 703/5 704/5 -f 703/5 457/5 704/5 -f 704/5 457/5 453/5 -f 705/5 706/5 707/5 -f 707/5 706/5 708/5 -f 709/5 710/5 711/5 -f 711/5 710/5 712/5 -f 709/5 713/5 710/5 -f 710/5 713/5 714/5 -f 713/5 715/5 714/5 -f 714/5 715/5 716/5 -f 715/5 717/5 716/5 -f 716/5 717/5 718/5 -f 717/5 719/5 718/5 -f 718/5 719/5 720/5 -f 719/5 721/5 720/5 -f 720/5 721/5 722/5 -f 721/5 723/5 722/5 -f 722/5 723/5 724/5 -f 723/5 725/5 724/5 -f 724/5 725/5 726/5 -f 725/5 727/5 726/5 -f 726/5 727/5 728/5 -f 727/5 729/5 728/5 -f 728/5 729/5 730/5 -f 729/5 731/5 730/5 -f 730/5 731/5 732/5 -f 731/5 733/5 732/5 -f 732/5 733/5 734/5 -f 733/5 735/5 734/5 -f 734/5 735/5 736/5 -f 735/5 737/5 736/5 -f 736/5 737/5 738/5 -f 737/5 739/5 738/5 -f 738/5 739/5 740/5 -f 739/5 741/5 740/5 -f 740/5 741/5 742/5 -f 741/5 743/5 742/5 -f 742/5 743/5 744/5 -f 743/5 745/5 744/5 -f 744/5 745/5 746/5 -f 745/5 637/5 746/5 -f 746/5 637/5 638/5 -f 708/5 747/5 707/5 -f 707/5 747/5 748/5 -f 747/5 749/5 748/5 -f 748/5 749/5 750/5 -f 749/5 751/5 750/5 -f 750/5 751/5 752/5 -f 751/5 753/5 752/5 -f 752/5 753/5 754/5 -f 753/5 755/5 754/5 -f 754/5 755/5 756/5 -f 755/5 757/5 756/5 -f 756/5 757/5 758/5 -f 757/5 759/5 758/5 -f 758/5 759/5 760/5 -f 759/5 761/5 760/5 -f 760/5 761/5 762/5 -f 761/5 711/5 762/5 -f 762/5 711/5 712/5 -f 426/5 763/5 421/5 -f 421/5 763/5 764/5 -f 763/5 765/5 764/5 -f 764/5 765/5 766/5 -f 765/5 767/5 766/5 -f 766/5 767/5 768/5 -f 767/5 769/5 768/5 -f 768/5 769/5 770/5 -f 769/5 771/5 770/5 -f 770/5 771/5 772/5 -f 771/5 773/5 772/5 -f 772/5 773/5 774/5 -f 773/5 775/5 774/5 -f 774/5 775/5 776/5 -f 775/5 777/5 776/5 -f 776/5 777/5 778/5 -f 777/5 706/5 778/5 -f 778/5 706/5 705/5 -f 345/5 347/5 779/5 -f 779/5 347/5 780/5 -f 781/5 782/5 783/5 -f 783/5 782/5 784/5 -f 784/5 782/5 785/5 -f 785/5 782/5 786/5 -f 785/5 786/5 787/5 -f 785/5 787/5 788/5 -f 788/5 787/5 789/5 -f 788/5 789/5 790/5 -f 790/5 789/5 791/5 -f 790/5 791/5 792/5 -f 792/5 791/5 793/5 -f 792/5 793/5 794/5 -f 794/5 793/5 795/5 -f 793/5 796/5 795/5 -f 795/5 796/5 797/5 -f 795/5 797/5 798/5 -f 798/5 797/5 799/5 -f 798/5 799/5 800/5 -f 800/5 799/5 801/5 -f 800/5 801/5 802/5 -f 802/5 801/5 803/5 -f 802/5 803/5 804/5 -f 804/5 803/5 805/5 -f 803/5 806/5 805/5 -f 805/5 806/5 807/5 -f 805/5 807/5 808/5 -f 808/5 807/5 809/5 -f 808/5 809/5 810/5 -f 810/5 809/5 811/5 -f 810/5 811/5 812/5 -f 812/5 811/5 813/5 -f 811/5 814/5 813/5 -f 813/5 814/5 815/5 -f 814/5 816/5 815/5 -f 815/5 816/5 817/5 -f 815/5 817/5 818/5 -f 818/5 817/5 819/5 -f 818/5 819/5 820/5 -f 820/5 819/5 821/5 -f 820/5 821/5 822/5 -f 822/5 821/5 823/5 -f 821/5 824/5 823/5 -f 823/5 824/5 825/5 -f 823/5 825/5 826/5 -f 826/5 825/5 827/5 -f 826/5 827/5 828/5 -f 828/5 827/5 829/5 -f 828/5 829/5 830/5 -f 830/5 829/5 831/5 -f 830/5 831/5 832/5 -f 832/5 831/5 833/5 -f 831/5 834/5 833/5 -f 833/5 834/5 835/5 -f 833/5 835/5 836/5 -f 836/5 835/5 837/5 -f 836/5 837/5 838/5 -f 838/5 837/5 839/5 -f 838/5 839/5 840/5 -f 840/5 839/5 841/5 -f 840/5 841/5 842/5 -f 842/5 841/5 843/5 -f 841/5 844/5 843/5 -f 843/5 844/5 845/5 -f 843/5 845/5 846/5 -f 847/5 848/5 849/5 -f 849/5 848/5 850/5 -f 850/5 848/5 851/5 -f 851/5 848/5 852/5 -f 851/5 852/5 853/5 -f 851/5 853/5 854/5 -f 854/5 853/5 855/5 -f 854/5 855/5 856/5 -f 856/5 855/5 857/5 -f 856/5 857/5 858/5 -f 858/5 857/5 859/5 -f 858/5 859/5 860/5 -f 860/5 859/5 861/5 -f 859/5 862/5 861/5 -f 861/5 862/5 863/5 -f 861/5 863/5 864/5 -f 864/5 863/5 865/5 -f 864/5 865/5 866/5 -f 866/5 865/5 867/5 -f 866/5 867/5 868/5 -f 868/5 867/5 869/5 -f 868/5 869/5 870/5 -f 870/5 869/5 871/5 -f 869/5 872/5 871/5 -f 871/5 872/5 873/5 -f 871/5 873/5 874/5 -f 874/5 873/5 875/5 -f 874/5 875/5 876/5 -f 876/5 875/5 877/5 -f 876/5 877/5 878/5 -f 878/5 877/5 879/5 -f 877/5 880/5 879/5 -f 879/5 880/5 881/5 -f 880/5 882/5 881/5 -f 881/5 882/5 883/5 -f 881/5 883/5 884/5 -f 884/5 883/5 885/5 -f 884/5 885/5 886/5 -f 886/5 885/5 887/5 -f 886/5 887/5 888/5 -f 888/5 887/5 889/5 -f 887/5 890/5 889/5 -f 889/5 890/5 891/5 -f 889/5 891/5 892/5 -f 892/5 891/5 893/5 -f 892/5 893/5 894/5 -f 894/5 893/5 895/5 -f 894/5 895/5 896/5 -f 896/5 895/5 897/5 -f 896/5 897/5 898/5 -f 898/5 897/5 899/5 -f 897/5 900/5 899/5 -f 899/5 900/5 901/5 -f 899/5 901/5 902/5 -f 902/5 901/5 903/5 -f 902/5 903/5 904/5 -f 904/5 903/5 905/5 -f 904/5 905/5 906/5 -f 906/5 905/5 907/5 -f 906/5 907/5 908/5 -f 908/5 907/5 909/5 -f 907/5 910/5 909/5 -f 909/5 910/5 911/5 -f 909/5 911/5 912/5 -f 913/5 914/5 915/5 -f 915/5 914/5 916/5 -f 915/5 916/5 917/5 -f 917/5 918/5 915/5 -f 915/5 918/5 919/5 -f 915/5 919/5 920/5 -f 920/5 921/5 915/5 -f 915/5 921/5 922/5 -f 915/5 922/5 923/5 -f 923/5 924/5 915/5 -f 915/5 924/5 925/5 -f 915/5 925/5 926/5 -f 926/5 927/5 915/5 -f 915/5 927/5 928/5 -f 915/5 928/5 929/5 -f 929/5 930/5 915/5 -f 915/5 930/5 931/5 -f 915/5 931/5 932/5 -f 932/5 933/5 915/5 -f 915/5 933/5 934/5 -f 915/5 934/5 935/5 -f 935/5 936/5 915/5 -f 915/5 936/5 937/5 -f 915/5 937/5 938/5 -f 938/5 939/5 915/5 -f 915/5 939/5 940/5 -f 915/5 940/5 941/5 -f 941/5 942/5 915/5 -f 915/5 942/5 943/5 -f 915/5 943/5 944/5 -f 944/5 945/5 915/5 -f 915/5 945/5 946/5 -f 946/5 945/5 947/5 -f 947/5 945/5 948/5 -f 947/5 948/5 949/5 -f 950/5 951/5 949/5 -f 949/5 951/5 952/5 -f 949/5 952/5 947/5 -f 950/5 953/5 951/5 -f 951/5 953/5 954/5 -f 951/5 954/5 955/5 -f 955/5 956/5 951/5 -f 951/5 956/5 957/5 -f 951/5 957/5 958/5 -f 958/5 959/5 951/5 -f 951/5 959/5 960/5 -f 951/5 960/5 961/5 -f 961/5 962/5 951/5 -f 951/5 962/5 963/5 -f 951/5 963/5 964/5 -f 964/5 965/5 951/5 -f 951/5 965/5 966/5 -f 951/5 966/5 967/5 -f 967/5 968/5 951/5 -f 951/5 968/5 969/5 -f 951/5 969/5 970/5 -f 970/5 971/5 951/5 -f 951/5 971/5 972/5 -f 951/5 972/5 973/5 -f 973/5 974/5 951/5 -f 951/5 974/5 975/5 -f 951/5 975/5 976/5 -f 976/5 977/5 951/5 -f 951/5 977/5 978/5 -f 951/5 978/5 979/5 -f 979/5 980/5 951/5 -f 951/5 980/5 981/5 -f 951/5 981/5 982/5 -f 781/5 783/5 983/5 -f 983/5 783/5 984/5 -f 983/5 984/5 985/5 -f 986/5 987/5 988/5 -f 988/5 987/5 989/5 -f 988/5 989/5 990/5 -f 990/5 989/5 991/5 -f 990/5 991/5 992/5 -f 992/5 991/5 993/5 -f 992/5 993/5 994/5 -f 994/5 993/5 995/5 -f 994/5 995/5 996/5 -f 996/5 995/5 997/5 -f 996/5 997/5 998/5 -f 998/5 997/5 999/5 -f 998/5 999/5 1000/5 -f 1000/5 999/5 1001/5 -f 1000/5 1001/5 985/5 -f 985/5 1001/5 1002/5 -f 985/5 1002/5 983/5 -f 986/5 1003/5 987/5 -f 987/5 1003/5 1004/5 -f 1003/5 1005/5 1004/5 -f 1004/5 1005/5 1006/5 -f 1005/5 1007/5 1006/5 -f 1006/5 1007/5 1008/5 -f 1007/5 1009/5 1008/5 -f 1008/5 1009/5 1010/5 -f 1009/5 1011/5 1010/5 -f 1010/5 1011/5 1012/5 -f 1011/5 1013/5 1012/5 -f 1012/5 1013/5 1014/5 -f 1013/5 1015/5 1014/5 -f 1014/5 1015/5 1016/5 -f 1015/5 1017/5 1016/5 -f 1016/5 1017/5 1018/5 -f 1017/5 847/5 1018/5 -f 1018/5 847/5 849/5 -f 1019/5 1020/5 1021/5 -f 1021/5 1020/5 1022/5 -f 1021/5 1022/5 1023/5 -f 1023/5 1024/5 1021/5 -f 1021/5 1024/5 1025/5 -f 1021/5 1025/5 1026/5 -f 1026/5 1027/5 1021/5 -f 1021/5 1027/5 1028/5 -f 1021/5 1028/5 1029/5 -f 1029/5 1030/5 1021/5 -f 1021/5 1030/5 1031/5 -f 1021/5 1031/5 1032/5 -f 1032/5 1033/5 1021/5 -f 1021/5 1033/5 1034/5 -f 1021/5 1034/5 1035/5 -f 1035/5 1036/5 1021/5 -f 1021/5 1036/5 1037/5 -f 1021/5 1037/5 1038/5 -f 1038/5 1039/5 1021/5 -f 1021/5 1039/5 1040/5 -f 1021/5 1040/5 1041/5 -f 1041/5 1042/5 1021/5 -f 1021/5 1042/5 1043/5 -f 1021/5 1043/5 1044/5 -f 1044/5 1045/5 1021/5 -f 1021/5 1045/5 1046/5 -f 1021/5 1046/5 1047/5 -f 1047/5 1048/5 1021/5 -f 1021/5 1048/5 1049/5 -f 1021/5 1049/5 1050/5 -f 1050/5 1051/5 1021/5 -f 1021/5 1051/5 1052/5 -f 1052/5 1051/5 1053/5 -f 1053/5 1051/5 1054/5 -f 1053/5 1054/5 1055/5 -f 1056/5 1057/5 1055/5 -f 1055/5 1057/5 1058/5 -f 1055/5 1058/5 1053/5 -f 1056/5 1059/5 1057/5 -f 1057/5 1059/5 1060/5 -f 1057/5 1060/5 1061/5 -f 1061/5 1062/5 1057/5 -f 1057/5 1062/5 1063/5 -f 1057/5 1063/5 1064/5 -f 1064/5 1065/5 1057/5 -f 1057/5 1065/5 1066/5 -f 1057/5 1066/5 1067/5 -f 1067/5 1068/5 1057/5 -f 1057/5 1068/5 1069/5 -f 1057/5 1069/5 1070/5 -f 1070/5 1071/5 1057/5 -f 1057/5 1071/5 1072/5 -f 1057/5 1072/5 1073/5 -f 1073/5 1074/5 1057/5 -f 1057/5 1074/5 1075/5 -f 1057/5 1075/5 1076/5 -f 1076/5 1077/5 1057/5 -f 1057/5 1077/5 1078/5 -f 1057/5 1078/5 1079/5 -f 1079/5 1080/5 1057/5 -f 1057/5 1080/5 1081/5 -f 1057/5 1081/5 1082/5 -f 1082/5 1083/5 1057/5 -f 1057/5 1083/5 1084/5 -f 1057/5 1084/5 1085/5 -f 1085/5 1086/5 1057/5 -f 1057/5 1086/5 1087/5 -f 1057/5 1087/5 1088/5 -f 846/5 845/5 1089/5 -f 1089/5 845/5 1090/5 -f 1089/5 1090/5 1091/5 -f 1091/5 1090/5 1092/5 -f 1093/5 1094/5 1095/5 -f 1095/5 1094/5 1096/5 -f 1095/5 1096/5 1097/5 -f 1093/5 1098/5 1094/5 -f 1094/5 1098/5 1099/5 -f 1094/5 1099/5 1100/5 -f 1100/5 1101/5 1094/5 -f 1094/5 1101/5 1102/5 -f 1094/5 1102/5 1103/5 -f 1103/5 1104/5 1094/5 -f 1094/5 1104/5 1105/5 -f 1094/5 1105/5 1106/5 -f 1106/5 1107/5 1094/5 -f 1094/5 1107/5 1108/5 -f 1094/5 1108/5 1109/5 -f 1109/5 1110/5 1094/5 -f 1094/5 1110/5 1111/5 -f 1094/5 1111/5 1112/5 -f 1112/5 1113/5 1094/5 -f 1094/5 1113/5 1114/5 -f 1094/5 1114/5 1115/5 -f 1115/5 1116/5 1094/5 -f 1094/5 1116/5 1117/5 -f 1094/5 1117/5 1118/5 -f 1118/5 1119/5 1094/5 -f 1094/5 1119/5 1120/5 -f 1094/5 1120/5 1121/5 -f 1121/5 1122/5 1094/5 -f 1094/5 1122/5 1123/5 -f 1094/5 1123/5 1124/5 -f 1124/5 1125/5 1094/5 -f 1094/5 1125/5 1126/5 -f 1094/5 1126/5 1127/5 -f 1128/5 1129/5 1097/5 -f 1097/5 1129/5 1130/5 -f 1097/5 1130/5 1095/5 -f 1128/5 1131/5 1129/5 -f 1129/5 1131/5 1132/5 -f 1133/5 1134/5 1131/5 -f 1131/5 1134/5 1135/5 -f 1131/5 1135/5 1136/5 -f 1136/5 1137/5 1131/5 -f 1131/5 1137/5 1138/5 -f 1131/5 1138/5 1139/5 -f 1139/5 1140/5 1131/5 -f 1131/5 1140/5 1141/5 -f 1131/5 1141/5 1142/5 -f 1142/5 1143/5 1131/5 -f 1131/5 1143/5 1144/5 -f 1131/5 1144/5 1145/5 -f 1145/5 1146/5 1131/5 -f 1131/5 1146/5 1147/5 -f 1131/5 1147/5 1148/5 -f 1148/5 1149/5 1131/5 -f 1131/5 1149/5 1150/5 -f 1131/5 1150/5 1151/5 -f 1151/5 1152/5 1131/5 -f 1131/5 1152/5 1153/5 -f 1131/5 1153/5 1154/5 -f 1154/5 1155/5 1131/5 -f 1131/5 1155/5 1156/5 -f 1131/5 1156/5 1157/5 -f 1157/5 1158/5 1131/5 -f 1131/5 1158/5 1159/5 -f 1131/5 1159/5 1160/5 -f 1160/5 1161/5 1131/5 -f 1131/5 1161/5 1162/5 -f 1131/5 1162/5 1132/5 -f 1163/5 1164/5 1165/5 -f 1165/5 1164/5 1166/5 -f 1165/5 1166/5 1167/5 -f 1164/5 1168/5 1166/5 -f 1165/5 1167/5 1169/5 -f 1169/5 1167/5 1170/5 -f 1169/5 1170/5 1171/5 -f 1171/5 1170/5 1172/5 -f 1171/5 1172/5 1173/5 -f 1173/5 1172/5 1174/5 -f 1173/5 1174/5 1175/5 -f 1175/5 1174/5 1176/5 -f 1175/5 1176/5 1177/5 -f 1177/5 1176/5 1178/5 -f 1177/5 1178/5 1179/5 -f 1179/5 1178/5 1097/5 -f 1179/5 1097/5 1096/5 -f 1178/5 1128/5 1097/5 -f 1180/5 1168/5 1181/5 -f 1181/5 1168/5 1164/5 -f 1181/5 1164/5 1182/5 -f 1182/5 1164/5 1163/5 -f 1180/5 1181/5 1183/5 -f 1183/5 1181/5 1184/5 -f 1183/5 1184/5 1185/5 -f 1181/5 1182/5 1184/5 -f 1183/5 1185/5 1186/5 -f 1186/5 1185/5 1187/5 -f 1186/5 1187/5 1188/5 -f 1188/5 1187/5 1189/5 -f 1188/5 1189/5 1190/5 -f 1190/5 1189/5 1191/5 -f 1190/5 1191/5 1192/5 -f 1192/5 1191/5 1193/5 -f 1192/5 1193/5 1194/5 -f 1194/5 1193/5 1195/5 -f 1194/5 1195/5 1196/5 -f 1196/5 1195/5 1053/5 -f 1196/5 1053/5 1058/5 -f 1195/5 1052/5 1053/5 -f 911/5 1197/5 912/5 -f 912/5 1197/5 1198/5 -f 1197/5 1199/5 1198/5 -f 1198/5 1199/5 1200/5 -f 1201/5 1202/5 1203/5 -f 1203/5 1202/5 1204/5 -f 1203/5 1204/5 1205/5 -f 1201/5 1206/5 1202/5 -f 1202/5 1206/5 1207/5 -f 1202/5 1207/5 1208/5 -f 1208/5 1209/5 1202/5 -f 1202/5 1209/5 1210/5 -f 1202/5 1210/5 1211/5 -f 1211/5 1212/5 1202/5 -f 1202/5 1212/5 1213/5 -f 1202/5 1213/5 1214/5 -f 1214/5 1215/5 1202/5 -f 1202/5 1215/5 1216/5 -f 1202/5 1216/5 1217/5 -f 1217/5 1218/5 1202/5 -f 1202/5 1218/5 1219/5 -f 1202/5 1219/5 1220/5 -f 1220/5 1221/5 1202/5 -f 1202/5 1221/5 1222/5 -f 1202/5 1222/5 1223/5 -f 1223/5 1224/5 1202/5 -f 1202/5 1224/5 1225/5 -f 1202/5 1225/5 1226/5 -f 1226/5 1227/5 1202/5 -f 1202/5 1227/5 1228/5 -f 1202/5 1228/5 1229/5 -f 1229/5 1230/5 1202/5 -f 1202/5 1230/5 1231/5 -f 1202/5 1231/5 1232/5 -f 1232/5 1233/5 1202/5 -f 1202/5 1233/5 1234/5 -f 1202/5 1234/5 1235/5 -f 1236/5 1237/5 1205/5 -f 1205/5 1237/5 1238/5 -f 1205/5 1238/5 1203/5 -f 1236/5 1239/5 1237/5 -f 1237/5 1239/5 1240/5 -f 1241/5 1242/5 1239/5 -f 1239/5 1242/5 1243/5 -f 1239/5 1243/5 1244/5 -f 1244/5 1245/5 1239/5 -f 1239/5 1245/5 1246/5 -f 1239/5 1246/5 1247/5 -f 1247/5 1248/5 1239/5 -f 1239/5 1248/5 1249/5 -f 1239/5 1249/5 1250/5 -f 1250/5 1251/5 1239/5 -f 1239/5 1251/5 1252/5 -f 1239/5 1252/5 1253/5 -f 1253/5 1254/5 1239/5 -f 1239/5 1254/5 1255/5 -f 1239/5 1255/5 1256/5 -f 1256/5 1257/5 1239/5 -f 1239/5 1257/5 1258/5 -f 1239/5 1258/5 1259/5 -f 1259/5 1260/5 1239/5 -f 1239/5 1260/5 1261/5 -f 1239/5 1261/5 1262/5 -f 1262/5 1263/5 1239/5 -f 1239/5 1263/5 1264/5 -f 1239/5 1264/5 1265/5 -f 1265/5 1266/5 1239/5 -f 1239/5 1266/5 1267/5 -f 1239/5 1267/5 1268/5 -f 1268/5 1269/5 1239/5 -f 1239/5 1269/5 1270/5 -f 1239/5 1270/5 1240/5 -f 1271/5 1272/5 1273/5 -f 1273/5 1272/5 1274/5 -f 1273/5 1274/5 1275/5 -f 1272/5 1276/5 1274/5 -f 1274/5 1276/5 1277/5 -f 1276/5 1278/5 1277/5 -f 1277/5 1278/5 1279/5 -f 1278/5 1280/5 1279/5 -f 1279/5 1280/5 1281/5 -f 1280/5 1282/5 1281/5 -f 1281/5 1282/5 1283/5 -f 1282/5 1284/5 1283/5 -f 1283/5 1284/5 1285/5 -f 1284/5 1286/5 1285/5 -f 1285/5 1286/5 1287/5 -f 1236/5 1205/5 1286/5 -f 1286/5 1205/5 1287/5 -f 1205/5 1204/5 1287/5 -f 1275/5 1288/5 1273/5 -f 1273/5 1288/5 1289/5 -f 1273/5 1289/5 1271/5 -f 1271/5 1289/5 1290/5 -f 1290/5 1289/5 1291/5 -f 1291/5 1289/5 1292/5 -f 1291/5 1292/5 1293/5 -f 1289/5 1288/5 1292/5 -f 1291/5 1293/5 1294/5 -f 1294/5 1293/5 1295/5 -f 1294/5 1295/5 1296/5 -f 1296/5 1295/5 1297/5 -f 1296/5 1297/5 1298/5 -f 1298/5 1297/5 1299/5 -f 1298/5 1299/5 1300/5 -f 1300/5 1299/5 1301/5 -f 1300/5 1301/5 1302/5 -f 1302/5 1301/5 1303/5 -f 1302/5 1303/5 1304/5 -f 1304/5 1303/5 947/5 -f 1304/5 947/5 952/5 -f 1303/5 946/5 947/5 -f 1305/5 1306/5 1307/5 -f 1307/5 1306/5 1308/5 -f 1306/5 1309/5 1308/5 -f 1308/5 1309/5 1310/5 -f 1311/5 1312/5 1313/5 -f 1313/5 1312/5 1314/5 -f 1312/5 1315/5 1314/5 -f 1314/5 1315/5 1316/5 -f 1316/5 1315/5 1317/5 -f 1317/5 1315/5 1318/5 -f 1317/5 1318/5 1319/5 -f 1317/5 1319/5 1320/5 -f 1320/5 1319/5 1321/5 -f 1320/5 1321/5 1322/5 -f 1322/5 1321/5 1323/5 -f 1322/5 1323/5 1324/5 -f 1324/5 1323/5 1325/5 -f 1324/5 1325/5 1326/5 -f 1326/5 1325/5 1327/5 -f 1325/5 1328/5 1327/5 -f 1327/5 1328/5 1329/5 -f 1327/5 1329/5 1330/5 -f 1330/5 1329/5 1331/5 -f 1330/5 1331/5 1332/5 -f 1332/5 1331/5 1333/5 -f 1332/5 1333/5 1334/5 -f 1334/5 1333/5 1335/5 -f 1334/5 1335/5 1336/5 -f 1336/5 1335/5 1337/5 -f 1335/5 1338/5 1337/5 -f 1337/5 1338/5 1339/5 -f 1337/5 1339/5 1340/5 -f 1340/5 1339/5 1341/5 -f 1340/5 1341/5 1342/5 -f 1342/5 1341/5 1343/5 -f 1342/5 1343/5 1344/5 -f 1344/5 1343/5 1345/5 -f 1344/5 1345/5 1346/5 -f 1346/5 1345/5 1347/5 -f 1345/5 1348/5 1347/5 -f 1347/5 1348/5 1349/5 -f 1347/5 1349/5 1350/5 -f 1350/5 1349/5 1351/5 -f 1350/5 1351/5 1352/5 -f 1352/5 1351/5 1353/5 -f 1352/5 1353/5 1354/5 -f 1354/5 1353/5 1355/5 -f 1354/5 1355/5 1356/5 -f 1356/5 1355/5 1357/5 -f 1355/5 1358/5 1357/5 -f 1357/5 1358/5 1359/5 -f 1357/5 1359/5 1360/5 -f 1360/5 1359/5 1361/5 -f 1360/5 1361/5 1362/5 -f 1362/5 1361/5 1363/5 -f 1362/5 1363/5 1364/5 -f 1364/5 1363/5 1365/5 -f 1364/5 1365/5 1366/5 -f 1366/5 1365/5 1367/5 -f 1365/5 1368/5 1367/5 -f 1367/5 1368/5 1369/5 -f 1367/5 1369/5 1370/5 -f 1370/5 1369/5 1371/5 -f 1370/5 1371/5 1372/5 -f 1372/5 1371/5 1373/5 -f 1372/5 1373/5 1374/5 -f 1374/5 1373/5 1199/5 -f 1373/5 1200/5 1199/5 -f 1091/5 1092/5 1375/5 -f 1375/5 1092/5 1376/5 -f 1375/5 1376/5 1377/5 -f 1375/5 1377/5 1378/5 -f 1378/5 1377/5 1379/5 -f 1378/5 1379/5 1380/5 -f 1380/5 1379/5 1381/5 -f 1380/5 1381/5 1382/5 -f 1382/5 1381/5 1383/5 -f 1381/5 1384/5 1383/5 -f 1383/5 1384/5 1385/5 -f 1383/5 1385/5 1386/5 -f 1386/5 1385/5 1387/5 -f 1386/5 1387/5 1388/5 -f 1388/5 1387/5 1389/5 -f 1388/5 1389/5 1390/5 -f 1390/5 1389/5 1391/5 -f 1390/5 1391/5 1392/5 -f 1392/5 1391/5 1393/5 -f 1391/5 1394/5 1393/5 -f 1393/5 1394/5 1395/5 -f 1393/5 1395/5 1396/5 -f 1396/5 1395/5 1397/5 -f 1396/5 1397/5 1398/5 -f 1398/5 1397/5 1399/5 -f 1398/5 1399/5 1400/5 -f 1400/5 1399/5 1401/5 -f 1400/5 1401/5 1402/5 -f 1402/5 1401/5 1403/5 -f 1401/5 1404/5 1403/5 -f 1403/5 1404/5 1405/5 -f 1403/5 1405/5 1406/5 -f 1406/5 1405/5 1407/5 -f 1406/5 1407/5 1408/5 -f 1408/5 1407/5 1409/5 -f 1408/5 1409/5 1410/5 -f 1410/5 1409/5 1411/5 -f 1410/5 1411/5 1412/5 -f 1412/5 1411/5 1413/5 -f 1411/5 1414/5 1413/5 -f 1413/5 1414/5 1415/5 -f 1413/5 1415/5 1416/5 -f 1416/5 1415/5 1417/5 -f 1416/5 1417/5 1418/5 -f 1418/5 1417/5 1419/5 -f 1418/5 1419/5 1420/5 -f 1420/5 1419/5 1421/5 -f 1420/5 1421/5 1422/5 -f 1422/5 1421/5 1423/5 -f 1421/5 1424/5 1423/5 -f 1423/5 1424/5 1425/5 -f 1423/5 1425/5 1426/5 -f 1426/5 1425/5 1427/5 -f 1426/5 1427/5 1428/5 -f 1428/5 1427/5 1429/5 -f 1428/5 1429/5 1430/5 -f 1430/5 1429/5 1431/5 -f 1430/5 1431/5 1432/5 -f 1432/5 1431/5 1433/5 -f 1431/5 1434/5 1433/5 -f 1433/5 1434/5 1435/5 -f 1433/5 1435/5 1436/5 -f 1436/5 1435/5 1437/5 -f 1436/5 1437/5 1438/5 -f 1439/5 1440/5 1441/5 -f 1441/5 1440/5 1442/5 -f 1441/5 1442/5 1443/5 -f 1441/5 1443/5 1444/5 -f 1444/5 1443/5 1445/5 -f 1444/5 1445/5 1446/5 -f 1446/5 1445/5 1447/5 -f 1446/5 1447/5 1448/5 -f 1448/5 1447/5 1449/5 -f 1448/5 1449/5 1450/5 -f 1450/5 1449/5 1451/5 -f 1449/5 1452/5 1451/5 -f 1451/5 1452/5 1453/5 -f 1451/5 1453/5 1454/5 -f 1454/5 1453/5 1455/5 -f 1454/5 1455/5 1456/5 -f 1456/5 1455/5 1457/5 -f 1456/5 1457/5 1458/5 -f 1458/5 1457/5 1459/5 -f 1458/5 1459/5 1460/5 -f 1460/5 1459/5 1461/5 -f 1459/5 1462/5 1461/5 -f 1461/5 1462/5 1463/5 -f 1461/5 1463/5 1464/5 -f 1464/5 1463/5 1465/5 -f 1464/5 1465/5 1466/5 -f 1466/5 1465/5 1467/5 -f 1466/5 1467/5 1468/5 -f 1468/5 1467/5 1469/5 -f 1468/5 1469/5 1470/5 -f 1470/5 1469/5 1471/5 -f 1469/5 1472/5 1471/5 -f 1471/5 1472/5 1473/5 -f 1472/5 1474/5 1473/5 -f 1473/5 1474/5 1475/5 -f 1473/5 1475/5 1476/5 -f 1476/5 1475/5 1477/5 -f 1476/5 1477/5 1478/5 -f 1478/5 1477/5 1479/5 -f 1478/5 1479/5 1480/5 -f 1480/5 1479/5 1481/5 -f 1480/5 1481/5 1482/5 -f 1482/5 1481/5 1483/5 -f 1481/5 1484/5 1483/5 -f 1483/5 1484/5 1485/5 -f 1483/5 1485/5 1486/5 -f 1486/5 1485/5 1487/5 -f 1486/5 1487/5 1488/5 -f 1488/5 1487/5 1489/5 -f 1488/5 1489/5 1490/5 -f 1490/5 1489/5 1491/5 -f 1490/5 1491/5 1492/5 -f 1492/5 1491/5 1493/5 -f 1491/5 1494/5 1493/5 -f 1493/5 1494/5 1495/5 -f 1493/5 1495/5 1496/5 -f 1496/5 1495/5 1497/5 -f 1496/5 1497/5 1498/5 -f 1498/5 1497/5 1499/5 -f 1498/5 1499/5 1500/5 -f 1500/5 1499/5 1501/5 -f 1500/5 1501/5 1502/5 -f 1502/5 1501/5 1307/5 -f 1501/5 1305/5 1307/5 -f 1503/5 1504/5 1505/5 -f 1505/5 1504/5 1506/5 -f 1504/5 1507/5 1506/5 -f 1506/5 1507/5 1508/5 -f 1507/5 1509/5 1508/5 -f 1508/5 1509/5 1510/5 -f 1509/5 1511/5 1510/5 -f 1510/5 1511/5 1512/5 -f 1511/5 1513/5 1512/5 -f 1512/5 1513/5 1514/5 -f 1513/5 1515/5 1514/5 -f 1514/5 1515/5 1516/5 -f 1515/5 1517/5 1516/5 -f 1516/5 1517/5 1518/5 -f 1517/5 1519/5 1518/5 -f 1518/5 1519/5 1520/5 -f 1519/5 1521/5 1520/5 -f 1520/5 1521/5 1522/5 -f 1521/5 1523/5 1522/5 -f 1522/5 1523/5 1524/5 -f 1523/5 1525/5 1524/5 -f 1524/5 1525/5 1526/5 -f 1525/5 1527/5 1526/5 -f 1526/5 1527/5 1528/5 -f 1527/5 1529/5 1528/5 -f 1528/5 1529/5 1530/5 -f 1529/5 1531/5 1530/5 -f 1530/5 1531/5 1532/5 -f 1531/5 1533/5 1532/5 -f 1532/5 1533/5 1534/5 -f 1533/5 1535/5 1534/5 -f 1534/5 1535/5 1536/5 -f 1535/5 1537/5 1536/5 -f 1536/5 1537/5 1538/5 -f 1537/5 1539/5 1538/5 -f 1538/5 1539/5 1540/5 -f 1539/5 1541/5 1540/5 -f 1540/5 1541/5 1542/5 -f 1541/5 1543/5 1542/5 -f 1542/5 1543/5 1544/5 -f 1544/5 1543/5 1545/5 -f 1545/5 1543/5 1546/5 -f 1545/5 1546/5 1547/5 -f 1545/5 1547/5 1548/5 -f 1548/5 1547/5 1549/5 -f 1548/5 1549/5 1550/5 -f 1550/5 1549/5 1551/5 -f 1550/5 1551/5 1552/5 -f 1552/5 1551/5 1553/5 -f 1552/5 1553/5 1554/5 -f 1554/5 1553/5 1555/5 -f 1554/5 1555/5 1556/5 -f 1556/5 1555/5 1557/5 -f 1556/5 1557/5 1558/5 -f 1558/5 1557/5 1559/5 -f 1558/5 1559/5 1560/5 -f 1560/5 1559/5 1561/5 -f 1560/5 1561/5 1562/5 -f 1562/5 1561/5 1563/5 -f 1562/5 1563/5 1564/5 -f 1564/5 1563/5 1565/5 -f 1564/5 1565/5 1566/5 -f 1566/5 1565/5 1271/5 -f 1566/5 1271/5 1290/5 -f 1567/5 1503/5 1568/5 -f 1568/5 1503/5 1505/5 -f 1568/5 1505/5 1569/5 -f 1570/5 1571/5 1572/5 -f 1572/5 1571/5 1573/5 -f 1572/5 1573/5 1574/5 -f 1573/5 1571/5 1575/5 -f 1575/5 1571/5 1576/5 -f 1575/5 1576/5 1577/5 -f 1575/5 1577/5 1578/5 -f 1578/5 1577/5 1579/5 -f 1578/5 1579/5 1580/5 -f 1580/5 1579/5 1581/5 -f 1580/5 1581/5 1582/5 -f 1582/5 1581/5 1583/5 -f 1582/5 1583/5 1584/5 -f 1584/5 1583/5 1585/5 -f 1583/5 1586/5 1585/5 -f 1585/5 1586/5 1587/5 -f 1585/5 1587/5 1588/5 -f 1588/5 1587/5 1589/5 -f 1588/5 1589/5 1590/5 -f 1590/5 1589/5 1591/5 -f 1589/5 1592/5 1591/5 -f 1591/5 1592/5 1593/5 -f 1591/5 1593/5 1594/5 -f 1594/5 1593/5 1595/5 -f 1593/5 1596/5 1595/5 -f 1595/5 1596/5 1597/5 -f 1595/5 1597/5 1598/5 -f 1598/5 1597/5 1599/5 -f 1598/5 1599/5 1600/5 -f 1600/5 1599/5 1601/5 -f 1600/5 1601/5 1602/5 -f 1602/5 1601/5 1568/5 -f 1602/5 1568/5 1569/5 -f 1601/5 1567/5 1568/5 -f 1603/5 1570/5 1604/5 -f 1604/5 1570/5 1572/5 -f 1604/5 1572/5 1605/5 -f 1605/5 1572/5 1606/5 -f 1572/5 1574/5 1606/5 -f 1606/5 1574/5 1607/5 -f 1606/5 1607/5 1608/5 -f 1608/5 1609/5 1606/5 -f 1606/5 1609/5 1610/5 -f 1606/5 1610/5 1611/5 -f 1611/5 1612/5 1606/5 -f 1606/5 1612/5 1613/5 -f 1606/5 1613/5 1614/5 -f 1614/5 1615/5 1606/5 -f 1606/5 1615/5 1616/5 -f 1606/5 1616/5 1617/5 -f 1617/5 1618/5 1606/5 -f 1606/5 1618/5 1619/5 -f 1606/5 1619/5 1620/5 -f 1620/5 1621/5 1606/5 -f 1606/5 1621/5 1622/5 -f 1606/5 1622/5 1623/5 -f 1623/5 1624/5 1606/5 -f 1606/5 1624/5 1625/5 -f 1606/5 1625/5 1626/5 -f 1626/5 1627/5 1606/5 -f 1606/5 1627/5 1628/5 -f 1606/5 1628/5 1629/5 -f 1629/5 1630/5 1606/5 -f 1606/5 1630/5 1631/5 -f 1606/5 1631/5 1632/5 -f 1632/5 1633/5 1606/5 -f 1606/5 1633/5 1634/5 -f 1606/5 1634/5 1635/5 -f 1635/5 1636/5 1606/5 -f 1606/5 1636/5 1637/5 -f 1606/5 1637/5 1638/5 -f 1639/5 1640/5 1604/5 -f 1604/5 1640/5 1641/5 -f 1604/5 1641/5 1642/5 -f 1642/5 1643/5 1604/5 -f 1604/5 1643/5 1644/5 -f 1604/5 1644/5 1645/5 -f 1645/5 1646/5 1604/5 -f 1604/5 1646/5 1647/5 -f 1604/5 1647/5 1648/5 -f 1648/5 1649/5 1604/5 -f 1604/5 1649/5 1650/5 -f 1604/5 1650/5 1651/5 -f 1651/5 1652/5 1604/5 -f 1604/5 1652/5 1653/5 -f 1604/5 1653/5 1654/5 -f 1654/5 1655/5 1604/5 -f 1604/5 1655/5 1656/5 -f 1604/5 1656/5 1657/5 -f 1657/5 1658/5 1604/5 -f 1604/5 1658/5 1659/5 -f 1604/5 1659/5 1660/5 -f 1660/5 1661/5 1604/5 -f 1604/5 1661/5 1662/5 -f 1604/5 1662/5 1663/5 -f 1663/5 1664/5 1604/5 -f 1604/5 1664/5 1665/5 -f 1604/5 1665/5 1666/5 -f 1666/5 1667/5 1604/5 -f 1604/5 1667/5 1668/5 -f 1604/5 1668/5 1669/5 -f 1669/5 1603/5 1604/5 -f 1310/5 1309/5 1670/5 -f 1670/5 1309/5 1671/5 -f 1670/5 1671/5 1672/5 -f 1670/5 1672/5 1673/5 -f 1673/5 1672/5 1674/5 -f 1673/5 1674/5 1675/5 -f 1675/5 1674/5 1676/5 -f 1675/5 1676/5 1677/5 -f 1677/5 1676/5 1678/5 -f 1676/5 1679/5 1678/5 -f 1678/5 1679/5 1680/5 -f 1678/5 1680/5 1681/5 -f 1681/5 1680/5 1682/5 -f 1681/5 1682/5 1683/5 -f 1683/5 1682/5 1684/5 -f 1683/5 1684/5 1685/5 -f 1685/5 1684/5 1686/5 -f 1685/5 1686/5 1687/5 -f 1687/5 1686/5 1688/5 -f 1686/5 1689/5 1688/5 -f 1688/5 1689/5 1690/5 -f 1688/5 1690/5 1691/5 -f 1691/5 1690/5 1692/5 -f 1691/5 1692/5 1693/5 -f 1693/5 1692/5 1694/5 -f 1693/5 1694/5 1695/5 -f 1695/5 1694/5 1696/5 -f 1695/5 1696/5 1697/5 -f 1697/5 1696/5 1698/5 -f 1696/5 1699/5 1698/5 -f 1698/5 1699/5 1700/5 -f 1698/5 1700/5 1701/5 -f 1701/5 1700/5 1702/5 -f 1701/5 1702/5 1703/5 -f 1703/5 1702/5 1704/5 -f 1703/5 1704/5 1705/5 -f 1705/5 1704/5 1706/5 -f 1705/5 1706/5 1707/5 -f 1707/5 1706/5 1708/5 -f 1706/5 1709/5 1708/5 -f 1708/5 1709/5 1710/5 -f 1708/5 1710/5 1711/5 -f 1711/5 1710/5 1712/5 -f 1711/5 1712/5 1713/5 -f 1713/5 1712/5 1714/5 -f 1713/5 1714/5 1715/5 -f 1715/5 1714/5 1716/5 -f 1715/5 1716/5 1717/5 -f 1717/5 1716/5 1718/5 -f 1716/5 1719/5 1718/5 -f 1718/5 1719/5 1720/5 -f 1718/5 1720/5 1721/5 -f 1721/5 1720/5 1722/5 -f 1721/5 1722/5 1723/5 -f 1723/5 1722/5 1724/5 -f 1723/5 1724/5 1725/5 -f 1725/5 1724/5 1726/5 -f 1725/5 1726/5 1727/5 -f 1727/5 1726/5 1728/5 -f 1726/5 1729/5 1728/5 -f 1728/5 1729/5 1730/5 -f 1728/5 1730/5 1731/5 -f 1731/5 1730/5 1732/5 -f 1731/5 1732/5 1733/5 -f 1734/5 1735/5 1736/5 -f 1736/5 1735/5 1737/5 -f 1736/5 1737/5 1738/5 -f 1738/5 1737/5 1739/5 -f 1738/5 1739/5 1740/5 -f 1740/5 1739/5 1741/5 -f 1740/5 1741/5 1742/5 -f 1743/5 1744/5 1736/5 -f 1736/5 1744/5 1745/5 -f 1736/5 1745/5 1746/5 -f 1746/5 1747/5 1736/5 -f 1736/5 1747/5 1748/5 -f 1736/5 1748/5 1749/5 -f 1749/5 1750/5 1736/5 -f 1736/5 1750/5 1751/5 -f 1736/5 1751/5 1752/5 -f 1752/5 1753/5 1736/5 -f 1736/5 1753/5 1754/5 -f 1736/5 1754/5 1755/5 -f 1755/5 1756/5 1736/5 -f 1736/5 1756/5 1757/5 -f 1736/5 1757/5 1758/5 -f 1758/5 1759/5 1736/5 -f 1736/5 1759/5 1760/5 -f 1736/5 1760/5 1761/5 -f 1761/5 1762/5 1736/5 -f 1736/5 1762/5 1763/5 -f 1736/5 1763/5 1764/5 -f 1764/5 1765/5 1736/5 -f 1736/5 1765/5 1766/5 -f 1736/5 1766/5 1767/5 -f 1767/5 1768/5 1736/5 -f 1736/5 1768/5 1769/5 -f 1736/5 1769/5 1770/5 -f 1770/5 1771/5 1736/5 -f 1736/5 1771/5 1772/5 -f 1736/5 1772/5 1734/5 -f 1742/5 1773/5 1740/5 -f 1740/5 1773/5 1774/5 -f 1740/5 1774/5 1775/5 -f 1775/5 1776/5 1740/5 -f 1740/5 1776/5 1777/5 -f 1740/5 1777/5 1778/5 -f 1778/5 1779/5 1740/5 -f 1740/5 1779/5 1780/5 -f 1740/5 1780/5 1781/5 -f 1781/5 1782/5 1740/5 -f 1740/5 1782/5 1783/5 -f 1740/5 1783/5 1784/5 -f 1784/5 1785/5 1740/5 -f 1740/5 1785/5 1786/5 -f 1740/5 1786/5 1787/5 -f 1787/5 1788/5 1740/5 -f 1740/5 1788/5 1789/5 -f 1740/5 1789/5 1790/5 -f 1790/5 1791/5 1740/5 -f 1740/5 1791/5 1792/5 -f 1740/5 1792/5 1793/5 -f 1793/5 1794/5 1740/5 -f 1740/5 1794/5 1795/5 -f 1740/5 1795/5 1796/5 -f 1796/5 1797/5 1740/5 -f 1740/5 1797/5 1798/5 -f 1740/5 1798/5 1799/5 -f 1799/5 1800/5 1740/5 -f 1740/5 1800/5 1801/5 -f 1740/5 1801/5 1802/5 -f 1737/5 1803/5 1739/5 -f 1739/5 1803/5 1804/5 -f 1804/5 1803/5 1805/5 -f 1805/5 1803/5 1806/5 -f 1805/5 1806/5 1807/5 -f 1805/5 1807/5 1808/5 -f 1808/5 1807/5 1809/5 -f 1808/5 1809/5 1810/5 -f 1810/5 1809/5 1811/5 -f 1810/5 1811/5 1812/5 -f 1812/5 1811/5 1813/5 -f 1812/5 1813/5 1814/5 -f 1814/5 1813/5 1815/5 -f 1813/5 1816/5 1815/5 -f 1815/5 1816/5 1817/5 -f 1815/5 1817/5 1818/5 -f 1818/5 1817/5 1819/5 -f 1818/5 1819/5 1820/5 -f 1820/5 1819/5 1821/5 -f 1819/5 1822/5 1821/5 -f 1821/5 1822/5 1823/5 -f 1821/5 1823/5 1824/5 -f 1824/5 1823/5 1825/5 -f 1823/5 1826/5 1825/5 -f 1825/5 1826/5 1827/5 -f 1825/5 1827/5 1828/5 -f 1828/5 1827/5 1829/5 -f 1828/5 1829/5 1830/5 -f 1830/5 1829/5 1831/5 -f 1830/5 1831/5 1832/5 -f 1832/5 1831/5 1833/5 -f 1832/5 1833/5 1834/5 -f 1311/5 1835/5 1836/5 -f 1836/5 1835/5 1837/5 -f 1836/5 1837/5 1838/5 -f 1838/5 1837/5 1839/5 -f 1838/5 1839/5 1840/5 -f 1840/5 1839/5 1841/5 -f 1840/5 1841/5 1842/5 -f 1842/5 1841/5 1843/5 -f 1842/5 1843/5 1844/5 -f 1844/5 1843/5 1845/5 -f 1844/5 1845/5 1846/5 -f 1846/5 1845/5 1847/5 -f 1846/5 1847/5 1848/5 -f 1848/5 1847/5 1849/5 -f 1848/5 1849/5 1850/5 -f 1850/5 1849/5 1851/5 -f 1850/5 1851/5 1852/5 -f 1311/5 1313/5 1835/5 -f 1853/5 1854/5 1855/5 -f 1855/5 1854/5 1856/5 -f 1855/5 1856/5 1857/5 -f 1855/5 1857/5 1858/5 -f 1858/5 1857/5 1859/5 -f 1858/5 1859/5 1860/5 -f 1860/5 1859/5 1861/5 -f 1860/5 1861/5 1862/5 -f 1862/5 1861/5 1863/5 -f 1862/5 1863/5 1864/5 -f 1864/5 1863/5 1865/5 -f 1864/5 1865/5 1866/5 -f 1866/5 1865/5 1867/5 -f 1866/5 1867/5 1868/5 -f 1868/5 1867/5 1869/5 -f 1867/5 1870/5 1869/5 -f 1869/5 1870/5 1438/5 -f 1869/5 1438/5 1437/5 -f 1833/5 1871/5 1834/5 -f 1834/5 1871/5 1872/5 -f 1873/5 1874/5 1875/5 -f 1875/5 1874/5 1876/5 -f 1875/5 1876/5 1877/5 -f 1877/5 1876/5 1878/5 -f 1877/5 1878/5 1879/5 -f 1879/5 1878/5 1880/5 -f 1879/5 1880/5 1881/5 -f 1881/5 1880/5 1882/5 -f 1881/5 1882/5 1883/5 -f 1883/5 1882/5 1884/5 -f 1883/5 1884/5 1885/5 -f 1885/5 1884/5 1886/5 -f 1885/5 1886/5 1887/5 -f 1887/5 1886/5 1888/5 -f 1887/5 1888/5 1889/5 -f 1889/5 1888/5 1890/5 -f 1889/5 1890/5 1891/5 -f 1891/5 1890/5 1892/5 -f 1891/5 1892/5 1893/5 -f 1893/5 1892/5 1894/5 -f 1893/5 1894/5 1895/5 -f 1895/5 1894/5 1896/5 -f 1895/5 1896/5 1897/5 -f 1897/5 1896/5 1898/5 -f 1897/5 1898/5 1899/5 -f 1899/5 1898/5 1900/5 -f 1899/5 1900/5 1901/5 -f 1873/5 1902/5 1874/5 -f 1874/5 1902/5 1903/5 -f 1902/5 1904/5 1903/5 -f 1903/5 1904/5 1905/5 -f 1904/5 1906/5 1905/5 -f 1905/5 1906/5 1907/5 -f 1906/5 1908/5 1907/5 -f 1907/5 1908/5 1909/5 -f 1908/5 1910/5 1909/5 -f 1909/5 1910/5 1911/5 -f 1910/5 1912/5 1911/5 -f 1911/5 1912/5 1913/5 -f 1912/5 1914/5 1913/5 -f 1913/5 1914/5 1915/5 -f 1914/5 1916/5 1915/5 -f 1915/5 1916/5 1917/5 -f 1916/5 1918/5 1917/5 -f 1917/5 1918/5 1919/5 -f 1918/5 1920/5 1919/5 -f 1919/5 1920/5 1921/5 -f 1920/5 1922/5 1921/5 -f 1921/5 1922/5 1923/5 -f 1922/5 1924/5 1923/5 -f 1923/5 1924/5 1925/5 -f 1924/5 1926/5 1925/5 -f 1925/5 1926/5 1927/5 -f 1926/5 1928/5 1927/5 -f 1927/5 1928/5 1929/5 -f 1928/5 1930/5 1929/5 -f 1929/5 1930/5 1931/5 -f 1930/5 1932/5 1931/5 -f 1931/5 1932/5 1933/5 -f 1932/5 1934/5 1933/5 -f 1933/5 1934/5 1935/5 -f 1934/5 1936/5 1935/5 -f 1935/5 1936/5 1937/5 -f 1936/5 1938/5 1937/5 -f 1937/5 1938/5 1939/5 -f 1938/5 1940/5 1939/5 -f 1939/5 1940/5 1941/5 -f 1940/5 1942/5 1941/5 -f 1941/5 1942/5 1943/5 -f 1942/5 1944/5 1943/5 -f 1943/5 1944/5 1945/5 -f 1944/5 1946/5 1945/5 -f 1945/5 1946/5 1947/5 -f 1946/5 1948/5 1947/5 -f 1947/5 1948/5 1949/5 -f 1948/5 1950/5 1949/5 -f 1949/5 1950/5 1951/5 -f 1950/5 1952/5 1951/5 -f 1951/5 1952/5 1953/5 -f 1952/5 1954/5 1953/5 -f 1953/5 1954/5 1955/5 -f 1899/5 1901/5 1956/5 -f 1956/5 1901/5 1957/5 -f 1956/5 1957/5 1958/5 -f 1958/5 1957/5 1959/5 -f 1958/5 1959/5 1960/5 -f 1960/5 1959/5 1961/5 -f 1960/5 1961/5 1962/5 -f 1962/5 1961/5 1963/5 -f 1962/5 1963/5 1964/5 -f 1964/5 1963/5 1965/5 -f 1964/5 1965/5 1966/5 -f 1966/5 1965/5 1967/5 -f 1966/5 1967/5 1968/5 -f 1968/5 1967/5 1969/5 -f 1968/5 1969/5 1970/5 -f 1970/5 1969/5 1971/5 -f 1970/5 1971/5 1972/5 -f 1972/5 1971/5 1440/5 -f 1972/5 1440/5 1439/5 -f 1973/5 1974/5 1975/5 -f 1975/5 1974/5 1976/5 -f 1975/5 1976/5 1977/5 -f 1975/5 1977/5 1978/5 -f 1978/5 1977/5 1979/5 -f 1978/5 1979/5 1980/5 -f 1980/5 1979/5 1981/5 -f 1980/5 1981/5 1982/5 -f 1982/5 1981/5 1983/5 -f 1982/5 1983/5 1984/5 -f 1984/5 1983/5 1985/5 -f 1984/5 1985/5 1986/5 -f 1986/5 1985/5 1987/5 -f 1986/5 1987/5 1988/5 -f 1988/5 1987/5 1989/5 -f 1988/5 1989/5 1990/5 -f 1990/5 1989/5 1991/5 -f 1990/5 1991/5 1992/5 -f 1992/5 1991/5 1993/5 -f 1992/5 1993/5 1994/5 -f 1994/5 1993/5 1995/5 -f 1994/5 1995/5 1996/5 -f 1996/5 1995/5 1997/5 -f 1996/5 1997/5 1998/5 -f 1998/5 1997/5 1999/5 -f 1998/5 1999/5 2000/5 -f 2000/5 1999/5 2001/5 -f 2000/5 2001/5 2002/5 -f 2002/5 2001/5 2003/5 -f 2002/5 2003/5 2004/5 -f 2004/5 2003/5 2005/5 -f 2004/5 2005/5 2006/5 -f 2006/5 2005/5 2007/5 -f 2006/5 2007/5 2008/5 -f 2008/5 2007/5 2009/5 -f 2008/5 2009/5 2010/5 -f 2010/5 2009/5 2011/5 -f 2010/5 2011/5 2012/5 -f 2012/5 2011/5 2013/5 -f 2012/5 2013/5 2014/5 -f 2014/5 2013/5 2015/5 -f 2014/5 2015/5 2016/5 -f 2016/5 2015/5 2017/5 -f 2016/5 2017/5 2018/5 -f 2018/5 2017/5 2019/5 -f 2018/5 2019/5 2020/5 -f 2020/5 2019/5 2021/5 -f 2020/5 2021/5 2022/5 -f 2022/5 2021/5 2023/5 -f 2022/5 2023/5 2024/5 -f 2024/5 2023/5 2025/5 -f 2024/5 2025/5 2026/5 -f 2024/5 2026/5 2027/5 -f 2027/5 2026/5 2028/5 -f 2027/5 2028/5 2029/5 -f 2029/5 2028/5 2030/5 -f 2029/5 2030/5 2031/5 -f 2031/5 2030/5 2032/5 -f 2031/5 2032/5 2033/5 -f 2033/5 2032/5 2034/5 -f 2033/5 2034/5 2035/5 -f 2035/5 2034/5 2036/5 -f 2035/5 2036/5 2037/5 -f 2037/5 2036/5 2038/5 -f 2037/5 2038/5 2039/5 -f 2037/5 2039/5 2040/5 -f 2040/5 2039/5 2041/5 -f 2040/5 2041/5 2042/5 -f 2042/5 2041/5 2043/5 -f 2042/5 2043/5 2044/5 -f 2044/5 2043/5 2045/5 -f 2044/5 2045/5 2046/5 -f 2046/5 2045/5 2047/5 -f 2046/5 2047/5 2048/5 -f 2048/5 2047/5 2049/5 -f 2048/5 2049/5 2050/5 -f 2050/5 2049/5 2051/5 -f 2050/5 2051/5 2052/5 -f 2052/5 2051/5 2053/5 -f 2052/5 2053/5 2054/5 -f 2054/5 2053/5 2055/5 -f 2054/5 2055/5 2056/5 -f 2056/5 2055/5 2057/5 -f 2056/5 2057/5 2058/5 -f 2058/5 2057/5 2059/5 -f 2058/5 2059/5 2060/5 -f 2060/5 2059/5 2061/5 -f 2060/5 2061/5 2062/5 -f 2062/5 2061/5 2063/5 -f 2062/5 2063/5 2064/5 -f 2064/5 2063/5 2065/5 -f 2064/5 2065/5 2066/5 -f 2066/5 2065/5 2067/5 -f 2066/5 2067/5 2068/5 -f 2068/5 2067/5 2069/5 -f 2068/5 2069/5 2070/5 -f 2070/5 2069/5 1733/5 -f 2070/5 1733/5 1732/5 -f 2071/5 2072/5 2027/5 -f 2027/5 2072/5 2024/5 -f 1871/5 2073/5 1872/5 -f 1872/5 2073/5 2074/5 -f 2073/5 2075/5 2074/5 -f 2074/5 2075/5 2076/5 -f 2075/5 2077/5 2076/5 -f 2076/5 2077/5 2078/5 -f 2077/5 2079/5 2078/5 -f 2078/5 2079/5 2080/5 -f 2079/5 2081/5 2080/5 -f 2080/5 2081/5 2082/5 -f 2081/5 2083/5 2082/5 -f 2082/5 2083/5 2084/5 -f 2083/5 2085/5 2084/5 -f 2084/5 2085/5 2086/5 -f 2085/5 2087/5 2086/5 -f 2086/5 2087/5 2088/5 -f 2087/5 2089/5 2088/5 -f 2088/5 2089/5 2090/5 -f 2089/5 2091/5 2090/5 -f 2090/5 2091/5 2092/5 -f 2091/5 2093/5 2092/5 -f 2092/5 2093/5 2094/5 -f 2093/5 2095/5 2094/5 -f 2094/5 2095/5 2096/5 -f 2095/5 2097/5 2096/5 -f 2096/5 2097/5 2098/5 -f 2097/5 2099/5 2098/5 -f 2098/5 2099/5 2100/5 -f 2099/5 2101/5 2100/5 -f 2100/5 2101/5 2102/5 -f 2101/5 2103/5 2102/5 -f 2102/5 2103/5 2104/5 -f 2103/5 2105/5 2104/5 -f 2104/5 2105/5 2106/5 -f 2105/5 2107/5 2106/5 -f 2106/5 2107/5 2108/5 -f 2107/5 2109/5 2108/5 -f 2108/5 2109/5 2110/5 -f 2109/5 2111/5 2110/5 -f 2110/5 2111/5 2112/5 -f 2112/5 2111/5 2113/5 -f 2113/5 2111/5 2114/5 -f 2113/5 2114/5 2115/5 -f 2113/5 2115/5 2116/5 -f 2116/5 2115/5 2117/5 -f 2116/5 2117/5 2118/5 -f 2118/5 2117/5 2119/5 -f 2118/5 2119/5 2120/5 -f 2120/5 2119/5 2121/5 -f 2120/5 2121/5 2122/5 -f 2122/5 2121/5 2123/5 -f 2122/5 2123/5 2124/5 -f 2124/5 2123/5 2125/5 -f 2124/5 2125/5 2126/5 -f 2126/5 2125/5 2127/5 -f 2126/5 2127/5 2128/5 -f 2128/5 2127/5 2129/5 -f 2128/5 2129/5 2130/5 -f 2130/5 2129/5 2131/5 -f 2130/5 2131/5 2132/5 -f 2132/5 2131/5 2133/5 -f 2132/5 2133/5 2134/5 -f 2134/5 2133/5 1168/5 -f 2134/5 1168/5 1180/5 -f 2135/5 2136/5 2137/5 -f 2137/5 2136/5 2138/5 -f 2137/5 2138/5 2139/5 -f 2137/5 2139/5 2140/5 -f 2140/5 2139/5 2141/5 -f 2140/5 2141/5 2142/5 -f 2142/5 2141/5 2143/5 -f 2142/5 2143/5 2144/5 -f 2144/5 2143/5 2145/5 -f 2144/5 2145/5 2146/5 -f 2146/5 2145/5 2147/5 -f 2145/5 2148/5 2147/5 -f 2147/5 2148/5 2149/5 -f 2147/5 2149/5 2150/5 -f 2150/5 2149/5 2151/5 -f 2150/5 2151/5 2152/5 -f 2152/5 2151/5 2153/5 -f 2152/5 2153/5 2154/5 -f 2154/5 2153/5 2155/5 -f 2154/5 2155/5 2156/5 -f 2156/5 2155/5 2157/5 -f 2155/5 2158/5 2157/5 -f 2157/5 2158/5 2159/5 -f 2157/5 2159/5 2160/5 -f 2160/5 2159/5 2161/5 -f 2160/5 2161/5 2162/5 -f 2162/5 2161/5 2163/5 -f 2162/5 2163/5 2164/5 -f 2164/5 2163/5 2165/5 -f 2164/5 2165/5 2166/5 -f 2166/5 2165/5 2167/5 -f 2165/5 2168/5 2167/5 -f 2167/5 2168/5 2169/5 -f 2168/5 2170/5 2169/5 -f 2169/5 2170/5 2171/5 -f 2169/5 2171/5 2172/5 -f 2172/5 2171/5 2173/5 -f 2172/5 2173/5 2174/5 -f 2174/5 2173/5 2175/5 -f 2174/5 2175/5 2176/5 -f 2176/5 2175/5 2177/5 -f 2176/5 2177/5 2178/5 -f 2178/5 2177/5 2179/5 -f 2177/5 2180/5 2179/5 -f 2179/5 2180/5 2181/5 -f 2179/5 2181/5 2182/5 -f 2182/5 2181/5 2183/5 -f 2182/5 2183/5 2184/5 -f 2184/5 2183/5 2185/5 -f 2184/5 2185/5 2186/5 -f 2186/5 2185/5 2187/5 -f 2186/5 2187/5 2188/5 -f 2188/5 2187/5 2189/5 -f 2187/5 2190/5 2189/5 -f 2189/5 2190/5 2191/5 -f 2189/5 2191/5 2192/5 -f 2192/5 2191/5 2193/5 -f 2192/5 2193/5 2194/5 -f 2194/5 2193/5 2195/5 -f 2194/5 2195/5 2196/5 -f 2196/5 2195/5 2197/5 -f 2196/5 2197/5 2198/5 -f 2198/5 2197/5 2199/5 -f 2197/5 2200/5 2199/5 -f 2201/5 2202/5 2203/5 -f 2203/5 2202/5 2204/5 -f 2203/5 2204/5 2205/5 -f 2203/5 2205/5 2206/5 -f 2206/5 2205/5 2207/5 -f 2206/5 2207/5 2208/5 -f 2208/5 2207/5 2209/5 -f 2208/5 2209/5 2210/5 -f 2210/5 2209/5 2211/5 -f 2210/5 2211/5 2212/5 -f 2212/5 2211/5 2213/5 -f 2211/5 2214/5 2213/5 -f 2213/5 2214/5 2215/5 -f 2213/5 2215/5 2216/5 -f 2216/5 2215/5 2217/5 -f 2216/5 2217/5 2218/5 -f 2218/5 2217/5 2219/5 -f 2218/5 2219/5 2220/5 -f 2220/5 2219/5 2221/5 -f 2220/5 2221/5 2222/5 -f 2222/5 2221/5 2223/5 -f 2221/5 2224/5 2223/5 -f 2223/5 2224/5 2225/5 -f 2223/5 2225/5 2226/5 -f 2226/5 2225/5 2227/5 -f 2226/5 2227/5 2228/5 -f 2228/5 2227/5 2229/5 -f 2228/5 2229/5 2230/5 -f 2230/5 2229/5 2231/5 -f 2230/5 2231/5 2232/5 -f 2232/5 2231/5 2233/5 -f 2231/5 2234/5 2233/5 -f 2233/5 2234/5 2235/5 -f 2234/5 2236/5 2235/5 -f 2235/5 2236/5 2237/5 -f 2235/5 2237/5 2238/5 -f 2238/5 2237/5 2239/5 -f 2238/5 2239/5 2240/5 -f 2240/5 2239/5 2241/5 -f 2240/5 2241/5 2242/5 -f 2242/5 2241/5 2243/5 -f 2242/5 2243/5 2244/5 -f 2244/5 2243/5 2245/5 -f 2243/5 2246/5 2245/5 -f 2245/5 2246/5 2247/5 -f 2245/5 2247/5 2248/5 -f 2248/5 2247/5 2249/5 -f 2248/5 2249/5 2250/5 -f 2250/5 2249/5 2251/5 -f 2250/5 2251/5 2252/5 -f 2252/5 2251/5 2253/5 -f 2252/5 2253/5 2254/5 -f 2254/5 2253/5 2255/5 -f 2253/5 2256/5 2255/5 -f 2255/5 2256/5 2257/5 -f 2255/5 2257/5 2258/5 -f 2258/5 2257/5 2259/5 -f 2258/5 2259/5 2260/5 -f 2260/5 2259/5 2261/5 -f 2260/5 2261/5 2262/5 -f 2262/5 2261/5 2263/5 -f 2262/5 2263/5 2264/5 -f 2264/5 2263/5 2265/5 -f 2263/5 2266/5 2265/5 -f 2267/5 2268/5 2269/5 -f 2269/5 2268/5 2270/5 -f 2269/5 2270/5 2271/5 -f 2271/5 2272/5 2269/5 -f 2269/5 2272/5 2273/5 -f 2269/5 2273/5 2274/5 -f 2274/5 2275/5 2269/5 -f 2269/5 2275/5 2276/5 -f 2269/5 2276/5 2277/5 -f 2277/5 2278/5 2269/5 -f 2269/5 2278/5 2279/5 -f 2269/5 2279/5 2280/5 -f 2280/5 2281/5 2269/5 -f 2269/5 2281/5 2282/5 -f 2269/5 2282/5 2283/5 -f 2283/5 2284/5 2269/5 -f 2269/5 2284/5 2285/5 -f 2269/5 2285/5 2286/5 -f 2286/5 2287/5 2269/5 -f 2269/5 2287/5 2288/5 -f 2269/5 2288/5 2289/5 -f 2289/5 2290/5 2269/5 -f 2269/5 2290/5 2291/5 -f 2269/5 2291/5 2292/5 -f 2292/5 2293/5 2269/5 -f 2269/5 2293/5 2294/5 -f 2269/5 2294/5 2295/5 -f 2295/5 2296/5 2269/5 -f 2269/5 2296/5 2297/5 -f 2269/5 2297/5 2298/5 -f 2298/5 2299/5 2269/5 -f 2269/5 2299/5 2300/5 -f 2300/5 2299/5 2301/5 -f 2301/5 2299/5 2302/5 -f 2301/5 2302/5 2303/5 -f 2304/5 2305/5 2303/5 -f 2303/5 2305/5 2306/5 -f 2303/5 2306/5 2301/5 -f 2304/5 2307/5 2305/5 -f 2305/5 2307/5 2308/5 -f 2305/5 2308/5 2309/5 -f 2309/5 2310/5 2305/5 -f 2305/5 2310/5 2311/5 -f 2305/5 2311/5 2312/5 -f 2312/5 2313/5 2305/5 -f 2305/5 2313/5 2314/5 -f 2305/5 2314/5 2315/5 -f 2315/5 2316/5 2305/5 -f 2305/5 2316/5 2317/5 -f 2305/5 2317/5 2318/5 -f 2318/5 2319/5 2305/5 -f 2305/5 2319/5 2320/5 -f 2305/5 2320/5 2321/5 -f 2321/5 2322/5 2305/5 -f 2305/5 2322/5 2323/5 -f 2305/5 2323/5 2324/5 -f 2324/5 2325/5 2305/5 -f 2305/5 2325/5 2326/5 -f 2305/5 2326/5 2327/5 -f 2327/5 2328/5 2305/5 -f 2305/5 2328/5 2329/5 -f 2305/5 2329/5 2330/5 -f 2330/5 2331/5 2305/5 -f 2305/5 2331/5 2332/5 -f 2305/5 2332/5 2333/5 -f 2333/5 2334/5 2305/5 -f 2305/5 2334/5 2335/5 -f 2305/5 2335/5 2336/5 -f 2136/5 2135/5 2337/5 -f 2337/5 2135/5 2338/5 -f 2337/5 2338/5 2339/5 -f 2340/5 2341/5 2342/5 -f 2342/5 2341/5 2343/5 -f 2342/5 2343/5 2344/5 -f 2344/5 2343/5 2345/5 -f 2344/5 2345/5 2346/5 -f 2346/5 2345/5 2347/5 -f 2346/5 2347/5 2348/5 -f 2348/5 2347/5 2349/5 -f 2348/5 2349/5 2350/5 -f 2350/5 2349/5 2351/5 -f 2350/5 2351/5 2352/5 -f 2352/5 2351/5 2353/5 -f 2352/5 2353/5 2354/5 -f 2354/5 2353/5 2355/5 -f 2354/5 2355/5 2339/5 -f 2339/5 2355/5 2356/5 -f 2339/5 2356/5 2337/5 -f 2340/5 2357/5 2341/5 -f 2341/5 2357/5 2358/5 -f 2357/5 2359/5 2358/5 -f 2358/5 2359/5 2360/5 -f 2359/5 2361/5 2360/5 -f 2360/5 2361/5 2362/5 -f 2361/5 2363/5 2362/5 -f 2362/5 2363/5 2364/5 -f 2363/5 2365/5 2364/5 -f 2364/5 2365/5 2366/5 -f 2365/5 2367/5 2366/5 -f 2366/5 2367/5 2368/5 -f 2367/5 2369/5 2368/5 -f 2368/5 2369/5 2370/5 -f 2369/5 2371/5 2370/5 -f 2370/5 2371/5 2372/5 -f 2371/5 2202/5 2372/5 -f 2372/5 2202/5 2201/5 -f 2373/5 2374/5 2375/5 -f 2375/5 2374/5 2376/5 -f 2375/5 2376/5 2377/5 -f 2377/5 2378/5 2375/5 -f 2375/5 2378/5 2379/5 -f 2375/5 2379/5 2380/5 -f 2380/5 2381/5 2375/5 -f 2375/5 2381/5 2382/5 -f 2375/5 2382/5 2383/5 -f 2383/5 2384/5 2375/5 -f 2375/5 2384/5 2385/5 -f 2375/5 2385/5 2386/5 -f 2386/5 2387/5 2375/5 -f 2375/5 2387/5 2388/5 -f 2375/5 2388/5 2389/5 -f 2389/5 2390/5 2375/5 -f 2375/5 2390/5 2391/5 -f 2375/5 2391/5 2392/5 -f 2392/5 2393/5 2375/5 -f 2375/5 2393/5 2394/5 -f 2375/5 2394/5 2395/5 -f 2395/5 2396/5 2375/5 -f 2375/5 2396/5 2397/5 -f 2375/5 2397/5 2398/5 -f 2398/5 2399/5 2375/5 -f 2375/5 2399/5 2400/5 -f 2375/5 2400/5 2401/5 -f 2401/5 2402/5 2375/5 -f 2375/5 2402/5 2403/5 -f 2375/5 2403/5 2404/5 -f 2404/5 2405/5 2375/5 -f 2375/5 2405/5 2406/5 -f 2406/5 2405/5 2407/5 -f 2407/5 2405/5 2408/5 -f 2407/5 2408/5 2409/5 -f 2410/5 2411/5 2409/5 -f 2409/5 2411/5 2412/5 -f 2409/5 2412/5 2407/5 -f 2410/5 2413/5 2411/5 -f 2411/5 2413/5 2414/5 -f 2411/5 2414/5 2415/5 -f 2415/5 2416/5 2411/5 -f 2411/5 2416/5 2417/5 -f 2411/5 2417/5 2418/5 -f 2418/5 2419/5 2411/5 -f 2411/5 2419/5 2420/5 -f 2411/5 2420/5 2421/5 -f 2421/5 2422/5 2411/5 -f 2411/5 2422/5 2423/5 -f 2411/5 2423/5 2424/5 -f 2424/5 2425/5 2411/5 -f 2411/5 2425/5 2426/5 -f 2411/5 2426/5 2427/5 -f 2427/5 2428/5 2411/5 -f 2411/5 2428/5 2429/5 -f 2411/5 2429/5 2430/5 -f 2430/5 2431/5 2411/5 -f 2411/5 2431/5 2432/5 -f 2411/5 2432/5 2433/5 -f 2433/5 2434/5 2411/5 -f 2411/5 2434/5 2435/5 -f 2411/5 2435/5 2436/5 -f 2436/5 2437/5 2411/5 -f 2411/5 2437/5 2438/5 -f 2411/5 2438/5 2439/5 -f 2439/5 2440/5 2411/5 -f 2411/5 2440/5 2441/5 -f 2411/5 2441/5 2442/5 -f 2199/5 2200/5 2443/5 -f 2443/5 2200/5 2444/5 -f 2443/5 2444/5 2445/5 -f 2445/5 2444/5 2446/5 -f 2447/5 2448/5 2449/5 -f 2449/5 2448/5 2450/5 -f 2449/5 2450/5 2451/5 -f 2447/5 2452/5 2448/5 -f 2448/5 2452/5 2453/5 -f 2448/5 2453/5 2454/5 -f 2454/5 2455/5 2448/5 -f 2448/5 2455/5 2456/5 -f 2448/5 2456/5 2457/5 -f 2457/5 2458/5 2448/5 -f 2448/5 2458/5 2459/5 -f 2448/5 2459/5 2460/5 -f 2460/5 2461/5 2448/5 -f 2448/5 2461/5 2462/5 -f 2448/5 2462/5 2463/5 -f 2463/5 2464/5 2448/5 -f 2448/5 2464/5 2465/5 -f 2448/5 2465/5 2466/5 -f 2466/5 2467/5 2448/5 -f 2448/5 2467/5 2468/5 -f 2448/5 2468/5 2469/5 -f 2469/5 2470/5 2448/5 -f 2448/5 2470/5 2471/5 -f 2448/5 2471/5 2472/5 -f 2472/5 2473/5 2448/5 -f 2448/5 2473/5 2474/5 -f 2448/5 2474/5 2475/5 -f 2475/5 2476/5 2448/5 -f 2448/5 2476/5 2477/5 -f 2448/5 2477/5 2478/5 -f 2478/5 2479/5 2448/5 -f 2448/5 2479/5 2480/5 -f 2448/5 2480/5 2481/5 -f 2482/5 2483/5 2451/5 -f 2451/5 2483/5 2484/5 -f 2451/5 2484/5 2449/5 -f 2482/5 2485/5 2483/5 -f 2483/5 2485/5 2486/5 -f 2487/5 2488/5 2485/5 -f 2485/5 2488/5 2489/5 -f 2485/5 2489/5 2490/5 -f 2490/5 2491/5 2485/5 -f 2485/5 2491/5 2492/5 -f 2485/5 2492/5 2493/5 -f 2493/5 2494/5 2485/5 -f 2485/5 2494/5 2495/5 -f 2485/5 2495/5 2496/5 -f 2496/5 2497/5 2485/5 -f 2485/5 2497/5 2498/5 -f 2485/5 2498/5 2499/5 -f 2499/5 2500/5 2485/5 -f 2485/5 2500/5 2501/5 -f 2485/5 2501/5 2502/5 -f 2502/5 2503/5 2485/5 -f 2485/5 2503/5 2504/5 -f 2485/5 2504/5 2505/5 -f 2505/5 2506/5 2485/5 -f 2485/5 2506/5 2507/5 -f 2485/5 2507/5 2508/5 -f 2508/5 2509/5 2485/5 -f 2485/5 2509/5 2510/5 -f 2485/5 2510/5 2511/5 -f 2511/5 2512/5 2485/5 -f 2485/5 2512/5 2513/5 -f 2485/5 2513/5 2514/5 -f 2514/5 2515/5 2485/5 -f 2485/5 2515/5 2516/5 -f 2485/5 2516/5 2486/5 -f 2517/5 2518/5 2519/5 -f 2519/5 2518/5 2520/5 -f 2519/5 2520/5 2521/5 -f 2518/5 2522/5 2520/5 -f 2519/5 2521/5 2523/5 -f 2523/5 2521/5 2524/5 -f 2523/5 2524/5 2525/5 -f 2525/5 2524/5 2526/5 -f 2525/5 2526/5 2527/5 -f 2527/5 2526/5 2528/5 -f 2527/5 2528/5 2529/5 -f 2529/5 2528/5 2530/5 -f 2529/5 2530/5 2531/5 -f 2531/5 2530/5 2532/5 -f 2531/5 2532/5 2533/5 -f 2533/5 2532/5 2451/5 -f 2533/5 2451/5 2450/5 -f 2532/5 2482/5 2451/5 -f 2534/5 2522/5 2535/5 -f 2535/5 2522/5 2518/5 -f 2535/5 2518/5 2536/5 -f 2536/5 2518/5 2517/5 -f 2534/5 2535/5 2537/5 -f 2537/5 2535/5 2538/5 -f 2537/5 2538/5 2539/5 -f 2535/5 2536/5 2538/5 -f 2537/5 2539/5 2540/5 -f 2540/5 2539/5 2541/5 -f 2540/5 2541/5 2542/5 -f 2542/5 2541/5 2543/5 -f 2542/5 2543/5 2544/5 -f 2544/5 2543/5 2545/5 -f 2544/5 2545/5 2546/5 -f 2546/5 2545/5 2547/5 -f 2546/5 2547/5 2548/5 -f 2548/5 2547/5 2549/5 -f 2548/5 2549/5 2550/5 -f 2550/5 2549/5 2407/5 -f 2550/5 2407/5 2412/5 -f 2549/5 2406/5 2407/5 -f 2266/5 2551/5 2265/5 -f 2265/5 2551/5 2552/5 -f 2551/5 2553/5 2552/5 -f 2552/5 2553/5 2554/5 -f 2555/5 2556/5 2557/5 -f 2557/5 2556/5 2558/5 -f 2557/5 2558/5 2559/5 -f 2555/5 2560/5 2556/5 -f 2556/5 2560/5 2561/5 -f 2556/5 2561/5 2562/5 -f 2562/5 2563/5 2556/5 -f 2556/5 2563/5 2564/5 -f 2556/5 2564/5 2565/5 -f 2565/5 2566/5 2556/5 -f 2556/5 2566/5 2567/5 -f 2556/5 2567/5 2568/5 -f 2568/5 2569/5 2556/5 -f 2556/5 2569/5 2570/5 -f 2556/5 2570/5 2571/5 -f 2571/5 2572/5 2556/5 -f 2556/5 2572/5 2573/5 -f 2556/5 2573/5 2574/5 -f 2574/5 2575/5 2556/5 -f 2556/5 2575/5 2576/5 -f 2556/5 2576/5 2577/5 -f 2577/5 2578/5 2556/5 -f 2556/5 2578/5 2579/5 -f 2556/5 2579/5 2580/5 -f 2580/5 2581/5 2556/5 -f 2556/5 2581/5 2582/5 -f 2556/5 2582/5 2583/5 -f 2583/5 2584/5 2556/5 -f 2556/5 2584/5 2585/5 -f 2556/5 2585/5 2586/5 -f 2586/5 2587/5 2556/5 -f 2556/5 2587/5 2588/5 -f 2556/5 2588/5 2589/5 -f 2590/5 2591/5 2559/5 -f 2559/5 2591/5 2592/5 -f 2559/5 2592/5 2557/5 -f 2590/5 2593/5 2591/5 -f 2591/5 2593/5 2594/5 -f 2595/5 2596/5 2593/5 -f 2593/5 2596/5 2597/5 -f 2593/5 2597/5 2598/5 -f 2598/5 2599/5 2593/5 -f 2593/5 2599/5 2600/5 -f 2593/5 2600/5 2601/5 -f 2601/5 2602/5 2593/5 -f 2593/5 2602/5 2603/5 -f 2593/5 2603/5 2604/5 -f 2604/5 2605/5 2593/5 -f 2593/5 2605/5 2606/5 -f 2593/5 2606/5 2607/5 -f 2607/5 2608/5 2593/5 -f 2593/5 2608/5 2609/5 -f 2593/5 2609/5 2610/5 -f 2610/5 2611/5 2593/5 -f 2593/5 2611/5 2612/5 -f 2593/5 2612/5 2613/5 -f 2613/5 2614/5 2593/5 -f 2593/5 2614/5 2615/5 -f 2593/5 2615/5 2616/5 -f 2616/5 2617/5 2593/5 -f 2593/5 2617/5 2618/5 -f 2593/5 2618/5 2619/5 -f 2619/5 2620/5 2593/5 -f 2593/5 2620/5 2621/5 -f 2593/5 2621/5 2622/5 -f 2622/5 2623/5 2593/5 -f 2593/5 2623/5 2624/5 -f 2593/5 2624/5 2594/5 -f 2625/5 2626/5 2627/5 -f 2627/5 2626/5 2628/5 -f 2627/5 2628/5 2629/5 -f 2626/5 2630/5 2628/5 -f 2628/5 2630/5 2631/5 -f 2630/5 2632/5 2631/5 -f 2631/5 2632/5 2633/5 -f 2632/5 2634/5 2633/5 -f 2633/5 2634/5 2635/5 -f 2634/5 2636/5 2635/5 -f 2635/5 2636/5 2637/5 -f 2636/5 2638/5 2637/5 -f 2637/5 2638/5 2639/5 -f 2638/5 2640/5 2639/5 -f 2639/5 2640/5 2641/5 -f 2590/5 2559/5 2640/5 -f 2640/5 2559/5 2641/5 -f 2559/5 2558/5 2641/5 -f 2629/5 2642/5 2627/5 -f 2627/5 2642/5 2643/5 -f 2627/5 2643/5 2625/5 -f 2625/5 2643/5 2644/5 -f 2644/5 2643/5 2645/5 -f 2645/5 2643/5 2646/5 -f 2645/5 2646/5 2647/5 -f 2643/5 2642/5 2646/5 -f 2645/5 2647/5 2648/5 -f 2648/5 2647/5 2649/5 -f 2648/5 2649/5 2650/5 -f 2650/5 2649/5 2651/5 -f 2650/5 2651/5 2652/5 -f 2652/5 2651/5 2653/5 -f 2652/5 2653/5 2654/5 -f 2654/5 2653/5 2655/5 -f 2654/5 2655/5 2656/5 -f 2656/5 2655/5 2657/5 -f 2656/5 2657/5 2658/5 -f 2658/5 2657/5 2301/5 -f 2658/5 2301/5 2306/5 -f 2657/5 2300/5 2301/5 -f 2659/5 2660/5 2661/5 -f 2661/5 2660/5 2662/5 -f 2660/5 2663/5 2662/5 -f 2662/5 2663/5 2664/5 -f 2665/5 2666/5 2667/5 -f 2667/5 2666/5 2668/5 -f 2667/5 2668/5 2669/5 -f 2667/5 2669/5 2670/5 -f 2670/5 2669/5 2671/5 -f 2670/5 2671/5 2672/5 -f 2672/5 2671/5 2673/5 -f 2672/5 2673/5 2674/5 -f 2674/5 2673/5 2675/5 -f 2674/5 2675/5 2676/5 -f 2676/5 2675/5 2677/5 -f 2675/5 2678/5 2677/5 -f 2677/5 2678/5 2679/5 -f 2677/5 2679/5 2680/5 -f 2680/5 2679/5 2681/5 -f 2680/5 2681/5 2682/5 -f 2682/5 2681/5 2683/5 -f 2682/5 2683/5 2684/5 -f 2684/5 2683/5 2685/5 -f 2684/5 2685/5 2686/5 -f 2686/5 2685/5 2687/5 -f 2685/5 2688/5 2687/5 -f 2687/5 2688/5 2689/5 -f 2687/5 2689/5 2690/5 -f 2690/5 2689/5 2691/5 -f 2690/5 2691/5 2692/5 -f 2692/5 2691/5 2693/5 -f 2692/5 2693/5 2694/5 -f 2694/5 2693/5 2695/5 -f 2694/5 2695/5 2696/5 -f 2696/5 2695/5 2697/5 -f 2695/5 2698/5 2697/5 -f 2697/5 2698/5 2699/5 -f 2698/5 2700/5 2699/5 -f 2699/5 2700/5 2701/5 -f 2699/5 2701/5 2702/5 -f 2702/5 2701/5 2703/5 -f 2702/5 2703/5 2704/5 -f 2704/5 2703/5 2705/5 -f 2704/5 2705/5 2706/5 -f 2706/5 2705/5 2707/5 -f 2706/5 2707/5 2708/5 -f 2708/5 2707/5 2709/5 -f 2707/5 2710/5 2709/5 -f 2709/5 2710/5 2711/5 -f 2709/5 2711/5 2712/5 -f 2712/5 2711/5 2713/5 -f 2712/5 2713/5 2714/5 -f 2714/5 2713/5 2715/5 -f 2714/5 2715/5 2716/5 -f 2716/5 2715/5 2717/5 -f 2716/5 2717/5 2718/5 -f 2718/5 2717/5 2719/5 -f 2717/5 2720/5 2719/5 -f 2719/5 2720/5 2721/5 -f 2719/5 2721/5 2722/5 -f 2722/5 2721/5 2723/5 -f 2722/5 2723/5 2724/5 -f 2724/5 2723/5 2725/5 -f 2724/5 2725/5 2726/5 -f 2726/5 2725/5 2727/5 -f 2726/5 2727/5 2728/5 -f 2728/5 2727/5 2553/5 -f 2727/5 2554/5 2553/5 -f 2445/5 2446/5 2729/5 -f 2729/5 2446/5 2730/5 -f 2729/5 2730/5 2731/5 -f 2729/5 2731/5 2732/5 -f 2732/5 2731/5 2733/5 -f 2732/5 2733/5 2734/5 -f 2734/5 2733/5 2735/5 -f 2734/5 2735/5 2736/5 -f 2736/5 2735/5 2737/5 -f 2736/5 2737/5 2738/5 -f 2738/5 2737/5 2739/5 -f 2737/5 2740/5 2739/5 -f 2739/5 2740/5 2741/5 -f 2739/5 2741/5 2742/5 -f 2742/5 2741/5 2743/5 -f 2742/5 2743/5 2744/5 -f 2744/5 2743/5 2745/5 -f 2744/5 2745/5 2746/5 -f 2746/5 2745/5 2747/5 -f 2746/5 2747/5 2748/5 -f 2748/5 2747/5 2749/5 -f 2747/5 2750/5 2749/5 -f 2749/5 2750/5 2751/5 -f 2749/5 2751/5 2752/5 -f 2752/5 2751/5 2753/5 -f 2752/5 2753/5 2754/5 -f 2754/5 2753/5 2755/5 -f 2754/5 2755/5 2756/5 -f 2756/5 2755/5 2757/5 -f 2756/5 2757/5 2758/5 -f 2758/5 2757/5 2759/5 -f 2757/5 2760/5 2759/5 -f 2759/5 2760/5 2761/5 -f 2760/5 2762/5 2761/5 -f 2761/5 2762/5 2763/5 -f 2761/5 2763/5 2764/5 -f 2764/5 2763/5 2765/5 -f 2764/5 2765/5 2766/5 -f 2766/5 2765/5 2767/5 -f 2766/5 2767/5 2768/5 -f 2768/5 2767/5 2769/5 -f 2768/5 2769/5 2770/5 -f 2770/5 2769/5 2771/5 -f 2769/5 2772/5 2771/5 -f 2771/5 2772/5 2773/5 -f 2771/5 2773/5 2774/5 -f 2774/5 2773/5 2775/5 -f 2774/5 2775/5 2776/5 -f 2776/5 2775/5 2777/5 -f 2776/5 2777/5 2778/5 -f 2778/5 2777/5 2779/5 -f 2778/5 2779/5 2780/5 -f 2780/5 2779/5 2781/5 -f 2779/5 2782/5 2781/5 -f 2781/5 2782/5 2783/5 -f 2781/5 2783/5 2784/5 -f 2784/5 2783/5 2785/5 -f 2784/5 2785/5 2786/5 -f 2786/5 2785/5 2787/5 -f 2786/5 2787/5 2788/5 -f 2788/5 2787/5 2789/5 -f 2788/5 2789/5 2790/5 -f 2790/5 2789/5 2791/5 -f 2789/5 2792/5 2791/5 -f 2793/5 2794/5 2795/5 -f 2795/5 2794/5 2796/5 -f 2795/5 2796/5 2797/5 -f 2795/5 2797/5 2798/5 -f 2798/5 2797/5 2799/5 -f 2798/5 2799/5 2800/5 -f 2800/5 2799/5 2801/5 -f 2800/5 2801/5 2802/5 -f 2802/5 2801/5 2803/5 -f 2802/5 2803/5 2804/5 -f 2804/5 2803/5 2805/5 -f 2803/5 2806/5 2805/5 -f 2805/5 2806/5 2807/5 -f 2805/5 2807/5 2808/5 -f 2808/5 2807/5 2809/5 -f 2808/5 2809/5 2810/5 -f 2810/5 2809/5 2811/5 -f 2810/5 2811/5 2812/5 -f 2812/5 2811/5 2813/5 -f 2812/5 2813/5 2814/5 -f 2814/5 2813/5 2815/5 -f 2813/5 2816/5 2815/5 -f 2815/5 2816/5 2817/5 -f 2815/5 2817/5 2818/5 -f 2818/5 2817/5 2819/5 -f 2818/5 2819/5 2820/5 -f 2820/5 2819/5 2821/5 -f 2820/5 2821/5 2822/5 -f 2822/5 2821/5 2823/5 -f 2822/5 2823/5 2824/5 -f 2824/5 2823/5 2825/5 -f 2823/5 2826/5 2825/5 -f 2825/5 2826/5 2827/5 -f 2826/5 2828/5 2827/5 -f 2827/5 2828/5 2829/5 -f 2827/5 2829/5 2830/5 -f 2830/5 2829/5 2831/5 -f 2830/5 2831/5 2832/5 -f 2832/5 2831/5 2833/5 -f 2832/5 2833/5 2834/5 -f 2834/5 2833/5 2835/5 -f 2834/5 2835/5 2836/5 -f 2836/5 2835/5 2837/5 -f 2835/5 2838/5 2837/5 -f 2837/5 2838/5 2839/5 -f 2837/5 2839/5 2840/5 -f 2840/5 2839/5 2841/5 -f 2840/5 2841/5 2842/5 -f 2842/5 2841/5 2843/5 -f 2842/5 2843/5 2844/5 -f 2844/5 2843/5 2845/5 -f 2844/5 2845/5 2846/5 -f 2846/5 2845/5 2847/5 -f 2845/5 2848/5 2847/5 -f 2847/5 2848/5 2849/5 -f 2847/5 2849/5 2850/5 -f 2850/5 2849/5 2851/5 -f 2850/5 2851/5 2852/5 -f 2852/5 2851/5 2853/5 -f 2852/5 2853/5 2854/5 -f 2854/5 2853/5 2855/5 -f 2854/5 2855/5 2856/5 -f 2856/5 2855/5 2661/5 -f 2855/5 2659/5 2661/5 -f 2857/5 2858/5 2859/5 -f 2859/5 2858/5 2860/5 -f 2859/5 2860/5 2861/5 -f 2859/5 2861/5 2862/5 -f 2862/5 2861/5 2863/5 -f 2862/5 2863/5 2864/5 -f 2864/5 2863/5 2865/5 -f 2864/5 2865/5 2866/5 -f 2866/5 2865/5 2867/5 -f 2866/5 2867/5 2868/5 -f 2868/5 2867/5 2869/5 -f 2868/5 2869/5 2870/5 -f 2870/5 2869/5 2871/5 -f 2870/5 2871/5 2872/5 -f 2872/5 2871/5 2873/5 -f 2872/5 2873/5 2874/5 -f 2874/5 2873/5 2875/5 -f 2874/5 2875/5 2876/5 -f 2876/5 2875/5 2877/5 -f 2876/5 2877/5 2878/5 -f 2878/5 2877/5 2879/5 -f 2878/5 2879/5 2880/5 -f 2880/5 2879/5 2881/5 -f 2880/5 2881/5 2882/5 -f 2882/5 2881/5 2883/5 -f 2882/5 2883/5 2884/5 -f 2884/5 2883/5 2885/5 -f 2884/5 2885/5 2886/5 -f 2886/5 2885/5 2887/5 -f 2886/5 2887/5 2888/5 -f 2888/5 2887/5 2889/5 -f 2888/5 2889/5 2890/5 -f 2890/5 2889/5 2891/5 -f 2890/5 2891/5 2892/5 -f 2892/5 2891/5 2893/5 -f 2892/5 2893/5 2894/5 -f 2894/5 2893/5 2895/5 -f 2894/5 2895/5 2896/5 -f 2896/5 2895/5 2897/5 -f 2896/5 2897/5 2898/5 -f 2898/5 2897/5 2899/5 -f 2898/5 2899/5 2900/5 -f 2900/5 2899/5 2901/5 -f 2900/5 2901/5 2902/5 -f 2902/5 2901/5 2903/5 -f 2902/5 2903/5 2904/5 -f 2904/5 2903/5 2905/5 -f 2904/5 2905/5 2906/5 -f 2906/5 2905/5 2907/5 -f 2906/5 2907/5 2908/5 -f 2908/5 2907/5 2909/5 -f 2908/5 2909/5 2910/5 -f 2910/5 2909/5 2911/5 -f 2910/5 2911/5 2912/5 -f 2912/5 2911/5 2913/5 -f 2912/5 2913/5 2914/5 -f 2914/5 2913/5 2915/5 -f 2914/5 2915/5 2916/5 -f 2916/5 2915/5 2917/5 -f 2916/5 2917/5 2918/5 -f 2918/5 2917/5 2919/5 -f 2918/5 2919/5 2920/5 -f 2920/5 2919/5 2644/5 -f 2919/5 2625/5 2644/5 -f 2921/5 2858/5 2922/5 -f 2922/5 2858/5 2857/5 -f 2922/5 2857/5 2923/5 -f 2924/5 2925/5 2926/5 -f 2926/5 2925/5 2927/5 -f 2926/5 2927/5 2928/5 -f 2927/5 2925/5 2929/5 -f 2929/5 2925/5 2930/5 -f 2929/5 2930/5 2931/5 -f 2929/5 2931/5 2932/5 -f 2932/5 2931/5 2933/5 -f 2932/5 2933/5 2934/5 -f 2934/5 2933/5 2935/5 -f 2934/5 2935/5 2936/5 -f 2936/5 2935/5 2937/5 -f 2936/5 2937/5 2938/5 -f 2938/5 2937/5 2939/5 -f 2937/5 2940/5 2939/5 -f 2939/5 2940/5 2941/5 -f 2939/5 2941/5 2942/5 -f 2942/5 2941/5 2943/5 -f 2942/5 2943/5 2944/5 -f 2944/5 2943/5 2945/5 -f 2943/5 2946/5 2945/5 -f 2945/5 2946/5 2947/5 -f 2945/5 2947/5 2948/5 -f 2948/5 2947/5 2949/5 -f 2947/5 2950/5 2949/5 -f 2949/5 2950/5 2951/5 -f 2949/5 2951/5 2952/5 -f 2952/5 2951/5 2953/5 -f 2952/5 2953/5 2954/5 -f 2954/5 2953/5 2955/5 -f 2954/5 2955/5 2956/5 -f 2956/5 2955/5 2922/5 -f 2956/5 2922/5 2923/5 -f 2955/5 2921/5 2922/5 -f 2957/5 2924/5 2958/5 -f 2958/5 2924/5 2926/5 -f 2958/5 2926/5 2959/5 -f 2959/5 2926/5 2960/5 -f 2926/5 2928/5 2960/5 -f 2960/5 2928/5 2961/5 -f 2960/5 2961/5 2962/5 -f 2962/5 2963/5 2960/5 -f 2960/5 2963/5 2964/5 -f 2960/5 2964/5 2965/5 -f 2965/5 2966/5 2960/5 -f 2960/5 2966/5 2967/5 -f 2960/5 2967/5 2968/5 -f 2968/5 2969/5 2960/5 -f 2960/5 2969/5 2970/5 -f 2960/5 2970/5 2971/5 -f 2971/5 2972/5 2960/5 -f 2960/5 2972/5 2973/5 -f 2960/5 2973/5 2974/5 -f 2974/5 2975/5 2960/5 -f 2960/5 2975/5 2976/5 -f 2960/5 2976/5 2977/5 -f 2977/5 2978/5 2960/5 -f 2960/5 2978/5 2979/5 -f 2960/5 2979/5 2980/5 -f 2980/5 2981/5 2960/5 -f 2960/5 2981/5 2982/5 -f 2960/5 2982/5 2983/5 -f 2983/5 2984/5 2960/5 -f 2960/5 2984/5 2985/5 -f 2960/5 2985/5 2986/5 -f 2986/5 2987/5 2960/5 -f 2960/5 2987/5 2988/5 -f 2960/5 2988/5 2989/5 -f 2989/5 2990/5 2960/5 -f 2960/5 2990/5 2991/5 -f 2960/5 2991/5 2992/5 -f 2993/5 2994/5 2958/5 -f 2958/5 2994/5 2995/5 -f 2958/5 2995/5 2996/5 -f 2996/5 2997/5 2958/5 -f 2958/5 2997/5 2998/5 -f 2958/5 2998/5 2999/5 -f 2999/5 3000/5 2958/5 -f 2958/5 3000/5 3001/5 -f 2958/5 3001/5 3002/5 -f 3002/5 3003/5 2958/5 -f 2958/5 3003/5 3004/5 -f 2958/5 3004/5 3005/5 -f 3005/5 3006/5 2958/5 -f 2958/5 3006/5 3007/5 -f 2958/5 3007/5 3008/5 -f 3008/5 3009/5 2958/5 -f 2958/5 3009/5 3010/5 -f 2958/5 3010/5 3011/5 -f 3011/5 3012/5 2958/5 -f 2958/5 3012/5 3013/5 -f 2958/5 3013/5 3014/5 -f 3014/5 3015/5 2958/5 -f 2958/5 3015/5 3016/5 -f 2958/5 3016/5 3017/5 -f 3017/5 3018/5 2958/5 -f 2958/5 3018/5 3019/5 -f 2958/5 3019/5 3020/5 -f 3020/5 3021/5 2958/5 -f 2958/5 3021/5 3022/5 -f 2958/5 3022/5 3023/5 -f 3023/5 2957/5 2958/5 -f 2664/5 2663/5 3024/5 -f 3024/5 2663/5 3025/5 -f 3024/5 3025/5 3026/5 -f 3024/5 3026/5 3027/5 -f 3027/5 3026/5 3028/5 -f 3027/5 3028/5 3029/5 -f 3029/5 3028/5 3030/5 -f 3029/5 3030/5 3031/5 -f 3031/5 3030/5 3032/5 -f 3031/5 3032/5 3033/5 -f 3033/5 3032/5 3034/5 -f 3032/5 3035/5 3034/5 -f 3034/5 3035/5 3036/5 -f 3034/5 3036/5 3037/5 -f 3037/5 3036/5 3038/5 -f 3037/5 3038/5 3039/5 -f 3039/5 3038/5 3040/5 -f 3039/5 3040/5 3041/5 -f 3041/5 3040/5 3042/5 -f 3041/5 3042/5 3043/5 -f 3043/5 3042/5 3044/5 -f 3042/5 3045/5 3044/5 -f 3044/5 3045/5 3046/5 -f 3044/5 3046/5 3047/5 -f 3047/5 3046/5 3048/5 -f 3047/5 3048/5 3049/5 -f 3049/5 3048/5 3050/5 -f 3049/5 3050/5 3051/5 -f 3051/5 3050/5 3052/5 -f 3051/5 3052/5 3053/5 -f 3053/5 3052/5 3054/5 -f 3052/5 3055/5 3054/5 -f 3054/5 3055/5 3056/5 -f 3055/5 3057/5 3056/5 -f 3056/5 3057/5 3058/5 -f 3056/5 3058/5 3059/5 -f 3059/5 3058/5 3060/5 -f 3059/5 3060/5 3061/5 -f 3061/5 3060/5 3062/5 -f 3061/5 3062/5 3063/5 -f 3063/5 3062/5 3064/5 -f 3063/5 3064/5 3065/5 -f 3065/5 3064/5 3066/5 -f 3064/5 3067/5 3066/5 -f 3066/5 3067/5 3068/5 -f 3066/5 3068/5 3069/5 -f 3069/5 3068/5 3070/5 -f 3069/5 3070/5 3071/5 -f 3071/5 3070/5 3072/5 -f 3071/5 3072/5 3073/5 -f 3073/5 3072/5 3074/5 -f 3073/5 3074/5 3075/5 -f 3075/5 3074/5 3076/5 -f 3074/5 3077/5 3076/5 -f 3076/5 3077/5 3078/5 -f 3076/5 3078/5 3079/5 -f 3079/5 3078/5 3080/5 -f 3079/5 3080/5 3081/5 -f 3081/5 3080/5 3082/5 -f 3081/5 3082/5 3083/5 -f 3083/5 3082/5 3084/5 -f 3083/5 3084/5 3085/5 -f 3085/5 3084/5 3086/5 -f 3084/5 3087/5 3086/5 -f 3088/5 3089/5 3090/5 -f 3090/5 3089/5 3091/5 -f 3090/5 3091/5 3092/5 -f 3092/5 3091/5 3093/5 -f 3092/5 3093/5 3094/5 -f 3094/5 3093/5 3095/5 -f 3094/5 3095/5 3096/5 -f 3097/5 3098/5 3090/5 -f 3090/5 3098/5 3099/5 -f 3090/5 3099/5 3100/5 -f 3100/5 3101/5 3090/5 -f 3090/5 3101/5 3102/5 -f 3090/5 3102/5 3103/5 -f 3103/5 3104/5 3090/5 -f 3090/5 3104/5 3105/5 -f 3090/5 3105/5 3106/5 -f 3106/5 3107/5 3090/5 -f 3090/5 3107/5 3108/5 -f 3090/5 3108/5 3109/5 -f 3109/5 3110/5 3090/5 -f 3090/5 3110/5 3111/5 -f 3090/5 3111/5 3112/5 -f 3112/5 3113/5 3090/5 -f 3090/5 3113/5 3114/5 -f 3090/5 3114/5 3115/5 -f 3115/5 3116/5 3090/5 -f 3090/5 3116/5 3117/5 -f 3090/5 3117/5 3118/5 -f 3118/5 3119/5 3090/5 -f 3090/5 3119/5 3120/5 -f 3090/5 3120/5 3121/5 -f 3121/5 3122/5 3090/5 -f 3090/5 3122/5 3123/5 -f 3090/5 3123/5 3124/5 -f 3124/5 3125/5 3090/5 -f 3090/5 3125/5 3126/5 -f 3090/5 3126/5 3088/5 -f 3096/5 3127/5 3094/5 -f 3094/5 3127/5 3128/5 -f 3094/5 3128/5 3129/5 -f 3129/5 3130/5 3094/5 -f 3094/5 3130/5 3131/5 -f 3094/5 3131/5 3132/5 -f 3132/5 3133/5 3094/5 -f 3094/5 3133/5 3134/5 -f 3094/5 3134/5 3135/5 -f 3135/5 3136/5 3094/5 -f 3094/5 3136/5 3137/5 -f 3094/5 3137/5 3138/5 -f 3138/5 3139/5 3094/5 -f 3094/5 3139/5 3140/5 -f 3094/5 3140/5 3141/5 -f 3141/5 3142/5 3094/5 -f 3094/5 3142/5 3143/5 -f 3094/5 3143/5 3144/5 -f 3144/5 3145/5 3094/5 -f 3094/5 3145/5 3146/5 -f 3094/5 3146/5 3147/5 -f 3147/5 3148/5 3094/5 -f 3094/5 3148/5 3149/5 -f 3094/5 3149/5 3150/5 -f 3150/5 3151/5 3094/5 -f 3094/5 3151/5 3152/5 -f 3094/5 3152/5 3153/5 -f 3153/5 3154/5 3094/5 -f 3094/5 3154/5 3155/5 -f 3094/5 3155/5 3156/5 -f 3091/5 3157/5 3093/5 -f 3093/5 3157/5 3158/5 -f 3158/5 3157/5 3159/5 -f 3159/5 3157/5 3160/5 -f 3159/5 3160/5 3161/5 -f 3159/5 3161/5 3162/5 -f 3162/5 3161/5 3163/5 -f 3162/5 3163/5 3164/5 -f 3164/5 3163/5 3165/5 -f 3164/5 3165/5 3166/5 -f 3166/5 3165/5 3167/5 -f 3166/5 3167/5 3168/5 -f 3168/5 3167/5 3169/5 -f 3167/5 3170/5 3169/5 -f 3169/5 3170/5 3171/5 -f 3169/5 3171/5 3172/5 -f 3172/5 3171/5 3173/5 -f 3172/5 3173/5 3174/5 -f 3174/5 3173/5 3175/5 -f 3173/5 3176/5 3175/5 -f 3175/5 3176/5 3177/5 -f 3175/5 3177/5 3178/5 -f 3178/5 3177/5 3179/5 -f 3177/5 3180/5 3179/5 -f 3179/5 3180/5 3181/5 -f 3179/5 3181/5 3182/5 -f 3182/5 3181/5 3183/5 -f 3182/5 3183/5 3184/5 -f 3184/5 3183/5 3185/5 -f 3184/5 3185/5 3186/5 -f 3186/5 3185/5 3187/5 -f 3186/5 3187/5 3188/5 -f 2666/5 3189/5 3190/5 -f 3190/5 3189/5 3191/5 -f 3190/5 3191/5 3192/5 -f 3192/5 3191/5 3193/5 -f 3192/5 3193/5 3194/5 -f 3194/5 3193/5 3195/5 -f 3194/5 3195/5 3196/5 -f 3196/5 3195/5 3197/5 -f 3196/5 3197/5 3198/5 -f 3198/5 3197/5 3199/5 -f 3198/5 3199/5 3200/5 -f 3200/5 3199/5 3201/5 -f 3200/5 3201/5 3202/5 -f 3202/5 3201/5 3203/5 -f 3202/5 3203/5 3204/5 -f 3204/5 3203/5 3205/5 -f 3204/5 3205/5 3206/5 -f 2666/5 2665/5 3189/5 -f 3207/5 3208/5 3209/5 -f 3209/5 3208/5 3210/5 -f 3209/5 3210/5 3211/5 -f 3209/5 3211/5 3212/5 -f 3212/5 3211/5 3213/5 -f 3212/5 3213/5 3214/5 -f 3214/5 3213/5 3215/5 -f 3214/5 3215/5 3216/5 -f 3216/5 3215/5 3217/5 -f 3216/5 3217/5 3218/5 -f 3218/5 3217/5 3219/5 -f 3218/5 3219/5 3220/5 -f 3220/5 3219/5 3221/5 -f 3220/5 3221/5 3222/5 -f 3222/5 3221/5 3223/5 -f 3221/5 3224/5 3223/5 -f 3223/5 3224/5 2791/5 -f 3223/5 2791/5 2792/5 -f 3187/5 3225/5 3188/5 -f 3188/5 3225/5 3226/5 -f 3227/5 3228/5 3229/5 -f 3229/5 3228/5 3230/5 -f 3229/5 3230/5 3231/5 -f 3231/5 3230/5 3232/5 -f 3231/5 3232/5 3233/5 -f 3233/5 3232/5 3234/5 -f 3233/5 3234/5 3235/5 -f 3235/5 3234/5 3236/5 -f 3235/5 3236/5 3237/5 -f 3237/5 3236/5 3238/5 -f 3237/5 3238/5 3239/5 -f 3239/5 3238/5 3240/5 -f 3239/5 3240/5 3241/5 -f 3241/5 3240/5 3242/5 -f 3241/5 3242/5 3243/5 -f 3243/5 3242/5 3244/5 -f 3243/5 3244/5 3245/5 -f 3245/5 3244/5 3246/5 -f 3245/5 3246/5 3247/5 -f 3247/5 3246/5 3248/5 -f 3247/5 3248/5 3249/5 -f 3249/5 3248/5 3250/5 -f 3249/5 3250/5 3251/5 -f 3251/5 3250/5 3252/5 -f 3251/5 3252/5 3253/5 -f 3253/5 3252/5 3254/5 -f 3253/5 3254/5 3255/5 -f 3227/5 3256/5 3228/5 -f 3228/5 3256/5 3257/5 -f 3256/5 3258/5 3257/5 -f 3257/5 3258/5 3259/5 -f 3258/5 3260/5 3259/5 -f 3259/5 3260/5 3261/5 -f 3260/5 3262/5 3261/5 -f 3261/5 3262/5 3263/5 -f 3262/5 3264/5 3263/5 -f 3263/5 3264/5 3265/5 -f 3264/5 3266/5 3265/5 -f 3265/5 3266/5 3267/5 -f 3266/5 3268/5 3267/5 -f 3267/5 3268/5 3269/5 -f 3268/5 3270/5 3269/5 -f 3269/5 3270/5 3271/5 -f 3270/5 3272/5 3271/5 -f 3271/5 3272/5 3273/5 -f 3272/5 3274/5 3273/5 -f 3273/5 3274/5 3275/5 -f 3274/5 3276/5 3275/5 -f 3275/5 3276/5 3277/5 -f 3276/5 3278/5 3277/5 -f 3277/5 3278/5 3279/5 -f 3278/5 3280/5 3279/5 -f 3279/5 3280/5 3281/5 -f 3280/5 3282/5 3281/5 -f 3281/5 3282/5 3283/5 -f 3282/5 3284/5 3283/5 -f 3283/5 3284/5 3285/5 -f 3284/5 3286/5 3285/5 -f 3285/5 3286/5 3287/5 -f 3286/5 3288/5 3287/5 -f 3287/5 3288/5 3289/5 -f 3288/5 3290/5 3289/5 -f 3289/5 3290/5 3291/5 -f 3290/5 3292/5 3291/5 -f 3291/5 3292/5 3293/5 -f 3292/5 3294/5 3293/5 -f 3293/5 3294/5 3295/5 -f 3294/5 3296/5 3295/5 -f 3295/5 3296/5 3297/5 -f 3296/5 3298/5 3297/5 -f 3297/5 3298/5 3299/5 -f 3298/5 3300/5 3299/5 -f 3299/5 3300/5 3301/5 -f 3300/5 3302/5 3301/5 -f 3301/5 3302/5 3303/5 -f 3302/5 3304/5 3303/5 -f 3303/5 3304/5 3305/5 -f 3304/5 3306/5 3305/5 -f 3305/5 3306/5 3307/5 -f 3306/5 3308/5 3307/5 -f 3307/5 3308/5 3309/5 -f 3253/5 3255/5 3310/5 -f 3310/5 3255/5 3311/5 -f 3310/5 3311/5 3312/5 -f 3312/5 3311/5 3313/5 -f 3312/5 3313/5 3314/5 -f 3314/5 3313/5 3315/5 -f 3314/5 3315/5 3316/5 -f 3316/5 3315/5 3317/5 -f 3316/5 3317/5 3318/5 -f 3318/5 3317/5 3319/5 -f 3318/5 3319/5 3320/5 -f 3320/5 3319/5 3321/5 -f 3320/5 3321/5 3322/5 -f 3322/5 3321/5 3323/5 -f 3322/5 3323/5 3324/5 -f 3324/5 3323/5 3325/5 -f 3324/5 3325/5 3326/5 -f 3326/5 3325/5 2794/5 -f 3326/5 2794/5 2793/5 -f 3327/5 3328/5 3329/5 -f 3329/5 3328/5 3330/5 -f 3329/5 3330/5 3331/5 -f 3329/5 3331/5 3332/5 -f 3332/5 3331/5 3333/5 -f 3332/5 3333/5 3334/5 -f 3334/5 3333/5 3335/5 -f 3334/5 3335/5 3336/5 -f 3336/5 3335/5 3337/5 -f 3336/5 3337/5 3338/5 -f 3338/5 3337/5 3339/5 -f 3338/5 3339/5 3340/5 -f 3340/5 3339/5 3341/5 -f 3340/5 3341/5 3342/5 -f 3342/5 3341/5 3343/5 -f 3342/5 3343/5 3344/5 -f 3344/5 3343/5 3345/5 -f 3344/5 3345/5 3346/5 -f 3346/5 3345/5 3347/5 -f 3346/5 3347/5 3348/5 -f 3348/5 3347/5 3349/5 -f 3348/5 3349/5 3350/5 -f 3350/5 3349/5 3351/5 -f 3350/5 3351/5 3352/5 -f 3352/5 3351/5 3353/5 -f 3352/5 3353/5 3354/5 -f 3354/5 3353/5 3355/5 -f 3354/5 3355/5 3356/5 -f 3356/5 3355/5 3357/5 -f 3356/5 3357/5 3358/5 -f 3358/5 3357/5 3359/5 -f 3358/5 3359/5 3360/5 -f 3360/5 3359/5 3361/5 -f 3360/5 3361/5 3362/5 -f 3362/5 3361/5 3363/5 -f 3362/5 3363/5 3364/5 -f 3364/5 3363/5 3365/5 -f 3364/5 3365/5 3366/5 -f 3366/5 3365/5 3367/5 -f 3366/5 3367/5 3368/5 -f 3368/5 3367/5 3369/5 -f 3368/5 3369/5 3370/5 -f 3370/5 3369/5 3371/5 -f 3370/5 3371/5 3372/5 -f 3372/5 3371/5 3373/5 -f 3372/5 3373/5 3374/5 -f 3374/5 3373/5 3375/5 -f 3374/5 3375/5 3376/5 -f 3376/5 3375/5 3377/5 -f 3376/5 3377/5 3378/5 -f 3378/5 3377/5 3379/5 -f 3378/5 3379/5 3380/5 -f 3378/5 3380/5 3381/5 -f 3381/5 3380/5 3382/5 -f 3381/5 3382/5 3383/5 -f 3383/5 3382/5 3384/5 -f 3383/5 3384/5 3385/5 -f 3385/5 3384/5 3386/5 -f 3385/5 3386/5 3387/5 -f 3387/5 3386/5 3388/5 -f 3387/5 3388/5 3389/5 -f 3389/5 3388/5 3390/5 -f 3389/5 3390/5 3391/5 -f 3391/5 3390/5 3392/5 -f 3391/5 3392/5 3393/5 -f 3391/5 3393/5 3394/5 -f 3394/5 3393/5 3395/5 -f 3394/5 3395/5 3396/5 -f 3396/5 3395/5 3397/5 -f 3396/5 3397/5 3398/5 -f 3398/5 3397/5 3399/5 -f 3398/5 3399/5 3400/5 -f 3400/5 3399/5 3401/5 -f 3400/5 3401/5 3402/5 -f 3402/5 3401/5 3403/5 -f 3402/5 3403/5 3404/5 -f 3404/5 3403/5 3405/5 -f 3404/5 3405/5 3406/5 -f 3406/5 3405/5 3407/5 -f 3406/5 3407/5 3408/5 -f 3408/5 3407/5 3409/5 -f 3408/5 3409/5 3410/5 -f 3410/5 3409/5 3411/5 -f 3410/5 3411/5 3412/5 -f 3412/5 3411/5 3413/5 -f 3412/5 3413/5 3414/5 -f 3414/5 3413/5 3415/5 -f 3414/5 3415/5 3416/5 -f 3416/5 3415/5 3417/5 -f 3416/5 3417/5 3418/5 -f 3418/5 3417/5 3419/5 -f 3418/5 3419/5 3420/5 -f 3420/5 3419/5 3421/5 -f 3420/5 3421/5 3422/5 -f 3422/5 3421/5 3423/5 -f 3422/5 3423/5 3424/5 -f 3424/5 3423/5 3086/5 -f 3424/5 3086/5 3087/5 -f 3425/5 3426/5 3381/5 -f 3381/5 3426/5 3378/5 -f 3226/5 3225/5 3427/5 -f 3427/5 3225/5 3428/5 -f 3427/5 3428/5 3429/5 -f 3427/5 3429/5 3430/5 -f 3430/5 3429/5 3431/5 -f 3430/5 3431/5 3432/5 -f 3432/5 3431/5 3433/5 -f 3432/5 3433/5 3434/5 -f 3434/5 3433/5 3435/5 -f 3434/5 3435/5 3436/5 -f 3436/5 3435/5 3437/5 -f 3436/5 3437/5 3438/5 -f 3438/5 3437/5 3439/5 -f 3438/5 3439/5 3440/5 -f 3440/5 3439/5 3441/5 -f 3440/5 3441/5 3442/5 -f 3442/5 3441/5 3443/5 -f 3442/5 3443/5 3444/5 -f 3444/5 3443/5 3445/5 -f 3444/5 3445/5 3446/5 -f 3446/5 3445/5 3447/5 -f 3446/5 3447/5 3448/5 -f 3448/5 3447/5 3449/5 -f 3448/5 3449/5 3450/5 -f 3450/5 3449/5 3451/5 -f 3450/5 3451/5 3452/5 -f 3452/5 3451/5 3453/5 -f 3452/5 3453/5 3454/5 -f 3454/5 3453/5 3455/5 -f 3454/5 3455/5 3456/5 -f 3456/5 3455/5 3457/5 -f 3456/5 3457/5 3458/5 -f 3458/5 3457/5 3459/5 -f 3458/5 3459/5 3460/5 -f 3460/5 3459/5 3461/5 -f 3460/5 3461/5 3462/5 -f 3462/5 3461/5 3463/5 -f 3462/5 3463/5 3464/5 -f 3464/5 3463/5 3465/5 -f 3464/5 3465/5 3466/5 -f 3466/5 3465/5 3467/5 -f 3466/5 3467/5 3468/5 -f 3468/5 3467/5 3469/5 -f 3468/5 3469/5 3470/5 -f 3470/5 3469/5 3471/5 -f 3470/5 3471/5 3472/5 -f 3472/5 3471/5 3473/5 -f 3472/5 3473/5 3474/5 -f 3474/5 3473/5 3475/5 -f 3474/5 3475/5 3476/5 -f 3476/5 3475/5 3477/5 -f 3476/5 3477/5 3478/5 -f 3478/5 3477/5 3479/5 -f 3478/5 3479/5 3480/5 -f 3480/5 3479/5 3481/5 -f 3480/5 3481/5 3482/5 -f 3482/5 3481/5 3483/5 -f 3482/5 3483/5 3484/5 -f 3484/5 3483/5 3485/5 -f 3484/5 3485/5 3486/5 -f 3486/5 3485/5 3487/5 -f 3486/5 3487/5 3488/5 -f 3488/5 3487/5 2534/5 -f 3487/5 2522/5 2534/5 -f 3489/5 3490/5 3491/5 -f 3491/5 3490/5 3492/5 -f 3491/5 3492/5 3493/5 -f 3491/5 3493/5 3494/5 -f 3494/5 3493/5 3495/5 -f 3494/5 3495/5 3496/5 -f 3496/5 3495/5 3497/5 -f 3496/5 3497/5 3498/5 -f 3498/5 3497/5 3499/5 -f 3498/5 3499/5 3500/5 -f 3500/5 3499/5 3501/5 -f 3499/5 3502/5 3501/5 -f 3501/5 3502/5 3503/5 -f 3501/5 3503/5 3504/5 -f 3504/5 3503/5 3505/5 -f 3504/5 3505/5 3506/5 -f 3506/5 3505/5 3507/5 -f 3506/5 3507/5 3508/5 -f 3508/5 3507/5 3509/5 -f 3508/5 3509/5 3510/5 -f 3510/5 3509/5 3511/5 -f 3509/5 3512/5 3511/5 -f 3511/5 3512/5 3513/5 -f 3511/5 3513/5 3514/5 -f 3514/5 3513/5 3515/5 -f 3514/5 3515/5 3516/5 -f 3516/5 3515/5 3517/5 -f 3516/5 3517/5 3518/5 -f 3518/5 3517/5 3519/5 -f 3518/5 3519/5 3520/5 -f 3520/5 3519/5 3521/5 -f 3519/5 3522/5 3521/5 -f 3521/5 3522/5 3523/5 -f 3522/5 3524/5 3523/5 -f 3523/5 3524/5 3525/5 -f 3523/5 3525/5 3526/5 -f 3526/5 3525/5 3527/5 -f 3526/5 3527/5 3528/5 -f 3528/5 3527/5 3529/5 -f 3528/5 3529/5 3530/5 -f 3530/5 3529/5 3531/5 -f 3530/5 3531/5 3532/5 -f 3532/5 3531/5 3533/5 -f 3531/5 3534/5 3533/5 -f 3533/5 3534/5 3535/5 -f 3533/5 3535/5 3536/5 -f 3536/5 3535/5 3537/5 -f 3536/5 3537/5 3538/5 -f 3538/5 3537/5 3539/5 -f 3538/5 3539/5 3540/5 -f 3540/5 3539/5 3541/5 -f 3540/5 3541/5 3542/5 -f 3542/5 3541/5 3543/5 -f 3541/5 3544/5 3543/5 -f 3543/5 3544/5 3545/5 -f 3543/5 3545/5 3546/5 -f 3546/5 3545/5 3547/5 -f 3546/5 3547/5 3548/5 -f 3548/5 3547/5 3549/5 -f 3548/5 3549/5 3550/5 -f 3550/5 3549/5 3551/5 -f 3550/5 3551/5 3552/5 -f 3552/5 3551/5 3553/5 -f 3551/5 3554/5 3553/5 -f 3555/5 3556/5 3557/5 -f 3557/5 3556/5 3558/5 -f 3557/5 3558/5 3559/5 -f 3557/5 3559/5 3560/5 -f 3560/5 3559/5 3561/5 -f 3560/5 3561/5 3562/5 -f 3562/5 3561/5 3563/5 -f 3562/5 3563/5 3564/5 -f 3564/5 3563/5 3565/5 -f 3564/5 3565/5 3566/5 -f 3566/5 3565/5 3567/5 -f 3565/5 3568/5 3567/5 -f 3567/5 3568/5 3569/5 -f 3567/5 3569/5 3570/5 -f 3570/5 3569/5 3571/5 -f 3570/5 3571/5 3572/5 -f 3572/5 3571/5 3573/5 -f 3572/5 3573/5 3574/5 -f 3574/5 3573/5 3575/5 -f 3574/5 3575/5 3576/5 -f 3576/5 3575/5 3577/5 -f 3575/5 3578/5 3577/5 -f 3577/5 3578/5 3579/5 -f 3577/5 3579/5 3580/5 -f 3580/5 3579/5 3581/5 -f 3580/5 3581/5 3582/5 -f 3582/5 3581/5 3583/5 -f 3582/5 3583/5 3584/5 -f 3584/5 3583/5 3585/5 -f 3584/5 3585/5 3586/5 -f 3586/5 3585/5 3587/5 -f 3585/5 3588/5 3587/5 -f 3587/5 3588/5 3589/5 -f 3588/5 3590/5 3589/5 -f 3589/5 3590/5 3591/5 -f 3589/5 3591/5 3592/5 -f 3592/5 3591/5 3593/5 -f 3592/5 3593/5 3594/5 -f 3594/5 3593/5 3595/5 -f 3594/5 3595/5 3596/5 -f 3596/5 3595/5 3597/5 -f 3596/5 3597/5 3598/5 -f 3598/5 3597/5 3599/5 -f 3597/5 3600/5 3599/5 -f 3599/5 3600/5 3601/5 -f 3599/5 3601/5 3602/5 -f 3602/5 3601/5 3603/5 -f 3602/5 3603/5 3604/5 -f 3604/5 3603/5 3605/5 -f 3604/5 3605/5 3606/5 -f 3606/5 3605/5 3607/5 -f 3606/5 3607/5 3608/5 -f 3608/5 3607/5 3609/5 -f 3607/5 3610/5 3609/5 -f 3609/5 3610/5 3611/5 -f 3609/5 3611/5 3612/5 -f 3612/5 3611/5 3613/5 -f 3612/5 3613/5 3614/5 -f 3614/5 3613/5 3615/5 -f 3614/5 3615/5 3616/5 -f 3616/5 3615/5 3617/5 -f 3616/5 3617/5 3618/5 -f 3618/5 3617/5 3619/5 -f 3617/5 3620/5 3619/5 -f 3621/5 3622/5 3623/5 -f 3623/5 3622/5 3624/5 -f 3623/5 3624/5 3625/5 -f 3625/5 3626/5 3623/5 -f 3623/5 3626/5 3627/5 -f 3623/5 3627/5 3628/5 -f 3628/5 3629/5 3623/5 -f 3623/5 3629/5 3630/5 -f 3623/5 3630/5 3631/5 -f 3631/5 3632/5 3623/5 -f 3623/5 3632/5 3633/5 -f 3623/5 3633/5 3634/5 -f 3634/5 3635/5 3623/5 -f 3623/5 3635/5 3636/5 -f 3623/5 3636/5 3637/5 -f 3637/5 3638/5 3623/5 -f 3623/5 3638/5 3639/5 -f 3623/5 3639/5 3640/5 -f 3640/5 3641/5 3623/5 -f 3623/5 3641/5 3642/5 -f 3623/5 3642/5 3643/5 -f 3643/5 3644/5 3623/5 -f 3623/5 3644/5 3645/5 -f 3623/5 3645/5 3646/5 -f 3646/5 3647/5 3623/5 -f 3623/5 3647/5 3648/5 -f 3623/5 3648/5 3649/5 -f 3649/5 3650/5 3623/5 -f 3623/5 3650/5 3651/5 -f 3623/5 3651/5 3652/5 -f 3652/5 3653/5 3623/5 -f 3623/5 3653/5 3654/5 -f 3654/5 3653/5 3655/5 -f 3655/5 3653/5 3656/5 -f 3655/5 3656/5 3657/5 -f 3658/5 3659/5 3657/5 -f 3657/5 3659/5 3660/5 -f 3657/5 3660/5 3655/5 -f 3658/5 3661/5 3659/5 -f 3659/5 3661/5 3662/5 -f 3659/5 3662/5 3663/5 -f 3663/5 3664/5 3659/5 -f 3659/5 3664/5 3665/5 -f 3659/5 3665/5 3666/5 -f 3666/5 3667/5 3659/5 -f 3659/5 3667/5 3668/5 -f 3659/5 3668/5 3669/5 -f 3669/5 3670/5 3659/5 -f 3659/5 3670/5 3671/5 -f 3659/5 3671/5 3672/5 -f 3672/5 3673/5 3659/5 -f 3659/5 3673/5 3674/5 -f 3659/5 3674/5 3675/5 -f 3675/5 3676/5 3659/5 -f 3659/5 3676/5 3677/5 -f 3659/5 3677/5 3678/5 -f 3678/5 3679/5 3659/5 -f 3659/5 3679/5 3680/5 -f 3659/5 3680/5 3681/5 -f 3681/5 3682/5 3659/5 -f 3659/5 3682/5 3683/5 -f 3659/5 3683/5 3684/5 -f 3684/5 3685/5 3659/5 -f 3659/5 3685/5 3686/5 -f 3659/5 3686/5 3687/5 -f 3687/5 3688/5 3659/5 -f 3659/5 3688/5 3689/5 -f 3659/5 3689/5 3690/5 -f 3490/5 3489/5 3691/5 -f 3691/5 3489/5 3692/5 -f 3691/5 3692/5 3693/5 -f 3694/5 3695/5 3696/5 -f 3696/5 3695/5 3697/5 -f 3696/5 3697/5 3698/5 -f 3698/5 3697/5 3699/5 -f 3698/5 3699/5 3700/5 -f 3700/5 3699/5 3701/5 -f 3700/5 3701/5 3702/5 -f 3702/5 3701/5 3703/5 -f 3702/5 3703/5 3704/5 -f 3704/5 3703/5 3705/5 -f 3704/5 3705/5 3706/5 -f 3706/5 3705/5 3707/5 -f 3706/5 3707/5 3708/5 -f 3708/5 3707/5 3709/5 -f 3708/5 3709/5 3693/5 -f 3693/5 3709/5 3710/5 -f 3693/5 3710/5 3691/5 -f 3694/5 3711/5 3695/5 -f 3695/5 3711/5 3712/5 -f 3711/5 3713/5 3712/5 -f 3712/5 3713/5 3714/5 -f 3713/5 3715/5 3714/5 -f 3714/5 3715/5 3716/5 -f 3715/5 3717/5 3716/5 -f 3716/5 3717/5 3718/5 -f 3717/5 3719/5 3718/5 -f 3718/5 3719/5 3720/5 -f 3719/5 3721/5 3720/5 -f 3720/5 3721/5 3722/5 -f 3721/5 3723/5 3722/5 -f 3722/5 3723/5 3724/5 -f 3723/5 3725/5 3724/5 -f 3724/5 3725/5 3726/5 -f 3725/5 3556/5 3726/5 -f 3726/5 3556/5 3555/5 -f 3727/5 3728/5 3729/5 -f 3729/5 3728/5 3730/5 -f 3729/5 3730/5 3731/5 -f 3731/5 3732/5 3729/5 -f 3729/5 3732/5 3733/5 -f 3729/5 3733/5 3734/5 -f 3734/5 3735/5 3729/5 -f 3729/5 3735/5 3736/5 -f 3729/5 3736/5 3737/5 -f 3737/5 3738/5 3729/5 -f 3729/5 3738/5 3739/5 -f 3729/5 3739/5 3740/5 -f 3740/5 3741/5 3729/5 -f 3729/5 3741/5 3742/5 -f 3729/5 3742/5 3743/5 -f 3743/5 3744/5 3729/5 -f 3729/5 3744/5 3745/5 -f 3729/5 3745/5 3746/5 -f 3746/5 3747/5 3729/5 -f 3729/5 3747/5 3748/5 -f 3729/5 3748/5 3749/5 -f 3749/5 3750/5 3729/5 -f 3729/5 3750/5 3751/5 -f 3729/5 3751/5 3752/5 -f 3752/5 3753/5 3729/5 -f 3729/5 3753/5 3754/5 -f 3729/5 3754/5 3755/5 -f 3755/5 3756/5 3729/5 -f 3729/5 3756/5 3757/5 -f 3729/5 3757/5 3758/5 -f 3758/5 3759/5 3729/5 -f 3729/5 3759/5 3760/5 -f 3760/5 3759/5 3761/5 -f 3761/5 3759/5 3762/5 -f 3761/5 3762/5 3763/5 -f 3764/5 3765/5 3763/5 -f 3763/5 3765/5 3766/5 -f 3763/5 3766/5 3761/5 -f 3764/5 3767/5 3765/5 -f 3765/5 3767/5 3768/5 -f 3765/5 3768/5 3769/5 -f 3769/5 3770/5 3765/5 -f 3765/5 3770/5 3771/5 -f 3765/5 3771/5 3772/5 -f 3772/5 3773/5 3765/5 -f 3765/5 3773/5 3774/5 -f 3765/5 3774/5 3775/5 -f 3775/5 3776/5 3765/5 -f 3765/5 3776/5 3777/5 -f 3765/5 3777/5 3778/5 -f 3778/5 3779/5 3765/5 -f 3765/5 3779/5 3780/5 -f 3765/5 3780/5 3781/5 -f 3781/5 3782/5 3765/5 -f 3765/5 3782/5 3783/5 -f 3765/5 3783/5 3784/5 -f 3784/5 3785/5 3765/5 -f 3765/5 3785/5 3786/5 -f 3765/5 3786/5 3787/5 -f 3787/5 3788/5 3765/5 -f 3765/5 3788/5 3789/5 -f 3765/5 3789/5 3790/5 -f 3790/5 3791/5 3765/5 -f 3765/5 3791/5 3792/5 -f 3765/5 3792/5 3793/5 -f 3793/5 3794/5 3765/5 -f 3765/5 3794/5 3795/5 -f 3765/5 3795/5 3796/5 -f 3553/5 3554/5 3797/5 -f 3797/5 3554/5 3798/5 -f 3797/5 3798/5 3799/5 -f 3799/5 3798/5 3800/5 -f 3801/5 3802/5 3803/5 -f 3803/5 3802/5 3804/5 -f 3803/5 3804/5 3805/5 -f 3801/5 3806/5 3802/5 -f 3802/5 3806/5 3807/5 -f 3802/5 3807/5 3808/5 -f 3808/5 3809/5 3802/5 -f 3802/5 3809/5 3810/5 -f 3802/5 3810/5 3811/5 -f 3811/5 3812/5 3802/5 -f 3802/5 3812/5 3813/5 -f 3802/5 3813/5 3814/5 -f 3814/5 3815/5 3802/5 -f 3802/5 3815/5 3816/5 -f 3802/5 3816/5 3817/5 -f 3817/5 3818/5 3802/5 -f 3802/5 3818/5 3819/5 -f 3802/5 3819/5 3820/5 -f 3820/5 3821/5 3802/5 -f 3802/5 3821/5 3822/5 -f 3802/5 3822/5 3823/5 -f 3823/5 3824/5 3802/5 -f 3802/5 3824/5 3825/5 -f 3802/5 3825/5 3826/5 -f 3826/5 3827/5 3802/5 -f 3802/5 3827/5 3828/5 -f 3802/5 3828/5 3829/5 -f 3829/5 3830/5 3802/5 -f 3802/5 3830/5 3831/5 -f 3802/5 3831/5 3832/5 -f 3832/5 3833/5 3802/5 -f 3802/5 3833/5 3834/5 -f 3802/5 3834/5 3835/5 -f 3836/5 3837/5 3805/5 -f 3805/5 3837/5 3838/5 -f 3805/5 3838/5 3803/5 -f 3836/5 3839/5 3837/5 -f 3837/5 3839/5 3840/5 -f 3841/5 3842/5 3839/5 -f 3839/5 3842/5 3843/5 -f 3839/5 3843/5 3844/5 -f 3844/5 3845/5 3839/5 -f 3839/5 3845/5 3846/5 -f 3839/5 3846/5 3847/5 -f 3847/5 3848/5 3839/5 -f 3839/5 3848/5 3849/5 -f 3839/5 3849/5 3850/5 -f 3850/5 3851/5 3839/5 -f 3839/5 3851/5 3852/5 -f 3839/5 3852/5 3853/5 -f 3853/5 3854/5 3839/5 -f 3839/5 3854/5 3855/5 -f 3839/5 3855/5 3856/5 -f 3856/5 3857/5 3839/5 -f 3839/5 3857/5 3858/5 -f 3839/5 3858/5 3859/5 -f 3859/5 3860/5 3839/5 -f 3839/5 3860/5 3861/5 -f 3839/5 3861/5 3862/5 -f 3862/5 3863/5 3839/5 -f 3839/5 3863/5 3864/5 -f 3839/5 3864/5 3865/5 -f 3865/5 3866/5 3839/5 -f 3839/5 3866/5 3867/5 -f 3839/5 3867/5 3868/5 -f 3868/5 3869/5 3839/5 -f 3839/5 3869/5 3870/5 -f 3839/5 3870/5 3840/5 -f 3871/5 3872/5 3873/5 -f 3873/5 3872/5 3874/5 -f 3873/5 3874/5 3875/5 -f 3872/5 3876/5 3874/5 -f 3873/5 3875/5 3877/5 -f 3877/5 3875/5 3878/5 -f 3877/5 3878/5 3879/5 -f 3879/5 3878/5 3880/5 -f 3879/5 3880/5 3881/5 -f 3881/5 3880/5 3882/5 -f 3881/5 3882/5 3883/5 -f 3883/5 3882/5 3884/5 -f 3883/5 3884/5 3885/5 -f 3885/5 3884/5 3886/5 -f 3885/5 3886/5 3887/5 -f 3887/5 3886/5 3805/5 -f 3887/5 3805/5 3804/5 -f 3886/5 3836/5 3805/5 -f 3888/5 3876/5 3889/5 -f 3889/5 3876/5 3872/5 -f 3889/5 3872/5 3890/5 -f 3890/5 3872/5 3871/5 -f 3888/5 3889/5 3891/5 -f 3891/5 3889/5 3892/5 -f 3891/5 3892/5 3893/5 -f 3889/5 3890/5 3892/5 -f 3891/5 3893/5 3894/5 -f 3894/5 3893/5 3895/5 -f 3894/5 3895/5 3896/5 -f 3896/5 3895/5 3897/5 -f 3896/5 3897/5 3898/5 -f 3898/5 3897/5 3899/5 -f 3898/5 3899/5 3900/5 -f 3900/5 3899/5 3901/5 -f 3900/5 3901/5 3902/5 -f 3902/5 3901/5 3903/5 -f 3902/5 3903/5 3904/5 -f 3904/5 3903/5 3761/5 -f 3904/5 3761/5 3766/5 -f 3903/5 3760/5 3761/5 -f 3620/5 3905/5 3619/5 -f 3619/5 3905/5 3906/5 -f 3905/5 3907/5 3906/5 -f 3906/5 3907/5 3908/5 -f 3909/5 3910/5 3911/5 -f 3911/5 3910/5 3912/5 -f 3911/5 3912/5 3913/5 -f 3909/5 3914/5 3910/5 -f 3910/5 3914/5 3915/5 -f 3910/5 3915/5 3916/5 -f 3916/5 3917/5 3910/5 -f 3910/5 3917/5 3918/5 -f 3910/5 3918/5 3919/5 -f 3919/5 3920/5 3910/5 -f 3910/5 3920/5 3921/5 -f 3910/5 3921/5 3922/5 -f 3922/5 3923/5 3910/5 -f 3910/5 3923/5 3924/5 -f 3910/5 3924/5 3925/5 -f 3925/5 3926/5 3910/5 -f 3910/5 3926/5 3927/5 -f 3910/5 3927/5 3928/5 -f 3928/5 3929/5 3910/5 -f 3910/5 3929/5 3930/5 -f 3910/5 3930/5 3931/5 -f 3931/5 3932/5 3910/5 -f 3910/5 3932/5 3933/5 -f 3910/5 3933/5 3934/5 -f 3934/5 3935/5 3910/5 -f 3910/5 3935/5 3936/5 -f 3910/5 3936/5 3937/5 -f 3937/5 3938/5 3910/5 -f 3910/5 3938/5 3939/5 -f 3910/5 3939/5 3940/5 -f 3940/5 3941/5 3910/5 -f 3910/5 3941/5 3942/5 -f 3910/5 3942/5 3943/5 -f 3944/5 3945/5 3913/5 -f 3913/5 3945/5 3946/5 -f 3913/5 3946/5 3911/5 -f 3944/5 3947/5 3945/5 -f 3945/5 3947/5 3948/5 -f 3949/5 3950/5 3947/5 -f 3947/5 3950/5 3951/5 -f 3947/5 3951/5 3952/5 -f 3952/5 3953/5 3947/5 -f 3947/5 3953/5 3954/5 -f 3947/5 3954/5 3955/5 -f 3955/5 3956/5 3947/5 -f 3947/5 3956/5 3957/5 -f 3947/5 3957/5 3958/5 -f 3958/5 3959/5 3947/5 -f 3947/5 3959/5 3960/5 -f 3947/5 3960/5 3961/5 -f 3961/5 3962/5 3947/5 -f 3947/5 3962/5 3963/5 -f 3947/5 3963/5 3964/5 -f 3964/5 3965/5 3947/5 -f 3947/5 3965/5 3966/5 -f 3947/5 3966/5 3967/5 -f 3967/5 3968/5 3947/5 -f 3947/5 3968/5 3969/5 -f 3947/5 3969/5 3970/5 -f 3970/5 3971/5 3947/5 -f 3947/5 3971/5 3972/5 -f 3947/5 3972/5 3973/5 -f 3973/5 3974/5 3947/5 -f 3947/5 3974/5 3975/5 -f 3947/5 3975/5 3976/5 -f 3976/5 3977/5 3947/5 -f 3947/5 3977/5 3978/5 -f 3947/5 3978/5 3948/5 -f 3979/5 3980/5 3981/5 -f 3981/5 3980/5 3982/5 -f 3981/5 3982/5 3983/5 -f 3980/5 3984/5 3982/5 -f 3982/5 3984/5 3985/5 -f 3984/5 3986/5 3985/5 -f 3985/5 3986/5 3987/5 -f 3986/5 3988/5 3987/5 -f 3987/5 3988/5 3989/5 -f 3988/5 3990/5 3989/5 -f 3989/5 3990/5 3991/5 -f 3990/5 3992/5 3991/5 -f 3991/5 3992/5 3993/5 -f 3992/5 3994/5 3993/5 -f 3993/5 3994/5 3995/5 -f 3944/5 3913/5 3994/5 -f 3994/5 3913/5 3995/5 -f 3913/5 3912/5 3995/5 -f 3983/5 3996/5 3981/5 -f 3981/5 3996/5 3997/5 -f 3981/5 3997/5 3979/5 -f 3979/5 3997/5 3998/5 -f 3998/5 3997/5 3999/5 -f 3999/5 3997/5 4000/5 -f 3999/5 4000/5 4001/5 -f 3997/5 3996/5 4000/5 -f 3999/5 4001/5 4002/5 -f 4002/5 4001/5 4003/5 -f 4002/5 4003/5 4004/5 -f 4004/5 4003/5 4005/5 -f 4004/5 4005/5 4006/5 -f 4006/5 4005/5 4007/5 -f 4006/5 4007/5 4008/5 -f 4008/5 4007/5 4009/5 -f 4008/5 4009/5 4010/5 -f 4010/5 4009/5 4011/5 -f 4010/5 4011/5 4012/5 -f 4012/5 4011/5 3655/5 -f 4012/5 3655/5 3660/5 -f 4011/5 3654/5 3655/5 -f 4013/5 4014/5 4015/5 -f 4015/5 4014/5 4016/5 -f 4014/5 4017/5 4016/5 -f 4016/5 4017/5 4018/5 -f 4019/5 4020/5 4021/5 -f 4021/5 4020/5 4022/5 -f 4021/5 4022/5 4023/5 -f 4021/5 4023/5 4024/5 -f 4024/5 4023/5 4025/5 -f 4024/5 4025/5 4026/5 -f 4026/5 4025/5 4027/5 -f 4026/5 4027/5 4028/5 -f 4028/5 4027/5 4029/5 -f 4028/5 4029/5 4030/5 -f 4030/5 4029/5 4031/5 -f 4029/5 4032/5 4031/5 -f 4031/5 4032/5 4033/5 -f 4031/5 4033/5 4034/5 -f 4034/5 4033/5 4035/5 -f 4034/5 4035/5 4036/5 -f 4036/5 4035/5 4037/5 -f 4036/5 4037/5 4038/5 -f 4038/5 4037/5 4039/5 -f 4038/5 4039/5 4040/5 -f 4040/5 4039/5 4041/5 -f 4039/5 4042/5 4041/5 -f 4041/5 4042/5 4043/5 -f 4041/5 4043/5 4044/5 -f 4044/5 4043/5 4045/5 -f 4044/5 4045/5 4046/5 -f 4046/5 4045/5 4047/5 -f 4046/5 4047/5 4048/5 -f 4048/5 4047/5 4049/5 -f 4048/5 4049/5 4050/5 -f 4050/5 4049/5 4051/5 -f 4049/5 4052/5 4051/5 -f 4051/5 4052/5 4053/5 -f 4052/5 4054/5 4053/5 -f 4053/5 4054/5 4055/5 -f 4053/5 4055/5 4056/5 -f 4056/5 4055/5 4057/5 -f 4056/5 4057/5 4058/5 -f 4058/5 4057/5 4059/5 -f 4058/5 4059/5 4060/5 -f 4060/5 4059/5 4061/5 -f 4060/5 4061/5 4062/5 -f 4062/5 4061/5 4063/5 -f 4061/5 4064/5 4063/5 -f 4063/5 4064/5 4065/5 -f 4063/5 4065/5 4066/5 -f 4066/5 4065/5 4067/5 -f 4066/5 4067/5 4068/5 -f 4068/5 4067/5 4069/5 -f 4068/5 4069/5 4070/5 -f 4070/5 4069/5 4071/5 -f 4070/5 4071/5 4072/5 -f 4072/5 4071/5 4073/5 -f 4071/5 4074/5 4073/5 -f 4073/5 4074/5 4075/5 -f 4073/5 4075/5 4076/5 -f 4076/5 4075/5 4077/5 -f 4076/5 4077/5 4078/5 -f 4078/5 4077/5 4079/5 -f 4078/5 4079/5 4080/5 -f 4080/5 4079/5 4081/5 -f 4080/5 4081/5 4082/5 -f 4082/5 4081/5 3907/5 -f 4081/5 3908/5 3907/5 -f 3799/5 3800/5 4083/5 -f 4083/5 3800/5 4084/5 -f 4083/5 4084/5 4085/5 -f 4083/5 4085/5 4086/5 -f 4086/5 4085/5 4087/5 -f 4086/5 4087/5 4088/5 -f 4088/5 4087/5 4089/5 -f 4088/5 4089/5 4090/5 -f 4090/5 4089/5 4091/5 -f 4090/5 4091/5 4092/5 -f 4092/5 4091/5 4093/5 -f 4091/5 4094/5 4093/5 -f 4093/5 4094/5 4095/5 -f 4093/5 4095/5 4096/5 -f 4096/5 4095/5 4097/5 -f 4096/5 4097/5 4098/5 -f 4098/5 4097/5 4099/5 -f 4098/5 4099/5 4100/5 -f 4100/5 4099/5 4101/5 -f 4100/5 4101/5 4102/5 -f 4102/5 4101/5 4103/5 -f 4101/5 4104/5 4103/5 -f 4103/5 4104/5 4105/5 -f 4103/5 4105/5 4106/5 -f 4106/5 4105/5 4107/5 -f 4106/5 4107/5 4108/5 -f 4108/5 4107/5 4109/5 -f 4108/5 4109/5 4110/5 -f 4110/5 4109/5 4111/5 -f 4110/5 4111/5 4112/5 -f 4112/5 4111/5 4113/5 -f 4111/5 4114/5 4113/5 -f 4113/5 4114/5 4115/5 -f 4114/5 4116/5 4115/5 -f 4115/5 4116/5 4117/5 -f 4115/5 4117/5 4118/5 -f 4118/5 4117/5 4119/5 -f 4118/5 4119/5 4120/5 -f 4120/5 4119/5 4121/5 -f 4120/5 4121/5 4122/5 -f 4122/5 4121/5 4123/5 -f 4122/5 4123/5 4124/5 -f 4124/5 4123/5 4125/5 -f 4123/5 4126/5 4125/5 -f 4125/5 4126/5 4127/5 -f 4125/5 4127/5 4128/5 -f 4128/5 4127/5 4129/5 -f 4128/5 4129/5 4130/5 -f 4130/5 4129/5 4131/5 -f 4130/5 4131/5 4132/5 -f 4132/5 4131/5 4133/5 -f 4132/5 4133/5 4134/5 -f 4134/5 4133/5 4135/5 -f 4133/5 4136/5 4135/5 -f 4135/5 4136/5 4137/5 -f 4135/5 4137/5 4138/5 -f 4138/5 4137/5 4139/5 -f 4138/5 4139/5 4140/5 -f 4140/5 4139/5 4141/5 -f 4140/5 4141/5 4142/5 -f 4142/5 4141/5 4143/5 -f 4142/5 4143/5 4144/5 -f 4144/5 4143/5 4145/5 -f 4143/5 4146/5 4145/5 -f 4147/5 4148/5 4149/5 -f 4149/5 4148/5 4150/5 -f 4149/5 4150/5 4151/5 -f 4149/5 4151/5 4152/5 -f 4152/5 4151/5 4153/5 -f 4152/5 4153/5 4154/5 -f 4154/5 4153/5 4155/5 -f 4154/5 4155/5 4156/5 -f 4156/5 4155/5 4157/5 -f 4156/5 4157/5 4158/5 -f 4158/5 4157/5 4159/5 -f 4157/5 4160/5 4159/5 -f 4159/5 4160/5 4161/5 -f 4159/5 4161/5 4162/5 -f 4162/5 4161/5 4163/5 -f 4162/5 4163/5 4164/5 -f 4164/5 4163/5 4165/5 -f 4164/5 4165/5 4166/5 -f 4166/5 4165/5 4167/5 -f 4166/5 4167/5 4168/5 -f 4168/5 4167/5 4169/5 -f 4167/5 4170/5 4169/5 -f 4169/5 4170/5 4171/5 -f 4169/5 4171/5 4172/5 -f 4172/5 4171/5 4173/5 -f 4172/5 4173/5 4174/5 -f 4174/5 4173/5 4175/5 -f 4174/5 4175/5 4176/5 -f 4176/5 4175/5 4177/5 -f 4176/5 4177/5 4178/5 -f 4178/5 4177/5 4179/5 -f 4177/5 4180/5 4179/5 -f 4179/5 4180/5 4181/5 -f 4180/5 4182/5 4181/5 -f 4181/5 4182/5 4183/5 -f 4181/5 4183/5 4184/5 -f 4184/5 4183/5 4185/5 -f 4184/5 4185/5 4186/5 -f 4186/5 4185/5 4187/5 -f 4186/5 4187/5 4188/5 -f 4188/5 4187/5 4189/5 -f 4188/5 4189/5 4190/5 -f 4190/5 4189/5 4191/5 -f 4189/5 4192/5 4191/5 -f 4191/5 4192/5 4193/5 -f 4191/5 4193/5 4194/5 -f 4194/5 4193/5 4195/5 -f 4194/5 4195/5 4196/5 -f 4196/5 4195/5 4197/5 -f 4196/5 4197/5 4198/5 -f 4198/5 4197/5 4199/5 -f 4198/5 4199/5 4200/5 -f 4200/5 4199/5 4201/5 -f 4199/5 4202/5 4201/5 -f 4201/5 4202/5 4203/5 -f 4201/5 4203/5 4204/5 -f 4204/5 4203/5 4205/5 -f 4204/5 4205/5 4206/5 -f 4206/5 4205/5 4207/5 -f 4206/5 4207/5 4208/5 -f 4208/5 4207/5 4209/5 -f 4208/5 4209/5 4210/5 -f 4210/5 4209/5 4015/5 -f 4209/5 4013/5 4015/5 -f 4211/5 4212/5 4213/5 -f 4213/5 4212/5 4214/5 -f 4213/5 4214/5 4215/5 -f 4213/5 4215/5 4216/5 -f 4216/5 4215/5 4217/5 -f 4216/5 4217/5 4218/5 -f 4218/5 4217/5 4219/5 -f 4218/5 4219/5 4220/5 -f 4220/5 4219/5 4221/5 -f 4220/5 4221/5 4222/5 -f 4222/5 4221/5 4223/5 -f 4222/5 4223/5 4224/5 -f 4224/5 4223/5 4225/5 -f 4224/5 4225/5 4226/5 -f 4226/5 4225/5 4227/5 -f 4226/5 4227/5 4228/5 -f 4228/5 4227/5 4229/5 -f 4228/5 4229/5 4230/5 -f 4230/5 4229/5 4231/5 -f 4230/5 4231/5 4232/5 -f 4232/5 4231/5 4233/5 -f 4232/5 4233/5 4234/5 -f 4234/5 4233/5 4235/5 -f 4234/5 4235/5 4236/5 -f 4236/5 4235/5 4237/5 -f 4236/5 4237/5 4238/5 -f 4238/5 4237/5 4239/5 -f 4238/5 4239/5 4240/5 -f 4240/5 4239/5 4241/5 -f 4240/5 4241/5 4242/5 -f 4242/5 4241/5 4243/5 -f 4242/5 4243/5 4244/5 -f 4244/5 4243/5 4245/5 -f 4244/5 4245/5 4246/5 -f 4246/5 4245/5 4247/5 -f 4246/5 4247/5 4248/5 -f 4248/5 4247/5 4249/5 -f 4248/5 4249/5 4250/5 -f 4250/5 4249/5 4251/5 -f 4250/5 4251/5 4252/5 -f 4252/5 4251/5 4253/5 -f 4252/5 4253/5 4254/5 -f 4254/5 4253/5 4255/5 -f 4254/5 4255/5 4256/5 -f 4256/5 4255/5 4257/5 -f 4256/5 4257/5 4258/5 -f 4258/5 4257/5 4259/5 -f 4258/5 4259/5 4260/5 -f 4260/5 4259/5 4261/5 -f 4260/5 4261/5 4262/5 -f 4262/5 4261/5 4263/5 -f 4262/5 4263/5 4264/5 -f 4264/5 4263/5 4265/5 -f 4264/5 4265/5 4266/5 -f 4266/5 4265/5 4267/5 -f 4266/5 4267/5 4268/5 -f 4268/5 4267/5 4269/5 -f 4268/5 4269/5 4270/5 -f 4270/5 4269/5 4271/5 -f 4270/5 4271/5 4272/5 -f 4272/5 4271/5 4273/5 -f 4272/5 4273/5 4274/5 -f 4274/5 4273/5 3998/5 -f 4273/5 3979/5 3998/5 -f 4275/5 4212/5 4276/5 -f 4276/5 4212/5 4211/5 -f 4276/5 4211/5 4277/5 -f 4278/5 4279/5 4280/5 -f 4280/5 4279/5 4281/5 -f 4280/5 4281/5 4282/5 -f 4281/5 4279/5 4283/5 -f 4283/5 4279/5 4284/5 -f 4283/5 4284/5 4285/5 -f 4283/5 4285/5 4286/5 -f 4286/5 4285/5 4287/5 -f 4286/5 4287/5 4288/5 -f 4288/5 4287/5 4289/5 -f 4288/5 4289/5 4290/5 -f 4290/5 4289/5 4291/5 -f 4290/5 4291/5 4292/5 -f 4292/5 4291/5 4293/5 -f 4291/5 4294/5 4293/5 -f 4293/5 4294/5 4295/5 -f 4293/5 4295/5 4296/5 -f 4296/5 4295/5 4297/5 -f 4296/5 4297/5 4298/5 -f 4298/5 4297/5 4299/5 -f 4297/5 4300/5 4299/5 -f 4299/5 4300/5 4301/5 -f 4299/5 4301/5 4302/5 -f 4302/5 4301/5 4303/5 -f 4301/5 4304/5 4303/5 -f 4303/5 4304/5 4305/5 -f 4303/5 4305/5 4306/5 -f 4306/5 4305/5 4307/5 -f 4306/5 4307/5 4308/5 -f 4308/5 4307/5 4309/5 -f 4308/5 4309/5 4310/5 -f 4310/5 4309/5 4276/5 -f 4310/5 4276/5 4277/5 -f 4309/5 4275/5 4276/5 -f 4311/5 4278/5 4312/5 -f 4312/5 4278/5 4280/5 -f 4312/5 4280/5 4313/5 -f 4313/5 4280/5 4314/5 -f 4280/5 4282/5 4314/5 -f 4314/5 4282/5 4315/5 -f 4314/5 4315/5 4316/5 -f 4316/5 4317/5 4314/5 -f 4314/5 4317/5 4318/5 -f 4314/5 4318/5 4319/5 -f 4319/5 4320/5 4314/5 -f 4314/5 4320/5 4321/5 -f 4314/5 4321/5 4322/5 -f 4322/5 4323/5 4314/5 -f 4314/5 4323/5 4324/5 -f 4314/5 4324/5 4325/5 -f 4325/5 4326/5 4314/5 -f 4314/5 4326/5 4327/5 -f 4314/5 4327/5 4328/5 -f 4328/5 4329/5 4314/5 -f 4314/5 4329/5 4330/5 -f 4314/5 4330/5 4331/5 -f 4331/5 4332/5 4314/5 -f 4314/5 4332/5 4333/5 -f 4314/5 4333/5 4334/5 -f 4334/5 4335/5 4314/5 -f 4314/5 4335/5 4336/5 -f 4314/5 4336/5 4337/5 -f 4337/5 4338/5 4314/5 -f 4314/5 4338/5 4339/5 -f 4314/5 4339/5 4340/5 -f 4340/5 4341/5 4314/5 -f 4314/5 4341/5 4342/5 -f 4314/5 4342/5 4343/5 -f 4343/5 4344/5 4314/5 -f 4314/5 4344/5 4345/5 -f 4314/5 4345/5 4346/5 -f 4347/5 4348/5 4312/5 -f 4312/5 4348/5 4349/5 -f 4312/5 4349/5 4350/5 -f 4350/5 4351/5 4312/5 -f 4312/5 4351/5 4352/5 -f 4312/5 4352/5 4353/5 -f 4353/5 4354/5 4312/5 -f 4312/5 4354/5 4355/5 -f 4312/5 4355/5 4356/5 -f 4356/5 4357/5 4312/5 -f 4312/5 4357/5 4358/5 -f 4312/5 4358/5 4359/5 -f 4359/5 4360/5 4312/5 -f 4312/5 4360/5 4361/5 -f 4312/5 4361/5 4362/5 -f 4362/5 4363/5 4312/5 -f 4312/5 4363/5 4364/5 -f 4312/5 4364/5 4365/5 -f 4365/5 4366/5 4312/5 -f 4312/5 4366/5 4367/5 -f 4312/5 4367/5 4368/5 -f 4368/5 4369/5 4312/5 -f 4312/5 4369/5 4370/5 -f 4312/5 4370/5 4371/5 -f 4371/5 4372/5 4312/5 -f 4312/5 4372/5 4373/5 -f 4312/5 4373/5 4374/5 -f 4374/5 4375/5 4312/5 -f 4312/5 4375/5 4376/5 -f 4312/5 4376/5 4377/5 -f 4377/5 4311/5 4312/5 -f 4018/5 4017/5 4378/5 -f 4378/5 4017/5 4379/5 -f 4378/5 4379/5 4380/5 -f 4378/5 4380/5 4381/5 -f 4381/5 4380/5 4382/5 -f 4381/5 4382/5 4383/5 -f 4383/5 4382/5 4384/5 -f 4383/5 4384/5 4385/5 -f 4385/5 4384/5 4386/5 -f 4385/5 4386/5 4387/5 -f 4387/5 4386/5 4388/5 -f 4386/5 4389/5 4388/5 -f 4388/5 4389/5 4390/5 -f 4388/5 4390/5 4391/5 -f 4391/5 4390/5 4392/5 -f 4391/5 4392/5 4393/5 -f 4393/5 4392/5 4394/5 -f 4393/5 4394/5 4395/5 -f 4395/5 4394/5 4396/5 -f 4395/5 4396/5 4397/5 -f 4397/5 4396/5 4398/5 -f 4396/5 4399/5 4398/5 -f 4398/5 4399/5 4400/5 -f 4398/5 4400/5 4401/5 -f 4401/5 4400/5 4402/5 -f 4401/5 4402/5 4403/5 -f 4403/5 4402/5 4404/5 -f 4403/5 4404/5 4405/5 -f 4405/5 4404/5 4406/5 -f 4405/5 4406/5 4407/5 -f 4407/5 4406/5 4408/5 -f 4406/5 4409/5 4408/5 -f 4408/5 4409/5 4410/5 -f 4409/5 4411/5 4410/5 -f 4410/5 4411/5 4412/5 -f 4410/5 4412/5 4413/5 -f 4413/5 4412/5 4414/5 -f 4413/5 4414/5 4415/5 -f 4415/5 4414/5 4416/5 -f 4415/5 4416/5 4417/5 -f 4417/5 4416/5 4418/5 -f 4417/5 4418/5 4419/5 -f 4419/5 4418/5 4420/5 -f 4418/5 4421/5 4420/5 -f 4420/5 4421/5 4422/5 -f 4420/5 4422/5 4423/5 -f 4423/5 4422/5 4424/5 -f 4423/5 4424/5 4425/5 -f 4425/5 4424/5 4426/5 -f 4425/5 4426/5 4427/5 -f 4427/5 4426/5 4428/5 -f 4427/5 4428/5 4429/5 -f 4429/5 4428/5 4430/5 -f 4428/5 4431/5 4430/5 -f 4430/5 4431/5 4432/5 -f 4430/5 4432/5 4433/5 -f 4433/5 4432/5 4434/5 -f 4433/5 4434/5 4435/5 -f 4435/5 4434/5 4436/5 -f 4435/5 4436/5 4437/5 -f 4437/5 4436/5 4438/5 -f 4437/5 4438/5 4439/5 -f 4439/5 4438/5 4440/5 -f 4438/5 4441/5 4440/5 -f 4442/5 4443/5 4444/5 -f 4444/5 4443/5 4445/5 -f 4444/5 4445/5 4446/5 -f 4446/5 4445/5 4447/5 -f 4446/5 4447/5 4448/5 -f 4448/5 4447/5 4449/5 -f 4448/5 4449/5 4450/5 -f 4451/5 4452/5 4444/5 -f 4444/5 4452/5 4453/5 -f 4444/5 4453/5 4454/5 -f 4454/5 4455/5 4444/5 -f 4444/5 4455/5 4456/5 -f 4444/5 4456/5 4457/5 -f 4457/5 4458/5 4444/5 -f 4444/5 4458/5 4459/5 -f 4444/5 4459/5 4460/5 -f 4460/5 4461/5 4444/5 -f 4444/5 4461/5 4462/5 -f 4444/5 4462/5 4463/5 -f 4463/5 4464/5 4444/5 -f 4444/5 4464/5 4465/5 -f 4444/5 4465/5 4466/5 -f 4466/5 4467/5 4444/5 -f 4444/5 4467/5 4468/5 -f 4444/5 4468/5 4469/5 -f 4469/5 4470/5 4444/5 -f 4444/5 4470/5 4471/5 -f 4444/5 4471/5 4472/5 -f 4472/5 4473/5 4444/5 -f 4444/5 4473/5 4474/5 -f 4444/5 4474/5 4475/5 -f 4475/5 4476/5 4444/5 -f 4444/5 4476/5 4477/5 -f 4444/5 4477/5 4478/5 -f 4478/5 4479/5 4444/5 -f 4444/5 4479/5 4480/5 -f 4444/5 4480/5 4442/5 -f 4450/5 4481/5 4448/5 -f 4448/5 4481/5 4482/5 -f 4448/5 4482/5 4483/5 -f 4483/5 4484/5 4448/5 -f 4448/5 4484/5 4485/5 -f 4448/5 4485/5 4486/5 -f 4486/5 4487/5 4448/5 -f 4448/5 4487/5 4488/5 -f 4448/5 4488/5 4489/5 -f 4489/5 4490/5 4448/5 -f 4448/5 4490/5 4491/5 -f 4448/5 4491/5 4492/5 -f 4492/5 4493/5 4448/5 -f 4448/5 4493/5 4494/5 -f 4448/5 4494/5 4495/5 -f 4495/5 4496/5 4448/5 -f 4448/5 4496/5 4497/5 -f 4448/5 4497/5 4498/5 -f 4498/5 4499/5 4448/5 -f 4448/5 4499/5 4500/5 -f 4448/5 4500/5 4501/5 -f 4501/5 4502/5 4448/5 -f 4448/5 4502/5 4503/5 -f 4448/5 4503/5 4504/5 -f 4504/5 4505/5 4448/5 -f 4448/5 4505/5 4506/5 -f 4448/5 4506/5 4507/5 -f 4507/5 4508/5 4448/5 -f 4448/5 4508/5 4509/5 -f 4448/5 4509/5 4510/5 -f 4445/5 4511/5 4447/5 -f 4447/5 4511/5 4512/5 -f 4512/5 4511/5 4513/5 -f 4513/5 4511/5 4514/5 -f 4513/5 4514/5 4515/5 -f 4513/5 4515/5 4516/5 -f 4516/5 4515/5 4517/5 -f 4516/5 4517/5 4518/5 -f 4518/5 4517/5 4519/5 -f 4518/5 4519/5 4520/5 -f 4520/5 4519/5 4521/5 -f 4520/5 4521/5 4522/5 -f 4522/5 4521/5 4523/5 -f 4521/5 4524/5 4523/5 -f 4523/5 4524/5 4525/5 -f 4523/5 4525/5 4526/5 -f 4526/5 4525/5 4527/5 -f 4526/5 4527/5 4528/5 -f 4528/5 4527/5 4529/5 -f 4527/5 4530/5 4529/5 -f 4529/5 4530/5 4531/5 -f 4529/5 4531/5 4532/5 -f 4532/5 4531/5 4533/5 -f 4531/5 4534/5 4533/5 -f 4533/5 4534/5 4535/5 -f 4533/5 4535/5 4536/5 -f 4536/5 4535/5 4537/5 -f 4536/5 4537/5 4538/5 -f 4538/5 4537/5 4539/5 -f 4538/5 4539/5 4540/5 -f 4540/5 4539/5 4541/5 -f 4540/5 4541/5 4542/5 -f 4020/5 4543/5 4544/5 -f 4544/5 4543/5 4545/5 -f 4544/5 4545/5 4546/5 -f 4546/5 4545/5 4547/5 -f 4546/5 4547/5 4548/5 -f 4548/5 4547/5 4549/5 -f 4548/5 4549/5 4550/5 -f 4550/5 4549/5 4551/5 -f 4550/5 4551/5 4552/5 -f 4552/5 4551/5 4553/5 -f 4552/5 4553/5 4554/5 -f 4554/5 4553/5 4555/5 -f 4554/5 4555/5 4556/5 -f 4556/5 4555/5 4557/5 -f 4556/5 4557/5 4558/5 -f 4558/5 4557/5 4559/5 -f 4558/5 4559/5 4560/5 -f 4020/5 4019/5 4543/5 -f 4561/5 4562/5 4563/5 -f 4563/5 4562/5 4564/5 -f 4563/5 4564/5 4565/5 -f 4563/5 4565/5 4566/5 -f 4566/5 4565/5 4567/5 -f 4566/5 4567/5 4568/5 -f 4568/5 4567/5 4569/5 -f 4568/5 4569/5 4570/5 -f 4570/5 4569/5 4571/5 -f 4570/5 4571/5 4572/5 -f 4572/5 4571/5 4573/5 -f 4572/5 4573/5 4574/5 -f 4574/5 4573/5 4575/5 -f 4574/5 4575/5 4576/5 -f 4576/5 4575/5 4577/5 -f 4575/5 4578/5 4577/5 -f 4577/5 4578/5 4145/5 -f 4577/5 4145/5 4146/5 -f 4541/5 4579/5 4542/5 -f 4542/5 4579/5 4580/5 -f 4581/5 4582/5 4583/5 -f 4583/5 4582/5 4584/5 -f 4583/5 4584/5 4585/5 -f 4585/5 4584/5 4586/5 -f 4585/5 4586/5 4587/5 -f 4587/5 4586/5 4588/5 -f 4587/5 4588/5 4589/5 -f 4589/5 4588/5 4590/5 -f 4589/5 4590/5 4591/5 -f 4591/5 4590/5 4592/5 -f 4591/5 4592/5 4593/5 -f 4593/5 4592/5 4594/5 -f 4593/5 4594/5 4595/5 -f 4595/5 4594/5 4596/5 -f 4595/5 4596/5 4597/5 -f 4597/5 4596/5 4598/5 -f 4597/5 4598/5 4599/5 -f 4599/5 4598/5 4600/5 -f 4599/5 4600/5 4601/5 -f 4601/5 4600/5 4602/5 -f 4601/5 4602/5 4603/5 -f 4603/5 4602/5 4604/5 -f 4603/5 4604/5 4605/5 -f 4605/5 4604/5 4606/5 -f 4605/5 4606/5 4607/5 -f 4607/5 4606/5 4608/5 -f 4607/5 4608/5 4609/5 -f 4581/5 4610/5 4582/5 -f 4582/5 4610/5 4611/5 -f 4610/5 4612/5 4611/5 -f 4611/5 4612/5 4613/5 -f 4612/5 4614/5 4613/5 -f 4613/5 4614/5 4615/5 -f 4614/5 4616/5 4615/5 -f 4615/5 4616/5 4617/5 -f 4616/5 4618/5 4617/5 -f 4617/5 4618/5 4619/5 -f 4618/5 4620/5 4619/5 -f 4619/5 4620/5 4621/5 -f 4620/5 4622/5 4621/5 -f 4621/5 4622/5 4623/5 -f 4622/5 4624/5 4623/5 -f 4623/5 4624/5 4625/5 -f 4624/5 4626/5 4625/5 -f 4625/5 4626/5 4627/5 -f 4626/5 4628/5 4627/5 -f 4627/5 4628/5 4629/5 -f 4628/5 4630/5 4629/5 -f 4629/5 4630/5 4631/5 -f 4630/5 4632/5 4631/5 -f 4631/5 4632/5 4633/5 -f 4632/5 4634/5 4633/5 -f 4633/5 4634/5 4635/5 -f 4634/5 4636/5 4635/5 -f 4635/5 4636/5 4637/5 -f 4636/5 4638/5 4637/5 -f 4637/5 4638/5 4639/5 -f 4638/5 4640/5 4639/5 -f 4639/5 4640/5 4641/5 -f 4640/5 4642/5 4641/5 -f 4641/5 4642/5 4643/5 -f 4642/5 4644/5 4643/5 -f 4643/5 4644/5 4645/5 -f 4644/5 4646/5 4645/5 -f 4645/5 4646/5 4647/5 -f 4646/5 4648/5 4647/5 -f 4647/5 4648/5 4649/5 -f 4648/5 4650/5 4649/5 -f 4649/5 4650/5 4651/5 -f 4650/5 4652/5 4651/5 -f 4651/5 4652/5 4653/5 -f 4652/5 4654/5 4653/5 -f 4653/5 4654/5 4655/5 -f 4654/5 4656/5 4655/5 -f 4655/5 4656/5 4657/5 -f 4656/5 4658/5 4657/5 -f 4657/5 4658/5 4659/5 -f 4658/5 4660/5 4659/5 -f 4659/5 4660/5 4661/5 -f 4660/5 4662/5 4661/5 -f 4661/5 4662/5 4663/5 -f 4607/5 4609/5 4664/5 -f 4664/5 4609/5 4665/5 -f 4664/5 4665/5 4666/5 -f 4666/5 4665/5 4667/5 -f 4666/5 4667/5 4668/5 -f 4668/5 4667/5 4669/5 -f 4668/5 4669/5 4670/5 -f 4670/5 4669/5 4671/5 -f 4670/5 4671/5 4672/5 -f 4672/5 4671/5 4673/5 -f 4672/5 4673/5 4674/5 -f 4674/5 4673/5 4675/5 -f 4674/5 4675/5 4676/5 -f 4676/5 4675/5 4677/5 -f 4676/5 4677/5 4678/5 -f 4678/5 4677/5 4679/5 -f 4678/5 4679/5 4680/5 -f 4680/5 4679/5 4148/5 -f 4680/5 4148/5 4147/5 -f 4681/5 4682/5 4683/5 -f 4683/5 4682/5 4684/5 -f 4683/5 4684/5 4685/5 -f 4683/5 4685/5 4686/5 -f 4686/5 4685/5 4687/5 -f 4686/5 4687/5 4688/5 -f 4688/5 4687/5 4689/5 -f 4688/5 4689/5 4690/5 -f 4690/5 4689/5 4691/5 -f 4690/5 4691/5 4692/5 -f 4692/5 4691/5 4693/5 -f 4692/5 4693/5 4694/5 -f 4694/5 4693/5 4695/5 -f 4694/5 4695/5 4696/5 -f 4696/5 4695/5 4697/5 -f 4696/5 4697/5 4698/5 -f 4698/5 4697/5 4699/5 -f 4698/5 4699/5 4700/5 -f 4700/5 4699/5 4701/5 -f 4700/5 4701/5 4702/5 -f 4702/5 4701/5 4703/5 -f 4702/5 4703/5 4704/5 -f 4704/5 4703/5 4705/5 -f 4704/5 4705/5 4706/5 -f 4706/5 4705/5 4707/5 -f 4706/5 4707/5 4708/5 -f 4708/5 4707/5 4709/5 -f 4708/5 4709/5 4710/5 -f 4710/5 4709/5 4711/5 -f 4710/5 4711/5 4712/5 -f 4712/5 4711/5 4713/5 -f 4712/5 4713/5 4714/5 -f 4714/5 4713/5 4715/5 -f 4714/5 4715/5 4716/5 -f 4716/5 4715/5 4717/5 -f 4716/5 4717/5 4718/5 -f 4718/5 4717/5 4719/5 -f 4718/5 4719/5 4720/5 -f 4720/5 4719/5 4721/5 -f 4720/5 4721/5 4722/5 -f 4722/5 4721/5 4723/5 -f 4722/5 4723/5 4724/5 -f 4724/5 4723/5 4725/5 -f 4724/5 4725/5 4726/5 -f 4726/5 4725/5 4727/5 -f 4726/5 4727/5 4728/5 -f 4728/5 4727/5 4729/5 -f 4728/5 4729/5 4730/5 -f 4730/5 4729/5 4731/5 -f 4730/5 4731/5 4732/5 -f 4732/5 4731/5 4733/5 -f 4732/5 4733/5 4734/5 -f 4732/5 4734/5 4735/5 -f 4735/5 4734/5 4736/5 -f 4735/5 4736/5 4737/5 -f 4737/5 4736/5 4738/5 -f 4737/5 4738/5 4739/5 -f 4739/5 4738/5 4740/5 -f 4739/5 4740/5 4741/5 -f 4741/5 4740/5 4742/5 -f 4741/5 4742/5 4743/5 -f 4743/5 4742/5 4744/5 -f 4743/5 4744/5 4745/5 -f 4745/5 4744/5 4746/5 -f 4745/5 4746/5 4747/5 -f 4745/5 4747/5 4748/5 -f 4748/5 4747/5 4749/5 -f 4748/5 4749/5 4750/5 -f 4750/5 4749/5 4751/5 -f 4750/5 4751/5 4752/5 -f 4752/5 4751/5 4753/5 -f 4752/5 4753/5 4754/5 -f 4754/5 4753/5 4755/5 -f 4754/5 4755/5 4756/5 -f 4756/5 4755/5 4757/5 -f 4756/5 4757/5 4758/5 -f 4758/5 4757/5 4759/5 -f 4758/5 4759/5 4760/5 -f 4760/5 4759/5 4761/5 -f 4760/5 4761/5 4762/5 -f 4762/5 4761/5 4763/5 -f 4762/5 4763/5 4764/5 -f 4764/5 4763/5 4765/5 -f 4764/5 4765/5 4766/5 -f 4766/5 4765/5 4767/5 -f 4766/5 4767/5 4768/5 -f 4768/5 4767/5 4769/5 -f 4768/5 4769/5 4770/5 -f 4770/5 4769/5 4771/5 -f 4770/5 4771/5 4772/5 -f 4772/5 4771/5 4773/5 -f 4772/5 4773/5 4774/5 -f 4774/5 4773/5 4775/5 -f 4774/5 4775/5 4776/5 -f 4776/5 4775/5 4777/5 -f 4776/5 4777/5 4778/5 -f 4778/5 4777/5 4440/5 -f 4778/5 4440/5 4441/5 -f 4779/5 4780/5 4735/5 -f 4735/5 4780/5 4732/5 -f 4580/5 4579/5 4781/5 -f 4781/5 4579/5 4782/5 -f 4781/5 4782/5 4783/5 -f 4781/5 4783/5 4784/5 -f 4784/5 4783/5 4785/5 -f 4784/5 4785/5 4786/5 -f 4786/5 4785/5 4787/5 -f 4786/5 4787/5 4788/5 -f 4788/5 4787/5 4789/5 -f 4788/5 4789/5 4790/5 -f 4790/5 4789/5 4791/5 -f 4790/5 4791/5 4792/5 -f 4792/5 4791/5 4793/5 -f 4792/5 4793/5 4794/5 -f 4794/5 4793/5 4795/5 -f 4794/5 4795/5 4796/5 -f 4796/5 4795/5 4797/5 -f 4796/5 4797/5 4798/5 -f 4798/5 4797/5 4799/5 -f 4798/5 4799/5 4800/5 -f 4800/5 4799/5 4801/5 -f 4800/5 4801/5 4802/5 -f 4802/5 4801/5 4803/5 -f 4802/5 4803/5 4804/5 -f 4804/5 4803/5 4805/5 -f 4804/5 4805/5 4806/5 -f 4806/5 4805/5 4807/5 -f 4806/5 4807/5 4808/5 -f 4808/5 4807/5 4809/5 -f 4808/5 4809/5 4810/5 -f 4810/5 4809/5 4811/5 -f 4810/5 4811/5 4812/5 -f 4812/5 4811/5 4813/5 -f 4812/5 4813/5 4814/5 -f 4814/5 4813/5 4815/5 -f 4814/5 4815/5 4816/5 -f 4816/5 4815/5 4817/5 -f 4816/5 4817/5 4818/5 -f 4818/5 4817/5 4819/5 -f 4818/5 4819/5 4820/5 -f 4820/5 4819/5 4821/5 -f 4820/5 4821/5 4822/5 -f 4822/5 4821/5 4823/5 -f 4822/5 4823/5 4824/5 -f 4824/5 4823/5 4825/5 -f 4824/5 4825/5 4826/5 -f 4826/5 4825/5 4827/5 -f 4826/5 4827/5 4828/5 -f 4828/5 4827/5 4829/5 -f 4828/5 4829/5 4830/5 -f 4830/5 4829/5 4831/5 -f 4830/5 4831/5 4832/5 -f 4832/5 4831/5 4833/5 -f 4832/5 4833/5 4834/5 -f 4834/5 4833/5 4835/5 -f 4834/5 4835/5 4836/5 -f 4836/5 4835/5 4837/5 -f 4836/5 4837/5 4838/5 -f 4838/5 4837/5 4839/5 -f 4838/5 4839/5 4840/5 -f 4840/5 4839/5 4841/5 -f 4840/5 4841/5 4842/5 -f 4842/5 4841/5 3888/5 -f 4841/5 3876/5 3888/5 -f 4843/5 4844/5 4845/5 -f 4845/5 4844/5 4846/5 -f 4845/5 4846/5 4847/5 -f 4845/5 4847/5 4848/5 -f 4848/5 4847/5 4849/5 -f 4848/5 4849/5 4850/5 -f 4850/5 4849/5 4851/5 -f 4850/5 4851/5 4852/5 -f 4852/5 4851/5 4853/5 -f 4852/5 4853/5 4854/5 -f 4854/5 4853/5 4855/5 -f 4853/5 4856/5 4855/5 -f 4855/5 4856/5 4857/5 -f 4855/5 4857/5 4858/5 -f 4858/5 4857/5 4859/5 -f 4858/5 4859/5 4860/5 -f 4860/5 4859/5 4861/5 -f 4860/5 4861/5 4862/5 -f 4862/5 4861/5 4863/5 -f 4862/5 4863/5 4864/5 -f 4864/5 4863/5 4865/5 -f 4863/5 4866/5 4865/5 -f 4865/5 4866/5 4867/5 -f 4865/5 4867/5 4868/5 -f 4868/5 4867/5 4869/5 -f 4868/5 4869/5 4870/5 -f 4870/5 4869/5 4871/5 -f 4870/5 4871/5 4872/5 -f 4872/5 4871/5 4873/5 -f 4872/5 4873/5 4874/5 -f 4874/5 4873/5 4875/5 -f 4873/5 4876/5 4875/5 -f 4875/5 4876/5 4877/5 -f 4876/5 4878/5 4877/5 -f 4877/5 4878/5 4879/5 -f 4877/5 4879/5 4880/5 -f 4880/5 4879/5 4881/5 -f 4880/5 4881/5 4882/5 -f 4882/5 4881/5 4883/5 -f 4882/5 4883/5 4884/5 -f 4884/5 4883/5 4885/5 -f 4884/5 4885/5 4886/5 -f 4886/5 4885/5 4887/5 -f 4885/5 4888/5 4887/5 -f 4887/5 4888/5 4889/5 -f 4887/5 4889/5 4890/5 -f 4890/5 4889/5 4891/5 -f 4890/5 4891/5 4892/5 -f 4892/5 4891/5 4893/5 -f 4892/5 4893/5 4894/5 -f 4894/5 4893/5 4895/5 -f 4894/5 4895/5 4896/5 -f 4896/5 4895/5 4897/5 -f 4895/5 4898/5 4897/5 -f 4897/5 4898/5 4899/5 -f 4897/5 4899/5 4900/5 -f 4900/5 4899/5 4901/5 -f 4900/5 4901/5 4902/5 -f 4902/5 4901/5 4903/5 -f 4902/5 4903/5 4904/5 -f 4904/5 4903/5 4905/5 -f 4904/5 4905/5 4906/5 -f 4906/5 4905/5 4907/5 -f 4905/5 4908/5 4907/5 -f 4909/5 4910/5 4911/5 -f 4911/5 4910/5 4912/5 -f 4911/5 4912/5 4913/5 -f 4911/5 4913/5 4914/5 -f 4914/5 4913/5 4915/5 -f 4914/5 4915/5 4916/5 -f 4916/5 4915/5 4917/5 -f 4916/5 4917/5 4918/5 -f 4918/5 4917/5 4919/5 -f 4918/5 4919/5 4920/5 -f 4920/5 4919/5 4921/5 -f 4919/5 4922/5 4921/5 -f 4921/5 4922/5 4923/5 -f 4921/5 4923/5 4924/5 -f 4924/5 4923/5 4925/5 -f 4924/5 4925/5 4926/5 -f 4926/5 4925/5 4927/5 -f 4926/5 4927/5 4928/5 -f 4928/5 4927/5 4929/5 -f 4928/5 4929/5 4930/5 -f 4930/5 4929/5 4931/5 -f 4929/5 4932/5 4931/5 -f 4931/5 4932/5 4933/5 -f 4931/5 4933/5 4934/5 -f 4934/5 4933/5 4935/5 -f 4934/5 4935/5 4936/5 -f 4936/5 4935/5 4937/5 -f 4936/5 4937/5 4938/5 -f 4938/5 4937/5 4939/5 -f 4938/5 4939/5 4940/5 -f 4940/5 4939/5 4941/5 -f 4939/5 4942/5 4941/5 -f 4941/5 4942/5 4943/5 -f 4942/5 4944/5 4943/5 -f 4943/5 4944/5 4945/5 -f 4943/5 4945/5 4946/5 -f 4946/5 4945/5 4947/5 -f 4946/5 4947/5 4948/5 -f 4948/5 4947/5 4949/5 -f 4948/5 4949/5 4950/5 -f 4950/5 4949/5 4951/5 -f 4950/5 4951/5 4952/5 -f 4952/5 4951/5 4953/5 -f 4951/5 4954/5 4953/5 -f 4953/5 4954/5 4955/5 -f 4953/5 4955/5 4956/5 -f 4956/5 4955/5 4957/5 -f 4956/5 4957/5 4958/5 -f 4958/5 4957/5 4959/5 -f 4958/5 4959/5 4960/5 -f 4960/5 4959/5 4961/5 -f 4960/5 4961/5 4962/5 -f 4962/5 4961/5 4963/5 -f 4961/5 4964/5 4963/5 -f 4963/5 4964/5 4965/5 -f 4963/5 4965/5 4966/5 -f 4966/5 4965/5 4967/5 -f 4966/5 4967/5 4968/5 -f 4968/5 4967/5 4969/5 -f 4968/5 4969/5 4970/5 -f 4970/5 4969/5 4971/5 -f 4970/5 4971/5 4972/5 -f 4972/5 4971/5 4973/5 -f 4971/5 4974/5 4973/5 -f 4975/5 4976/5 4977/5 -f 4977/5 4976/5 4978/5 -f 4977/5 4978/5 4979/5 -f 4979/5 4980/5 4977/5 -f 4977/5 4980/5 4981/5 -f 4977/5 4981/5 4982/5 -f 4982/5 4983/5 4977/5 -f 4977/5 4983/5 4984/5 -f 4977/5 4984/5 4985/5 -f 4985/5 4986/5 4977/5 -f 4977/5 4986/5 4987/5 -f 4977/5 4987/5 4988/5 -f 4988/5 4989/5 4977/5 -f 4977/5 4989/5 4990/5 -f 4977/5 4990/5 4991/5 -f 4991/5 4992/5 4977/5 -f 4977/5 4992/5 4993/5 -f 4977/5 4993/5 4994/5 -f 4994/5 4995/5 4977/5 -f 4977/5 4995/5 4996/5 -f 4977/5 4996/5 4997/5 -f 4997/5 4998/5 4977/5 -f 4977/5 4998/5 4999/5 -f 4977/5 4999/5 5000/5 -f 5000/5 5001/5 4977/5 -f 4977/5 5001/5 5002/5 -f 4977/5 5002/5 5003/5 -f 5003/5 5004/5 4977/5 -f 4977/5 5004/5 5005/5 -f 4977/5 5005/5 5006/5 -f 5006/5 5007/5 4977/5 -f 4977/5 5007/5 5008/5 -f 5008/5 5007/5 5009/5 -f 5009/5 5007/5 5010/5 -f 5009/5 5010/5 5011/5 -f 5012/5 5013/5 5011/5 -f 5011/5 5013/5 5014/5 -f 5011/5 5014/5 5009/5 -f 5012/5 5015/5 5013/5 -f 5013/5 5015/5 5016/5 -f 5013/5 5016/5 5017/5 -f 5017/5 5018/5 5013/5 -f 5013/5 5018/5 5019/5 -f 5013/5 5019/5 5020/5 -f 5020/5 5021/5 5013/5 -f 5013/5 5021/5 5022/5 -f 5013/5 5022/5 5023/5 -f 5023/5 5024/5 5013/5 -f 5013/5 5024/5 5025/5 -f 5013/5 5025/5 5026/5 -f 5026/5 5027/5 5013/5 -f 5013/5 5027/5 5028/5 -f 5013/5 5028/5 5029/5 -f 5029/5 5030/5 5013/5 -f 5013/5 5030/5 5031/5 -f 5013/5 5031/5 5032/5 -f 5032/5 5033/5 5013/5 -f 5013/5 5033/5 5034/5 -f 5013/5 5034/5 5035/5 -f 5035/5 5036/5 5013/5 -f 5013/5 5036/5 5037/5 -f 5013/5 5037/5 5038/5 -f 5038/5 5039/5 5013/5 -f 5013/5 5039/5 5040/5 -f 5013/5 5040/5 5041/5 -f 5041/5 5042/5 5013/5 -f 5013/5 5042/5 5043/5 -f 5013/5 5043/5 5044/5 -f 4844/5 4843/5 5045/5 -f 5045/5 4843/5 5046/5 -f 5045/5 5046/5 5047/5 -f 5048/5 5049/5 5050/5 -f 5050/5 5049/5 5051/5 -f 5050/5 5051/5 5052/5 -f 5052/5 5051/5 5053/5 -f 5052/5 5053/5 5054/5 -f 5054/5 5053/5 5055/5 -f 5054/5 5055/5 5056/5 -f 5056/5 5055/5 5057/5 -f 5056/5 5057/5 5058/5 -f 5058/5 5057/5 5059/5 -f 5058/5 5059/5 5060/5 -f 5060/5 5059/5 5061/5 -f 5060/5 5061/5 5062/5 -f 5062/5 5061/5 5063/5 -f 5062/5 5063/5 5047/5 -f 5047/5 5063/5 5064/5 -f 5047/5 5064/5 5045/5 -f 5048/5 5065/5 5049/5 -f 5049/5 5065/5 5066/5 -f 5065/5 5067/5 5066/5 -f 5066/5 5067/5 5068/5 -f 5067/5 5069/5 5068/5 -f 5068/5 5069/5 5070/5 -f 5069/5 5071/5 5070/5 -f 5070/5 5071/5 5072/5 -f 5071/5 5073/5 5072/5 -f 5072/5 5073/5 5074/5 -f 5073/5 5075/5 5074/5 -f 5074/5 5075/5 5076/5 -f 5075/5 5077/5 5076/5 -f 5076/5 5077/5 5078/5 -f 5077/5 5079/5 5078/5 -f 5078/5 5079/5 5080/5 -f 5079/5 4910/5 5080/5 -f 5080/5 4910/5 4909/5 -f 5081/5 5082/5 5083/5 -f 5083/5 5082/5 5084/5 -f 5083/5 5084/5 5085/5 -f 5085/5 5086/5 5083/5 -f 5083/5 5086/5 5087/5 -f 5083/5 5087/5 5088/5 -f 5088/5 5089/5 5083/5 -f 5083/5 5089/5 5090/5 -f 5083/5 5090/5 5091/5 -f 5091/5 5092/5 5083/5 -f 5083/5 5092/5 5093/5 -f 5083/5 5093/5 5094/5 -f 5094/5 5095/5 5083/5 -f 5083/5 5095/5 5096/5 -f 5083/5 5096/5 5097/5 -f 5097/5 5098/5 5083/5 -f 5083/5 5098/5 5099/5 -f 5083/5 5099/5 5100/5 -f 5100/5 5101/5 5083/5 -f 5083/5 5101/5 5102/5 -f 5083/5 5102/5 5103/5 -f 5103/5 5104/5 5083/5 -f 5083/5 5104/5 5105/5 -f 5083/5 5105/5 5106/5 -f 5106/5 5107/5 5083/5 -f 5083/5 5107/5 5108/5 -f 5083/5 5108/5 5109/5 -f 5109/5 5110/5 5083/5 -f 5083/5 5110/5 5111/5 -f 5083/5 5111/5 5112/5 -f 5112/5 5113/5 5083/5 -f 5083/5 5113/5 5114/5 -f 5114/5 5113/5 5115/5 -f 5115/5 5113/5 5116/5 -f 5115/5 5116/5 5117/5 -f 5118/5 5119/5 5117/5 -f 5117/5 5119/5 5120/5 -f 5117/5 5120/5 5115/5 -f 5118/5 5121/5 5119/5 -f 5119/5 5121/5 5122/5 -f 5119/5 5122/5 5123/5 -f 5123/5 5124/5 5119/5 -f 5119/5 5124/5 5125/5 -f 5119/5 5125/5 5126/5 -f 5126/5 5127/5 5119/5 -f 5119/5 5127/5 5128/5 -f 5119/5 5128/5 5129/5 -f 5129/5 5130/5 5119/5 -f 5119/5 5130/5 5131/5 -f 5119/5 5131/5 5132/5 -f 5132/5 5133/5 5119/5 -f 5119/5 5133/5 5134/5 -f 5119/5 5134/5 5135/5 -f 5135/5 5136/5 5119/5 -f 5119/5 5136/5 5137/5 -f 5119/5 5137/5 5138/5 -f 5138/5 5139/5 5119/5 -f 5119/5 5139/5 5140/5 -f 5119/5 5140/5 5141/5 -f 5141/5 5142/5 5119/5 -f 5119/5 5142/5 5143/5 -f 5119/5 5143/5 5144/5 -f 5144/5 5145/5 5119/5 -f 5119/5 5145/5 5146/5 -f 5119/5 5146/5 5147/5 -f 5147/5 5148/5 5119/5 -f 5119/5 5148/5 5149/5 -f 5119/5 5149/5 5150/5 -f 4907/5 4908/5 5151/5 -f 5151/5 4908/5 5152/5 -f 5151/5 5152/5 5153/5 -f 5153/5 5152/5 5154/5 -f 5155/5 5156/5 5157/5 -f 5157/5 5156/5 5158/5 -f 5157/5 5158/5 5159/5 -f 5155/5 5160/5 5156/5 -f 5156/5 5160/5 5161/5 -f 5156/5 5161/5 5162/5 -f 5162/5 5163/5 5156/5 -f 5156/5 5163/5 5164/5 -f 5156/5 5164/5 5165/5 -f 5165/5 5166/5 5156/5 -f 5156/5 5166/5 5167/5 -f 5156/5 5167/5 5168/5 -f 5168/5 5169/5 5156/5 -f 5156/5 5169/5 5170/5 -f 5156/5 5170/5 5171/5 -f 5171/5 5172/5 5156/5 -f 5156/5 5172/5 5173/5 -f 5156/5 5173/5 5174/5 -f 5174/5 5175/5 5156/5 -f 5156/5 5175/5 5176/5 -f 5156/5 5176/5 5177/5 -f 5177/5 5178/5 5156/5 -f 5156/5 5178/5 5179/5 -f 5156/5 5179/5 5180/5 -f 5180/5 5181/5 5156/5 -f 5156/5 5181/5 5182/5 -f 5156/5 5182/5 5183/5 -f 5183/5 5184/5 5156/5 -f 5156/5 5184/5 5185/5 -f 5156/5 5185/5 5186/5 -f 5186/5 5187/5 5156/5 -f 5156/5 5187/5 5188/5 -f 5156/5 5188/5 5189/5 -f 5190/5 5191/5 5159/5 -f 5159/5 5191/5 5192/5 -f 5159/5 5192/5 5157/5 -f 5190/5 5193/5 5191/5 -f 5191/5 5193/5 5194/5 -f 5195/5 5196/5 5193/5 -f 5193/5 5196/5 5197/5 -f 5193/5 5197/5 5198/5 -f 5198/5 5199/5 5193/5 -f 5193/5 5199/5 5200/5 -f 5193/5 5200/5 5201/5 -f 5201/5 5202/5 5193/5 -f 5193/5 5202/5 5203/5 -f 5193/5 5203/5 5204/5 -f 5204/5 5205/5 5193/5 -f 5193/5 5205/5 5206/5 -f 5193/5 5206/5 5207/5 -f 5207/5 5208/5 5193/5 -f 5193/5 5208/5 5209/5 -f 5193/5 5209/5 5210/5 -f 5210/5 5211/5 5193/5 -f 5193/5 5211/5 5212/5 -f 5193/5 5212/5 5213/5 -f 5213/5 5214/5 5193/5 -f 5193/5 5214/5 5215/5 -f 5193/5 5215/5 5216/5 -f 5216/5 5217/5 5193/5 -f 5193/5 5217/5 5218/5 -f 5193/5 5218/5 5219/5 -f 5219/5 5220/5 5193/5 -f 5193/5 5220/5 5221/5 -f 5193/5 5221/5 5222/5 -f 5222/5 5223/5 5193/5 -f 5193/5 5223/5 5224/5 -f 5193/5 5224/5 5194/5 -f 5225/5 5226/5 5227/5 -f 5227/5 5226/5 5228/5 -f 5227/5 5228/5 5229/5 -f 5226/5 5230/5 5228/5 -f 5227/5 5229/5 5231/5 -f 5231/5 5229/5 5232/5 -f 5231/5 5232/5 5233/5 -f 5233/5 5232/5 5234/5 -f 5233/5 5234/5 5235/5 -f 5235/5 5234/5 5236/5 -f 5235/5 5236/5 5237/5 -f 5237/5 5236/5 5238/5 -f 5237/5 5238/5 5239/5 -f 5239/5 5238/5 5240/5 -f 5239/5 5240/5 5241/5 -f 5241/5 5240/5 5159/5 -f 5241/5 5159/5 5158/5 -f 5240/5 5190/5 5159/5 -f 5242/5 5230/5 5243/5 -f 5243/5 5230/5 5226/5 -f 5243/5 5226/5 5244/5 -f 5244/5 5226/5 5225/5 -f 5242/5 5243/5 5245/5 -f 5245/5 5243/5 5246/5 -f 5245/5 5246/5 5247/5 -f 5243/5 5244/5 5246/5 -f 5245/5 5247/5 5248/5 -f 5248/5 5247/5 5249/5 -f 5248/5 5249/5 5250/5 -f 5250/5 5249/5 5251/5 -f 5250/5 5251/5 5252/5 -f 5252/5 5251/5 5253/5 -f 5252/5 5253/5 5254/5 -f 5254/5 5253/5 5255/5 -f 5254/5 5255/5 5256/5 -f 5256/5 5255/5 5257/5 -f 5256/5 5257/5 5258/5 -f 5258/5 5257/5 5115/5 -f 5258/5 5115/5 5120/5 -f 5257/5 5114/5 5115/5 -f 4974/5 5259/5 4973/5 -f 4973/5 5259/5 5260/5 -f 5259/5 5261/5 5260/5 -f 5260/5 5261/5 5262/5 -f 5263/5 5264/5 5265/5 -f 5265/5 5264/5 5266/5 -f 5265/5 5266/5 5267/5 -f 5263/5 5268/5 5264/5 -f 5264/5 5268/5 5269/5 -f 5264/5 5269/5 5270/5 -f 5270/5 5271/5 5264/5 -f 5264/5 5271/5 5272/5 -f 5264/5 5272/5 5273/5 -f 5273/5 5274/5 5264/5 -f 5264/5 5274/5 5275/5 -f 5264/5 5275/5 5276/5 -f 5276/5 5277/5 5264/5 -f 5264/5 5277/5 5278/5 -f 5264/5 5278/5 5279/5 -f 5279/5 5280/5 5264/5 -f 5264/5 5280/5 5281/5 -f 5264/5 5281/5 5282/5 -f 5282/5 5283/5 5264/5 -f 5264/5 5283/5 5284/5 -f 5264/5 5284/5 5285/5 -f 5285/5 5286/5 5264/5 -f 5264/5 5286/5 5287/5 -f 5264/5 5287/5 5288/5 -f 5288/5 5289/5 5264/5 -f 5264/5 5289/5 5290/5 -f 5264/5 5290/5 5291/5 -f 5291/5 5292/5 5264/5 -f 5264/5 5292/5 5293/5 -f 5264/5 5293/5 5294/5 -f 5294/5 5295/5 5264/5 -f 5264/5 5295/5 5296/5 -f 5264/5 5296/5 5297/5 -f 5298/5 5299/5 5267/5 -f 5267/5 5299/5 5300/5 -f 5267/5 5300/5 5265/5 -f 5298/5 5301/5 5299/5 -f 5299/5 5301/5 5302/5 -f 5303/5 5304/5 5301/5 -f 5301/5 5304/5 5305/5 -f 5301/5 5305/5 5306/5 -f 5306/5 5307/5 5301/5 -f 5301/5 5307/5 5308/5 -f 5301/5 5308/5 5309/5 -f 5309/5 5310/5 5301/5 -f 5301/5 5310/5 5311/5 -f 5301/5 5311/5 5312/5 -f 5312/5 5313/5 5301/5 -f 5301/5 5313/5 5314/5 -f 5301/5 5314/5 5315/5 -f 5315/5 5316/5 5301/5 -f 5301/5 5316/5 5317/5 -f 5301/5 5317/5 5318/5 -f 5318/5 5319/5 5301/5 -f 5301/5 5319/5 5320/5 -f 5301/5 5320/5 5321/5 -f 5321/5 5322/5 5301/5 -f 5301/5 5322/5 5323/5 -f 5301/5 5323/5 5324/5 -f 5324/5 5325/5 5301/5 -f 5301/5 5325/5 5326/5 -f 5301/5 5326/5 5327/5 -f 5327/5 5328/5 5301/5 -f 5301/5 5328/5 5329/5 -f 5301/5 5329/5 5330/5 -f 5330/5 5331/5 5301/5 -f 5301/5 5331/5 5332/5 -f 5301/5 5332/5 5302/5 -f 5333/5 5334/5 5335/5 -f 5335/5 5334/5 5336/5 -f 5335/5 5336/5 5337/5 -f 5334/5 5338/5 5336/5 -f 5336/5 5338/5 5339/5 -f 5338/5 5340/5 5339/5 -f 5339/5 5340/5 5341/5 -f 5340/5 5342/5 5341/5 -f 5341/5 5342/5 5343/5 -f 5342/5 5344/5 5343/5 -f 5343/5 5344/5 5345/5 -f 5344/5 5346/5 5345/5 -f 5345/5 5346/5 5347/5 -f 5346/5 5348/5 5347/5 -f 5347/5 5348/5 5349/5 -f 5298/5 5267/5 5348/5 -f 5348/5 5267/5 5349/5 -f 5267/5 5266/5 5349/5 -f 5337/5 5350/5 5335/5 -f 5335/5 5350/5 5351/5 -f 5335/5 5351/5 5333/5 -f 5333/5 5351/5 5352/5 -f 5352/5 5351/5 5353/5 -f 5353/5 5351/5 5354/5 -f 5353/5 5354/5 5355/5 -f 5351/5 5350/5 5354/5 -f 5353/5 5355/5 5356/5 -f 5356/5 5355/5 5357/5 -f 5356/5 5357/5 5358/5 -f 5358/5 5357/5 5359/5 -f 5358/5 5359/5 5360/5 -f 5360/5 5359/5 5361/5 -f 5360/5 5361/5 5362/5 -f 5362/5 5361/5 5363/5 -f 5362/5 5363/5 5364/5 -f 5364/5 5363/5 5365/5 -f 5364/5 5365/5 5366/5 -f 5366/5 5365/5 5009/5 -f 5366/5 5009/5 5014/5 -f 5365/5 5008/5 5009/5 -f 5367/5 5368/5 5369/5 -f 5369/5 5368/5 5370/5 -f 5368/5 5371/5 5370/5 -f 5370/5 5371/5 5372/5 -f 5373/5 5374/5 5375/5 -f 5375/5 5374/5 5376/5 -f 5375/5 5376/5 5377/5 -f 5375/5 5377/5 5378/5 -f 5378/5 5377/5 5379/5 -f 5378/5 5379/5 5380/5 -f 5380/5 5379/5 5381/5 -f 5380/5 5381/5 5382/5 -f 5382/5 5381/5 5383/5 -f 5382/5 5383/5 5384/5 -f 5384/5 5383/5 5385/5 -f 5383/5 5386/5 5385/5 -f 5385/5 5386/5 5387/5 -f 5385/5 5387/5 5388/5 -f 5388/5 5387/5 5389/5 -f 5388/5 5389/5 5390/5 -f 5390/5 5389/5 5391/5 -f 5390/5 5391/5 5392/5 -f 5392/5 5391/5 5393/5 -f 5392/5 5393/5 5394/5 -f 5394/5 5393/5 5395/5 -f 5393/5 5396/5 5395/5 -f 5395/5 5396/5 5397/5 -f 5395/5 5397/5 5398/5 -f 5398/5 5397/5 5399/5 -f 5398/5 5399/5 5400/5 -f 5400/5 5399/5 5401/5 -f 5400/5 5401/5 5402/5 -f 5402/5 5401/5 5403/5 -f 5402/5 5403/5 5404/5 -f 5404/5 5403/5 5405/5 -f 5403/5 5406/5 5405/5 -f 5405/5 5406/5 5407/5 -f 5406/5 5408/5 5407/5 -f 5407/5 5408/5 5409/5 -f 5407/5 5409/5 5410/5 -f 5410/5 5409/5 5411/5 -f 5410/5 5411/5 5412/5 -f 5412/5 5411/5 5413/5 -f 5412/5 5413/5 5414/5 -f 5414/5 5413/5 5415/5 -f 5414/5 5415/5 5416/5 -f 5416/5 5415/5 5417/5 -f 5415/5 5418/5 5417/5 -f 5417/5 5418/5 5419/5 -f 5417/5 5419/5 5420/5 -f 5420/5 5419/5 5421/5 -f 5420/5 5421/5 5422/5 -f 5422/5 5421/5 5423/5 -f 5422/5 5423/5 5424/5 -f 5424/5 5423/5 5425/5 -f 5424/5 5425/5 5426/5 -f 5426/5 5425/5 5427/5 -f 5425/5 5428/5 5427/5 -f 5427/5 5428/5 5429/5 -f 5427/5 5429/5 5430/5 -f 5430/5 5429/5 5431/5 -f 5430/5 5431/5 5432/5 -f 5432/5 5431/5 5433/5 -f 5432/5 5433/5 5434/5 -f 5434/5 5433/5 5435/5 -f 5434/5 5435/5 5436/5 -f 5436/5 5435/5 5261/5 -f 5435/5 5262/5 5261/5 -f 5153/5 5154/5 5437/5 -f 5437/5 5154/5 5438/5 -f 5437/5 5438/5 5439/5 -f 5437/5 5439/5 5440/5 -f 5440/5 5439/5 5441/5 -f 5440/5 5441/5 5442/5 -f 5442/5 5441/5 5443/5 -f 5442/5 5443/5 5444/5 -f 5444/5 5443/5 5445/5 -f 5444/5 5445/5 5446/5 -f 5446/5 5445/5 5447/5 -f 5445/5 5448/5 5447/5 -f 5447/5 5448/5 5449/5 -f 5447/5 5449/5 5450/5 -f 5450/5 5449/5 5451/5 -f 5450/5 5451/5 5452/5 -f 5452/5 5451/5 5453/5 -f 5452/5 5453/5 5454/5 -f 5454/5 5453/5 5455/5 -f 5454/5 5455/5 5456/5 -f 5456/5 5455/5 5457/5 -f 5455/5 5458/5 5457/5 -f 5457/5 5458/5 5459/5 -f 5457/5 5459/5 5460/5 -f 5460/5 5459/5 5461/5 -f 5460/5 5461/5 5462/5 -f 5462/5 5461/5 5463/5 -f 5462/5 5463/5 5464/5 -f 5464/5 5463/5 5465/5 -f 5464/5 5465/5 5466/5 -f 5466/5 5465/5 5467/5 -f 5465/5 5468/5 5467/5 -f 5467/5 5468/5 5469/5 -f 5468/5 5470/5 5469/5 -f 5469/5 5470/5 5471/5 -f 5469/5 5471/5 5472/5 -f 5472/5 5471/5 5473/5 -f 5472/5 5473/5 5474/5 -f 5474/5 5473/5 5475/5 -f 5474/5 5475/5 5476/5 -f 5476/5 5475/5 5477/5 -f 5476/5 5477/5 5478/5 -f 5478/5 5477/5 5479/5 -f 5477/5 5480/5 5479/5 -f 5479/5 5480/5 5481/5 -f 5479/5 5481/5 5482/5 -f 5482/5 5481/5 5483/5 -f 5482/5 5483/5 5484/5 -f 5484/5 5483/5 5485/5 -f 5484/5 5485/5 5486/5 -f 5486/5 5485/5 5487/5 -f 5486/5 5487/5 5488/5 -f 5488/5 5487/5 5489/5 -f 5487/5 5490/5 5489/5 -f 5489/5 5490/5 5491/5 -f 5489/5 5491/5 5492/5 -f 5492/5 5491/5 5493/5 -f 5492/5 5493/5 5494/5 -f 5494/5 5493/5 5495/5 -f 5494/5 5495/5 5496/5 -f 5496/5 5495/5 5497/5 -f 5496/5 5497/5 5498/5 -f 5498/5 5497/5 5499/5 -f 5497/5 5500/5 5499/5 -f 5501/5 5502/5 5503/5 -f 5503/5 5502/5 5504/5 -f 5503/5 5504/5 5505/5 -f 5503/5 5505/5 5506/5 -f 5506/5 5505/5 5507/5 -f 5506/5 5507/5 5508/5 -f 5508/5 5507/5 5509/5 -f 5508/5 5509/5 5510/5 -f 5510/5 5509/5 5511/5 -f 5510/5 5511/5 5512/5 -f 5512/5 5511/5 5513/5 -f 5511/5 5514/5 5513/5 -f 5513/5 5514/5 5515/5 -f 5513/5 5515/5 5516/5 -f 5516/5 5515/5 5517/5 -f 5516/5 5517/5 5518/5 -f 5518/5 5517/5 5519/5 -f 5518/5 5519/5 5520/5 -f 5520/5 5519/5 5521/5 -f 5520/5 5521/5 5522/5 -f 5522/5 5521/5 5523/5 -f 5521/5 5524/5 5523/5 -f 5523/5 5524/5 5525/5 -f 5523/5 5525/5 5526/5 -f 5526/5 5525/5 5527/5 -f 5526/5 5527/5 5528/5 -f 5528/5 5527/5 5529/5 -f 5528/5 5529/5 5530/5 -f 5530/5 5529/5 5531/5 -f 5530/5 5531/5 5532/5 -f 5532/5 5531/5 5533/5 -f 5531/5 5534/5 5533/5 -f 5533/5 5534/5 5535/5 -f 5534/5 5536/5 5535/5 -f 5535/5 5536/5 5537/5 -f 5535/5 5537/5 5538/5 -f 5538/5 5537/5 5539/5 -f 5538/5 5539/5 5540/5 -f 5540/5 5539/5 5541/5 -f 5540/5 5541/5 5542/5 -f 5542/5 5541/5 5543/5 -f 5542/5 5543/5 5544/5 -f 5544/5 5543/5 5545/5 -f 5543/5 5546/5 5545/5 -f 5545/5 5546/5 5547/5 -f 5545/5 5547/5 5548/5 -f 5548/5 5547/5 5549/5 -f 5548/5 5549/5 5550/5 -f 5550/5 5549/5 5551/5 -f 5550/5 5551/5 5552/5 -f 5552/5 5551/5 5553/5 -f 5552/5 5553/5 5554/5 -f 5554/5 5553/5 5555/5 -f 5553/5 5556/5 5555/5 -f 5555/5 5556/5 5557/5 -f 5555/5 5557/5 5558/5 -f 5558/5 5557/5 5559/5 -f 5558/5 5559/5 5560/5 -f 5560/5 5559/5 5561/5 -f 5560/5 5561/5 5562/5 -f 5562/5 5561/5 5563/5 -f 5562/5 5563/5 5564/5 -f 5564/5 5563/5 5369/5 -f 5563/5 5367/5 5369/5 -f 5565/5 5566/5 5567/5 -f 5567/5 5566/5 5568/5 -f 5567/5 5568/5 5569/5 -f 5567/5 5569/5 5570/5 -f 5570/5 5569/5 5571/5 -f 5570/5 5571/5 5572/5 -f 5572/5 5571/5 5573/5 -f 5572/5 5573/5 5574/5 -f 5574/5 5573/5 5575/5 -f 5574/5 5575/5 5576/5 -f 5576/5 5575/5 5577/5 -f 5576/5 5577/5 5578/5 -f 5578/5 5577/5 5579/5 -f 5578/5 5579/5 5580/5 -f 5580/5 5579/5 5581/5 -f 5580/5 5581/5 5582/5 -f 5582/5 5581/5 5583/5 -f 5582/5 5583/5 5584/5 -f 5584/5 5583/5 5585/5 -f 5584/5 5585/5 5586/5 -f 5586/5 5585/5 5587/5 -f 5586/5 5587/5 5588/5 -f 5588/5 5587/5 5589/5 -f 5588/5 5589/5 5590/5 -f 5590/5 5589/5 5591/5 -f 5590/5 5591/5 5592/5 -f 5592/5 5591/5 5593/5 -f 5592/5 5593/5 5594/5 -f 5594/5 5593/5 5595/5 -f 5594/5 5595/5 5596/5 -f 5596/5 5595/5 5597/5 -f 5596/5 5597/5 5598/5 -f 5598/5 5597/5 5599/5 -f 5598/5 5599/5 5600/5 -f 5600/5 5599/5 5601/5 -f 5600/5 5601/5 5602/5 -f 5602/5 5601/5 5603/5 -f 5602/5 5603/5 5604/5 -f 5604/5 5603/5 5605/5 -f 5604/5 5605/5 5606/5 -f 5606/5 5605/5 5607/5 -f 5606/5 5607/5 5608/5 -f 5608/5 5607/5 5609/5 -f 5608/5 5609/5 5610/5 -f 5610/5 5609/5 5611/5 -f 5610/5 5611/5 5612/5 -f 5612/5 5611/5 5613/5 -f 5612/5 5613/5 5614/5 -f 5614/5 5613/5 5615/5 -f 5614/5 5615/5 5616/5 -f 5616/5 5615/5 5617/5 -f 5616/5 5617/5 5618/5 -f 5618/5 5617/5 5619/5 -f 5618/5 5619/5 5620/5 -f 5620/5 5619/5 5621/5 -f 5620/5 5621/5 5622/5 -f 5622/5 5621/5 5623/5 -f 5622/5 5623/5 5624/5 -f 5624/5 5623/5 5625/5 -f 5624/5 5625/5 5626/5 -f 5626/5 5625/5 5627/5 -f 5626/5 5627/5 5628/5 -f 5628/5 5627/5 5352/5 -f 5627/5 5333/5 5352/5 -f 5629/5 5566/5 5630/5 -f 5630/5 5566/5 5565/5 -f 5630/5 5565/5 5631/5 -f 5632/5 5633/5 5634/5 -f 5634/5 5633/5 5635/5 -f 5634/5 5635/5 5636/5 -f 5635/5 5633/5 5637/5 -f 5637/5 5633/5 5638/5 -f 5637/5 5638/5 5639/5 -f 5637/5 5639/5 5640/5 -f 5640/5 5639/5 5641/5 -f 5640/5 5641/5 5642/5 -f 5642/5 5641/5 5643/5 -f 5642/5 5643/5 5644/5 -f 5644/5 5643/5 5645/5 -f 5644/5 5645/5 5646/5 -f 5646/5 5645/5 5647/5 -f 5645/5 5648/5 5647/5 -f 5647/5 5648/5 5649/5 -f 5647/5 5649/5 5650/5 -f 5650/5 5649/5 5651/5 -f 5650/5 5651/5 5652/5 -f 5652/5 5651/5 5653/5 -f 5651/5 5654/5 5653/5 -f 5653/5 5654/5 5655/5 -f 5653/5 5655/5 5656/5 -f 5656/5 5655/5 5657/5 -f 5655/5 5658/5 5657/5 -f 5657/5 5658/5 5659/5 -f 5657/5 5659/5 5660/5 -f 5660/5 5659/5 5661/5 -f 5660/5 5661/5 5662/5 -f 5662/5 5661/5 5663/5 -f 5662/5 5663/5 5664/5 -f 5664/5 5663/5 5630/5 -f 5664/5 5630/5 5631/5 -f 5663/5 5629/5 5630/5 -f 5665/5 5632/5 5666/5 -f 5666/5 5632/5 5634/5 -f 5666/5 5634/5 5667/5 -f 5667/5 5634/5 5668/5 -f 5634/5 5636/5 5668/5 -f 5668/5 5636/5 5669/5 -f 5668/5 5669/5 5670/5 -f 5670/5 5671/5 5668/5 -f 5668/5 5671/5 5672/5 -f 5668/5 5672/5 5673/5 -f 5673/5 5674/5 5668/5 -f 5668/5 5674/5 5675/5 -f 5668/5 5675/5 5676/5 -f 5676/5 5677/5 5668/5 -f 5668/5 5677/5 5678/5 -f 5668/5 5678/5 5679/5 -f 5679/5 5680/5 5668/5 -f 5668/5 5680/5 5681/5 -f 5668/5 5681/5 5682/5 -f 5682/5 5683/5 5668/5 -f 5668/5 5683/5 5684/5 -f 5668/5 5684/5 5685/5 -f 5685/5 5686/5 5668/5 -f 5668/5 5686/5 5687/5 -f 5668/5 5687/5 5688/5 -f 5688/5 5689/5 5668/5 -f 5668/5 5689/5 5690/5 -f 5668/5 5690/5 5691/5 -f 5691/5 5692/5 5668/5 -f 5668/5 5692/5 5693/5 -f 5668/5 5693/5 5694/5 -f 5694/5 5695/5 5668/5 -f 5668/5 5695/5 5696/5 -f 5668/5 5696/5 5697/5 -f 5697/5 5698/5 5668/5 -f 5668/5 5698/5 5699/5 -f 5668/5 5699/5 5700/5 -f 5701/5 5702/5 5666/5 -f 5666/5 5702/5 5703/5 -f 5666/5 5703/5 5704/5 -f 5704/5 5705/5 5666/5 -f 5666/5 5705/5 5706/5 -f 5666/5 5706/5 5707/5 -f 5707/5 5708/5 5666/5 -f 5666/5 5708/5 5709/5 -f 5666/5 5709/5 5710/5 -f 5710/5 5711/5 5666/5 -f 5666/5 5711/5 5712/5 -f 5666/5 5712/5 5713/5 -f 5713/5 5714/5 5666/5 -f 5666/5 5714/5 5715/5 -f 5666/5 5715/5 5716/5 -f 5716/5 5717/5 5666/5 -f 5666/5 5717/5 5718/5 -f 5666/5 5718/5 5719/5 -f 5719/5 5720/5 5666/5 -f 5666/5 5720/5 5721/5 -f 5666/5 5721/5 5722/5 -f 5722/5 5723/5 5666/5 -f 5666/5 5723/5 5724/5 -f 5666/5 5724/5 5725/5 -f 5725/5 5726/5 5666/5 -f 5666/5 5726/5 5727/5 -f 5666/5 5727/5 5728/5 -f 5728/5 5729/5 5666/5 -f 5666/5 5729/5 5730/5 -f 5666/5 5730/5 5731/5 -f 5731/5 5665/5 5666/5 -f 5372/5 5371/5 5732/5 -f 5732/5 5371/5 5733/5 -f 5732/5 5733/5 5734/5 -f 5732/5 5734/5 5735/5 -f 5735/5 5734/5 5736/5 -f 5735/5 5736/5 5737/5 -f 5737/5 5736/5 5738/5 -f 5737/5 5738/5 5739/5 -f 5739/5 5738/5 5740/5 -f 5739/5 5740/5 5741/5 -f 5741/5 5740/5 5742/5 -f 5740/5 5743/5 5742/5 -f 5742/5 5743/5 5744/5 -f 5742/5 5744/5 5745/5 -f 5745/5 5744/5 5746/5 -f 5745/5 5746/5 5747/5 -f 5747/5 5746/5 5748/5 -f 5747/5 5748/5 5749/5 -f 5749/5 5748/5 5750/5 -f 5749/5 5750/5 5751/5 -f 5751/5 5750/5 5752/5 -f 5750/5 5753/5 5752/5 -f 5752/5 5753/5 5754/5 -f 5752/5 5754/5 5755/5 -f 5755/5 5754/5 5756/5 -f 5755/5 5756/5 5757/5 -f 5757/5 5756/5 5758/5 -f 5757/5 5758/5 5759/5 -f 5759/5 5758/5 5760/5 -f 5759/5 5760/5 5761/5 -f 5761/5 5760/5 5762/5 -f 5760/5 5763/5 5762/5 -f 5762/5 5763/5 5764/5 -f 5763/5 5765/5 5764/5 -f 5764/5 5765/5 5766/5 -f 5764/5 5766/5 5767/5 -f 5767/5 5766/5 5768/5 -f 5767/5 5768/5 5769/5 -f 5769/5 5768/5 5770/5 -f 5769/5 5770/5 5771/5 -f 5771/5 5770/5 5772/5 -f 5771/5 5772/5 5773/5 -f 5773/5 5772/5 5774/5 -f 5772/5 5775/5 5774/5 -f 5774/5 5775/5 5776/5 -f 5774/5 5776/5 5777/5 -f 5777/5 5776/5 5778/5 -f 5777/5 5778/5 5779/5 -f 5779/5 5778/5 5780/5 -f 5779/5 5780/5 5781/5 -f 5781/5 5780/5 5782/5 -f 5781/5 5782/5 5783/5 -f 5783/5 5782/5 5784/5 -f 5782/5 5785/5 5784/5 -f 5784/5 5785/5 5786/5 -f 5784/5 5786/5 5787/5 -f 5787/5 5786/5 5788/5 -f 5787/5 5788/5 5789/5 -f 5789/5 5788/5 5790/5 -f 5789/5 5790/5 5791/5 -f 5791/5 5790/5 5792/5 -f 5791/5 5792/5 5793/5 -f 5793/5 5792/5 5794/5 -f 5792/5 5795/5 5794/5 -f 5796/5 5797/5 5798/5 -f 5798/5 5797/5 5799/5 -f 5798/5 5799/5 5800/5 -f 5800/5 5799/5 5801/5 -f 5800/5 5801/5 5802/5 -f 5802/5 5801/5 5803/5 -f 5802/5 5803/5 5804/5 -f 5805/5 5806/5 5798/5 -f 5798/5 5806/5 5807/5 -f 5798/5 5807/5 5808/5 -f 5808/5 5809/5 5798/5 -f 5798/5 5809/5 5810/5 -f 5798/5 5810/5 5811/5 -f 5811/5 5812/5 5798/5 -f 5798/5 5812/5 5813/5 -f 5798/5 5813/5 5814/5 -f 5814/5 5815/5 5798/5 -f 5798/5 5815/5 5816/5 -f 5798/5 5816/5 5817/5 -f 5817/5 5818/5 5798/5 -f 5798/5 5818/5 5819/5 -f 5798/5 5819/5 5820/5 -f 5820/5 5821/5 5798/5 -f 5798/5 5821/5 5822/5 -f 5798/5 5822/5 5823/5 -f 5823/5 5824/5 5798/5 -f 5798/5 5824/5 5825/5 -f 5798/5 5825/5 5826/5 -f 5826/5 5827/5 5798/5 -f 5798/5 5827/5 5828/5 -f 5798/5 5828/5 5829/5 -f 5829/5 5830/5 5798/5 -f 5798/5 5830/5 5831/5 -f 5798/5 5831/5 5832/5 -f 5832/5 5833/5 5798/5 -f 5798/5 5833/5 5834/5 -f 5798/5 5834/5 5796/5 -f 5804/5 5835/5 5802/5 -f 5802/5 5835/5 5836/5 -f 5802/5 5836/5 5837/5 -f 5837/5 5838/5 5802/5 -f 5802/5 5838/5 5839/5 -f 5802/5 5839/5 5840/5 -f 5840/5 5841/5 5802/5 -f 5802/5 5841/5 5842/5 -f 5802/5 5842/5 5843/5 -f 5843/5 5844/5 5802/5 -f 5802/5 5844/5 5845/5 -f 5802/5 5845/5 5846/5 -f 5846/5 5847/5 5802/5 -f 5802/5 5847/5 5848/5 -f 5802/5 5848/5 5849/5 -f 5849/5 5850/5 5802/5 -f 5802/5 5850/5 5851/5 -f 5802/5 5851/5 5852/5 -f 5852/5 5853/5 5802/5 -f 5802/5 5853/5 5854/5 -f 5802/5 5854/5 5855/5 -f 5855/5 5856/5 5802/5 -f 5802/5 5856/5 5857/5 -f 5802/5 5857/5 5858/5 -f 5858/5 5859/5 5802/5 -f 5802/5 5859/5 5860/5 -f 5802/5 5860/5 5861/5 -f 5861/5 5862/5 5802/5 -f 5802/5 5862/5 5863/5 -f 5802/5 5863/5 5864/5 -f 5799/5 5865/5 5801/5 -f 5801/5 5865/5 5866/5 -f 5866/5 5865/5 5867/5 -f 5867/5 5865/5 5868/5 -f 5867/5 5868/5 5869/5 -f 5867/5 5869/5 5870/5 -f 5870/5 5869/5 5871/5 -f 5870/5 5871/5 5872/5 -f 5872/5 5871/5 5873/5 -f 5872/5 5873/5 5874/5 -f 5874/5 5873/5 5875/5 -f 5874/5 5875/5 5876/5 -f 5876/5 5875/5 5877/5 -f 5875/5 5878/5 5877/5 -f 5877/5 5878/5 5879/5 -f 5877/5 5879/5 5880/5 -f 5880/5 5879/5 5881/5 -f 5880/5 5881/5 5882/5 -f 5882/5 5881/5 5883/5 -f 5881/5 5884/5 5883/5 -f 5883/5 5884/5 5885/5 -f 5883/5 5885/5 5886/5 -f 5886/5 5885/5 5887/5 -f 5885/5 5888/5 5887/5 -f 5887/5 5888/5 5889/5 -f 5887/5 5889/5 5890/5 -f 5890/5 5889/5 5891/5 -f 5890/5 5891/5 5892/5 -f 5892/5 5891/5 5893/5 -f 5892/5 5893/5 5894/5 -f 5894/5 5893/5 5895/5 -f 5894/5 5895/5 5896/5 -f 5374/5 5897/5 5898/5 -f 5898/5 5897/5 5899/5 -f 5898/5 5899/5 5900/5 -f 5900/5 5899/5 5901/5 -f 5900/5 5901/5 5902/5 -f 5902/5 5901/5 5903/5 -f 5902/5 5903/5 5904/5 -f 5904/5 5903/5 5905/5 -f 5904/5 5905/5 5906/5 -f 5906/5 5905/5 5907/5 -f 5906/5 5907/5 5908/5 -f 5908/5 5907/5 5909/5 -f 5908/5 5909/5 5910/5 -f 5910/5 5909/5 5911/5 -f 5910/5 5911/5 5912/5 -f 5912/5 5911/5 5913/5 -f 5912/5 5913/5 5914/5 -f 5374/5 5373/5 5897/5 -f 5915/5 5916/5 5917/5 -f 5917/5 5916/5 5918/5 -f 5917/5 5918/5 5919/5 -f 5917/5 5919/5 5920/5 -f 5920/5 5919/5 5921/5 -f 5920/5 5921/5 5922/5 -f 5922/5 5921/5 5923/5 -f 5922/5 5923/5 5924/5 -f 5924/5 5923/5 5925/5 -f 5924/5 5925/5 5926/5 -f 5926/5 5925/5 5927/5 -f 5926/5 5927/5 5928/5 -f 5928/5 5927/5 5929/5 -f 5928/5 5929/5 5930/5 -f 5930/5 5929/5 5931/5 -f 5929/5 5932/5 5931/5 -f 5931/5 5932/5 5499/5 -f 5931/5 5499/5 5500/5 -f 5895/5 5933/5 5896/5 -f 5896/5 5933/5 5934/5 -f 5935/5 5936/5 5937/5 -f 5937/5 5936/5 5938/5 -f 5937/5 5938/5 5939/5 -f 5939/5 5938/5 5940/5 -f 5939/5 5940/5 5941/5 -f 5941/5 5940/5 5942/5 -f 5941/5 5942/5 5943/5 -f 5943/5 5942/5 5944/5 -f 5943/5 5944/5 5945/5 -f 5945/5 5944/5 5946/5 -f 5945/5 5946/5 5947/5 -f 5947/5 5946/5 5948/5 -f 5947/5 5948/5 5949/5 -f 5949/5 5948/5 5950/5 -f 5949/5 5950/5 5951/5 -f 5951/5 5950/5 5952/5 -f 5951/5 5952/5 5953/5 -f 5953/5 5952/5 5954/5 -f 5953/5 5954/5 5955/5 -f 5955/5 5954/5 5956/5 -f 5955/5 5956/5 5957/5 -f 5957/5 5956/5 5958/5 -f 5957/5 5958/5 5959/5 -f 5959/5 5958/5 5960/5 -f 5959/5 5960/5 5961/5 -f 5961/5 5960/5 5962/5 -f 5961/5 5962/5 5963/5 -f 5935/5 5964/5 5936/5 -f 5936/5 5964/5 5965/5 -f 5964/5 5966/5 5965/5 -f 5965/5 5966/5 5967/5 -f 5966/5 5968/5 5967/5 -f 5967/5 5968/5 5969/5 -f 5968/5 5970/5 5969/5 -f 5969/5 5970/5 5971/5 -f 5970/5 5972/5 5971/5 -f 5971/5 5972/5 5973/5 -f 5972/5 5974/5 5973/5 -f 5973/5 5974/5 5975/5 -f 5974/5 5976/5 5975/5 -f 5975/5 5976/5 5977/5 -f 5976/5 5978/5 5977/5 -f 5977/5 5978/5 5979/5 -f 5978/5 5980/5 5979/5 -f 5979/5 5980/5 5981/5 -f 5980/5 5982/5 5981/5 -f 5981/5 5982/5 5983/5 -f 5982/5 5984/5 5983/5 -f 5983/5 5984/5 5985/5 -f 5984/5 5986/5 5985/5 -f 5985/5 5986/5 5987/5 -f 5986/5 5988/5 5987/5 -f 5987/5 5988/5 5989/5 -f 5988/5 5990/5 5989/5 -f 5989/5 5990/5 5991/5 -f 5990/5 5992/5 5991/5 -f 5991/5 5992/5 5993/5 -f 5992/5 5994/5 5993/5 -f 5993/5 5994/5 5995/5 -f 5994/5 5996/5 5995/5 -f 5995/5 5996/5 5997/5 -f 5996/5 5998/5 5997/5 -f 5997/5 5998/5 5999/5 -f 5998/5 6000/5 5999/5 -f 5999/5 6000/5 6001/5 -f 6000/5 6002/5 6001/5 -f 6001/5 6002/5 6003/5 -f 6002/5 6004/5 6003/5 -f 6003/5 6004/5 6005/5 -f 6004/5 6006/5 6005/5 -f 6005/5 6006/5 6007/5 -f 6006/5 6008/5 6007/5 -f 6007/5 6008/5 6009/5 -f 6008/5 6010/5 6009/5 -f 6009/5 6010/5 6011/5 -f 6010/5 6012/5 6011/5 -f 6011/5 6012/5 6013/5 -f 6012/5 6014/5 6013/5 -f 6013/5 6014/5 6015/5 -f 6014/5 6016/5 6015/5 -f 6015/5 6016/5 6017/5 -f 5961/5 5963/5 6018/5 -f 6018/5 5963/5 6019/5 -f 6018/5 6019/5 6020/5 -f 6020/5 6019/5 6021/5 -f 6020/5 6021/5 6022/5 -f 6022/5 6021/5 6023/5 -f 6022/5 6023/5 6024/5 -f 6024/5 6023/5 6025/5 -f 6024/5 6025/5 6026/5 -f 6026/5 6025/5 6027/5 -f 6026/5 6027/5 6028/5 -f 6028/5 6027/5 6029/5 -f 6028/5 6029/5 6030/5 -f 6030/5 6029/5 6031/5 -f 6030/5 6031/5 6032/5 -f 6032/5 6031/5 6033/5 -f 6032/5 6033/5 6034/5 -f 6034/5 6033/5 5502/5 -f 6034/5 5502/5 5501/5 -f 6035/5 6036/5 6037/5 -f 6037/5 6036/5 6038/5 -f 6037/5 6038/5 6039/5 -f 6037/5 6039/5 6040/5 -f 6040/5 6039/5 6041/5 -f 6040/5 6041/5 6042/5 -f 6042/5 6041/5 6043/5 -f 6042/5 6043/5 6044/5 -f 6044/5 6043/5 6045/5 -f 6044/5 6045/5 6046/5 -f 6046/5 6045/5 6047/5 -f 6046/5 6047/5 6048/5 -f 6048/5 6047/5 6049/5 -f 6048/5 6049/5 6050/5 -f 6050/5 6049/5 6051/5 -f 6050/5 6051/5 6052/5 -f 6052/5 6051/5 6053/5 -f 6052/5 6053/5 6054/5 -f 6054/5 6053/5 6055/5 -f 6054/5 6055/5 6056/5 -f 6056/5 6055/5 6057/5 -f 6056/5 6057/5 6058/5 -f 6058/5 6057/5 6059/5 -f 6058/5 6059/5 6060/5 -f 6060/5 6059/5 6061/5 -f 6060/5 6061/5 6062/5 -f 6062/5 6061/5 6063/5 -f 6062/5 6063/5 6064/5 -f 6064/5 6063/5 6065/5 -f 6064/5 6065/5 6066/5 -f 6066/5 6065/5 6067/5 -f 6066/5 6067/5 6068/5 -f 6068/5 6067/5 6069/5 -f 6068/5 6069/5 6070/5 -f 6070/5 6069/5 6071/5 -f 6070/5 6071/5 6072/5 -f 6072/5 6071/5 6073/5 -f 6072/5 6073/5 6074/5 -f 6074/5 6073/5 6075/5 -f 6074/5 6075/5 6076/5 -f 6076/5 6075/5 6077/5 -f 6076/5 6077/5 6078/5 -f 6078/5 6077/5 6079/5 -f 6078/5 6079/5 6080/5 -f 6080/5 6079/5 6081/5 -f 6080/5 6081/5 6082/5 -f 6082/5 6081/5 6083/5 -f 6082/5 6083/5 6084/5 -f 6084/5 6083/5 6085/5 -f 6084/5 6085/5 6086/5 -f 6086/5 6085/5 6087/5 -f 6086/5 6087/5 6088/5 -f 6086/5 6088/5 6089/5 -f 6089/5 6088/5 6090/5 -f 6089/5 6090/5 6091/5 -f 6091/5 6090/5 6092/5 -f 6091/5 6092/5 6093/5 -f 6093/5 6092/5 6094/5 -f 6093/5 6094/5 6095/5 -f 6095/5 6094/5 6096/5 -f 6095/5 6096/5 6097/5 -f 6097/5 6096/5 6098/5 -f 6097/5 6098/5 6099/5 -f 6099/5 6098/5 6100/5 -f 6099/5 6100/5 6101/5 -f 6099/5 6101/5 6102/5 -f 6102/5 6101/5 6103/5 -f 6102/5 6103/5 6104/5 -f 6104/5 6103/5 6105/5 -f 6104/5 6105/5 6106/5 -f 6106/5 6105/5 6107/5 -f 6106/5 6107/5 6108/5 -f 6108/5 6107/5 6109/5 -f 6108/5 6109/5 6110/5 -f 6110/5 6109/5 6111/5 -f 6110/5 6111/5 6112/5 -f 6112/5 6111/5 6113/5 -f 6112/5 6113/5 6114/5 -f 6114/5 6113/5 6115/5 -f 6114/5 6115/5 6116/5 -f 6116/5 6115/5 6117/5 -f 6116/5 6117/5 6118/5 -f 6118/5 6117/5 6119/5 -f 6118/5 6119/5 6120/5 -f 6120/5 6119/5 6121/5 -f 6120/5 6121/5 6122/5 -f 6122/5 6121/5 6123/5 -f 6122/5 6123/5 6124/5 -f 6124/5 6123/5 6125/5 -f 6124/5 6125/5 6126/5 -f 6126/5 6125/5 6127/5 -f 6126/5 6127/5 6128/5 -f 6128/5 6127/5 6129/5 -f 6128/5 6129/5 6130/5 -f 6130/5 6129/5 6131/5 -f 6130/5 6131/5 6132/5 -f 6132/5 6131/5 5794/5 -f 6132/5 5794/5 5795/5 -f 6133/5 6134/5 6089/5 -f 6089/5 6134/5 6086/5 -f 5934/5 5933/5 6135/5 -f 6135/5 5933/5 6136/5 -f 6135/5 6136/5 6137/5 -f 6135/5 6137/5 6138/5 -f 6138/5 6137/5 6139/5 -f 6138/5 6139/5 6140/5 -f 6140/5 6139/5 6141/5 -f 6140/5 6141/5 6142/5 -f 6142/5 6141/5 6143/5 -f 6142/5 6143/5 6144/5 -f 6144/5 6143/5 6145/5 -f 6144/5 6145/5 6146/5 -f 6146/5 6145/5 6147/5 -f 6146/5 6147/5 6148/5 -f 6148/5 6147/5 6149/5 -f 6148/5 6149/5 6150/5 -f 6150/5 6149/5 6151/5 -f 6150/5 6151/5 6152/5 -f 6152/5 6151/5 6153/5 -f 6152/5 6153/5 6154/5 -f 6154/5 6153/5 6155/5 -f 6154/5 6155/5 6156/5 -f 6156/5 6155/5 6157/5 -f 6156/5 6157/5 6158/5 -f 6158/5 6157/5 6159/5 -f 6158/5 6159/5 6160/5 -f 6160/5 6159/5 6161/5 -f 6160/5 6161/5 6162/5 -f 6162/5 6161/5 6163/5 -f 6162/5 6163/5 6164/5 -f 6164/5 6163/5 6165/5 -f 6164/5 6165/5 6166/5 -f 6166/5 6165/5 6167/5 -f 6166/5 6167/5 6168/5 -f 6168/5 6167/5 6169/5 -f 6168/5 6169/5 6170/5 -f 6170/5 6169/5 6171/5 -f 6170/5 6171/5 6172/5 -f 6172/5 6171/5 6173/5 -f 6172/5 6173/5 6174/5 -f 6174/5 6173/5 6175/5 -f 6174/5 6175/5 6176/5 -f 6176/5 6175/5 6177/5 -f 6176/5 6177/5 6178/5 -f 6178/5 6177/5 6179/5 -f 6178/5 6179/5 6180/5 -f 6180/5 6179/5 6181/5 -f 6180/5 6181/5 6182/5 -f 6182/5 6181/5 6183/5 -f 6182/5 6183/5 6184/5 -f 6184/5 6183/5 6185/5 -f 6184/5 6185/5 6186/5 -f 6186/5 6185/5 6187/5 -f 6186/5 6187/5 6188/5 -f 6188/5 6187/5 6189/5 -f 6188/5 6189/5 6190/5 -f 6190/5 6189/5 6191/5 -f 6190/5 6191/5 6192/5 -f 6192/5 6191/5 6193/5 -f 6192/5 6193/5 6194/5 -f 6194/5 6193/5 6195/5 -f 6194/5 6195/5 6196/5 -f 6196/5 6195/5 5242/5 -f 6195/5 5230/5 5242/5 \ No newline at end of file diff --git a/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg deleted file mode 100644 index 17de71876a..0000000000 --- a/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -definition = ultimaker_sketch -name = Fast -version = 4 - -[metadata] -material = generic_pla_175 -quality_type = draft -setting_version = 23 -type = quality -weight = -2 - -[values] - diff --git a/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg deleted file mode 100644 index 444ad58aab..0000000000 --- a/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -definition = ultimaker_sketch -name = Fast -version = 4 - -[metadata] -material = generic_tough_pla_175 -quality_type = draft -setting_version = 23 -type = quality -weight = -2 - -[values] - diff --git a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg deleted file mode 100644 index 26ab646015..0000000000 --- a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = ultimaker_sketch -name = 0.4mm -version = 4 - -[metadata] -hardware_type = nozzle -reference_extruder_id = sketch_extruder -setting_version = 23 -type = variant - -[values] -machine_nozzle_id = 0.4mm -machine_nozzle_size = 0.4 - From 0675ec43be7b1ceb51cf2b12f5b842cc3989a952 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 21 Jun 2024 09:14:51 +0200 Subject: [PATCH 27/84] Remove Sketch machine for Cura 5.8 release. PP-333 --- .../um_sketch_global_Draft_Quality.inst.cfg | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg diff --git a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg deleted file mode 100644 index 01222c6f9d..0000000000 --- a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = ultimaker_sketch -name = Fast -version = 4 - -[metadata] -global_quality = True -quality_type = draft -setting_version = 23 -type = quality -weight = -2 - -[values] -layer_height = 0.2 - From 675c2caaba9dd9a36c71c93be13909dd5bd10279 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 11:33:07 +0200 Subject: [PATCH 28/84] Default layer start position to machine_extruder start position CURA-11937 --- resources/definitions/fdmprinter.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a124145314..ef0631ac36 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,6 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "machine_extruder_start_pos_x", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4384,6 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "machine_extruder_start_pos_y", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, From 539cd8b306a15a491273ad5bae22eb358c24da53 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 13:48:37 +0200 Subject: [PATCH 29/84] Replace "first" by "initial" in setting label and description CURA-11947 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3ea1ba7ac6..bcfa2f2229 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5129,8 +5129,8 @@ }, "support_infill_density_multiplier_layer_0": { - "label": "Support Infill Density Multiplier First Layer", - "description": "Multiplier for the infill on the first layers of the support. Increasing this may help for bed adhesion.", + "label": "Support Infill Density Multiplier Initial Layer", + "description": "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion.", "type": "int", "minimum_value": "1", "default_value": 1, From 9ae9debfc3efcd61100c9b8ea16e41ab77e9575c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 16:55:28 +0200 Subject: [PATCH 30/84] Rename setting from layer_0 to initial CURA-11947 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index bcfa2f2229..4ef0bdd8fa 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5127,7 +5127,7 @@ } } }, - "support_infill_density_multiplier_layer_0": + "support_infill_density_multiplier_initial_layer": { "label": "Support Infill Density Multiplier Initial Layer", "description": "Multiplier for the infill on the initial layers of the support. Increasing this may help for bed adhesion.", From 0d805df7110f8f043aa997980fd70948b7a0fd25 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 17:09:51 +0200 Subject: [PATCH 31/84] Set layer_start_x/y to a safer value Also remove all the definitions that had exactly this value as an override. CURA-11947 --- resources/definitions/fdmprinter.def.json | 4 ++-- resources/definitions/strateo3d.def.json | 2 -- resources/definitions/ultimaker3.def.json | 2 -- resources/definitions/ultimaker_factor4.def.json | 2 -- resources/definitions/ultimaker_method_base.def.json | 2 -- resources/definitions/ultimaker_s3.def.json | 2 -- resources/definitions/ultimaker_s5.def.json | 3 +-- resources/definitions/ultimaker_sketch.def.json | 2 -- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ef0631ac36..89dde70354 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,7 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "machine_extruder_start_pos_x", + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4385,7 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "machine_extruder_start_pos_y", + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index f21a13ca86..39ac818e6a 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -157,8 +157,6 @@ "value": "jerk_wall * 5 / 10" }, "jerk_wall_x": { "maximum_value_warning": "0.01" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 1500 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 420 }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 173fbdb524..9b732aa421 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 215 }, "machine_disallowed_areas": diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..3fed9b2388 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -103,8 +103,6 @@ }, "jerk_travel_enabled": { "value": "True" }, "layer_height": { "value": "min(min(extruderValues('machine_nozzle_size')) / 2, 0.2)" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..c5a1f522cb 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -315,8 +315,6 @@ "enabled": false, "value": "jerk_print" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 3750b83553..82776bd62e 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index eb3984510e..42e26225c5 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,8 +74,7 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 05e506c3b6..cac14b07d4 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -208,8 +208,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_sparse_density": { "value": 15 }, "jerk_enabled": { "value": false }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 150 }, "machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" }, From 6b0e492dffd060bb468bdc36fc986f6aaaa90c3b Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Tue, 25 Jun 2024 15:12:08 +0000 Subject: [PATCH 32/84] Applied printer-linter format --- resources/definitions/ultimaker_s5.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 42e26225c5..3c35c84a00 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,7 +74,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, From 853c21dbb23883c9d6bc57e645938dde59e5a5bb Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 25 Jun 2024 18:07:14 +0200 Subject: [PATCH 33/84] Improve self support for Method machines --- .../ultimaker_method_base.def.json | 48 ++++++++++------- .../definitions/ultimaker_methodx.def.json | 17 ++---- .../definitions/ultimaker_methodxl.def.json | 6 --- .../um_methodx_1c_um-abscf-175_0.2mm.inst.cfg | 43 +++++++++++---- .../um_methodx_1c_um-absr-175_0.2mm.inst.cfg | 53 +++++++++++++------ .../um_methodx_1c_um-asa-175_0.2mm.inst.cfg | 51 ++++++++++++------ ...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 35 +++++++----- .../um_methodx_1xa_um-absr-175_0.2mm.inst.cfg | 53 +++++++++++++------ .../um_methodx_1xa_um-asa-175_0.2mm.inst.cfg | 51 ++++++++++++------ ...m_methodx_labs_um-abscf-175_0.2mm.inst.cfg | 43 +++++++++++---- ...um_methodx_labs_um-absr-175_0.2mm.inst.cfg | 53 +++++++++++++------ .../um_methodx_labs_um-asa-175_0.2mm.inst.cfg | 51 ++++++++++++------ ...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 35 +++++++----- ...um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg | 43 +++++++++++---- .../um_methodxl_1c_um-absr-175_0.2mm.inst.cfg | 52 ++++++++++++------ .../um_methodxl_1c_um-asa-175_0.2mm.inst.cfg | 50 +++++++++++------ ...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 35 +++++++----- ...um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg | 52 ++++++++++++------ .../um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg | 50 +++++++++++------ ..._methodxl_labs_um-abscf-175_0.2mm.inst.cfg | 43 +++++++++++---- ...m_methodxl_labs_um-absr-175_0.2mm.inst.cfg | 52 ++++++++++++------ ...um_methodxl_labs_um-asa-175_0.2mm.inst.cfg | 50 +++++++++++------ ...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 35 +++++++----- 23 files changed, 669 insertions(+), 332 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..670f437024 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -23,12 +23,8 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_pc_175", + "generic_", "ultimaker_rapidrinse_175", - "generic_tpu_175", "goofoo_", "ideagen3D_", "imade3d_", @@ -59,13 +55,7 @@ "1": "ultimaker_method_extruder_right" }, "nozzle_offsetting_for_disallowed_areas": false, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", - "preferred_material": "generic_pla_175", + "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "fast", "preferred_variant_name": "1A", "supports_network_connection": true, @@ -207,7 +197,7 @@ "infill_enable_travel_optimization": { "value": true }, "infill_material_flow": { "value": "material_flow" }, "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'lines'" }, + "infill_pattern": { "value": "'grid' if infill_sparse_density < 80 else 'lines'" }, "infill_wipe_dist": { "value": 0 }, "inset_direction": { "value": "'inside_out'" }, "jerk_enabled": @@ -333,10 +323,11 @@ "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_final_print_temperature": { "value": "material_print_temperature-10" }, - "material_flow": { "value": 97 }, + "material_flow": { "value": 100 }, "material_initial_print_temperature": { "value": "material_print_temperature-10" }, "material_print_temperature": { "value": "default_material_print_temperature" }, "material_shrinkage_percentage": { "enabled": true }, + "min_bead_width": { "value": "0.75*line_width" }, "min_wall_line_width": { "value": 0.4 }, "minimum_support_area": { "value": 0.1 }, "multiple_mesh_overlap": { "value": 0 }, @@ -351,19 +342,25 @@ "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, + "raft_base_fan_speed": { "value": 0 }, "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, "raft_base_line_width": { "value": 1.4 }, "raft_base_speed": { "value": 10 }, "raft_base_thickness": { "value": 0.8 }, "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_fan_speed": { "value": 0 }, "raft_interface_layers": { "value": 2 }, "raft_interface_line_width": { "value": 0.7 }, "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, "raft_margin": { "value": 1.2 }, + "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_fan_speed": { "value": 0 }, + "raft_surface_monotonic": { "value": true }, "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, "retraction_combing": { "value": "'off'" }, "retraction_combing_max_distance": { "value": "speed_travel / 10" }, @@ -372,11 +369,15 @@ "retraction_hop": { "value": 0.4 }, "retraction_hop_enabled": { "value": true }, "retraction_hop_only_when_collides": { "value": false }, + "retraction_min_travel": { "value": "0.6 if extruder_nr == support_extruder_nr else 5" }, "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, "roofing_layer_count": { "value": 2 }, + "roofing_material_flow": { "value": "material_flow" }, "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "0.95*material_flow" }, + "skin_material_flow": { "value": "material_flow" }, + "skin_material_flow_layer_0": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, "skin_outline_count": { "value": 0 }, "skin_overlap": { "value": 0 }, "skin_preshrink": { "value": 0 }, @@ -395,25 +396,30 @@ "speed_wall_0": { "value": "speed_wall * 30/40" }, "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_distance": { "value": "layer_height if extruder_nr == support_extruder_nr else 0" }, + "support_bottom_enable": { "value": "false if extruder_nr == support_extruder_nr else true" }, "support_bottom_material_flow": { "value": "material_flow" }, + "support_bottom_wall_count": { "value": "0 if extruder_nr == support_extruder_nr else support_wall_count" }, "support_brim_enable": { "value": false }, "support_conical_min_width": { "value": 10 }, "support_enable": { "value": true }, "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, + "support_fan_enable": { "value": "true if extruder_nr == support_extruder_nr else false" }, "support_infill_rate": { "value": 20.0 }, + "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, + "support_interface_offset": { "value": "1 if extruder_nr == support_extruder_nr else 0" }, "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, + "support_interface_wall_count": { "value": "1 if extruder_nr == support_extruder_nr else 2" }, "support_material_flow": { "value": "material_flow" }, + "support_offset": { "value": "1.8 if extruder_nr == support_extruder_nr else 0.8" }, "support_pattern": { "value": "'lines'" }, + "support_roof_height": { "value": "4*layer_height if extruder_nr == support_extruder_nr else 5*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_z_distance": { "value": 0 }, "switch_extruder_retraction_amount": { "value": 0.5 }, @@ -423,9 +429,11 @@ "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_material_flow_layer_0": { "value": "material_flow" }, "wall_0_wipe_dist": { "value": 0.8 }, "wall_material_flow": { "value": "material_flow" }, "wall_x_material_flow": { "value": "material_flow" }, + "wall_x_material_flow_layer_0": { "value": "material_flow" }, "xy_offset": { "value": 0 }, "xy_offset_layer_0": { "value": "xy_offset" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 9828ba96f2..3f02a30235 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -48,6 +36,8 @@ "polywood_pla", "redd_", "tizyx_", + "ultimaker_pla_175", + "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", @@ -70,7 +60,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", "preferred_quality_type": "draft", "preferred_variant_name": "1XA", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 6c12218b51..098586df68 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -18,12 +18,6 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg index d426353111..a7746bf442 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg @@ -12,31 +12,52 @@ variant = 1C weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 6 +cool_min_layer_time_fan_speed_max = 11 +cool_min_speed = 6 +cool_min_temperature = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_surface_flow = =110 if extruder_nr == support_extruder_nr else 100 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 +raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 speed_roofing = 55 -speed_topbottom = 55 +speed_support = =speed_print +speed_topbottom = 85 speed_travel = 250.0 speed_wall_0 = 45 speed_wall_x = 65 -support_angle = 50 +support_angle = 52 support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True +support_interface_offset = 1.2 support_interface_pattern = lines -support_line_width = 0.3 +support_line_width = 0.35 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 +support_roof_density = 82 support_roof_height = 1.015 support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.25 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.15 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 50 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg index 3272134e2d..d52a19cb97 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg @@ -12,31 +12,54 @@ variant = 1C weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 75 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 8 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = 250 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260 +raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_interface_density = 85 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = 85 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg index f2d399ff3b..e0ad6f46aa 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg @@ -13,38 +13,55 @@ variant = 1C weight = -2 [values] -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) material_print_temperature_layer_0 = =default_material_print_temperature+5 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = 90 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 98.0 +skin_overlap = 10 small_skin_width = 3.6 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 +speed_wall_x = 25 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 78e7b96bc8..f08b71df37 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -14,16 +14,22 @@ weight = -2 [values] cool_fan_enabled = False -material_final_print_temperature = =default_material_print_temperature-5 -material_initial_print_temperature = =default_material_print_temperature-5 -raft_airgap = 0.3 +cool_min_temperature = =material_print_temperature-5 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +min_wall_line_width = 0.35 +raft_airgap = =0.2 if extruder_nr == support_extruder_nr else 0 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = =1 if extruder_nr == support_extruder_nr else 1.2 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_interface_layers = =1 if extruder_nr == support_extruder_nr else 2 +raft_interface_line_spacing = =1 if extruder_nr == support_extruder_nr else 0.9 +raft_surface_layers = =3 if extruder_nr == support_extruder_nr else 2 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 100 small_skin_width = 3.6 speed_prime_tower = 30.0 speed_print = 120.0 @@ -37,17 +43,18 @@ support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False support_infill_rate = 12.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.3 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.35 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 60 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg index eda3730602..a18f008ac7 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg @@ -12,31 +12,54 @@ variant = 1XA weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 75 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 8 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = 250 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260 +raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_interface_density = 85 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = 85 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg index e46ee25b09..675c411f85 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg @@ -13,38 +13,55 @@ variant = 1XA weight = -2 [values] -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) material_print_temperature_layer_0 = =default_material_print_temperature+5 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = 90 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 98.0 +skin_overlap = 10 small_skin_width = 3.6 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 +speed_wall_x = 25 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg index 444d893bc7..a2b0e3b146 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg @@ -12,31 +12,52 @@ variant = LABS weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 6 +cool_min_layer_time_fan_speed_max = 11 +cool_min_speed = 6 +cool_min_temperature = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_surface_flow = =110 if extruder_nr == support_extruder_nr else 100 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 +raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 speed_roofing = 55 -speed_topbottom = 55 +speed_support = =speed_print +speed_topbottom = 85 speed_travel = 250.0 speed_wall_0 = 45 speed_wall_x = 65 -support_angle = 50 +support_angle = 52 support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True +support_interface_offset = 1.2 support_interface_pattern = lines -support_line_width = 0.3 +support_line_width = 0.35 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 +support_roof_density = 82 support_roof_height = 1.015 support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.25 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.15 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 50 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg index d95a017608..e0a3f5e715 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg @@ -12,31 +12,54 @@ variant = LABS weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 75 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 8 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = 250 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260 +raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_interface_density = 85 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = 85 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg index 384f85381c..5316aece19 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg @@ -13,38 +13,55 @@ variant = LABS weight = -2 [values] -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) material_print_temperature_layer_0 = =default_material_print_temperature+5 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = 90 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 98.0 +skin_overlap = 10 small_skin_width = 3.6 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 +speed_wall_x = 25 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index afc790abb4..85f7d7ffb9 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -14,16 +14,22 @@ weight = -2 [values] cool_fan_enabled = False -material_final_print_temperature = =default_material_print_temperature-5 -material_initial_print_temperature = =default_material_print_temperature-5 -raft_airgap = 0.3 +cool_min_temperature = =material_print_temperature-5 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +min_wall_line_width = 0.35 +raft_airgap = =0.2 if extruder_nr == support_extruder_nr else 0 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = =1 if extruder_nr == support_extruder_nr else 1.2 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_interface_layers = =1 if extruder_nr == support_extruder_nr else 2 +raft_interface_line_spacing = =1 if extruder_nr == support_extruder_nr else 0.9 +raft_surface_layers = =3 if extruder_nr == support_extruder_nr else 2 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 100 small_skin_width = 3.6 speed_prime_tower = 30.0 speed_print = 120.0 @@ -37,17 +43,18 @@ support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False support_infill_rate = 12.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.3 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.35 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 60 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg index f142216062..fd323798d9 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg @@ -13,32 +13,53 @@ weight = -2 [values] build_volume_temperature = 85 -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 6 +cool_min_layer_time_fan_speed_max = 11 +cool_min_speed = 6 +cool_min_temperature = 250 default_material_bed_temperature = 95 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_surface_flow = =110 if extruder_nr == support_extruder_nr else 100 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 +raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 speed_roofing = 55 -speed_topbottom = 55 +speed_support = =speed_print +speed_topbottom = 85 speed_travel = 250.0 speed_wall_0 = 45 speed_wall_x = 65 -support_angle = 50 +support_angle = 52 support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True +support_interface_offset = 1.2 support_interface_pattern = lines -support_line_width = 0.3 +support_line_width = 0.35 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 +support_roof_density = 82 support_roof_height = 1.015 support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.25 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.15 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 50 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg index c18441b7cd..8148f54948 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg @@ -12,31 +12,53 @@ variant = 1C weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 75 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 8 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = 250 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260 +raft_airgap = =0.18 if extruder_nr == support_extruder_nr else 0 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_interface_density = 85 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = 85 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg index e8ee70b2b4..e581e2dbd1 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg @@ -13,39 +13,55 @@ variant = 1C weight = -2 [values] -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) material_print_temperature_layer_0 = =default_material_print_temperature+5 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 raft_base_speed = 10 -retract_at_layer_change = True +raft_surface_speed = 90 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 98.0 +skin_overlap = 10 small_skin_width = 3.6 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 500 speed_travel_layer_0 = 250 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 +speed_wall_x = 25 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 5d5f891daf..918a1f0f57 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -14,16 +14,22 @@ weight = -2 [values] cool_fan_enabled = False -material_final_print_temperature = =default_material_print_temperature-5 -material_initial_print_temperature = =default_material_print_temperature-5 -raft_airgap = 0.3 +cool_min_temperature = =material_print_temperature-5 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +min_wall_line_width = 0.35 +raft_airgap = =0.2 if extruder_nr == support_extruder_nr else 0 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = =1 if extruder_nr == support_extruder_nr else 1.2 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_interface_layers = =1 if extruder_nr == support_extruder_nr else 2 +raft_interface_line_spacing = =1 if extruder_nr == support_extruder_nr else 0.9 +raft_surface_layers = =3 if extruder_nr == support_extruder_nr else 2 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 100 small_skin_width = 3.6 speed_prime_tower = 30.0 speed_print = 120.0 @@ -37,17 +43,18 @@ support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False support_infill_rate = 12.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.3 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.35 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 60 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg index ea2a441350..f6b0fce699 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg @@ -12,31 +12,53 @@ variant = 1XA weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 75 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 8 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = 250 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260 +raft_airgap = =0.18 if extruder_nr == support_extruder_nr else 0 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_interface_density = 85 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = 85 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg index acbd50b36e..f84dfcf5f9 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg @@ -13,39 +13,55 @@ variant = 1XA weight = -2 [values] -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) material_print_temperature_layer_0 = =default_material_print_temperature+5 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 raft_base_speed = 10 -retract_at_layer_change = True +raft_surface_speed = 90 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 98.0 +skin_overlap = 10 small_skin_width = 3.6 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 500 speed_travel_layer_0 = 250 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 +speed_wall_x = 25 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg index 77acd4f2b9..524922c316 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg @@ -13,32 +13,53 @@ weight = -2 [values] build_volume_temperature = 85 -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 6 +cool_min_layer_time_fan_speed_max = 11 +cool_min_speed = 6 +cool_min_temperature = 250 default_material_bed_temperature = 95 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_surface_flow = =110 if extruder_nr == support_extruder_nr else 100 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 +raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 speed_roofing = 55 -speed_topbottom = 55 +speed_support = =speed_print +speed_topbottom = 85 speed_travel = 250.0 speed_wall_0 = 45 speed_wall_x = 65 -support_angle = 50 +support_angle = 52 support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True +support_interface_offset = 1.2 support_interface_pattern = lines -support_line_width = 0.3 +support_line_width = 0.35 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 +support_roof_density = 82 support_roof_height = 1.015 support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.25 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.15 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 50 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg index 94895b5fa4..06e3e6a1df 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg @@ -12,31 +12,53 @@ variant = LABS weight = -2 [values] -cool_fan_enabled = False -raft_airgap = 0.3 +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 75 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 8 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = 250 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10) +material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260 +raft_airgap = =0.18 if extruder_nr == support_extruder_nr else 0 +raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +skin_overlap = 10 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 250.0 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_interface_density = 85 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = 85 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg index 0ecfa14554..bb9d380e13 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg @@ -13,39 +13,55 @@ variant = LABS weight = -2 [values] -cool_fan_enabled = False +cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False +cool_fan_full_layer = 3 +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) material_print_temperature_layer_0 = =default_material_print_temperature+5 -raft_airgap = 0.3 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 raft_base_speed = 10 -retract_at_layer_change = True +raft_surface_speed = 90 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 98.0 +skin_overlap = 10 small_skin_width = 3.6 +speed_layer_0 = 35 speed_prime_tower = 30.0 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = 65 +speed_support = 100 +speed_support_interface = 75 speed_topbottom = 55 speed_travel = 500 speed_travel_layer_0 = 250 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_wall = 25 +speed_wall_0 = 20 +speed_wall_x = 25 support_angle = 50 support_bottom_density = 24 -support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False -support_infill_rate = 12.0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 -support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index cc075adf90..255045e168 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -14,16 +14,22 @@ weight = -2 [values] cool_fan_enabled = False -material_final_print_temperature = =default_material_print_temperature-5 -material_initial_print_temperature = =default_material_print_temperature-5 -raft_airgap = 0.3 +cool_min_temperature = =material_print_temperature-5 +material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 5) +min_wall_line_width = 0.35 +raft_airgap = =0.2 if extruder_nr == support_extruder_nr else 0 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = =1 if extruder_nr == support_extruder_nr else 1.2 raft_base_speed = 10 -retract_at_layer_change = True +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_base_wall_count = =2 if extruder_nr == support_extruder_nr else 1 +raft_interface_layers = =1 if extruder_nr == support_extruder_nr else 2 +raft_interface_line_spacing = =1 if extruder_nr == support_extruder_nr else 0.9 +raft_surface_layers = =3 if extruder_nr == support_extruder_nr else 2 +raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 retraction_amount = 0.5 retraction_min_travel = 3.2 -roofing_material_flow = 100 small_skin_width = 3.6 speed_prime_tower = 30.0 speed_print = 120.0 @@ -37,17 +43,18 @@ support_bottom_density = 24 support_bottom_enable = False support_bottom_line_width = 0.6 support_bottom_stair_step_height = 0 -support_fan_enable = False support_infill_rate = 12.0 support_interface_enable = True support_interface_pattern = lines support_line_width = 0.3 +support_material_flow = 90 support_pattern = lines -support_roof_density = 97 -support_roof_height = 1.015 -support_roof_line_width = 0.25 -support_use_towers = False -support_xy_distance = 0.2 -support_xy_distance_overhang = 0.15 -support_z_distance = 0.25 +support_roof_density = 85 +support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25 +support_use_towers = True +support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2 +support_xy_distance_overhang = =0.3 if extruder_nr == support_extruder_nr else 0.15 +support_z_distance = 0.35 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 60 From 79b6794a0bf3ae90ba8a858c0adebdbff01716a1 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 26 Jun 2024 10:50:50 +0200 Subject: [PATCH 34/84] PP-489 adds 0.1C to the heat up speed, reduces time spend at printing temperature without printing. --- resources/definitions/ultimaker_factor4.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..684729f710 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -130,7 +130,7 @@ "machine_min_cool_heat_time_window": { "value": "15" }, "machine_name": { "default_value": "Ultimaker Factor 4" }, "machine_nozzle_cool_down_speed": { "value": "0.3 + 0.0025 * material_print_temperature" }, - "machine_nozzle_heat_up_speed": { "value": "2 - 0.0025 * material_print_temperature" }, + "machine_nozzle_heat_up_speed": { "value": "2.1 - 0.0025 * material_print_temperature" }, "machine_start_gcode": { "default_value": "" }, "machine_width": { "default_value": 330 }, "material_bed_temperature": { "maximum_value": "120" }, From cfaeb2d8fcd432ce3bf682b60d490b180efe55ad Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 26 Jun 2024 13:25:52 +0200 Subject: [PATCH 35/84] Add setting to setup cooling during nozzle switch CURA-11795 --- resources/definitions/fdmprinter.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a124145314..85f8ba3124 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4612,6 +4612,21 @@ "maximum_value": "365", "settable_per_mesh": false, "settable_per_extruder": true + }, + "cool_during_extruder_switch": + { + "label": "Cooling during extruder switch", + "description": "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
  • Unchanged: keep the fans as they were previously
  • Only last extruder: turn on the fan of the last used extruder, but turn the others off. This is useful if you have completely separate extruders.
  • All fans: turn on all fans during nozzle switch. This is useful if you have multiple fans that stay close to each other.
", + "type": "enum", + "options": + { + "unchanged": "Unchanged", + "only_last_extruder": "Only last extruder", + "all_fans": "All fans" + }, + "default_value": "unchanged", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, From 86a829a8b58a18c0f047441729b60a24d8541c6b Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 26 Jun 2024 15:00:18 +0200 Subject: [PATCH 36/84] PP-491 Improves top surface quality --- resources/definitions/ultimaker_factor4.def.json | 1 + .../ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg | 3 ++- .../quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..ca72e05c8f 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -64,6 +64,7 @@ "bridge_skin_material_flow": { "maximum_value": "100" }, "bridge_skin_material_flow_2": { "maximum_value": "100" }, "bridge_skin_material_flow_3": { "maximum_value": "100" }, + "bridge_sparse_infill_max_density": { "value": "50" }, "bridge_wall_material_flow": { "maximum_value": "100" }, "bridge_wall_speed": { "value": "speed_wall" }, "brim_width": { "value": "5" }, diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg index cd3fdba7a1..a35f2d6e10 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -17,5 +17,6 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 inset_direction = outside_in skin_material_flow = =material_flow * 0.93 -speed_print = 60 +speed_print = 80 +wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg index 16ea397d55..3257605cd2 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg @@ -17,5 +17,6 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 inset_direction = outside_in skin_material_flow = =material_flow * 0.965 -speed_print = 60 +speed_print = 80 +wall_thickness = =line_width * 3 From 7a3f3eb3fa347f3d00fcd38af7d8bb4e9de9719c Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 01:29:21 -0400 Subject: [PATCH 37/84] Added profiles for PLA / PVA on Method, MethodX and Method XL PP-475 --- .../ultimaker_method_extruder_left.def.json | 29 +++++++ .../ultimaker_method_extruder_right.def.json | 29 +++++++ ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 18 ++++ ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 18 ++++ ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 18 ++++ ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 19 ++++ ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 19 ++++ ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 19 ++++ .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 84 ++++++++++++++++++ .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 84 ++++++++++++++++++ .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 77 ++++++++++++++++ .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 84 ++++++++++++++++++ .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 87 +++++++++++++++++++ .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 87 +++++++++++++++++++ .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 77 ++++++++++++++++ ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 87 +++++++++++++++++++ .../variants/ultimaker_methodx_2A.inst.cfg | 15 ++++ .../variants/ultimaker_methodxl_1A.inst.cfg | 15 ++++ .../variants/ultimaker_methodxl_2A.inst.cfg | 15 ++++ 19 files changed, 881 insertions(+) create mode 100644 resources/extruders/ultimaker_method_extruder_left.def.json create mode 100644 resources/extruders/ultimaker_method_extruder_right.def.json create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/variants/ultimaker_methodx_2A.inst.cfg create mode 100644 resources/variants/ultimaker_methodxl_1A.inst.cfg create mode 100644 resources/variants/ultimaker_methodxl_2A.inst.cfg diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json new file mode 100644 index 0000000000..b64e66ad5d --- /dev/null +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_method", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } + } +} diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json new file mode 100644 index 0000000000..ec4d40dd59 --- /dev/null +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_method", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } + } +} diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8293c9f51a --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..f98c3b0043 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..2c82f9dde9 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..9759b6ccd6 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_plate_temperature = 45 +build_volume_temperature = 45 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..3d6d9ab875 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_plate_temperature = 45 +build_volume_temperature = 45 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..f27719fb38 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_plate_temperature = 45 +build_volume_temperature = 45 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..d8d1aba9e8 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..2ee6e68d37 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..1f5ac00167 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -0,0 +1,77 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 2A +material = ultimaker_pva_175 +quality_type = draft +type = quality +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_speed = 5 +cool_min_temperature = =material_print_temperature +initial_layer_line_width_factor = 300 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = 50 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 220 +material_standby_temperature = 160 +prime_tower_flow = 125 +raft_airgap = 0.0 +raft_base_wall_count = 4 +raft_interface_flow = 110 +raft_interface_infill_overlap = 50 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.9 +raft_interface_line_width = 1 +raft_interface_speed = 15 +raft_interface_z_offset = -0.05 +raft_surface_flow = 110 +raft_surface_infill_overlap = 50 +raft_surface_line_spacing = 0.44 +raft_surface_line_width = 0.4 +raft_surface_speed = 20 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.075 +retraction_speed = 1.75 +speed_layer_0 = 10 +speed_prime_tower = 10 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 10 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_angle = 50 +support_bottom_density = 99 +support_bottom_height = 0.406 +support_bottom_line_width = 1.2 +support_bottom_wall_count = 2 +support_conical_angle = 20 +support_conical_min_width = 20 +support_fan_enable = False +support_infill_density_multiplier_layer_0 = 2 +support_infill_rate = 12 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_interface_offset = 0.8 +support_pattern = grid +support_roof_density = 95 +support_roof_height = =layer_height*8 +support_wall_count = 2 +support_xy_distance = 0.2 +support_z_distance = 0 +switch_extruder_extra_prime_amount = 1 +switch_extruder_retraction_amount = 2.5 +switch_extruder_retraction_speeds = 3 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..5b615d9329 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..c43848cd42 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,87 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +default_material_bed_temperature = 45 +infill_sparse_density = 15 +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 2 +raft_interface_line_spacing = 0.7 +raft_interface_speed = 60 +raft_interface_thickness = 0.3 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..cc774cfe15 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,87 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +default_material_bed_temperature = 45 +infill_sparse_density = 15 +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 2 +raft_interface_line_spacing = 0.7 +raft_interface_speed = 60 +raft_interface_thickness = 0.3 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..2eb21fb62f --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -0,0 +1,77 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 2A +material = ultimaker_pva_175 +quality_type = draft +type = quality +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_speed = 5 +cool_min_temperature = =material_print_temperature +initial_layer_line_width_factor = 300 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = 50 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 220 +material_standby_temperature = 160 +prime_tower_flow = 125 +raft_airgap = 0.0 +raft_base_wall_count = 4 +raft_interface_flow = 110 +raft_interface_infill_overlap = 50 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.9 +raft_interface_line_width = 1 +raft_interface_speed = 15 +raft_interface_z_offset = -0.05 +raft_surface_flow = 110 +raft_surface_infill_overlap = 50 +raft_surface_line_spacing = 0.44 +raft_surface_line_width = 0.4 +raft_surface_speed = 20 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.075 +retraction_speed = 1.75 +speed_layer_0 = 10 +speed_prime_tower = 10 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 10 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_angle = 50 +support_bottom_density = 99 +support_bottom_height = 0.406 +support_bottom_line_width = 1.2 +support_bottom_wall_count = 2 +support_conical_angle = 20 +support_conical_min_width = 20 +support_fan_enable = False +support_infill_density_multiplier_layer_0 = 2 +support_infill_rate = 12 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_interface_offset = 0.8 +support_pattern = grid +support_roof_density = 95 +support_roof_height = =layer_height*8 +support_wall_count = 2 +support_xy_distance = 0.2 +support_z_distance = 0 +switch_extruder_extra_prime_amount = 1 +switch_extruder_retraction_amount = 2.5 +switch_extruder_retraction_speeds = 3 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..cb6738bc3e --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,87 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +default_material_bed_temperature = 45 +infill_sparse_density = 15 +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 2 +raft_interface_line_spacing = 0.7 +raft_interface_speed = 60 +raft_interface_thickness = 0.3 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/variants/ultimaker_methodx_2A.inst.cfg b/resources/variants/ultimaker_methodx_2A.inst.cfg new file mode 100644 index 0000000000..49edb9cf3c --- /dev/null +++ b/resources/variants/ultimaker_methodx_2A.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodx +name = 2A +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 2A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_methodxl_1A.inst.cfg b/resources/variants/ultimaker_methodxl_1A.inst.cfg new file mode 100644 index 0000000000..b7a54d8242 --- /dev/null +++ b/resources/variants/ultimaker_methodxl_1A.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodxl +name = 1A +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = mk14 +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 1A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_methodxl_2A.inst.cfg b/resources/variants/ultimaker_methodxl_2A.inst.cfg new file mode 100644 index 0000000000..3a93dfdd9f --- /dev/null +++ b/resources/variants/ultimaker_methodxl_2A.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodxl +name = 2A +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 2A +machine_nozzle_size = 0.4 + From b3dd3c2dfd51fdc7a7ee5a8be84cfbdba52d1dce Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 01:31:08 -0400 Subject: [PATCH 38/84] Added profiles for PLA / PVA on Method, MethodX and Method XL PP-475 --- .../ultimaker_method_base.def.json | 1108 ++++++++++------- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- ...inst.cfg => ultimaker_methodx_1A.inst.cfg} | 8 +- 4 files changed, 713 insertions(+), 459 deletions(-) rename resources/variants/{ultimaker_sketch_0.4mm.inst.cfg => ultimaker_methodx_1A.inst.cfg} (54%) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..95514f58c6 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,436 +1,682 @@ { - "version": 2, - "name": "UltiMaker Method Base Profile", - "inherits": "ultimaker", - "metadata": - { - "visible": false, - "author": "UltiMaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot", - "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_pc_175", - "ultimaker_rapidrinse_175", - "generic_tpu_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "nozzle_offsetting_for_disallowed_areas": false, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", - "preferred_material": "generic_pla_175", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "weight": -1 + "version": 2, + "inherits": "ultimaker", + "metadata": { + "author": "UltiMaker", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "file_formats": "application/x-makerbot", + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" }, - "overrides": + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_method_platform.stl", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "preferred_material": "ultimaker_pla_175", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "visible": false, + "weight": -1 + }, + "name": "UltiMaker Method Base Profile", + "overrides": { + "adhesion_extruder_nr": { + "value": 0 + }, + "adhesion_type": { + "value": "'raft'" + }, + "bridge_enable_more_layers": { + "value": true + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_fan_speed_2": { + "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "bridge_settings_enabled": { + "value": true + }, + "bridge_skin_density": { + "value": 100 + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_skin_material_flow": { + "value": "material_flow" + }, + "bridge_skin_material_flow_2": { + "value": "material_flow" + }, + "bridge_skin_material_flow_3": { + "value": "material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_sparse_infill_max_density": { + "value": 50 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_material_flow": { + "value": "material_flow" + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "brim_width": { + "value": 5 + }, + "extruder_prime_pos_abs": { + "default_value": true + }, + "gradual_support_infill_steps": { + "value": 0 + }, + "infill_before_walls": { + "value": false + }, + "inset_direction": { + "value": "'inside_out'" + }, + "infill_enable_travel_optimization": { + "value": true + }, + "infill_material_flow": { + "value": "material_flow" + }, + "infill_overlap": { + "value": 0 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 80 else 'grid'" + }, + "infill_wipe_dist": { + "value": 0 + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "value": true + }, + "machine_scale_fan_speed_zero_to_one": { + "value": true + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "Griffin" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": true + }, + "machine_min_cool_heat_time_window": { + "value": 15 + }, + "machine_name": { + "default_value": "UltiMaker Method" + }, + "machine_start_gcode": { + "default_value": "" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature-10" + }, + "material_final_print_temperature": { + "value": "material_print_temperature-10" + }, + "machine_nozzle_heat_up_speed": { + "value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "value": 0.8 + }, + "material_flow": { + "value": 100 + }, + "skin_material_flow": { + "value": "material_flow" + }, + "material_print_temperature": { + "value": "default_material_print_temperature" + }, + "material_bed_temperature": { + "enabled": "machine_heated_bed" + }, + "material_bed_temperature_layer_0": { + "enabled": "machine_heated_bed" + }, + "material_shrinkage_percentage": { + "enabled": true + }, + "min_wall_line_width": { + "value": 0.4 + }, + "minimum_support_area": { + "value": 0.1 + }, + "multiple_mesh_overlap": { + "value": 0 + }, + "optimize_wall_printing_order": { + "value": true + }, + "prime_blob_enable": { + "enabled": false + }, + "prime_tower_enable": { + "value": false + }, + "prime_tower_flow": { + "value": "material_flow" + }, + "prime_tower_line_width": { + "value": 1 + }, + "prime_tower_raft_base_line_spacing": { + "value": "raft_base_line_width" + }, + "prime_tower_wipe_enabled": { + "value": true + }, + "print_sequence": { - "acceleration_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_prime_tower": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_print": - { - "enabled": false, - "value": 800 - }, - "acceleration_print_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_bottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_interface": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_roof": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_topbottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_travel": - { - "enabled": false, - "value": 5000 - }, - "acceleration_travel_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_travel_layer_0": - { - "enabled": false, - "value": "acceleration_travel" - }, - "acceleration_wall": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "adhesion_extruder_nr": { "value": 0 }, - "adhesion_type": { "value": "'raft'" }, - "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, - "bridge_skin_material_flow_2": { "value": "material_flow" }, - "bridge_skin_material_flow_3": { "value": "material_flow" }, - "bridge_skin_speed": { "value": "speed_topbottom" }, - "bridge_skin_speed_2": { "value": "speed_topbottom" }, - "bridge_skin_speed_3": { "value": "speed_topbottom" }, - "bridge_sparse_infill_max_density": { "value": 50 }, - "bridge_wall_coast": { "value": 0 }, - "bridge_wall_material_flow": { "value": "material_flow" }, - "bridge_wall_speed": { "value": "speed_wall" }, - "brim_width": { "value": 5 }, - "extruder_prime_pos_abs": { "default_value": true }, - "gradual_support_infill_steps": { "value": 0 }, - "infill_before_walls": { "value": false }, - "infill_enable_travel_optimization": { "value": true }, - "infill_material_flow": { "value": "material_flow" }, - "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'lines'" }, - "infill_wipe_dist": { "value": 0 }, - "inset_direction": { "value": "'inside_out'" }, - "jerk_enabled": - { - "enabled": false, - "value": true - }, - "jerk_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_prime_tower": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_print": - { - "enabled": false, - "value": 6.25 - }, - "jerk_print_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_bottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_interface": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_roof": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_topbottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel_enabled": - { - "enabled": false, - "value": true - }, - "jerk_travel_layer_0": - { - "enabled": false, - "value": "jerk_travel" - }, - "jerk_wall": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "value": true }, - "machine_end_gcode": { "default_value": "" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": false }, - "machine_heated_build_volume": { "default_value": true }, - "machine_min_cool_heat_time_window": { "value": 15 }, - "machine_name": { "default_value": "UltiMaker Method" }, - "machine_nozzle_cool_down_speed": { "value": 0.8 }, - "machine_nozzle_heat_up_speed": { "value": 3.5 }, - "machine_scale_fan_speed_zero_to_one": { "value": true }, - "machine_start_gcode": { "default_value": "" }, - "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, - "material_final_print_temperature": { "value": "material_print_temperature-10" }, - "material_flow": { "value": 97 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, - "material_print_temperature": { "value": "default_material_print_temperature" }, - "material_shrinkage_percentage": { "enabled": true }, - "min_wall_line_width": { "value": 0.4 }, - "minimum_support_area": { "value": 0.1 }, - "multiple_mesh_overlap": { "value": 0 }, - "optimize_wall_printing_order": { "value": true }, - "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, - "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, - "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, - "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": { "enabled": false }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, - "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, - "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, - "raft_interface_thickness": { "value": 0.3 }, - "raft_interface_wall_count": { "value": "raft_wall_count" }, - "raft_margin": { "value": 1.2 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, - "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": "speed_travel / 10" }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 0 }, - "retraction_hop": { "value": 0.4 }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": false }, - "retraction_prime_speed": { "value": "retraction_speed" }, - "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "0.95*material_flow" }, - "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, - "skin_preshrink": { "value": 0 }, - "skirt_brim_material_flow": { "value": "material_flow" }, - "skirt_brim_minimal_length": { "value": 500 }, - "small_skin_width": { "value": 4 }, - "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, - "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_bottom_material_flow": { "value": "material_flow" }, - "support_brim_enable": { "value": false }, - "support_conical_min_width": { "value": 10 }, - "support_enable": { "value": true }, - "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, - "support_infill_rate": { "value": 20.0 }, - "support_interface_enable": { "value": true }, - "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, - "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, - "support_material_flow": { "value": "material_flow" }, - "support_pattern": { "value": "'lines'" }, - "support_roof_material_flow": { "value": "material_flow" }, - "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, - "switch_extruder_retraction_amount": { "value": 0.5 }, - "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "travel_avoid_other_parts": { "value": false }, - "wall_0_inset": { "value": 0 }, - "wall_0_material_flow": { "value": "material_flow" }, - "wall_0_wipe_dist": { "value": 0.8 }, - "wall_material_flow": { "value": "material_flow" }, - "wall_x_material_flow": { "value": "material_flow" }, - "xy_offset": { "value": 0 }, - "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_corner": { "value": "'z_seam_corner_none'" }, - "z_seam_position": { "value": "'backright'" }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "enabled": false + }, + "prime_tower_base_size": { + "value": 10 + }, + "prime_tower_base_height": { + "value": 6 + }, + "prime_tower_base_curve_magnitude": { + "value": 2 + }, + "raft_base_line_spacing": { + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": { + "value": 1.4 + }, + "raft_base_speed": { + "value": 10 + }, + "raft_base_thickness": { + "value": 0.8 + }, + "raft_interface_extruder_nr": { + "value": "raft_surface_extruder_nr" + }, + "raft_interface_layers": { + "value": 2 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_speed": { + "value": 90 + }, + "raft_interface_thickness": { + "value": 0.3 + }, + "raft_interface_wall_count": { + "value": "raft_wall_count" + }, + "raft_margin": { + "value": 1.2 + }, + "raft_surface_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" + }, + "raft_surface_wall_count": { + "value": "raft_wall_count" + }, + "retraction_amount": { + "value": 0.75 + }, + "retraction_combing": { + "value": "'off'" + }, + "retraction_combing_max_distance": { + "value": "speed_travel / 10" + }, + "retraction_count_max": { + "value": 100 + }, + "retraction_extrusion_window": { + "value": 0 + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop_only_when_collides": { + "value": false + }, + "retraction_prime_speed": { + "value": "retraction_speed" + }, + "retraction_speed": { + "value": 5 + }, + "roofing_layer_count": { + "value": 2 + }, + "roofing_monotonic": { + "value": true + }, + "skin_monotonic": { + "value": true + }, + "skin_outline_count": { + "value": 0 + }, + "skin_overlap": { + "value": 0 + }, + "skin_preshrink": { + "value": 0 + }, + "skirt_brim_material_flow": { + "value": "material_flow" + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "small_skin_width": { + "value": 4 + }, + "speed_equalize_flow_width_factor": { + "value": 0 + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_print": { + "value": 50 + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_support": { + "value": "speed_wall" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "speed_topbottom": { + "value": "speed_wall" + }, + "speed_travel": { + "value": 250 + }, + "speed_wall": { + "value": "speed_print * 40/50" + }, + "speed_wall_0": { + "value": "speed_wall * 30/40" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "support_angle": { + "value": 40 + }, + "support_bottom_distance": { + "value": "support_z_distance / 2" + }, + "support_bottom_material_flow": { + "value": "material_flow" + }, + "support_brim_enable": { + "value": false + }, + "support_conical_min_width": { + "value": 10 + }, + "support_enable": { + "value": true + }, + "support_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material'))" + }, + "support_fan_enable": { + "value": false + }, + "support_infill_rate": { + "value": 20.0 + }, + "support_interface_enable": { + "value": true + }, + "support_interface_material_flow": { + "value": "material_flow" + }, + "support_interface_offset": { + "value": 0 + }, + "support_interface_pattern": { + "value": "'lines'" + }, + "support_interface_wall_count": { + "value": 2 + }, + "support_material_flow": { + "value": "material_flow" + }, + "support_pattern": { + "value": "'lines'" + }, + "support_roof_material_flow": { + "value": "material_flow" + }, + "support_supported_skin_fan_speed": { + "value": "cool_fan_speed_max" + }, + "support_top_distance": { + "value": "support_z_distance" + }, + "support_wall_count": { + "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" + }, + "support_xy_distance": { + "value": 0.2 + }, + "support_z_distance": { + "value": 0 + }, + "switch_extruder_retraction_amount": { + "value": 0.5 + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed" + }, + "top_bottom_thickness": { + "value": "5*layer_height" + }, + "travel_avoid_distance": { + "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" + }, + "travel_avoid_other_parts": { + "value": false + }, + "wall_0_inset": { + "value": 0 + }, + "wall_0_material_flow": { + "value": "material_flow" + }, + "wall_0_wipe_dist": { + "value": 0.8 + }, + "wall_material_flow": { + "value": "material_flow" + }, + "wall_x_material_flow": { + "value": "material_flow" + }, + "xy_offset": { + "value": 0 + }, + "xy_offset_layer_0": { + "value": "xy_offset" + }, + "zig_zaggify_infill": { + "value": true + }, + "z_seam_corner": { + "value": "'z_seam_corner_none'" + }, + "z_seam_position": { + "value": "'backright'" + }, + "z_seam_relative": { + "value": true + }, + "z_seam_type": { + "value": "'sharpest_corner'" + }, + "acceleration_enabled": { + "value": true, + "enabled": false + }, + "acceleration_travel_enabled": { + "value": true, + "enabled": false + }, + "acceleration_print": { + "value": 800, + "enabled": false + }, + "acceleration_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_topbottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_interface": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_roof": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_bottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_prime_tower": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_travel": { + "value": 5000, + "enabled": false + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel", + "enabled": false + }, + "acceleration_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_print_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "jerk_enabled": { + "value": true, + "enabled": false + }, + "jerk_travel_enabled": { + "value": true, + "enabled": false + }, + "jerk_print": { + "value": 6.25, + "enabled": false + }, + "jerk_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x": { + "value": "jerk_print", + "enabled": false + }, + "jerk_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_topbottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_interface": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_roof": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_bottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_prime_tower": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel_layer_0": { + "value": "jerk_travel", + "enabled": false + }, + "jerk_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_print_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x_roofing": { + "value": "jerk_print", + "enabled": false } + } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 648a1d6a5c..a77c9c576b 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index ea52c5dbd2..6ff40895a0 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg b/resources/variants/ultimaker_methodx_1A.inst.cfg similarity index 54% rename from resources/variants/ultimaker_sketch_0.4mm.inst.cfg rename to resources/variants/ultimaker_methodx_1A.inst.cfg index 26ab646015..886c14c184 100644 --- a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg +++ b/resources/variants/ultimaker_methodx_1A.inst.cfg @@ -1,15 +1,15 @@ [general] -definition = ultimaker_sketch -name = 0.4mm +definition = ultimaker_methodx +name = 1A version = 4 [metadata] hardware_type = nozzle -reference_extruder_id = sketch_extruder +reference_extruder_id = mk14 setting_version = 23 type = variant [values] -machine_nozzle_id = 0.4mm +machine_nozzle_id = 1A machine_nozzle_size = 0.4 From 12a04e68d671a326ba2d7b131bc41e03c399c42d Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 05:32:42 +0000 Subject: [PATCH 39/84] Applied printer-linter format --- .../ultimaker_method_base.def.json | 1102 +++++++---------- .../ultimaker_method_extruder_left.def.json | 28 +- .../ultimaker_method_extruder_right.def.json | 28 +- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 +- ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 +- 19 files changed, 506 insertions(+), 776 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 95514f58c6..26d0ce8329 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,682 +1,428 @@ { - "version": 2, - "inherits": "ultimaker", - "metadata": { - "author": "UltiMaker", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "file_formats": "application/x-makerbot", - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "manufacturer": "Ultimaker B.V.", - "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_method_platform.stl", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "preferred_material": "ultimaker_pla_175", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "visible": false, - "weight": -1 - }, - "name": "UltiMaker Method Base Profile", - "overrides": { - "adhesion_extruder_nr": { - "value": 0 - }, - "adhesion_type": { - "value": "'raft'" - }, - "bridge_enable_more_layers": { - "value": true - }, - "bridge_fan_speed": { - "value": "cool_fan_speed_max" - }, - "bridge_fan_speed_2": { - "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" - }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, - "bridge_settings_enabled": { - "value": true - }, - "bridge_skin_density": { - "value": 100 - }, - "bridge_skin_density_2": { - "value": 100 - }, - "bridge_skin_density_3": { - "value": 100 - }, - "bridge_skin_material_flow": { - "value": "material_flow" - }, - "bridge_skin_material_flow_2": { - "value": "material_flow" - }, - "bridge_skin_material_flow_3": { - "value": "material_flow" - }, - "bridge_skin_speed": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_2": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_3": { - "value": "speed_topbottom" - }, - "bridge_sparse_infill_max_density": { - "value": 50 - }, - "bridge_wall_coast": { - "value": 0 - }, - "bridge_wall_material_flow": { - "value": "material_flow" - }, - "bridge_wall_speed": { - "value": "speed_wall" - }, - "brim_width": { - "value": 5 - }, - "extruder_prime_pos_abs": { - "default_value": true - }, - "gradual_support_infill_steps": { - "value": 0 - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "value": "'inside_out'" - }, - "infill_enable_travel_optimization": { - "value": true - }, - "infill_material_flow": { - "value": "material_flow" - }, - "infill_overlap": { - "value": 0 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 80 else 'grid'" - }, - "infill_wipe_dist": { - "value": 0 - }, - "layer_start_x": { - "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" - }, - "layer_start_y": { - "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_center_is_zero": { - "value": true - }, - "machine_scale_fan_speed_zero_to_one": { - "value": true - }, - "machine_end_gcode": { - "default_value": "" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "Griffin" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": true - }, - "machine_min_cool_heat_time_window": { - "value": 15 - }, - "machine_name": { - "default_value": "UltiMaker Method" - }, - "machine_start_gcode": { - "default_value": "" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature-10" - }, - "material_final_print_temperature": { - "value": "material_print_temperature-10" - }, - "machine_nozzle_heat_up_speed": { - "value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "value": 0.8 - }, - "material_flow": { - "value": 100 - }, - "skin_material_flow": { - "value": "material_flow" - }, - "material_print_temperature": { - "value": "default_material_print_temperature" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed" - }, - "material_bed_temperature_layer_0": { - "enabled": "machine_heated_bed" - }, - "material_shrinkage_percentage": { - "enabled": true - }, - "min_wall_line_width": { - "value": 0.4 - }, - "minimum_support_area": { - "value": 0.1 - }, - "multiple_mesh_overlap": { - "value": 0 - }, - "optimize_wall_printing_order": { - "value": true - }, - "prime_blob_enable": { - "enabled": false - }, - "prime_tower_enable": { - "value": false - }, - "prime_tower_flow": { - "value": "material_flow" - }, - "prime_tower_line_width": { - "value": 1 - }, - "prime_tower_raft_base_line_spacing": { - "value": "raft_base_line_width" - }, - "prime_tower_wipe_enabled": { - "value": true - }, - "print_sequence": + "version": 2, + "name": "UltiMaker Method Base Profile", + "inherits": "ultimaker", + "metadata": { - "enabled": false - }, - "prime_tower_base_size": { - "value": 10 - }, - "prime_tower_base_height": { - "value": 6 - }, - "prime_tower_base_curve_magnitude": { - "value": 2 - }, - "raft_base_line_spacing": { - "value": "2*raft_base_line_width" - }, - "raft_base_line_width": { - "value": 1.4 - }, - "raft_base_speed": { - "value": 10 - }, - "raft_base_thickness": { - "value": 0.8 - }, - "raft_interface_extruder_nr": { - "value": "raft_surface_extruder_nr" - }, - "raft_interface_layers": { - "value": 2 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_interface_speed": { - "value": 90 - }, - "raft_interface_thickness": { - "value": 0.3 - }, - "raft_interface_wall_count": { - "value": "raft_wall_count" - }, - "raft_margin": { - "value": 1.2 - }, - "raft_surface_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" - }, - "raft_surface_wall_count": { - "value": "raft_wall_count" - }, - "retraction_amount": { - "value": 0.75 - }, - "retraction_combing": { - "value": "'off'" - }, - "retraction_combing_max_distance": { - "value": "speed_travel / 10" - }, - "retraction_count_max": { - "value": 100 - }, - "retraction_extrusion_window": { - "value": 0 - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop_only_when_collides": { - "value": false - }, - "retraction_prime_speed": { - "value": "retraction_speed" - }, - "retraction_speed": { - "value": 5 - }, - "roofing_layer_count": { - "value": 2 - }, - "roofing_monotonic": { - "value": true - }, - "skin_monotonic": { - "value": true - }, - "skin_outline_count": { - "value": 0 - }, - "skin_overlap": { - "value": 0 - }, - "skin_preshrink": { - "value": 0 - }, - "skirt_brim_material_flow": { - "value": "material_flow" - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "small_skin_width": { - "value": 4 - }, - "speed_equalize_flow_width_factor": { - "value": 0 - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_print": { - "value": 50 - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_support": { - "value": "speed_wall" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "speed_topbottom": { - "value": "speed_wall" - }, - "speed_travel": { - "value": 250 - }, - "speed_wall": { - "value": "speed_print * 40/50" - }, - "speed_wall_0": { - "value": "speed_wall * 30/40" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "support_angle": { - "value": 40 - }, - "support_bottom_distance": { - "value": "support_z_distance / 2" - }, - "support_bottom_material_flow": { - "value": "material_flow" - }, - "support_brim_enable": { - "value": false - }, - "support_conical_min_width": { - "value": 10 - }, - "support_enable": { - "value": true - }, - "support_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material'))" - }, - "support_fan_enable": { - "value": false - }, - "support_infill_rate": { - "value": 20.0 - }, - "support_interface_enable": { - "value": true - }, - "support_interface_material_flow": { - "value": "material_flow" - }, - "support_interface_offset": { - "value": 0 - }, - "support_interface_pattern": { - "value": "'lines'" - }, - "support_interface_wall_count": { - "value": 2 - }, - "support_material_flow": { - "value": "material_flow" - }, - "support_pattern": { - "value": "'lines'" - }, - "support_roof_material_flow": { - "value": "material_flow" - }, - "support_supported_skin_fan_speed": { - "value": "cool_fan_speed_max" - }, - "support_top_distance": { - "value": "support_z_distance" - }, - "support_wall_count": { - "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" - }, - "support_xy_distance": { - "value": 0.2 - }, - "support_z_distance": { - "value": 0 - }, - "switch_extruder_retraction_amount": { - "value": 0.5 - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed" - }, - "top_bottom_thickness": { - "value": "5*layer_height" - }, - "travel_avoid_distance": { - "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" - }, - "travel_avoid_other_parts": { - "value": false - }, - "wall_0_inset": { - "value": 0 - }, - "wall_0_material_flow": { - "value": "material_flow" - }, - "wall_0_wipe_dist": { - "value": 0.8 - }, - "wall_material_flow": { - "value": "material_flow" - }, - "wall_x_material_flow": { - "value": "material_flow" - }, - "xy_offset": { - "value": 0 - }, - "xy_offset_layer_0": { - "value": "xy_offset" - }, - "zig_zaggify_infill": { - "value": true - }, - "z_seam_corner": { - "value": "'z_seam_corner_none'" - }, - "z_seam_position": { - "value": "'backright'" - }, - "z_seam_relative": { - "value": true - }, - "z_seam_type": { - "value": "'sharpest_corner'" - }, - "acceleration_enabled": { - "value": true, - "enabled": false - }, - "acceleration_travel_enabled": { - "value": true, - "enabled": false - }, - "acceleration_print": { - "value": 800, - "enabled": false - }, - "acceleration_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_topbottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_interface": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_roof": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_bottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_prime_tower": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_travel": { - "value": 5000, - "enabled": false - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel", - "enabled": false - }, - "acceleration_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_print_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "jerk_enabled": { - "value": true, - "enabled": false - }, - "jerk_travel_enabled": { - "value": true, - "enabled": false - }, - "jerk_print": { - "value": 6.25, - "enabled": false - }, - "jerk_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x": { - "value": "jerk_print", - "enabled": false - }, - "jerk_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_topbottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_interface": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_roof": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_bottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_prime_tower": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel_layer_0": { - "value": "jerk_travel", - "enabled": false - }, - "jerk_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_print_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x_roofing": { - "value": "jerk_print", - "enabled": false + "visible": false, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "nozzle_offsetting_for_disallowed_areas": false, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "adhesion_extruder_nr": { "value": 0 }, + "adhesion_type": { "value": "'raft'" }, + "bridge_enable_more_layers": { "value": true }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow_2": { "value": "material_flow" }, + "bridge_skin_material_flow_3": { "value": "material_flow" }, + "bridge_skin_speed": { "value": "speed_topbottom" }, + "bridge_skin_speed_2": { "value": "speed_topbottom" }, + "bridge_skin_speed_3": { "value": "speed_topbottom" }, + "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_wall_coast": { "value": 0 }, + "bridge_wall_material_flow": { "value": "material_flow" }, + "bridge_wall_speed": { "value": "speed_wall" }, + "brim_width": { "value": 5 }, + "extruder_prime_pos_abs": { "default_value": true }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_enable_travel_optimization": { "value": true }, + "infill_material_flow": { "value": "material_flow" }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": 0 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 6.25 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "value": true }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": true }, + "machine_min_cool_heat_time_window": { "value": 15 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_nozzle_cool_down_speed": { "value": 0.8 }, + "machine_nozzle_heat_up_speed": { "value": 3.5 }, + "machine_scale_fan_speed_zero_to_one": { "value": true }, + "machine_start_gcode": { "default_value": "" }, + "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, + "material_final_print_temperature": { "value": "material_print_temperature-10" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_print_temperature": { "value": "default_material_print_temperature" }, + "material_shrinkage_percentage": { "enabled": true }, + "min_wall_line_width": { "value": 0.4 }, + "minimum_support_area": { "value": 0.1 }, + "multiple_mesh_overlap": { "value": 0 }, + "optimize_wall_printing_order": { "value": true }, + "prime_blob_enable": { "enabled": false }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, + "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, + "prime_tower_wipe_enabled": { "value": true }, + "print_sequence": { "enabled": false }, + "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_width": { "value": 1.4 }, + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": { "value": 0.8 }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": { "value": 90 }, + "raft_interface_thickness": { "value": 0.3 }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": 1.2 }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retraction_amount": { "value": 0.75 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": "speed_travel / 10" }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 0 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": false }, + "retraction_prime_speed": { "value": "retraction_speed" }, + "retraction_speed": { "value": 5 }, + "roofing_layer_count": { "value": 2 }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 0 }, + "skin_preshrink": { "value": 0 }, + "skirt_brim_material_flow": { "value": "material_flow" }, + "skirt_brim_minimal_length": { "value": 500 }, + "small_skin_width": { "value": 4 }, + "speed_equalize_flow_width_factor": { "value": 0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, + "speed_travel": { "value": 250 }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": 40 }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_material_flow": { "value": "material_flow" }, + "support_brim_enable": { "value": false }, + "support_conical_min_width": { "value": 10 }, + "support_enable": { "value": true }, + "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": 20.0 }, + "support_interface_enable": { "value": true }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 0 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 2 }, + "support_material_flow": { "value": "material_flow" }, + "support_pattern": { "value": "'lines'" }, + "support_roof_material_flow": { "value": "material_flow" }, + "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_xy_distance": { "value": 0.2 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_retraction_amount": { "value": 0.5 }, + "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, + "top_bottom_thickness": { "value": "5*layer_height" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_other_parts": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_wipe_dist": { "value": 0.8 }, + "wall_material_flow": { "value": "material_flow" }, + "wall_x_material_flow": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": "xy_offset" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_position": { "value": "'backright'" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "zig_zaggify_infill": { "value": true } } - } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index b64e66ad5d..f6c9e35622 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index ec4d40dd59..9c6521f35b 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index a77c9c576b..1e4fefb17e 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 6ff40895a0..34aba96b42 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 8293c9f51a..5375e81138 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index f98c3b0043..7164ec03e8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2c82f9dde9..271a651e20 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 9759b6ccd6..428c5e950f 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_plate_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d6d9ab875..fff7bb9e19 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_plate_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index f27719fb38..c27d1e596a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_plate_temperature = 45 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index d8d1aba9e8..9db56941cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index 2ee6e68d37..a75826d1ae 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 1f5ac00167..4fa889187b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 5b615d9329..44b777ea77 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c43848cd42..c1f049384a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 2eb21fb62f..594c9e6d15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] From aacc11a1be3c6f421ed23b46094281a57bd3348f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 08:52:06 +0200 Subject: [PATCH 40/84] Setup multi cooling fans for Method printers CURA-11795 --- resources/extruders/ultimaker_methodx_extruder_left.def.json | 5 +++-- .../extruders/ultimaker_methodx_extruder_right.def.json | 5 +++-- .../extruders/ultimaker_methodxl_extruder_left.def.json | 5 +++-- .../extruders/ultimaker_methodxl_extruder_right.def.json | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 648a1d6a5c..de0c566a28 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -14,8 +14,9 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index ea52c5dbd2..a837f9943f 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -14,8 +14,9 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 43de74b497..175029aa69 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -14,8 +14,9 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 581811646f..7749974663 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -14,8 +14,9 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From 40881268a0c7af98d4dbb6256881ca4c269a54bc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 08:52:40 +0200 Subject: [PATCH 41/84] Activate all fans cooling during switch for UM printers CURA-11795 --- resources/definitions/ultimaker.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97bb099ea4..02cba7db20 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -36,6 +36,7 @@ "bridge_wall_coast": { "value": 0 }, "bridge_wall_material_flow": { "value": "wall_material_flow" }, "bridge_wall_speed": { "value": "bridge_skin_speed" }, + "cool_during_extruder_switch": { "value": "'all_fans'" }, "cool_fan_speed_0": { "value": "cool_fan_speed_min" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_layer_time": { "value": 6 }, From a9b144c0fa2528e68ab7f2b752994390fbb1d136 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 08:52:59 +0200 Subject: [PATCH 42/84] Refine setting description CURA-11795 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 85f8ba3124..a661d78e31 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4616,7 +4616,7 @@ "cool_during_extruder_switch": { "label": "Cooling during extruder switch", - "description": "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
  • Unchanged: keep the fans as they were previously
  • Only last extruder: turn on the fan of the last used extruder, but turn the others off. This is useful if you have completely separate extruders.
  • All fans: turn on all fans during nozzle switch. This is useful if you have multiple fans that stay close to each other.
", + "description": "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
  • Unchanged: keep the fans as they were previously
  • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
  • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
", "type": "enum", "options": { From ecf482016a596e19ba62e8cda37849819712f16c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 10:23:04 +0200 Subject: [PATCH 43/84] Not enable fans cooling during extruder switch This will be applied by more specific profiles CURA-11795 --- resources/definitions/ultimaker.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 02cba7db20..97bb099ea4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -36,7 +36,6 @@ "bridge_wall_coast": { "value": 0 }, "bridge_wall_material_flow": { "value": "wall_material_flow" }, "bridge_wall_speed": { "value": "bridge_skin_speed" }, - "cool_during_extruder_switch": { "value": "'all_fans'" }, "cool_fan_speed_0": { "value": "cool_fan_speed_min" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_layer_time": { "value": 6 }, From b5cd19d6fc202646a376c96e5fc361bc1993fa0d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 11:12:13 +0200 Subject: [PATCH 44/84] Revert "Setup multi cooling fans for Method printers" This reverts commit aacc11a1be3c6f421ed23b46094281a57bd3348f. --- resources/extruders/ultimaker_methodx_extruder_left.def.json | 5 ++--- .../extruders/ultimaker_methodx_extruder_right.def.json | 5 ++--- .../extruders/ultimaker_methodxl_extruder_left.def.json | 5 ++--- .../extruders/ultimaker_methodxl_extruder_right.def.json | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index de0c566a28..648a1d6a5c 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -14,9 +14,8 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 0 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index a837f9943f..ea52c5dbd2 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -14,9 +14,8 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 1 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 175029aa69..43de74b497 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -14,9 +14,8 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 0 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 7749974663..581811646f 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -14,9 +14,8 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 1 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From 3712b81d76355f373ab69979edef4aa386469c6e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 11:14:21 +0200 Subject: [PATCH 45/84] Setup multi cooling fans for Method printers Start and end G-code are intentionally not updated, to keep the current behavior in place until the fans use is properly setup. CURA-11795 --- resources/extruders/ultimaker_methodx_extruder_left.def.json | 1 + resources/extruders/ultimaker_methodx_extruder_right.def.json | 1 + resources/extruders/ultimaker_methodxl_extruder_left.def.json | 1 + resources/extruders/ultimaker_methodxl_extruder_right.def.json | 1 + 4 files changed, 4 insertions(+) diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 648a1d6a5c..9ee09b9fae 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index ea52c5dbd2..ff014e0f74 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 43de74b497..68d6fe416b 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 581811646f..4e43bdbfc6 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, From e3daeecce439a065b1ed208e38c60c8a39c03dd0 Mon Sep 17 00:00:00 2001 From: Vadim Danilchik <45650122+vadim-danilchik@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:47:18 +0300 Subject: [PATCH 46/84] Add Creality Ender 3 V3 KE definition and nozzles (#17519) * Add Creality Ender 3 V3 KE definition and nozzles * fixed code review comment * added more values from creality print config * changed initial layer line width * fixed line width --------- Co-authored-by: Erwan MATHIEU Co-authored-by: Casper Lamboo Co-authored-by: c.lamboo Co-authored-by: Jelle Spijker Co-authored-by: Saumya Jain <70144862+saumyaj3@users.noreply.github.com> --- .../definitions/creality_ender3v3ke.def.json | 59 +++++++++++++++++++ .../creality/creality_ender3v3ke_0.2.inst.cfg | 13 ++++ .../creality/creality_ender3v3ke_0.3.inst.cfg | 13 ++++ .../creality/creality_ender3v3ke_0.4.inst.cfg | 13 ++++ .../creality/creality_ender3v3ke_0.5.inst.cfg | 13 ++++ .../creality/creality_ender3v3ke_0.6.inst.cfg | 13 ++++ .../creality/creality_ender3v3ke_0.8.inst.cfg | 13 ++++ .../creality/creality_ender3v3ke_1.0.inst.cfg | 13 ++++ 8 files changed, 150 insertions(+) create mode 100644 resources/definitions/creality_ender3v3ke.def.json create mode 100644 resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json new file mode 100644 index 0000000000..e395400599 --- /dev/null +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Creality Ender-3 V3 KE", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "platform": "creality_ender3.3mf", + "manufacturer": "Creality3D", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "creality_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "creality_base", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "gantry_height": { "value": 38 }, + "machine_depth": { "default_value": 220 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 10], + [10, 10], + [10, -10], + [-20, -10] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 8000.0 }, + "machine_max_acceleration_y": { "value": 8000.0 }, + "machine_max_acceleration_z": { "value": 500.0 }, + "machine_max_feedrate_e": { "value": 100 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 30 }, + "machine_name": { "default_value": "Creality Ender-3 V3 KE" }, + "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S{material_print_temperature_layer_0}\nG1 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X-1.7 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0 F1800" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z5 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X2 Y218 F3000 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, + "machine_width": { "default_value": 220 }, + "retraction_amount": { "default_value": 0.80 }, + "retraction_speed": { "default_value": 40 }, + "speed_layer_0": { "value": 100 }, + "speed_print": { "value": 300 }, + "material_print_temp_wait": { "default_value": false }, + "retraction_min_travel": { "value": 2.0 }, + "retraction_extrusion_window": { "value": "retraction_amount" }, + "retraction_combing": { "value": "no_outer_surfaces" }, + "retraction_combing_max_distance": { "default_value": 5.0 } + } +} diff --git a/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg new file mode 100644 index 0000000000..7ef855b97c --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg new file mode 100644 index 0000000000..b4523fb2ec --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg new file mode 100644 index 0000000000..08617c2b6a --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg new file mode 100644 index 0000000000..337181748d --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg new file mode 100644 index 0000000000..405d4e0c75 --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg new file mode 100644 index 0000000000..645713d5ef --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg b/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg new file mode 100644 index 0000000000..bb26262203 --- /dev/null +++ b/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v3ke +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 1.0 + From 298bd49737eb9823c37259543d316f8a91088c52 Mon Sep 17 00:00:00 2001 From: nallath Date: Thu, 27 Jun 2024 12:48:12 +0000 Subject: [PATCH 47/84] Applied printer-linter format --- .../definitions/creality_ender3v3ke.def.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index e395400599..c1016b515f 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -5,9 +5,9 @@ "metadata": { "visible": true, - "platform": "creality_ender3.3mf", "manufacturer": "Creality3D", "file_formats": "text/x-gcode", + "platform": "creality_ender3.3mf", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, @@ -23,6 +23,7 @@ { "gantry_height": { "value": 38 }, "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z5 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X2 Y218 F3000 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, "machine_head_with_fans_polygon": { "default_value": [ @@ -44,16 +45,15 @@ "machine_max_feedrate_z": { "value": 30 }, "machine_name": { "default_value": "Creality Ender-3 V3 KE" }, "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S{material_print_temperature_layer_0}\nG1 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X-1.7 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0 F1800" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z5 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X2 Y218 F3000 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, "machine_width": { "default_value": 220 }, - "retraction_amount": { "default_value": 0.80 }, + "material_print_temp_wait": { "default_value": false }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_combing": { "value": "no_outer_surfaces" }, + "retraction_combing_max_distance": { "default_value": 5.0 }, + "retraction_extrusion_window": { "value": "retraction_amount" }, + "retraction_min_travel": { "value": 2.0 }, "retraction_speed": { "default_value": 40 }, "speed_layer_0": { "value": 100 }, - "speed_print": { "value": 300 }, - "material_print_temp_wait": { "default_value": false }, - "retraction_min_travel": { "value": 2.0 }, - "retraction_extrusion_window": { "value": "retraction_amount" }, - "retraction_combing": { "value": "no_outer_surfaces" }, - "retraction_combing_max_distance": { "default_value": 5.0 } + "speed_print": { "value": 300 } } -} +} \ No newline at end of file From 07a3162bb4d93480f7dfd0ac0985a7946e61742e Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 09:06:11 -0400 Subject: [PATCH 48/84] Adding Method files that were missing PP-475 --- .../definitions/ultimaker_method.def.json | 137 ++++++++++++++++++ ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 18 +++ ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 17 +++ ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 18 +++ ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 17 +++ ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 18 +++ .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 84 +++++++++++ ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 52 +++++++ .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 84 +++++++++++ .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 77 ++++++++++ .../um_method_global_Draft_Quality.inst.cfg} | 10 +- .../um_method_global_Normal_Quality.inst.cfg | 15 ++ ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 52 +++++++ .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 84 +++++++++++ .../variants/ultimaker_method_1A.inst.cfg | 15 ++ .../variants/ultimaker_method_1C.inst.cfg | 15 ++ .../variants/ultimaker_method_2A.inst.cfg | 15 ++ .../variants/ultimaker_method_LABS.inst.cfg | 14 ++ 18 files changed, 737 insertions(+), 5 deletions(-) create mode 100644 resources/definitions/ultimaker_method.def.json create mode 100644 resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg rename resources/quality/{ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg => ultimaker_method/um_method_global_Draft_Quality.inst.cfg} (74%) create mode 100644 resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/variants/ultimaker_method_1A.inst.cfg create mode 100644 resources/variants/ultimaker_method_1C.inst.cfg create mode 100644 resources/variants/ultimaker_method_2A.inst.cfg create mode 100644 resources/variants/ultimaker_method_LABS.inst.cfg diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json new file mode 100644 index 0000000000..0d23ba4813 --- /dev/null +++ b/resources/definitions/ultimaker_method.def.json @@ -0,0 +1,137 @@ +{ + "version": 2, + "name": "UltiMaker Method", + "inherits": "ultimaker_method_base", + "metadata": + { + "visible": true, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_asa_175", + "generic_abs_175", + "generic_bvoh_175", + "generic_petg_175", + "generic_pla_175", + "generic_tough_pla_175", + "generic_pva_175", + "generic_cffpa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_hips_175", + "generic_pc_175", + "generic_tpu_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "ultimaker_asa_175", + "ultimaker_abs_175", + "ultimaker_absr_175", + "ultimaker_abscf_175", + "ultimaker_bvoh_175", + "ultimaker_petg_175", + "ultimaker_cffpa_175", + "ultimaker_cpe_175", + "ultimaker_nylon_175", + "ultimaker_hips_175", + "ultimaker_pc_175", + "ultimaker_tpu_175", + "ultimaker_tough_pla_175", + "ultimaker_rapidrinse_175", + "ultimaker_sr30", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "platform_offset": [ + 0, + 0, + 16 + ], + "platform_texture": "MakerbotMethod.png", + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "draft", + "preferred_variant_name": "1A", + "reference_machine_id": "fire_e", + "supports_network_connection": true, + "supports_usb_connection": false, + "variant_definition": "ultimaker_method", + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -94], + [-141.65, -94] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 94], + [-141.65, 94] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] + ] + }, + "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_width": { "default_value": 283.3 }, + "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } + } +} \ No newline at end of file diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8f4fcf08cd --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8d73200d81 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_nylon12-cf_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..b903d9a419 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..e760b2d642 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_nylon12-cf_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..2527856c8c --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..809acb9d2d --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..1617da74c1 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,52 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_nylon12-cf_175 +quality_type = draft +type = quality +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..cd264fb95f --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..82298fbb70 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -0,0 +1,77 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 2A +material = ultimaker_pva_175 +quality_type = draft +type = quality +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_speed = 5 +cool_min_temperature = =material_print_temperature +initial_layer_line_width_factor = 300 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = 50 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 220 +material_standby_temperature = 160 +prime_tower_flow = 125 +raft_airgap = 0.0 +raft_base_wall_count = 4 +raft_interface_flow = 110 +raft_interface_infill_overlap = 50 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.9 +raft_interface_line_width = 1 +raft_interface_speed = 15 +raft_interface_z_offset = -0.05 +raft_surface_flow = 110 +raft_surface_infill_overlap = 50 +raft_surface_line_spacing = 0.44 +raft_surface_line_width = 0.4 +raft_surface_speed = 20 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.075 +retraction_speed = 1.75 +speed_layer_0 = 10 +speed_prime_tower = 10 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 10 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_angle = 50 +support_bottom_density = 99 +support_bottom_height = 0.406 +support_bottom_line_width = 1.2 +support_bottom_wall_count = 2 +support_conical_angle = 20 +support_conical_min_width = 20 +support_fan_enable = False +support_infill_density_multiplier_layer_0 = 2 +support_infill_rate = 12 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_interface_offset = 0.8 +support_pattern = grid +support_roof_density = 95 +support_roof_height = =layer_height*8 +support_wall_count = 2 +support_xy_distance = 0.2 +support_z_distance = 0 +switch_extruder_extra_prime_amount = 1 +switch_extruder_retraction_amount = 2.5 +switch_extruder_retraction_speeds = 3 + diff --git a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg similarity index 74% rename from resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg rename to resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index 01222c6f9d..f889bedb60 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -definition = ultimaker_sketch -name = Fast version = 4 +name = Fast +definition = ultimaker_method [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] -layer_height = 0.2 +layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..b07a54ce8e --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..47b957e0e9 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,52 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_nylon12-cf_175 +quality_type = draft +type = quality +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..0069d15c80 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg new file mode 100644 index 0000000000..5d637829ec --- /dev/null +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 1A +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +reference_extruder_id = mk14 +hardware_type = nozzle + +[values] +machine_nozzle_id = 1A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg new file mode 100644 index 0000000000..bfb2e05bc8 --- /dev/null +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 1C +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +reference_extruder_id = mk14_c +hardware_type = nozzle + +[values] +machine_nozzle_id = 1C +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg new file mode 100644 index 0000000000..8e336e8170 --- /dev/null +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 2A +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +reference_extruder_id = mk14_s +hardware_type = nozzle + +[values] +machine_nozzle_id = 2A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg new file mode 100644 index 0000000000..25f35f7bd3 --- /dev/null +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = LABS +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = LABS +machine_nozzle_size = 0.4 + From 729387921b4ab4b5b38d90db00913f765ee17434 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 13:07:19 +0000 Subject: [PATCH 49/84] Applied printer-linter format --- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 ++-- .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_method_global_Draft_Quality.inst.cfg | 8 ++++---- .../um_method_global_Normal_Quality.inst.cfg | 8 ++++---- .../um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 ++-- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- resources/variants/ultimaker_method_1A.inst.cfg | 6 +++--- resources/variants/ultimaker_method_1C.inst.cfg | 6 +++--- resources/variants/ultimaker_method_2A.inst.cfg | 6 +++--- resources/variants/ultimaker_method_LABS.inst.cfg | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 8f4fcf08cd..09767ce8a7 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 8d73200d81..17b29cbbef 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index b903d9a419..3d5fa82b7a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index e760b2d642..fe2f11dac9 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 2527856c8c..05a61d6b82 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 809acb9d2d..65218afbda 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 1617da74c1..e4ab617a39 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index cd264fb95f..ca62933f25 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 82298fbb70..c2fab76b89 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index f889bedb60..433d839545 100644 --- a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_method +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg index b07a54ce8e..b1304e3b14 100644 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fine definition = ultimaker_method +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 23 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 47b957e0e9..b3e7d1da4d 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 0069d15c80..7f6b2a7be2 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg index 5d637829ec..d8ac36154a 100644 --- a/resources/variants/ultimaker_method_1A.inst.cfg +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14 setting_version = 23 type = variant -reference_extruder_id = mk14 -hardware_type = nozzle [values] machine_nozzle_id = 1A diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg index bfb2e05bc8..b881a01fdc 100644 --- a/resources/variants/ultimaker_method_1C.inst.cfg +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1C version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_c setting_version = 23 type = variant -reference_extruder_id = mk14_c -hardware_type = nozzle [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg index 8e336e8170..b2f16e4472 100644 --- a/resources/variants/ultimaker_method_2A.inst.cfg +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 2A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s setting_version = 23 type = variant -reference_extruder_id = mk14_s -hardware_type = nozzle [values] machine_nozzle_id = 2A diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg index 25f35f7bd3..97e78c30e0 100644 --- a/resources/variants/ultimaker_method_LABS.inst.cfg +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_method name = LABS version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] machine_nozzle_id = LABS From 98994518f7a524a9912da2a592eed83a2973b59b Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 12:18:48 -0400 Subject: [PATCH 50/84] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 26d0ce8329..505d9046cb 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -419,8 +419,7 @@ "wall_x_material_flow": { "value": "material_flow" }, "xy_offset": { "value": 0 }, "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_corner": { "value": "'z_seam_corner_none'" }, - "z_seam_position": { "value": "'backright'" }, + "z_seam_position": { "value": "'backright'" }, "z_seam_relative": { "value": true }, "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } From b3b06e86268b353fb4543295609f99d0c81e511a Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 16:19:53 +0000 Subject: [PATCH 51/84] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 505d9046cb..a2a5990979 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -419,7 +419,7 @@ "wall_x_material_flow": { "value": "material_flow" }, "xy_offset": { "value": 0 }, "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_position": { "value": "'backright'" }, + "z_seam_position": { "value": "'backright'" }, "z_seam_relative": { "value": true }, "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } From f554b0d4f2707bad3d446c4812625e642122fff7 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 12:50:43 -0400 Subject: [PATCH 52/84] Updated PLA PVA N12CF 175 settings PP-475 --- .../ultimaker_method_base.def.json | 1084 ++++++++++------- .../definitions/ultimaker_methodx.def.json | 25 +- .../definitions/ultimaker_methodxl.def.json | 6 - .../ultimaker_method_extruder_left.def.json | 30 +- .../ultimaker_method_extruder_right.def.json | 30 +- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- .../ultimaker_methodxl_extruder_left.def.json | 28 +- ...ultimaker_methodxl_extruder_right.def.json | 28 +- ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 8 +- .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 8 +- .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_method_global_Draft_Quality.inst.cfg | 8 +- .../um_method_global_Normal_Quality.inst.cfg | 8 +- ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 8 +- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodx_global_Draft_Quality.inst.cfg | 8 +- ...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_global_Draft_Quality.inst.cfg | 8 +- ...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../variants/ultimaker_method_1A.inst.cfg | 6 +- .../variants/ultimaker_method_1C.inst.cfg | 6 +- .../variants/ultimaker_method_2A.inst.cfg | 6 +- .../variants/ultimaker_method_LABS.inst.cfg | 4 +- 50 files changed, 903 insertions(+), 646 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index a2a5990979..cd46b31900 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,427 +1,667 @@ { - "version": 2, - "name": "UltiMaker Method Base Profile", - "inherits": "ultimaker", - "metadata": - { - "visible": false, - "author": "UltiMaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot", - "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "nozzle_offsetting_for_disallowed_areas": false, - "preferred_material": "ultimaker_pla_175", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "weight": -1 + "version": 2, + "inherits": "ultimaker", + "metadata": { + "author": "UltiMaker", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "file_formats": "application/x-makerbot", + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" }, - "overrides": + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_method_platform.stl", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "preferred_material": "ultimaker_pla_175", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "visible": false, + "weight": -1 + }, + "name": "UltiMaker Method Base Profile", + "overrides": { + "adhesion_extruder_nr": { + "value": 0 + }, + "adhesion_type": { + "value": "'raft'" + }, + "bridge_enable_more_layers": { + "value": true + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_fan_speed_2": { + "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "bridge_settings_enabled": { + "value": true + }, + "bridge_skin_density": { + "value": 100 + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_skin_material_flow": { + "value": "material_flow" + }, + "bridge_skin_material_flow_2": { + "value": "material_flow" + }, + "bridge_skin_material_flow_3": { + "value": "material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_sparse_infill_max_density": { + "value": 50 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_material_flow": { + "value": "material_flow" + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "brim_width": { + "value": 5 + }, + "extruder_prime_pos_abs": { + "default_value": true + }, + "gradual_support_infill_steps": { + "value": 0 + }, + "infill_before_walls": { + "value": false + }, + "inset_direction": { + "value": "'inside_out'" + }, + "infill_material_flow": { + "value": "material_flow" + }, + "infill_overlap": { + "value": 0 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 80 else 'grid'" + }, + "infill_wipe_dist": { + "value": 0 + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "value": true + }, + "machine_scale_fan_speed_zero_to_one": { + "value": true + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "Griffin" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": true + }, + "machine_min_cool_heat_time_window": { + "value": 15 + }, + "machine_name": { + "default_value": "UltiMaker Method" + }, + "machine_start_gcode": { + "default_value": "" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature-10" + }, + "machine_nozzle_heat_up_speed": { + "value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "value": 0.8 + }, + "material_flow": { + "value": 100 + }, + "skin_material_flow": { + "value": "material_flow" + }, + "material_bed_temperature": { + "enabled": "machine_heated_bed" + }, + "material_shrinkage_percentage": { + "enabled": true + }, + "min_wall_line_width": { + "value": 0.4 + }, + "minimum_support_area": { + "value": 0.1 + }, + "multiple_mesh_overlap": { + "value": 0 + }, + "optimize_wall_printing_order": { + "value": true + }, + "prime_blob_enable": { + "enabled": false + }, + "prime_tower_enable": { + "value": false + }, + "prime_tower_flow": { + "value": "material_flow" + }, + "prime_tower_line_width": { + "value": 1 + }, + "prime_tower_raft_base_line_spacing": { + "value": "raft_base_line_width" + }, + "prime_tower_wipe_enabled": { + "value": true + }, + "print_sequence": { - "acceleration_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_prime_tower": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_print": - { - "enabled": false, - "value": 800 - }, - "acceleration_print_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_bottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_interface": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_roof": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_topbottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_travel": - { - "enabled": false, - "value": 5000 - }, - "acceleration_travel_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_travel_layer_0": - { - "enabled": false, - "value": "acceleration_travel" - }, - "acceleration_wall": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "adhesion_extruder_nr": { "value": 0 }, - "adhesion_type": { "value": "'raft'" }, - "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, - "bridge_skin_material_flow_2": { "value": "material_flow" }, - "bridge_skin_material_flow_3": { "value": "material_flow" }, - "bridge_skin_speed": { "value": "speed_topbottom" }, - "bridge_skin_speed_2": { "value": "speed_topbottom" }, - "bridge_skin_speed_3": { "value": "speed_topbottom" }, - "bridge_sparse_infill_max_density": { "value": 50 }, - "bridge_wall_coast": { "value": 0 }, - "bridge_wall_material_flow": { "value": "material_flow" }, - "bridge_wall_speed": { "value": "speed_wall" }, - "brim_width": { "value": 5 }, - "extruder_prime_pos_abs": { "default_value": true }, - "gradual_support_infill_steps": { "value": 0 }, - "infill_before_walls": { "value": false }, - "infill_enable_travel_optimization": { "value": true }, - "infill_material_flow": { "value": "material_flow" }, - "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, - "infill_wipe_dist": { "value": 0 }, - "inset_direction": { "value": "'inside_out'" }, - "jerk_enabled": - { - "enabled": false, - "value": true - }, - "jerk_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_prime_tower": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_print": - { - "enabled": false, - "value": 6.25 - }, - "jerk_print_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_bottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_interface": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_roof": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_topbottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel_enabled": - { - "enabled": false, - "value": true - }, - "jerk_travel_layer_0": - { - "enabled": false, - "value": "jerk_travel" - }, - "jerk_wall": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "value": true }, - "machine_end_gcode": { "default_value": "" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": false }, - "machine_heated_build_volume": { "default_value": true }, - "machine_min_cool_heat_time_window": { "value": 15 }, - "machine_name": { "default_value": "UltiMaker Method" }, - "machine_nozzle_cool_down_speed": { "value": 0.8 }, - "machine_nozzle_heat_up_speed": { "value": 3.5 }, - "machine_scale_fan_speed_zero_to_one": { "value": true }, - "machine_start_gcode": { "default_value": "" }, - "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, - "material_final_print_temperature": { "value": "material_print_temperature-10" }, - "material_flow": { "value": 100 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, - "material_print_temperature": { "value": "default_material_print_temperature" }, - "material_shrinkage_percentage": { "enabled": true }, - "min_wall_line_width": { "value": 0.4 }, - "minimum_support_area": { "value": 0.1 }, - "multiple_mesh_overlap": { "value": 0 }, - "optimize_wall_printing_order": { "value": true }, - "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, - "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, - "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, - "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": { "enabled": false }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, - "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, - "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, - "raft_interface_thickness": { "value": 0.3 }, - "raft_interface_wall_count": { "value": "raft_wall_count" }, - "raft_margin": { "value": 1.2 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, - "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": "speed_travel / 10" }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 0 }, - "retraction_hop": { "value": 0.4 }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": false }, - "retraction_prime_speed": { "value": "retraction_speed" }, - "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "material_flow" }, - "skin_monotonic": { "value": true }, - "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, - "skin_preshrink": { "value": 0 }, - "skirt_brim_material_flow": { "value": "material_flow" }, - "skirt_brim_minimal_length": { "value": 500 }, - "small_skin_width": { "value": 4 }, - "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, - "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_bottom_material_flow": { "value": "material_flow" }, - "support_brim_enable": { "value": false }, - "support_conical_min_width": { "value": 10 }, - "support_enable": { "value": true }, - "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, - "support_infill_rate": { "value": 20.0 }, - "support_interface_enable": { "value": true }, - "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, - "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, - "support_material_flow": { "value": "material_flow" }, - "support_pattern": { "value": "'lines'" }, - "support_roof_material_flow": { "value": "material_flow" }, - "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, - "switch_extruder_retraction_amount": { "value": 0.5 }, - "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "travel_avoid_other_parts": { "value": false }, - "wall_0_inset": { "value": 0 }, - "wall_0_material_flow": { "value": "material_flow" }, - "wall_0_wipe_dist": { "value": 0.8 }, - "wall_material_flow": { "value": "material_flow" }, - "wall_x_material_flow": { "value": "material_flow" }, - "xy_offset": { "value": 0 }, - "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_position": { "value": "'backright'" }, - "z_seam_relative": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "enabled": false + }, + "prime_tower_base_size": { + "value": 10 + }, + "prime_tower_base_height": { + "value": 6 + }, + "prime_tower_base_curve_magnitude": { + "value": 2 + }, + "raft_base_line_spacing": { + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": { + "value": 1.4 + }, + "raft_base_speed": { + "value": 10 + }, + "raft_base_thickness": { + "value": 0.8 + }, + "raft_interface_extruder_nr": { + "value": "raft_surface_extruder_nr" + }, + "raft_interface_layers": { + "value": 2 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_speed": { + "value": 90 + }, + "raft_interface_thickness": { + "value": 0.3 + }, + "raft_interface_wall_count": { + "value": "raft_wall_count" + }, + "raft_margin": { + "value": 1.2 + }, + "raft_surface_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" + }, + "raft_surface_wall_count": { + "value": "raft_wall_count" + }, + "retraction_amount": { + "value": 0.75 + }, + "retraction_combing": { + "value": "'off'" + }, + "retraction_combing_max_distance": { + "value": "speed_travel / 10" + }, + "retraction_count_max": { + "value": 100 + }, + "retraction_extrusion_window": { + "value": 0 + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop_only_when_collides": { + "value": false + }, + "retraction_prime_speed": { + "value": "retraction_speed" + }, + "retraction_speed": { + "value": 5 + }, + "roofing_layer_count": { + "value": 2 + }, + "roofing_monotonic": { + "value": true + }, + "skin_monotonic": { + "value": true + }, + "skin_outline_count": { + "value": 0 + }, + "skin_overlap": { + "value": 0 + }, + "skin_preshrink": { + "value": 0 + }, + "skirt_brim_material_flow": { + "value": "material_flow" + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "small_skin_width": { + "value": 4 + }, + "speed_equalize_flow_width_factor": { + "value": 0 + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_print": { + "value": 50 + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_support": { + "value": "speed_wall" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "speed_topbottom": { + "value": "speed_wall" + }, + "speed_travel": { + "value": 250 + }, + "speed_wall": { + "value": "speed_print * 40/50" + }, + "speed_wall_0": { + "value": "speed_wall * 30/40" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "support_angle": { + "value": 40 + }, + "support_bottom_distance": { + "value": "support_z_distance / 2" + }, + "support_bottom_material_flow": { + "value": "material_flow" + }, + "support_brim_enable": { + "value": false + }, + "support_conical_min_width": { + "value": 10 + }, + "support_enable": { + "value": true + }, + "support_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material'))" + }, + "support_fan_enable": { + "value": false + }, + "support_infill_rate": { + "value": 20.0 + }, + "support_interface_enable": { + "value": true + }, + "support_interface_material_flow": { + "value": "material_flow" + }, + "support_interface_offset": { + "value": 0 + }, + "support_interface_pattern": { + "value": "'lines'" + }, + "support_interface_wall_count": { + "value": 2 + }, + "support_material_flow": { + "value": "material_flow" + }, + "support_pattern": { + "value": "'lines'" + }, + "support_roof_material_flow": { + "value": "material_flow" + }, + "support_supported_skin_fan_speed": { + "value": "cool_fan_speed_max" + }, + "support_top_distance": { + "value": "support_z_distance" + }, + "support_wall_count": { + "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" + }, + "support_xy_distance": { + "value": 0.2 + }, + "support_z_distance": { + "value": 0 + }, + "switch_extruder_retraction_amount": { + "value": 0.5 + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed" + }, + "top_bottom_thickness": { + "value": "5*layer_height" + }, + "travel_avoid_distance": { + "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" + }, + "travel_avoid_other_parts": { + "value": false + }, + "wall_0_inset": { + "value": 0 + }, + "wall_0_material_flow": { + "value": "material_flow" + }, + "wall_0_wipe_dist": { + "value": 0.8 + }, + "wall_material_flow": { + "value": "material_flow" + }, + "wall_x_material_flow": { + "value": "material_flow" + }, + "xy_offset": { + "value": 0 + }, + "xy_offset_layer_0": { + "value": "xy_offset" + }, + "zig_zaggify_infill": { + "value": true + }, + "z_seam_position": { + "value": "'backright'" + }, + "z_seam_relative": { + "value": true + }, + "z_seam_type": { + "value": "'sharpest_corner'" + }, + "acceleration_enabled": { + "value": true, + "enabled": false + }, + "acceleration_travel_enabled": { + "value": true, + "enabled": false + }, + "acceleration_print": { + "value": 800, + "enabled": false + }, + "acceleration_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_topbottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_interface": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_roof": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_bottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_prime_tower": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_travel": { + "value": 5000, + "enabled": false + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel", + "enabled": false + }, + "acceleration_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_print_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "jerk_enabled": { + "value": true, + "enabled": false + }, + "jerk_travel_enabled": { + "value": true, + "enabled": false + }, + "jerk_print": { + "value": 6.25, + "enabled": false + }, + "jerk_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x": { + "value": "jerk_print", + "enabled": false + }, + "jerk_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_topbottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_interface": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_roof": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_bottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_prime_tower": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel_layer_0": { + "value": "jerk_travel", + "enabled": false + }, + "jerk_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_print_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x_roofing": { + "value": "jerk_print", + "enabled": false } + } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 9828ba96f2..262647e781 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -48,6 +36,8 @@ "polywood_pla", "redd_", "tizyx_", + "ultimaker_pla_175", + "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", @@ -70,7 +60,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", "preferred_quality_type": "draft", "preferred_variant_name": "1XA", @@ -116,7 +105,13 @@ "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, "machine_width": { "default_value": 283.3 }, + "material_flow": { + "value": 97 + }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "skin_material_flow": { + "value": "0.95*material_flow" + } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 6c12218b51..098586df68 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -18,12 +18,6 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index f6c9e35622..e6d17d87a8 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_method", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, - "maximum_value": "1" + "maximum_value": 1 }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 9c6521f35b..9591daa35a 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_method", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, - "maximum_value": "1" + "maximum_value": 1 }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 1e4fefb17e..a77c9c576b 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 34aba96b42..6ff40895a0 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 43de74b497..4f315999a5 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodxl", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 10 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":10 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 581811646f..c0d39f811a 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodxl", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 10 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":10 + } } -} \ No newline at end of file +} diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 09767ce8a7..8f4fcf08cd 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 17b29cbbef..8d73200d81 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d5fa82b7a..b903d9a419 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index fe2f11dac9..e760b2d642 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 05a61d6b82..2527856c8c 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 5375e81138..8293c9f51a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 364eea5b52..e5877fbae4 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 7164ec03e8..f98c3b0043 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 3a5e5e4491..3c760ee13c 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 271a651e20..2c82f9dde9 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 428c5e950f..294aa9e702 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,16 +4,16 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] -build_plate_temperature = 45 build_volume_temperature = 45 infill_pattern = lines infill_sparse_density = 100 +material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 4594c37f50..11589adae4 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index fff7bb9e19..91a9e40dcc 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,16 +4,16 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] -build_plate_temperature = 45 build_volume_temperature = 45 infill_pattern = lines infill_sparse_density = 100 +material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 0ae080086d..4a8faa703f 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index c27d1e596a..af7e8e0819 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,16 +4,16 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] -build_plate_temperature = 45 build_volume_temperature = 45 infill_pattern = lines infill_sparse_density = 100 +material_bed_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 65218afbda..809acb9d2d 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index e4ab617a39..4c80139d70 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] @@ -17,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index ca62933f25..cd264fb95f 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index c2fab76b89..82298fbb70 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index 433d839545..f889bedb60 100644 --- a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_method -name = Fast version = 4 +name = Fast +definition = ultimaker_method [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg index b1304e3b14..b07a54ce8e 100644 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_method -name = Fine version = 4 +name = Fine +definition = ultimaker_method [metadata] -global_quality = True -quality_type = normal setting_version = 23 type = quality +quality_type = normal weight = 0 +global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index b3e7d1da4d..57c3ed6207 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] @@ -17,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 7f6b2a7be2..0069d15c80 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index 9db56941cb..d8d1aba9e8 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 78e7b96bc8..005f55166f 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index a75826d1ae..2ee6e68d37 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 4fa889187b..1f5ac00167 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg index f3d1eea204..082218b554 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_methodx -name = Fast version = 4 +name = Fast +definition = ultimaker_methodx [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index afc790abb4..0d8e243dc9 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 44b777ea77..5b615d9329 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c1f049384a..c43848cd42 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 5d5f891daf..a82e951c77 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 9ddfc18600..cc774cfe15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 594c9e6d15..2eb21fb62f 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg index 115568be2c..d15026d184 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_methodxl -name = Fast version = 4 +name = Fast +definition = ultimaker_methodxl [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index cc075adf90..b191c53e4d 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 40a85a3a0e..cb6738bc3e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg index d8ac36154a..5d637829ec 100644 --- a/resources/variants/ultimaker_method_1A.inst.cfg +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -1,13 +1,13 @@ [general] -definition = ultimaker_method name = 1A version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle -reference_extruder_id = mk14 setting_version = 23 type = variant +reference_extruder_id = mk14 +hardware_type = nozzle [values] machine_nozzle_id = 1A diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg index b881a01fdc..bfb2e05bc8 100644 --- a/resources/variants/ultimaker_method_1C.inst.cfg +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -1,13 +1,13 @@ [general] -definition = ultimaker_method name = 1C version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle -reference_extruder_id = mk14_c setting_version = 23 type = variant +reference_extruder_id = mk14_c +hardware_type = nozzle [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg index b2f16e4472..8e336e8170 100644 --- a/resources/variants/ultimaker_method_2A.inst.cfg +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -1,13 +1,13 @@ [general] -definition = ultimaker_method name = 2A version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle -reference_extruder_id = mk14_s setting_version = 23 type = variant +reference_extruder_id = mk14_s +hardware_type = nozzle [values] machine_nozzle_id = 2A diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg index 97e78c30e0..25f35f7bd3 100644 --- a/resources/variants/ultimaker_method_LABS.inst.cfg +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -1,12 +1,12 @@ [general] -definition = ultimaker_method name = LABS version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle setting_version = 23 type = variant +hardware_type = nozzle [values] machine_nozzle_id = LABS From 74777085df7c6cbec01e80f511c56a6558d81bae Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 16:51:45 +0000 Subject: [PATCH 53/84] Applied printer-linter format --- .../ultimaker_method_base.def.json | 1082 +++++++---------- .../definitions/ultimaker_methodx.def.json | 8 +- .../ultimaker_method_extruder_left.def.json | 28 +- .../ultimaker_method_extruder_right.def.json | 28 +- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- .../ultimaker_methodxl_extruder_left.def.json | 28 +- ...ultimaker_methodxl_extruder_right.def.json | 28 +- ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_method_global_Draft_Quality.inst.cfg | 8 +- .../um_method_global_Normal_Quality.inst.cfg | 8 +- ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodx_global_Draft_Quality.inst.cfg | 8 +- ...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_global_Draft_Quality.inst.cfg | 8 +- ...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../variants/ultimaker_method_1A.inst.cfg | 6 +- .../variants/ultimaker_method_1C.inst.cfg | 6 +- .../variants/ultimaker_method_2A.inst.cfg | 6 +- .../variants/ultimaker_method_LABS.inst.cfg | 4 +- 49 files changed, 601 insertions(+), 873 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index cd46b31900..e97db9b28e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,667 +1,423 @@ { - "version": 2, - "inherits": "ultimaker", - "metadata": { - "author": "UltiMaker", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "file_formats": "application/x-makerbot", - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "manufacturer": "Ultimaker B.V.", - "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_method_platform.stl", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "preferred_material": "ultimaker_pla_175", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "visible": false, - "weight": -1 - }, - "name": "UltiMaker Method Base Profile", - "overrides": { - "adhesion_extruder_nr": { - "value": 0 - }, - "adhesion_type": { - "value": "'raft'" - }, - "bridge_enable_more_layers": { - "value": true - }, - "bridge_fan_speed": { - "value": "cool_fan_speed_max" - }, - "bridge_fan_speed_2": { - "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" - }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, - "bridge_settings_enabled": { - "value": true - }, - "bridge_skin_density": { - "value": 100 - }, - "bridge_skin_density_2": { - "value": 100 - }, - "bridge_skin_density_3": { - "value": 100 - }, - "bridge_skin_material_flow": { - "value": "material_flow" - }, - "bridge_skin_material_flow_2": { - "value": "material_flow" - }, - "bridge_skin_material_flow_3": { - "value": "material_flow" - }, - "bridge_skin_speed": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_2": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_3": { - "value": "speed_topbottom" - }, - "bridge_sparse_infill_max_density": { - "value": 50 - }, - "bridge_wall_coast": { - "value": 0 - }, - "bridge_wall_material_flow": { - "value": "material_flow" - }, - "bridge_wall_speed": { - "value": "speed_wall" - }, - "brim_width": { - "value": 5 - }, - "extruder_prime_pos_abs": { - "default_value": true - }, - "gradual_support_infill_steps": { - "value": 0 - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "value": "'inside_out'" - }, - "infill_material_flow": { - "value": "material_flow" - }, - "infill_overlap": { - "value": 0 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 80 else 'grid'" - }, - "infill_wipe_dist": { - "value": 0 - }, - "layer_start_x": { - "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" - }, - "layer_start_y": { - "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_center_is_zero": { - "value": true - }, - "machine_scale_fan_speed_zero_to_one": { - "value": true - }, - "machine_end_gcode": { - "default_value": "" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "Griffin" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": true - }, - "machine_min_cool_heat_time_window": { - "value": 15 - }, - "machine_name": { - "default_value": "UltiMaker Method" - }, - "machine_start_gcode": { - "default_value": "" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature-10" - }, - "machine_nozzle_heat_up_speed": { - "value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "value": 0.8 - }, - "material_flow": { - "value": 100 - }, - "skin_material_flow": { - "value": "material_flow" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed" - }, - "material_shrinkage_percentage": { - "enabled": true - }, - "min_wall_line_width": { - "value": 0.4 - }, - "minimum_support_area": { - "value": 0.1 - }, - "multiple_mesh_overlap": { - "value": 0 - }, - "optimize_wall_printing_order": { - "value": true - }, - "prime_blob_enable": { - "enabled": false - }, - "prime_tower_enable": { - "value": false - }, - "prime_tower_flow": { - "value": "material_flow" - }, - "prime_tower_line_width": { - "value": 1 - }, - "prime_tower_raft_base_line_spacing": { - "value": "raft_base_line_width" - }, - "prime_tower_wipe_enabled": { - "value": true - }, - "print_sequence": + "version": 2, + "name": "UltiMaker Method Base Profile", + "inherits": "ultimaker", + "metadata": { - "enabled": false - }, - "prime_tower_base_size": { - "value": 10 - }, - "prime_tower_base_height": { - "value": 6 - }, - "prime_tower_base_curve_magnitude": { - "value": 2 - }, - "raft_base_line_spacing": { - "value": "2*raft_base_line_width" - }, - "raft_base_line_width": { - "value": 1.4 - }, - "raft_base_speed": { - "value": 10 - }, - "raft_base_thickness": { - "value": 0.8 - }, - "raft_interface_extruder_nr": { - "value": "raft_surface_extruder_nr" - }, - "raft_interface_layers": { - "value": 2 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_interface_speed": { - "value": 90 - }, - "raft_interface_thickness": { - "value": 0.3 - }, - "raft_interface_wall_count": { - "value": "raft_wall_count" - }, - "raft_margin": { - "value": 1.2 - }, - "raft_surface_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" - }, - "raft_surface_wall_count": { - "value": "raft_wall_count" - }, - "retraction_amount": { - "value": 0.75 - }, - "retraction_combing": { - "value": "'off'" - }, - "retraction_combing_max_distance": { - "value": "speed_travel / 10" - }, - "retraction_count_max": { - "value": 100 - }, - "retraction_extrusion_window": { - "value": 0 - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop_only_when_collides": { - "value": false - }, - "retraction_prime_speed": { - "value": "retraction_speed" - }, - "retraction_speed": { - "value": 5 - }, - "roofing_layer_count": { - "value": 2 - }, - "roofing_monotonic": { - "value": true - }, - "skin_monotonic": { - "value": true - }, - "skin_outline_count": { - "value": 0 - }, - "skin_overlap": { - "value": 0 - }, - "skin_preshrink": { - "value": 0 - }, - "skirt_brim_material_flow": { - "value": "material_flow" - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "small_skin_width": { - "value": 4 - }, - "speed_equalize_flow_width_factor": { - "value": 0 - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_print": { - "value": 50 - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_support": { - "value": "speed_wall" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "speed_topbottom": { - "value": "speed_wall" - }, - "speed_travel": { - "value": 250 - }, - "speed_wall": { - "value": "speed_print * 40/50" - }, - "speed_wall_0": { - "value": "speed_wall * 30/40" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "support_angle": { - "value": 40 - }, - "support_bottom_distance": { - "value": "support_z_distance / 2" - }, - "support_bottom_material_flow": { - "value": "material_flow" - }, - "support_brim_enable": { - "value": false - }, - "support_conical_min_width": { - "value": 10 - }, - "support_enable": { - "value": true - }, - "support_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material'))" - }, - "support_fan_enable": { - "value": false - }, - "support_infill_rate": { - "value": 20.0 - }, - "support_interface_enable": { - "value": true - }, - "support_interface_material_flow": { - "value": "material_flow" - }, - "support_interface_offset": { - "value": 0 - }, - "support_interface_pattern": { - "value": "'lines'" - }, - "support_interface_wall_count": { - "value": 2 - }, - "support_material_flow": { - "value": "material_flow" - }, - "support_pattern": { - "value": "'lines'" - }, - "support_roof_material_flow": { - "value": "material_flow" - }, - "support_supported_skin_fan_speed": { - "value": "cool_fan_speed_max" - }, - "support_top_distance": { - "value": "support_z_distance" - }, - "support_wall_count": { - "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" - }, - "support_xy_distance": { - "value": 0.2 - }, - "support_z_distance": { - "value": 0 - }, - "switch_extruder_retraction_amount": { - "value": 0.5 - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed" - }, - "top_bottom_thickness": { - "value": "5*layer_height" - }, - "travel_avoid_distance": { - "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" - }, - "travel_avoid_other_parts": { - "value": false - }, - "wall_0_inset": { - "value": 0 - }, - "wall_0_material_flow": { - "value": "material_flow" - }, - "wall_0_wipe_dist": { - "value": 0.8 - }, - "wall_material_flow": { - "value": "material_flow" - }, - "wall_x_material_flow": { - "value": "material_flow" - }, - "xy_offset": { - "value": 0 - }, - "xy_offset_layer_0": { - "value": "xy_offset" - }, - "zig_zaggify_infill": { - "value": true - }, - "z_seam_position": { - "value": "'backright'" - }, - "z_seam_relative": { - "value": true - }, - "z_seam_type": { - "value": "'sharpest_corner'" - }, - "acceleration_enabled": { - "value": true, - "enabled": false - }, - "acceleration_travel_enabled": { - "value": true, - "enabled": false - }, - "acceleration_print": { - "value": 800, - "enabled": false - }, - "acceleration_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_topbottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_interface": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_roof": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_bottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_prime_tower": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_travel": { - "value": 5000, - "enabled": false - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel", - "enabled": false - }, - "acceleration_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_print_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "jerk_enabled": { - "value": true, - "enabled": false - }, - "jerk_travel_enabled": { - "value": true, - "enabled": false - }, - "jerk_print": { - "value": 6.25, - "enabled": false - }, - "jerk_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x": { - "value": "jerk_print", - "enabled": false - }, - "jerk_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_topbottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_interface": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_roof": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_bottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_prime_tower": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel_layer_0": { - "value": "jerk_travel", - "enabled": false - }, - "jerk_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_print_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x_roofing": { - "value": "jerk_print", - "enabled": false + "visible": false, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "nozzle_offsetting_for_disallowed_areas": false, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "adhesion_extruder_nr": { "value": 0 }, + "adhesion_type": { "value": "'raft'" }, + "bridge_enable_more_layers": { "value": true }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow_2": { "value": "material_flow" }, + "bridge_skin_material_flow_3": { "value": "material_flow" }, + "bridge_skin_speed": { "value": "speed_topbottom" }, + "bridge_skin_speed_2": { "value": "speed_topbottom" }, + "bridge_skin_speed_3": { "value": "speed_topbottom" }, + "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_wall_coast": { "value": 0 }, + "bridge_wall_material_flow": { "value": "material_flow" }, + "bridge_wall_speed": { "value": "speed_wall" }, + "brim_width": { "value": 5 }, + "extruder_prime_pos_abs": { "default_value": true }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_material_flow": { "value": "material_flow" }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": 0 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 6.25 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "value": true }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": true }, + "machine_min_cool_heat_time_window": { "value": 15 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_nozzle_cool_down_speed": { "value": 0.8 }, + "machine_nozzle_heat_up_speed": { "value": 3.5 }, + "machine_scale_fan_speed_zero_to_one": { "value": true }, + "machine_start_gcode": { "default_value": "" }, + "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_shrinkage_percentage": { "enabled": true }, + "min_wall_line_width": { "value": 0.4 }, + "minimum_support_area": { "value": 0.1 }, + "multiple_mesh_overlap": { "value": 0 }, + "optimize_wall_printing_order": { "value": true }, + "prime_blob_enable": { "enabled": false }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, + "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, + "prime_tower_wipe_enabled": { "value": true }, + "print_sequence": { "enabled": false }, + "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_width": { "value": 1.4 }, + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": { "value": 0.8 }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": { "value": 90 }, + "raft_interface_thickness": { "value": 0.3 }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": 1.2 }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retraction_amount": { "value": 0.75 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": "speed_travel / 10" }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 0 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": false }, + "retraction_prime_speed": { "value": "retraction_speed" }, + "retraction_speed": { "value": 5 }, + "roofing_layer_count": { "value": 2 }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 0 }, + "skin_preshrink": { "value": 0 }, + "skirt_brim_material_flow": { "value": "material_flow" }, + "skirt_brim_minimal_length": { "value": 500 }, + "small_skin_width": { "value": 4 }, + "speed_equalize_flow_width_factor": { "value": 0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, + "speed_travel": { "value": 250 }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": 40 }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_material_flow": { "value": "material_flow" }, + "support_brim_enable": { "value": false }, + "support_conical_min_width": { "value": 10 }, + "support_enable": { "value": true }, + "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": 20.0 }, + "support_interface_enable": { "value": true }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 0 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 2 }, + "support_material_flow": { "value": "material_flow" }, + "support_pattern": { "value": "'lines'" }, + "support_roof_material_flow": { "value": "material_flow" }, + "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_xy_distance": { "value": 0.2 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_retraction_amount": { "value": 0.5 }, + "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, + "top_bottom_thickness": { "value": "5*layer_height" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_other_parts": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_wipe_dist": { "value": 0.8 }, + "wall_material_flow": { "value": "material_flow" }, + "wall_x_material_flow": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": "xy_offset" }, + "z_seam_position": { "value": "'backright'" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "zig_zaggify_infill": { "value": true } } - } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 262647e781..7a6c8aa494 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -105,13 +105,9 @@ "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, "machine_width": { "default_value": 283.3 }, - "material_flow": { - "value": 97 - }, + "material_flow": { "value": 97 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "skin_material_flow": { - "value": "0.95*material_flow" - } + "skin_material_flow": { "value": "0.95*material_flow" } } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index e6d17d87a8..cb8e86a33b 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 9591daa35a..520d8abae8 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index a77c9c576b..1e4fefb17e 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 6ff40895a0..34aba96b42 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 4f315999a5..64c1577f1e 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodxl", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":10 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index c0d39f811a..0af672130d 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodxl", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":10 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 8f4fcf08cd..09767ce8a7 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 8d73200d81..17b29cbbef 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index b903d9a419..3d5fa82b7a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index e760b2d642..fe2f11dac9 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 2527856c8c..05a61d6b82 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 8293c9f51a..5375e81138 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index e5877fbae4..2a6f009282 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index f98c3b0043..7164ec03e8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 3c760ee13c..13ff5b5b67 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2c82f9dde9..271a651e20 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 294aa9e702..ce3c938e8c 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 11589adae4..1f6aad371a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 91a9e40dcc..2ac7cdd32a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 4a8faa703f..0322b30164 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index af7e8e0819..242d166473 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 809acb9d2d..65218afbda 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 4c80139d70..fd1f868b7a 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index cd264fb95f..ca62933f25 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 82298fbb70..c2fab76b89 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index f889bedb60..433d839545 100644 --- a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_method +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg index b07a54ce8e..b1304e3b14 100644 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fine definition = ultimaker_method +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 23 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 57c3ed6207..8fa5f11f67 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 0069d15c80..7f6b2a7be2 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index d8d1aba9e8..9db56941cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 005f55166f..aafa89e07c 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index 2ee6e68d37..a75826d1ae 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 1f5ac00167..4fa889187b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg index 082218b554..f3d1eea204 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_methodx +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 0d8e243dc9..b2d657955a 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 5b615d9329..44b777ea77 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c43848cd42..c1f049384a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index a82e951c77..8554e49fe8 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 2eb21fb62f..594c9e6d15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg index d15026d184..115568be2c 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_methodxl +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index b191c53e4d..b14d2334e5 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg index 5d637829ec..d8ac36154a 100644 --- a/resources/variants/ultimaker_method_1A.inst.cfg +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14 setting_version = 23 type = variant -reference_extruder_id = mk14 -hardware_type = nozzle [values] machine_nozzle_id = 1A diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg index bfb2e05bc8..b881a01fdc 100644 --- a/resources/variants/ultimaker_method_1C.inst.cfg +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1C version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_c setting_version = 23 type = variant -reference_extruder_id = mk14_c -hardware_type = nozzle [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg index 8e336e8170..b2f16e4472 100644 --- a/resources/variants/ultimaker_method_2A.inst.cfg +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 2A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s setting_version = 23 type = variant -reference_extruder_id = mk14_s -hardware_type = nozzle [values] machine_nozzle_id = 2A diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg index 25f35f7bd3..97e78c30e0 100644 --- a/resources/variants/ultimaker_method_LABS.inst.cfg +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_method name = LABS version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] machine_nozzle_id = LABS From 0d977178f105d11ef34f500271e0102854c775ab Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:02:14 +0200 Subject: [PATCH 54/84] Removed PLA filter from Method X and Method XL. Changed setting support_infill_density_multiplier_layer_0 to support_infill_density_multiplier_initial_layer. Added Tough PLA to the MaterialOutputModel.py so it is recognised by Cura. PP-475 --- cura/PrinterOutput/Models/MaterialOutputModel.py | 3 ++- resources/definitions/ultimaker_methodx.def.json | 1 - .../ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/PrinterOutput/Models/MaterialOutputModel.py b/cura/PrinterOutput/Models/MaterialOutputModel.py index f9125278f0..06d01604d2 100644 --- a/cura/PrinterOutput/Models/MaterialOutputModel.py +++ b/cura/PrinterOutput/Models/MaterialOutputModel.py @@ -39,7 +39,8 @@ class MaterialOutputModel(QObject): "bvoh" :{"name" :"BVOH" ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, "cpe" :{"name" :"CPE" ,"guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, "hips" :{"name" :"HIPS" ,"guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"} + "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, + "im-pla" :{"name": "Tough" ,"guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} } diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 7a6c8aa494..5202b7f66a 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -36,7 +36,6 @@ "polywood_pla", "redd_", "tizyx_", - "ultimaker_pla_175", "ultimaker_tough_pla_175", "verbatim_", "Vertex_", diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index c2fab76b89..40b591975c 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -60,7 +60,7 @@ support_bottom_wall_count = 2 support_conical_angle = 20 support_conical_min_width = 20 support_fan_enable = False -support_infill_density_multiplier_layer_0 = 2 +support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 4fa889187b..fe1a6de6b7 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -60,7 +60,7 @@ support_bottom_wall_count = 2 support_conical_angle = 20 support_conical_min_width = 20 support_fan_enable = False -support_infill_density_multiplier_layer_0 = 2 +support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 594c9e6d15..611921c3f1 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -60,7 +60,7 @@ support_bottom_wall_count = 2 support_conical_angle = 20 support_conical_min_width = 20 support_fan_enable = False -support_infill_density_multiplier_layer_0 = 2 +support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_enable = True From 06d85437f7e6d92b43a13e6a59af4caed9f13e55 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 12:05:38 +0200 Subject: [PATCH 55/84] Display new setting in advanced and expert configs CURA-11795 --- resources/setting_visibility/advanced.cfg | 1 + resources/setting_visibility/expert.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 652f33b4a4..261743c708 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -97,6 +97,7 @@ cool_fan_full_layer cool_min_layer_time cool_min_speed cool_lift_head +cool_during_extruder_switch [support] support_enable diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 3742fc9f60..4c0c2180ec 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -249,6 +249,7 @@ cool_fan_full_layer cool_min_layer_time cool_min_speed cool_lift_head +cool_during_extruder_switch [support] support_enable From 9e2c44009716ccc401ec52632f36cb2a1bb3ecc3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 15:36:10 +0200 Subject: [PATCH 56/84] Fix false warnings on setting formulas We also need to consider the extruder settings when looking into formulas for existing values. --- printer-linter/src/printerlinter/linters/formulas.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/printer-linter/src/printerlinter/linters/formulas.py b/printer-linter/src/printerlinter/linters/formulas.py index aa31619678..07f1bc24a8 100644 --- a/printer-linter/src/printerlinter/linters/formulas.py +++ b/printer-linter/src/printerlinter/linters/formulas.py @@ -51,9 +51,17 @@ class Formulas(Linter): self._definition = {} def getCuraSettingList(self) -> list: + settings_list = [] + with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmprinter.def.json")) as data: json_data = json.load(data) - return self.extractKeys(json_data) + settings_list += self.extractKeys(json_data) + + with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmextruder.def.json")) as data: + json_data = json.load(data) + settings_list += self.extractKeys(json_data) + + return settings_list def extractKeys(self, json_obj, parent_key=''): keys_with_value = [] From 7233bcfa29f7e3cc0dd4bb2d39deb08a2e7ec956 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 10:18:09 -0400 Subject: [PATCH 57/84] updated PLA on Method XL PP-475 --- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 2ac7cdd32a..91a9e40dcc 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 242d166473..af7e8e0819 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 9ddfc18600..cc774cfe15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 40a85a3a0e..cb6738bc3e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] From 216420a755d2756ede41d5cf3f289d0db114bc6a Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 14:19:25 +0000 Subject: [PATCH 58/84] Applied printer-linter format --- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 91a9e40dcc..2ac7cdd32a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index af7e8e0819..242d166473 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] From 9f5658adb79b1b10c827f77698b4dd80810895f1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 16:43:38 +0200 Subject: [PATCH 59/84] Add missing intent translation CURA-11976 --- cura/Machines/Models/IntentTranslations.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index 3a2afcb7c5..aab902204a 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -24,6 +24,10 @@ intent_translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") } +intent_translations["annealing"] = { + "name": catalog.i18nc("@label", "Annealing"), + "description": catalog.i18nc("@text", "The annealing profile requires post-processing in an oven after the print is finished. This profile retains the dimensional accuracy of the printed part after annealing and improves strength, stiffness, and thermal resistance.") +} intent_translations["solid"] = { "name": catalog.i18nc("@label", "Solid"), "description": catalog.i18nc("@text", From fb274df5278f32124e69d5fedc0f6bb279292c5a Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 10:51:46 -0400 Subject: [PATCH 60/84] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: Erwan MATHIEU --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 670f437024..1ff2f00c60 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -404,7 +404,7 @@ "support_conical_min_width": { "value": 10 }, "support_enable": { "value": true }, "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": "true if extruder_nr == support_extruder_nr else false" }, + "support_fan_enable": { "value": "extruder_nr == support_extruder_nr" }, "support_infill_rate": { "value": 20.0 }, "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, From 5857f37f07b5de6c2f8341a522f4f6c6d620a67f Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 10:54:18 -0400 Subject: [PATCH 61/84] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 1ff2f00c60..862238c578 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -358,8 +358,7 @@ "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, "raft_surface_fan_speed": { "value": 0 }, - "raft_surface_monotonic": { "value": true }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, "retraction_combing": { "value": "'off'" }, From 828362d2d0c685d5daa69d4456ca73dec9916812 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 10:54:50 -0400 Subject: [PATCH 62/84] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 862238c578..6e322a64d4 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -372,8 +372,7 @@ "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, "roofing_layer_count": { "value": 2 }, - "roofing_material_flow": { "value": "material_flow" }, - "roofing_monotonic": { "value": true }, + "roofing_monotonic": { "value": true }, "skin_material_flow": { "value": "material_flow" }, "skin_material_flow_layer_0": { "value": "material_flow" }, "skin_monotonic": { "value": true }, From 637d516e742143179b61f3cd6ab46c610d26df1c Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 14:55:45 +0000 Subject: [PATCH 63/84] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 6e322a64d4..71bd386fd2 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -358,7 +358,7 @@ "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, "raft_surface_fan_speed": { "value": 0 }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, "retraction_combing": { "value": "'off'" }, @@ -372,7 +372,7 @@ "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, + "roofing_monotonic": { "value": true }, "skin_material_flow": { "value": "material_flow" }, "skin_material_flow_layer_0": { "value": "material_flow" }, "skin_monotonic": { "value": true }, From df04127a9dcb7b865d31c3300f63c056686a01ae Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 11:06:59 -0400 Subject: [PATCH 64/84] removed support_z_distance = 0 from soluble material quality files, this value was in the base definition file PP-490 --- .../um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 5 ++--- .../um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg | 7 +++---- .../um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 5 ++--- .../um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg | 7 +++---- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 4cfb9c9276..82130b359a 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2XA material = ultimaker_rapidrinse_175 quality_type = draft -setting_version = 23 type = quality -variant = 2XA weight = -2 [values] @@ -32,5 +32,4 @@ support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 support_interface_enable = True support_wall_count = 1 support_xy_distance = 0.2 -support_z_distance = 0 diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg index 2ee2106356..64bfd5b293 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg @@ -4,13 +4,13 @@ name = Fast - Experimental version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = 2XA material = ultimaker_sr30_175 quality_type = draft -setting_version = 23 type = quality -variant = 2XA weight = -2 +is_experimental = True [values] brim_replaces_support = False @@ -37,5 +37,4 @@ support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 support_interface_enable = True support_wall_count = 1 support_xy_distance = 0.2 -support_z_distance = 0 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg index f73e194cc2..168d4cd66a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2XA material = ultimaker_rapidrinse_175 quality_type = draft -setting_version = 23 type = quality -variant = 2XA weight = -2 [values] @@ -32,5 +32,4 @@ support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 support_interface_enable = True support_wall_count = 1 support_xy_distance = 0.2 -support_z_distance = 0 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg index 370a22fd34..b97cea9743 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg @@ -4,13 +4,13 @@ name = Fast - Experimental version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = 2XA material = ultimaker_sr30_175 quality_type = draft -setting_version = 23 type = quality -variant = 2XA weight = -2 +is_experimental = True [values] brim_replaces_support = False @@ -37,5 +37,4 @@ support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 support_interface_enable = True support_wall_count = 1 support_xy_distance = 0.2 -support_z_distance = 0 From ec452d609b51df9a7221c1004c5d783969510e86 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 15:08:04 +0000 Subject: [PATCH 65/84] Applied printer-linter format --- .../um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg | 6 +++--- .../um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 82130b359a..14b81d4b2b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2XA material = ultimaker_rapidrinse_175 quality_type = draft +setting_version = 23 type = quality +variant = 2XA weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg index 64bfd5b293..0c8ec95802 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg @@ -4,13 +4,13 @@ name = Fast - Experimental version = 4 [metadata] -setting_version = 23 -variant = 2XA +is_experimental = True material = ultimaker_sr30_175 quality_type = draft +setting_version = 23 type = quality +variant = 2XA weight = -2 -is_experimental = True [values] brim_replaces_support = False diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 168d4cd66a..f55b24eaa8 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2XA material = ultimaker_rapidrinse_175 quality_type = draft +setting_version = 23 type = quality +variant = 2XA weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg index b97cea9743..9b2b33cacc 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg @@ -4,13 +4,13 @@ name = Fast - Experimental version = 4 [metadata] -setting_version = 23 -variant = 2XA +is_experimental = True material = ultimaker_sr30_175 quality_type = draft +setting_version = 23 type = quality +variant = 2XA weight = -2 -is_experimental = True [values] brim_replaces_support = False From 770d12e9bb967d6ff80a11347393541c52fe3d92 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 11:36:25 -0400 Subject: [PATCH 66/84] Adding PLA with 1A extruder for Method XL, updated adhesion messages for PLA and PVA PP-475 --- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 09767ce8a7..8f4fcf08cd 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d5fa82b7a..b903d9a419 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 05a61d6b82..2527856c8c 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 5375e81138..8293c9f51a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 7164ec03e8..f98c3b0043 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 271a651e20..2c82f9dde9 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index ce3c938e8c..294aa9e702 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 2ac7cdd32a..91a9e40dcc 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 242d166473..af7e8e0819 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 65218afbda..809acb9d2d 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index ca62933f25..cd264fb95f 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 40b591975c..69baab3115 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 7f6b2a7be2..0069d15c80 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index 9db56941cb..d8d1aba9e8 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index a75826d1ae..2ee6e68d37 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index fe1a6de6b7..6fb312b3e4 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 44b777ea77..5b615d9329 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c1f049384a..c43848cd42 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 9ddfc18600..cc774cfe15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 611921c3f1..0c34af917b 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 40a85a3a0e..cb6738bc3e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] From a6ff0589fd3e66b593c88fb6bb8bfcbfb07a9132 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 15:37:26 +0000 Subject: [PATCH 67/84] Applied printer-linter format --- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 8f4fcf08cd..09767ce8a7 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index b903d9a419..3d5fa82b7a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 2527856c8c..05a61d6b82 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 8293c9f51a..5375e81138 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index f98c3b0043..7164ec03e8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2c82f9dde9..271a651e20 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 294aa9e702..ce3c938e8c 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 91a9e40dcc..2ac7cdd32a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index af7e8e0819..242d166473 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 809acb9d2d..65218afbda 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index cd264fb95f..ca62933f25 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 69baab3115..40b591975c 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 0069d15c80..7f6b2a7be2 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index d8d1aba9e8..9db56941cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index 2ee6e68d37..a75826d1ae 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 6fb312b3e4..fe1a6de6b7 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 5b615d9329..44b777ea77 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c43848cd42..c1f049384a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 0c34af917b..611921c3f1 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] From 6b1a6127f490bfeca07a6121b59a015b3140d290 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 16:24:13 -0400 Subject: [PATCH 68/84] removed method platform texture PP-475 --- .../definitions/ultimaker_method.def.json | 1 - .../ultimaker_method_base.def.json | 1080 ++++++++++------- 2 files changed, 662 insertions(+), 419 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 0d23ba4813..90c3a0ae2f 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -85,7 +85,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", "preferred_variant_name": "1A", diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index e97db9b28e..cd46b31900 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,423 +1,667 @@ { - "version": 2, - "name": "UltiMaker Method Base Profile", - "inherits": "ultimaker", - "metadata": - { - "visible": false, - "author": "UltiMaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot", - "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "nozzle_offsetting_for_disallowed_areas": false, - "preferred_material": "ultimaker_pla_175", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "weight": -1 + "version": 2, + "inherits": "ultimaker", + "metadata": { + "author": "UltiMaker", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "file_formats": "application/x-makerbot", + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" }, - "overrides": + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_method_platform.stl", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "preferred_material": "ultimaker_pla_175", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "visible": false, + "weight": -1 + }, + "name": "UltiMaker Method Base Profile", + "overrides": { + "adhesion_extruder_nr": { + "value": 0 + }, + "adhesion_type": { + "value": "'raft'" + }, + "bridge_enable_more_layers": { + "value": true + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_fan_speed_2": { + "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "bridge_settings_enabled": { + "value": true + }, + "bridge_skin_density": { + "value": 100 + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_skin_material_flow": { + "value": "material_flow" + }, + "bridge_skin_material_flow_2": { + "value": "material_flow" + }, + "bridge_skin_material_flow_3": { + "value": "material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_sparse_infill_max_density": { + "value": 50 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_material_flow": { + "value": "material_flow" + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "brim_width": { + "value": 5 + }, + "extruder_prime_pos_abs": { + "default_value": true + }, + "gradual_support_infill_steps": { + "value": 0 + }, + "infill_before_walls": { + "value": false + }, + "inset_direction": { + "value": "'inside_out'" + }, + "infill_material_flow": { + "value": "material_flow" + }, + "infill_overlap": { + "value": 0 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 80 else 'grid'" + }, + "infill_wipe_dist": { + "value": 0 + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "value": true + }, + "machine_scale_fan_speed_zero_to_one": { + "value": true + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "Griffin" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": true + }, + "machine_min_cool_heat_time_window": { + "value": 15 + }, + "machine_name": { + "default_value": "UltiMaker Method" + }, + "machine_start_gcode": { + "default_value": "" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature-10" + }, + "machine_nozzle_heat_up_speed": { + "value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "value": 0.8 + }, + "material_flow": { + "value": 100 + }, + "skin_material_flow": { + "value": "material_flow" + }, + "material_bed_temperature": { + "enabled": "machine_heated_bed" + }, + "material_shrinkage_percentage": { + "enabled": true + }, + "min_wall_line_width": { + "value": 0.4 + }, + "minimum_support_area": { + "value": 0.1 + }, + "multiple_mesh_overlap": { + "value": 0 + }, + "optimize_wall_printing_order": { + "value": true + }, + "prime_blob_enable": { + "enabled": false + }, + "prime_tower_enable": { + "value": false + }, + "prime_tower_flow": { + "value": "material_flow" + }, + "prime_tower_line_width": { + "value": 1 + }, + "prime_tower_raft_base_line_spacing": { + "value": "raft_base_line_width" + }, + "prime_tower_wipe_enabled": { + "value": true + }, + "print_sequence": { - "acceleration_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_prime_tower": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_print": - { - "enabled": false, - "value": 800 - }, - "acceleration_print_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_bottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_interface": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_roof": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_topbottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_travel": - { - "enabled": false, - "value": 5000 - }, - "acceleration_travel_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_travel_layer_0": - { - "enabled": false, - "value": "acceleration_travel" - }, - "acceleration_wall": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "adhesion_extruder_nr": { "value": 0 }, - "adhesion_type": { "value": "'raft'" }, - "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, - "bridge_skin_material_flow_2": { "value": "material_flow" }, - "bridge_skin_material_flow_3": { "value": "material_flow" }, - "bridge_skin_speed": { "value": "speed_topbottom" }, - "bridge_skin_speed_2": { "value": "speed_topbottom" }, - "bridge_skin_speed_3": { "value": "speed_topbottom" }, - "bridge_sparse_infill_max_density": { "value": 50 }, - "bridge_wall_coast": { "value": 0 }, - "bridge_wall_material_flow": { "value": "material_flow" }, - "bridge_wall_speed": { "value": "speed_wall" }, - "brim_width": { "value": 5 }, - "extruder_prime_pos_abs": { "default_value": true }, - "gradual_support_infill_steps": { "value": 0 }, - "infill_before_walls": { "value": false }, - "infill_material_flow": { "value": "material_flow" }, - "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, - "infill_wipe_dist": { "value": 0 }, - "inset_direction": { "value": "'inside_out'" }, - "jerk_enabled": - { - "enabled": false, - "value": true - }, - "jerk_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_prime_tower": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_print": - { - "enabled": false, - "value": 6.25 - }, - "jerk_print_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_bottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_interface": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_roof": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_topbottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel_enabled": - { - "enabled": false, - "value": true - }, - "jerk_travel_layer_0": - { - "enabled": false, - "value": "jerk_travel" - }, - "jerk_wall": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "value": true }, - "machine_end_gcode": { "default_value": "" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": false }, - "machine_heated_build_volume": { "default_value": true }, - "machine_min_cool_heat_time_window": { "value": 15 }, - "machine_name": { "default_value": "UltiMaker Method" }, - "machine_nozzle_cool_down_speed": { "value": 0.8 }, - "machine_nozzle_heat_up_speed": { "value": 3.5 }, - "machine_scale_fan_speed_zero_to_one": { "value": true }, - "machine_start_gcode": { "default_value": "" }, - "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_flow": { "value": 100 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, - "material_shrinkage_percentage": { "enabled": true }, - "min_wall_line_width": { "value": 0.4 }, - "minimum_support_area": { "value": 0.1 }, - "multiple_mesh_overlap": { "value": 0 }, - "optimize_wall_printing_order": { "value": true }, - "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, - "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, - "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, - "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": { "enabled": false }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, - "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, - "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, - "raft_interface_thickness": { "value": 0.3 }, - "raft_interface_wall_count": { "value": "raft_wall_count" }, - "raft_margin": { "value": 1.2 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, - "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": "speed_travel / 10" }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 0 }, - "retraction_hop": { "value": 0.4 }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": false }, - "retraction_prime_speed": { "value": "retraction_speed" }, - "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "material_flow" }, - "skin_monotonic": { "value": true }, - "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, - "skin_preshrink": { "value": 0 }, - "skirt_brim_material_flow": { "value": "material_flow" }, - "skirt_brim_minimal_length": { "value": 500 }, - "small_skin_width": { "value": 4 }, - "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, - "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_bottom_material_flow": { "value": "material_flow" }, - "support_brim_enable": { "value": false }, - "support_conical_min_width": { "value": 10 }, - "support_enable": { "value": true }, - "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, - "support_infill_rate": { "value": 20.0 }, - "support_interface_enable": { "value": true }, - "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, - "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, - "support_material_flow": { "value": "material_flow" }, - "support_pattern": { "value": "'lines'" }, - "support_roof_material_flow": { "value": "material_flow" }, - "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, - "switch_extruder_retraction_amount": { "value": 0.5 }, - "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "travel_avoid_other_parts": { "value": false }, - "wall_0_inset": { "value": 0 }, - "wall_0_material_flow": { "value": "material_flow" }, - "wall_0_wipe_dist": { "value": 0.8 }, - "wall_material_flow": { "value": "material_flow" }, - "wall_x_material_flow": { "value": "material_flow" }, - "xy_offset": { "value": 0 }, - "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_position": { "value": "'backright'" }, - "z_seam_relative": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "enabled": false + }, + "prime_tower_base_size": { + "value": 10 + }, + "prime_tower_base_height": { + "value": 6 + }, + "prime_tower_base_curve_magnitude": { + "value": 2 + }, + "raft_base_line_spacing": { + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": { + "value": 1.4 + }, + "raft_base_speed": { + "value": 10 + }, + "raft_base_thickness": { + "value": 0.8 + }, + "raft_interface_extruder_nr": { + "value": "raft_surface_extruder_nr" + }, + "raft_interface_layers": { + "value": 2 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_speed": { + "value": 90 + }, + "raft_interface_thickness": { + "value": 0.3 + }, + "raft_interface_wall_count": { + "value": "raft_wall_count" + }, + "raft_margin": { + "value": 1.2 + }, + "raft_surface_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" + }, + "raft_surface_wall_count": { + "value": "raft_wall_count" + }, + "retraction_amount": { + "value": 0.75 + }, + "retraction_combing": { + "value": "'off'" + }, + "retraction_combing_max_distance": { + "value": "speed_travel / 10" + }, + "retraction_count_max": { + "value": 100 + }, + "retraction_extrusion_window": { + "value": 0 + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop_only_when_collides": { + "value": false + }, + "retraction_prime_speed": { + "value": "retraction_speed" + }, + "retraction_speed": { + "value": 5 + }, + "roofing_layer_count": { + "value": 2 + }, + "roofing_monotonic": { + "value": true + }, + "skin_monotonic": { + "value": true + }, + "skin_outline_count": { + "value": 0 + }, + "skin_overlap": { + "value": 0 + }, + "skin_preshrink": { + "value": 0 + }, + "skirt_brim_material_flow": { + "value": "material_flow" + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "small_skin_width": { + "value": 4 + }, + "speed_equalize_flow_width_factor": { + "value": 0 + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_print": { + "value": 50 + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_support": { + "value": "speed_wall" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "speed_topbottom": { + "value": "speed_wall" + }, + "speed_travel": { + "value": 250 + }, + "speed_wall": { + "value": "speed_print * 40/50" + }, + "speed_wall_0": { + "value": "speed_wall * 30/40" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "support_angle": { + "value": 40 + }, + "support_bottom_distance": { + "value": "support_z_distance / 2" + }, + "support_bottom_material_flow": { + "value": "material_flow" + }, + "support_brim_enable": { + "value": false + }, + "support_conical_min_width": { + "value": 10 + }, + "support_enable": { + "value": true + }, + "support_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material'))" + }, + "support_fan_enable": { + "value": false + }, + "support_infill_rate": { + "value": 20.0 + }, + "support_interface_enable": { + "value": true + }, + "support_interface_material_flow": { + "value": "material_flow" + }, + "support_interface_offset": { + "value": 0 + }, + "support_interface_pattern": { + "value": "'lines'" + }, + "support_interface_wall_count": { + "value": 2 + }, + "support_material_flow": { + "value": "material_flow" + }, + "support_pattern": { + "value": "'lines'" + }, + "support_roof_material_flow": { + "value": "material_flow" + }, + "support_supported_skin_fan_speed": { + "value": "cool_fan_speed_max" + }, + "support_top_distance": { + "value": "support_z_distance" + }, + "support_wall_count": { + "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" + }, + "support_xy_distance": { + "value": 0.2 + }, + "support_z_distance": { + "value": 0 + }, + "switch_extruder_retraction_amount": { + "value": 0.5 + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed" + }, + "top_bottom_thickness": { + "value": "5*layer_height" + }, + "travel_avoid_distance": { + "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" + }, + "travel_avoid_other_parts": { + "value": false + }, + "wall_0_inset": { + "value": 0 + }, + "wall_0_material_flow": { + "value": "material_flow" + }, + "wall_0_wipe_dist": { + "value": 0.8 + }, + "wall_material_flow": { + "value": "material_flow" + }, + "wall_x_material_flow": { + "value": "material_flow" + }, + "xy_offset": { + "value": 0 + }, + "xy_offset_layer_0": { + "value": "xy_offset" + }, + "zig_zaggify_infill": { + "value": true + }, + "z_seam_position": { + "value": "'backright'" + }, + "z_seam_relative": { + "value": true + }, + "z_seam_type": { + "value": "'sharpest_corner'" + }, + "acceleration_enabled": { + "value": true, + "enabled": false + }, + "acceleration_travel_enabled": { + "value": true, + "enabled": false + }, + "acceleration_print": { + "value": 800, + "enabled": false + }, + "acceleration_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_topbottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_interface": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_roof": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_bottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_prime_tower": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_travel": { + "value": 5000, + "enabled": false + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel", + "enabled": false + }, + "acceleration_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_print_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "jerk_enabled": { + "value": true, + "enabled": false + }, + "jerk_travel_enabled": { + "value": true, + "enabled": false + }, + "jerk_print": { + "value": 6.25, + "enabled": false + }, + "jerk_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x": { + "value": "jerk_print", + "enabled": false + }, + "jerk_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_topbottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_interface": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_roof": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_bottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_prime_tower": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel_layer_0": { + "value": "jerk_travel", + "enabled": false + }, + "jerk_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_print_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x_roofing": { + "value": "jerk_print", + "enabled": false } + } } \ No newline at end of file From 2ecea2c4429ce8447cfbd145abdfc7ee47ab1ce7 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 20:25:16 +0000 Subject: [PATCH 69/84] Applied printer-linter format --- .../ultimaker_method_base.def.json | 1082 +++++++---------- 1 file changed, 419 insertions(+), 663 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index cd46b31900..e97db9b28e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,667 +1,423 @@ { - "version": 2, - "inherits": "ultimaker", - "metadata": { - "author": "UltiMaker", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "file_formats": "application/x-makerbot", - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "manufacturer": "Ultimaker B.V.", - "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_method_platform.stl", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "preferred_material": "ultimaker_pla_175", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "visible": false, - "weight": -1 - }, - "name": "UltiMaker Method Base Profile", - "overrides": { - "adhesion_extruder_nr": { - "value": 0 - }, - "adhesion_type": { - "value": "'raft'" - }, - "bridge_enable_more_layers": { - "value": true - }, - "bridge_fan_speed": { - "value": "cool_fan_speed_max" - }, - "bridge_fan_speed_2": { - "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" - }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, - "bridge_settings_enabled": { - "value": true - }, - "bridge_skin_density": { - "value": 100 - }, - "bridge_skin_density_2": { - "value": 100 - }, - "bridge_skin_density_3": { - "value": 100 - }, - "bridge_skin_material_flow": { - "value": "material_flow" - }, - "bridge_skin_material_flow_2": { - "value": "material_flow" - }, - "bridge_skin_material_flow_3": { - "value": "material_flow" - }, - "bridge_skin_speed": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_2": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_3": { - "value": "speed_topbottom" - }, - "bridge_sparse_infill_max_density": { - "value": 50 - }, - "bridge_wall_coast": { - "value": 0 - }, - "bridge_wall_material_flow": { - "value": "material_flow" - }, - "bridge_wall_speed": { - "value": "speed_wall" - }, - "brim_width": { - "value": 5 - }, - "extruder_prime_pos_abs": { - "default_value": true - }, - "gradual_support_infill_steps": { - "value": 0 - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "value": "'inside_out'" - }, - "infill_material_flow": { - "value": "material_flow" - }, - "infill_overlap": { - "value": 0 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 80 else 'grid'" - }, - "infill_wipe_dist": { - "value": 0 - }, - "layer_start_x": { - "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" - }, - "layer_start_y": { - "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_center_is_zero": { - "value": true - }, - "machine_scale_fan_speed_zero_to_one": { - "value": true - }, - "machine_end_gcode": { - "default_value": "" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "Griffin" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": true - }, - "machine_min_cool_heat_time_window": { - "value": 15 - }, - "machine_name": { - "default_value": "UltiMaker Method" - }, - "machine_start_gcode": { - "default_value": "" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature-10" - }, - "machine_nozzle_heat_up_speed": { - "value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "value": 0.8 - }, - "material_flow": { - "value": 100 - }, - "skin_material_flow": { - "value": "material_flow" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed" - }, - "material_shrinkage_percentage": { - "enabled": true - }, - "min_wall_line_width": { - "value": 0.4 - }, - "minimum_support_area": { - "value": 0.1 - }, - "multiple_mesh_overlap": { - "value": 0 - }, - "optimize_wall_printing_order": { - "value": true - }, - "prime_blob_enable": { - "enabled": false - }, - "prime_tower_enable": { - "value": false - }, - "prime_tower_flow": { - "value": "material_flow" - }, - "prime_tower_line_width": { - "value": 1 - }, - "prime_tower_raft_base_line_spacing": { - "value": "raft_base_line_width" - }, - "prime_tower_wipe_enabled": { - "value": true - }, - "print_sequence": + "version": 2, + "name": "UltiMaker Method Base Profile", + "inherits": "ultimaker", + "metadata": { - "enabled": false - }, - "prime_tower_base_size": { - "value": 10 - }, - "prime_tower_base_height": { - "value": 6 - }, - "prime_tower_base_curve_magnitude": { - "value": 2 - }, - "raft_base_line_spacing": { - "value": "2*raft_base_line_width" - }, - "raft_base_line_width": { - "value": 1.4 - }, - "raft_base_speed": { - "value": 10 - }, - "raft_base_thickness": { - "value": 0.8 - }, - "raft_interface_extruder_nr": { - "value": "raft_surface_extruder_nr" - }, - "raft_interface_layers": { - "value": 2 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_interface_speed": { - "value": 90 - }, - "raft_interface_thickness": { - "value": 0.3 - }, - "raft_interface_wall_count": { - "value": "raft_wall_count" - }, - "raft_margin": { - "value": 1.2 - }, - "raft_surface_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" - }, - "raft_surface_wall_count": { - "value": "raft_wall_count" - }, - "retraction_amount": { - "value": 0.75 - }, - "retraction_combing": { - "value": "'off'" - }, - "retraction_combing_max_distance": { - "value": "speed_travel / 10" - }, - "retraction_count_max": { - "value": 100 - }, - "retraction_extrusion_window": { - "value": 0 - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop_only_when_collides": { - "value": false - }, - "retraction_prime_speed": { - "value": "retraction_speed" - }, - "retraction_speed": { - "value": 5 - }, - "roofing_layer_count": { - "value": 2 - }, - "roofing_monotonic": { - "value": true - }, - "skin_monotonic": { - "value": true - }, - "skin_outline_count": { - "value": 0 - }, - "skin_overlap": { - "value": 0 - }, - "skin_preshrink": { - "value": 0 - }, - "skirt_brim_material_flow": { - "value": "material_flow" - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "small_skin_width": { - "value": 4 - }, - "speed_equalize_flow_width_factor": { - "value": 0 - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_print": { - "value": 50 - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_support": { - "value": "speed_wall" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "speed_topbottom": { - "value": "speed_wall" - }, - "speed_travel": { - "value": 250 - }, - "speed_wall": { - "value": "speed_print * 40/50" - }, - "speed_wall_0": { - "value": "speed_wall * 30/40" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "support_angle": { - "value": 40 - }, - "support_bottom_distance": { - "value": "support_z_distance / 2" - }, - "support_bottom_material_flow": { - "value": "material_flow" - }, - "support_brim_enable": { - "value": false - }, - "support_conical_min_width": { - "value": 10 - }, - "support_enable": { - "value": true - }, - "support_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material'))" - }, - "support_fan_enable": { - "value": false - }, - "support_infill_rate": { - "value": 20.0 - }, - "support_interface_enable": { - "value": true - }, - "support_interface_material_flow": { - "value": "material_flow" - }, - "support_interface_offset": { - "value": 0 - }, - "support_interface_pattern": { - "value": "'lines'" - }, - "support_interface_wall_count": { - "value": 2 - }, - "support_material_flow": { - "value": "material_flow" - }, - "support_pattern": { - "value": "'lines'" - }, - "support_roof_material_flow": { - "value": "material_flow" - }, - "support_supported_skin_fan_speed": { - "value": "cool_fan_speed_max" - }, - "support_top_distance": { - "value": "support_z_distance" - }, - "support_wall_count": { - "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" - }, - "support_xy_distance": { - "value": 0.2 - }, - "support_z_distance": { - "value": 0 - }, - "switch_extruder_retraction_amount": { - "value": 0.5 - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed" - }, - "top_bottom_thickness": { - "value": "5*layer_height" - }, - "travel_avoid_distance": { - "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" - }, - "travel_avoid_other_parts": { - "value": false - }, - "wall_0_inset": { - "value": 0 - }, - "wall_0_material_flow": { - "value": "material_flow" - }, - "wall_0_wipe_dist": { - "value": 0.8 - }, - "wall_material_flow": { - "value": "material_flow" - }, - "wall_x_material_flow": { - "value": "material_flow" - }, - "xy_offset": { - "value": 0 - }, - "xy_offset_layer_0": { - "value": "xy_offset" - }, - "zig_zaggify_infill": { - "value": true - }, - "z_seam_position": { - "value": "'backright'" - }, - "z_seam_relative": { - "value": true - }, - "z_seam_type": { - "value": "'sharpest_corner'" - }, - "acceleration_enabled": { - "value": true, - "enabled": false - }, - "acceleration_travel_enabled": { - "value": true, - "enabled": false - }, - "acceleration_print": { - "value": 800, - "enabled": false - }, - "acceleration_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_topbottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_interface": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_roof": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_bottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_prime_tower": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_travel": { - "value": 5000, - "enabled": false - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel", - "enabled": false - }, - "acceleration_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_print_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "jerk_enabled": { - "value": true, - "enabled": false - }, - "jerk_travel_enabled": { - "value": true, - "enabled": false - }, - "jerk_print": { - "value": 6.25, - "enabled": false - }, - "jerk_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x": { - "value": "jerk_print", - "enabled": false - }, - "jerk_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_topbottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_interface": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_roof": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_bottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_prime_tower": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel_layer_0": { - "value": "jerk_travel", - "enabled": false - }, - "jerk_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_print_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x_roofing": { - "value": "jerk_print", - "enabled": false + "visible": false, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "nozzle_offsetting_for_disallowed_areas": false, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "adhesion_extruder_nr": { "value": 0 }, + "adhesion_type": { "value": "'raft'" }, + "bridge_enable_more_layers": { "value": true }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow_2": { "value": "material_flow" }, + "bridge_skin_material_flow_3": { "value": "material_flow" }, + "bridge_skin_speed": { "value": "speed_topbottom" }, + "bridge_skin_speed_2": { "value": "speed_topbottom" }, + "bridge_skin_speed_3": { "value": "speed_topbottom" }, + "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_wall_coast": { "value": 0 }, + "bridge_wall_material_flow": { "value": "material_flow" }, + "bridge_wall_speed": { "value": "speed_wall" }, + "brim_width": { "value": 5 }, + "extruder_prime_pos_abs": { "default_value": true }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_material_flow": { "value": "material_flow" }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": 0 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 6.25 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "value": true }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": true }, + "machine_min_cool_heat_time_window": { "value": 15 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_nozzle_cool_down_speed": { "value": 0.8 }, + "machine_nozzle_heat_up_speed": { "value": 3.5 }, + "machine_scale_fan_speed_zero_to_one": { "value": true }, + "machine_start_gcode": { "default_value": "" }, + "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_shrinkage_percentage": { "enabled": true }, + "min_wall_line_width": { "value": 0.4 }, + "minimum_support_area": { "value": 0.1 }, + "multiple_mesh_overlap": { "value": 0 }, + "optimize_wall_printing_order": { "value": true }, + "prime_blob_enable": { "enabled": false }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, + "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, + "prime_tower_wipe_enabled": { "value": true }, + "print_sequence": { "enabled": false }, + "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_width": { "value": 1.4 }, + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": { "value": 0.8 }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": { "value": 90 }, + "raft_interface_thickness": { "value": 0.3 }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": 1.2 }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retraction_amount": { "value": 0.75 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": "speed_travel / 10" }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 0 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": false }, + "retraction_prime_speed": { "value": "retraction_speed" }, + "retraction_speed": { "value": 5 }, + "roofing_layer_count": { "value": 2 }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 0 }, + "skin_preshrink": { "value": 0 }, + "skirt_brim_material_flow": { "value": "material_flow" }, + "skirt_brim_minimal_length": { "value": 500 }, + "small_skin_width": { "value": 4 }, + "speed_equalize_flow_width_factor": { "value": 0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, + "speed_travel": { "value": 250 }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": 40 }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_material_flow": { "value": "material_flow" }, + "support_brim_enable": { "value": false }, + "support_conical_min_width": { "value": 10 }, + "support_enable": { "value": true }, + "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": 20.0 }, + "support_interface_enable": { "value": true }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 0 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 2 }, + "support_material_flow": { "value": "material_flow" }, + "support_pattern": { "value": "'lines'" }, + "support_roof_material_flow": { "value": "material_flow" }, + "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_xy_distance": { "value": 0.2 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_retraction_amount": { "value": 0.5 }, + "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, + "top_bottom_thickness": { "value": "5*layer_height" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_other_parts": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_wipe_dist": { "value": 0.8 }, + "wall_material_flow": { "value": "material_flow" }, + "wall_x_material_flow": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": "xy_offset" }, + "z_seam_position": { "value": "'backright'" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "zig_zaggify_infill": { "value": true } } - } } \ No newline at end of file From 2bf62d8b3a9c71a0636c391cd92017df3c02baa9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 11:28:37 +0200 Subject: [PATCH 70/84] Remove useless image and offset definition PP-475 --- resources/images/MakerbotMethod.png | Bin 138 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/images/MakerbotMethod.png diff --git a/resources/images/MakerbotMethod.png b/resources/images/MakerbotMethod.png deleted file mode 100644 index 4406a6175b848efd4563c5bb84b0e4a7cbcc1432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4aTa()7Bet#3xhBt!>l*8o|0J>k`SPAFjv*C{Z%-*QGB9v3Z*VMH6#S6s Date: Mon, 1 Jul 2024 12:04:47 +0200 Subject: [PATCH 71/84] Remove indirect conan dependency --- conandata.yml | 1 - conanfile.py | 1 - 2 files changed, 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 89ceba3d30..9c52662398 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,7 +9,6 @@ requirements: - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/0.2.0" - "native_cad_plugin/2.0.0" requirements_internal: - "fdm_materials/(latest)@internal/testing" diff --git a/conanfile.py b/conanfile.py index 221d4ea288..787c26785f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -329,7 +329,6 @@ class CuraConan(ConanFile): self.options["cpython"].shared = True self.options["boost"].header_only = True if self.settings.os == "Linux": - self.options["curaengine_grpc_definitions"].shared = True self.options["openssl"].shared = True if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "": self.options["curaengine"].enable_sentry = True From 6cc6026b22f4642dc18f75a0cbeb6f89ba56dd50 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 13:47:05 +0200 Subject: [PATCH 72/84] Remove MacOS 11 runner which is deprecated --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9c940330e1..ffc9b27b8b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,6 @@ on: options: - self-hosted-X64 - self-hosted-ARM64 - - macos-11 - macos-12 jobs: @@ -53,4 +52,4 @@ jobs: staging: ${{ inputs.staging }} architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} - secrets: inherit \ No newline at end of file + secrets: inherit From a087cbffae5a409419a2b83fca15ecd9b4566519 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 13:59:05 +0200 Subject: [PATCH 73/84] Bump gradual flow plugin version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9c52662398..cf94aee8ac 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - - "curaengine_plugin_gradual_flow/0.1.0-beta.3" + - "curaengine_plugin_gradual_flow/0.1.1-beta.3" - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" From f7a3b48bcdd22063c1612b9ca9044b159a72fb62 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 15:40:24 +0200 Subject: [PATCH 74/84] Fix Creality profiles This should have been caught before the PR was merged... --- resources/definitions/creality_ender3v3ke.def.json | 2 +- resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index c1016b515f..47227e187d 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -49,7 +49,7 @@ "material_print_temp_wait": { "default_value": false }, "retraction_amount": { "default_value": 0.8 }, "retraction_combing": { "value": "no_outer_surfaces" }, - "retraction_combing_max_distance": { "default_value": 5.0 }, + "retraction_combing_max_distance": { "value": 5.0 }, "retraction_extrusion_window": { "value": "retraction_amount" }, "retraction_min_travel": { "value": 2.0 }, "retraction_speed": { "default_value": 40 }, diff --git a/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg index 7ef855b97c..7d92d94a8c 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg index b4523fb2ec..dc779a977f 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg index 08617c2b6a..745880b4c5 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg index 337181748d..e58eaeef03 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg index 405d4e0c75..6b90f99126 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg index 645713d5ef..e4dfb23e5f 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg b/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg index bb26262203..30758942af 100644 --- a/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] From 346ea887dc7498ad200e2d6a797363c7c3a80ec9 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Jul 2024 07:10:52 +0000 Subject: [PATCH 75/84] Applied printer-linter format --- resources/definitions/voron2_stealthchanger_250.def.json | 2 +- resources/definitions/voron2_stealthchanger_300.def.json | 2 +- resources/definitions/voron2_stealthchanger_350.def.json | 2 +- resources/definitions/voron2_stealthchanger_base.def.json | 4 ++-- .../extruders/voron2_stealthchanger_extruder_0.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_1.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_2.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_3.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_4.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_5.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_6.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_7.def.json | 6 +++--- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/resources/definitions/voron2_stealthchanger_250.def.json b/resources/definitions/voron2_stealthchanger_250.def.json index 123852a661..e75c3c8daf 100644 --- a/resources/definitions/voron2_stealthchanger_250.def.json +++ b/resources/definitions/voron2_stealthchanger_250.def.json @@ -15,4 +15,4 @@ "machine_name": { "default_value": "VORON2 StealthChanger 250" }, "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_stealthchanger_300.def.json b/resources/definitions/voron2_stealthchanger_300.def.json index bc079a1714..5672d72159 100644 --- a/resources/definitions/voron2_stealthchanger_300.def.json +++ b/resources/definitions/voron2_stealthchanger_300.def.json @@ -15,4 +15,4 @@ "machine_name": { "default_value": "VORON2 StealthChanger 300" }, "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_stealthchanger_350.def.json b/resources/definitions/voron2_stealthchanger_350.def.json index a73e274809..99ef8e46f9 100644 --- a/resources/definitions/voron2_stealthchanger_350.def.json +++ b/resources/definitions/voron2_stealthchanger_350.def.json @@ -15,4 +15,4 @@ "machine_name": { "default_value": "VORON2 StealthChanger 350" }, "machine_width": { "default_value": 350 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json index 3eabc3e04e..e1db1d24c3 100644 --- a/resources/definitions/voron2_stealthchanger_base.def.json +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -21,9 +21,9 @@ }, "overrides": { - "machine_name": { "default_value": "VORON2 StealthChanger" }, "machine_end_gcode": { "default_value": "PRINT_END" }, "machine_extruder_count": { "default_value": 1 }, + "machine_name": { "default_value": "VORON2 StealthChanger" }, "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json index 887ab01349..55ddf8f90b 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_0.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -14,12 +14,12 @@ "default_value": 0, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json index 4342d4ba55..ad29966960 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_1.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -14,12 +14,12 @@ "default_value": 1, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json index 3dd2955b2a..ec3b6ff3a9 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_2.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -14,12 +14,12 @@ "default_value": 2, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json index 9eeb9702eb..dfaa249e5d 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_3.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -14,12 +14,12 @@ "default_value": 3, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json index 6641620313..eeb6fbbe60 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_4.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -14,12 +14,12 @@ "default_value": 4, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json index fe8c86cd6b..61e05b6945 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_5.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -14,12 +14,12 @@ "default_value": 5, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json index e8aac016c4..3b3f614ae7 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_6.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -14,12 +14,12 @@ "default_value": 6, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json index 9e98525f90..071cd5d064 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_7.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -14,12 +14,12 @@ "default_value": 7, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From abf9fef334387b01c7d054bff5ea3f2247ff6926 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Jul 2024 07:31:04 +0000 Subject: [PATCH 76/84] Applied printer-linter format --- .../weedo_x40v3_extruder_right.def.json | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json index ffb8cb5a17..14faf4d632 100644 --- a/resources/extruders/weedo_x40v3_extruder_right.def.json +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder Right", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40v3", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_cooling_fan_number": {"default_value": 1}, - "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n"} + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n" }, + "machine_extruder_start_code": { "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From c9e23dab83ac53921f2d21486fa521c1e3d04ab9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 2 Jul 2024 13:17:21 +0200 Subject: [PATCH 77/84] Disable 'temp should be defined in material' warning for now. relates to CURA-11999 --- .printer-linter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.printer-linter b/.printer-linter index 31376f4dad..02be6361b9 100644 --- a/.printer-linter +++ b/.printer-linter @@ -6,7 +6,7 @@ checks: diagnostic-resources-macos-app-directory-name: true diagnostic-incorrect-formula: true diagnostic-resource-file-deleted: true - diagnostic-material-temperature-defined: true + diagnostic-material-temperature-defined: false diagnostic-long-profile-names: true fixes: diagnostic-definition-redundant-override: true From f36e18fe3c2f34e78061de295a71d4ec38b02875 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 3 Jul 2024 12:54:45 +0200 Subject: [PATCH 78/84] Make it possible to set the various raft walls per-extruder. relates to PP-475 and CURA-11998 --- resources/definitions/fdmprinter.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1b93bd9107..a1b50aced0 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6680,7 +6680,7 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": false, + "settable_per_extruder": true, "children": { "raft_base_wall_count": @@ -6693,7 +6693,7 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": false + "settable_per_extruder": true }, "raft_interface_wall_count": { @@ -6704,7 +6704,7 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": false + "settable_per_extruder": true }, "raft_surface_wall_count": { @@ -6715,7 +6715,7 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": false + "settable_per_extruder": true } } }, From 8a1ca5116eeeacfcce5a89fb6743bafb0aff78fd Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 3 Jul 2024 13:50:37 +0200 Subject: [PATCH 79/84] Add 'limit_to_extruder' for wall-count raft settings. Except base-setting. relates to PP-475 and CURA-11998 --- resources/definitions/fdmprinter.def.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a1b50aced0..0d8504879d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6693,7 +6693,8 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "limit_to_extruder": "raft_base_extruder_nr" }, "raft_interface_wall_count": { @@ -6704,7 +6705,8 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "limit_to_extruder": "raft_interface_extruder_nr" }, "raft_surface_wall_count": { @@ -6715,7 +6717,8 @@ "minimum_value": "0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "limit_to_extruder": "raft_surface_extruder_nr" } } }, From 4fb9042dbf7589104c1ee937dd9f518c1135793c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 3 Jul 2024 17:27:27 +0200 Subject: [PATCH 80/84] Significantly improve the speed of the version upgrader This knocked about 10 seconds from my boot time. Huzzah :D --- cura/CuraApplication.py | 2 ++ .../VersionUpgrade22to24/VersionUpgrade.py | 6 ------ .../VersionUpgrade27to30.py | 17 ----------------- .../VersionUpgrade460to462.py | 6 ------ 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index c8356e5727..3bdf7aa126 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1218,6 +1218,8 @@ class CuraApplication(QtApplication): # Once we're at this point, everything should have been flushed already (past OnExitCallbackManager). # It's more difficult to call sys.exit(0): That requires that it happens as the result of a pyqtSignal-emit. # (See https://doc.qt.io/qt-6/qcoreapplication.html#quit) + # WARNING: With this in place you CAN NOT use cProfile. You will need to replace the next line with pass + # for it to work! os._exit(0) return super().event(event) diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py index 2c3a0939a8..d70df8517d 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py @@ -152,9 +152,3 @@ class VersionUpgrade22to24(VersionUpgrade): config.write(output) return [filename], [output.getvalue()] - def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None) - parser.read_string(serialised) - format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised. - setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) - return format_version * 1000000 + setting_version diff --git a/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py b/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py index b594c3c6c4..b839b72b9a 100644 --- a/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py +++ b/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py @@ -33,23 +33,6 @@ _renamed_i18n = { class VersionUpgrade27to30(VersionUpgrade): - ## Gets the version number from a CFG file in Uranium's 2.7 format. - # - # Since the format may change, this is implemented for the 2.7 format only - # and needs to be included in the version upgrade system rather than - # globally in Uranium. - # - # \param serialised The serialised form of a CFG file. - # \return The version number stored in the CFG file. - # \raises ValueError The format of the version number in the file is - # incorrect. - # \raises KeyError The format of the file is incorrect. - def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None) - parser.read_string(serialised) - format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised. - setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) - return format_version * 1000000 + setting_version ## Upgrades a preferences file from version 2.7 to 3.0. # diff --git a/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py b/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py index 1aa5e1b2da..c6a8db6f89 100644 --- a/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py +++ b/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py @@ -33,12 +33,6 @@ default_qualities_per_nozzle_and_material = { class VersionUpgrade460to462(VersionUpgrade): - def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None) - parser.read_string(serialised) - format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. - setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) - return format_version * 1000000 + setting_version def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: """ From c771424fa5746f4b3012f29d6ef9d71ee8b724e7 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 4 Jul 2024 08:30:36 +0200 Subject: [PATCH 81/84] Update PR with latest changes from main. PP-490 --- resources/definitions/fdmprinter.def.json | 2 ++ resources/definitions/ultimaker3.def.json | 2 -- .../definitions/ultimaker_method_base.def.json | 5 +++-- resources/definitions/ultimaker_s3.def.json | 2 -- resources/definitions/ultimaker_s5.def.json | 2 -- ..._aa0.4_tough-pla_0.2mm_engineering.inst.cfg | 4 +++- ..._f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ .../um_f4_aa0.4_bam_0.15mm.inst.cfg | 4 ++-- .../um_f4_aa0.4_bam_0.1mm.inst.cfg | 2 ++ .../um_f4_aa0.4_bam_0.2mm.inst.cfg | 2 ++ .../um_f4_aa0.4_bam_0.3mm.inst.cfg | 2 ++ .../um_f4_bb0.4_pva_0.15mm.inst.cfg | 5 ++++- .../um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 ++ .../um_f4_cc0.4_cffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.4_gffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.6_cffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.6_gffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_s3_aa0.4_bam_0.15mm.inst.cfg | 2 ++ .../um_s3_aa0.4_bam_0.1mm.inst.cfg | 2 ++ .../um_s3_aa0.4_bam_0.2mm.inst.cfg | 2 ++ .../um_s3_aa0.4_bam_0.3mm.inst.cfg | 2 ++ .../um_s3_bb0.4_pva_0.06mm.inst.cfg | 2 ++ .../um_s3_bb0.4_pva_0.15mm.inst.cfg | 2 ++ .../um_s3_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../um_s3_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../um_s3_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../um_s3_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../um_s3_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../um_s3_bb0.8_pva_0.4mm.inst.cfg | 2 ++ .../um_s5_aa0.4_bam_0.15mm.inst.cfg | 2 ++ .../um_s5_aa0.4_bam_0.1mm.inst.cfg | 2 ++ .../um_s5_aa0.4_bam_0.2mm.inst.cfg | 2 ++ .../um_s5_aa0.4_bam_0.3mm.inst.cfg | 2 ++ .../um_s5_bb0.4_pva_0.06mm.inst.cfg | 2 ++ .../um_s5_bb0.4_pva_0.15mm.inst.cfg | 2 ++ .../um_s5_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../um_s5_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../um_s5_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../um_s5_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../um_s5_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../um_s5_bb0.8_pva_0.4mm.inst.cfg | 2 ++ 49 files changed, 224 insertions(+), 12 deletions(-) create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4ef0bdd8fa..8123c34586 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,6 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4384,6 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 173fbdb524..9b732aa421 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 215 }, "machine_disallowed_areas": diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 71bd386fd2..6ff3339953 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -358,6 +358,7 @@ "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, "raft_surface_fan_speed": { "value": 0 }, + "raft_surface_monotonic": { "value": true }, "raft_surface_wall_count": { "value": "raft_wall_count" }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, @@ -372,6 +373,7 @@ "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, "roofing_layer_count": { "value": 2 }, + "roofing_material_flow": { "value": "material_flow" }, "roofing_monotonic": { "value": true }, "skin_material_flow": { "value": "material_flow" }, "skin_material_flow_layer_0": { "value": "material_flow" }, @@ -402,7 +404,7 @@ "support_conical_min_width": { "value": 10 }, "support_enable": { "value": true }, "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": "extruder_nr == support_extruder_nr" }, + "support_fan_enable": { "value": "true if extruder_nr == support_extruder_nr else false" }, "support_infill_rate": { "value": 20.0 }, "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, @@ -419,7 +421,6 @@ "support_top_distance": { "value": "support_z_distance" }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, "switch_extruder_retraction_amount": { "value": 0.5 }, "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, "top_bottom_thickness": { "value": "5*layer_height" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 3750b83553..82776bd62e 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index eb3984510e..3c35c84a00 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,8 +74,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg index 0aa1fc3d6d..9dd0190dbc 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -12,8 +12,10 @@ type = intent variant = AA 0.4 [values] +build_volume_temperature = 35 jerk_print = 30 -material_print_temperature = =default_material_print_temperature + 10 +material_bed_temperature = =default_material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature + 15 speed_print = 80 wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..a29540bbeb --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..01ea70dd38 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..98087f4712 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..ffe4988764 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg index d7aad11dec..44ae90f27d 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg @@ -16,11 +16,11 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 -material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 -speed_print = 60 support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_interface_density = =min(extruderValues('material_surface_energy')) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg index eb28e13dfa..4d19af3298 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg index 6bdee60b57..bb057c5cda 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg index 407447f7c6..7203764593 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg index 6fd09e5917..bae4a519f3 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg @@ -18,9 +18,12 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 -speed_print = 50 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_offset = 1 support_offset = 3 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 2c99c484c9..95b7c1856d 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index f0aeb24746..8de45aa01b 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index 1856bda292..be24017486 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index f51bdb596a..1e1ab101f4 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index e39b921c31..2ae11eb441 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index aa36cd2fd2..448152ca8e 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 prime_tower_min_volume = 15 diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..40f9516580 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d0dacd043c --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..74915d58be --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d6140b680a --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index bcca24890b..205434e462 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -13,6 +13,8 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index f398a6a42d..0e7c3a6500 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -13,6 +13,8 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index 522f155ad0..51e698affa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -13,6 +13,8 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index acd966f3ab..348f6de988 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -14,6 +14,8 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index e5369b467e..de72bf59ff 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -14,7 +14,9 @@ weight = 1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index bad46d3573..93217e726e 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -14,7 +14,9 @@ weight = -1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index 8424914a2d..d4ad0a9904 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -14,7 +14,9 @@ weight = 0 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index fc34184c72..90f45b02e8 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -14,7 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg index 184f40a74d..ae7a28fbc6 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg @@ -15,7 +15,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg index 9477268780..2b3b2bb338 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg @@ -14,7 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg index 58a4a1901f..cbbe1b5e01 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg @@ -14,7 +14,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg index a7817b224b..1ba661d82a 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg @@ -14,7 +14,9 @@ weight = -4 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index 6b118fde63..808bdd3de3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -13,6 +13,8 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index 6422d61996..4d30a7c10d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -13,6 +13,8 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index 4b82ec4068..65f11b5736 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -13,6 +13,8 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index 6a910b3deb..c4bf1775bb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -14,6 +14,8 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index f22a56d0b7..4a74cd6227 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -14,7 +14,9 @@ weight = 1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index b2e541697c..e4a35cd961 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -14,7 +14,9 @@ weight = -1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index d3ca3ea07f..41f5d71c4d 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -14,7 +14,9 @@ weight = 0 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index eb0293dd11..248e54863f 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -14,7 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index b87724042c..056b3bb327 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -15,7 +15,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg index 9940bab26a..8bc8491beb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg @@ -14,7 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg index d2e6410596..7f42564da8 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg @@ -14,7 +14,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg index 07e4d926ac..8115c6148c 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg @@ -14,7 +14,9 @@ weight = -4 [values] acceleration_prime_tower = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 From d86750942b40f48391c1d6380ff28bdfec2e5cd9 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:10:10 +0200 Subject: [PATCH 82/84] Various corrections to the profile. PP-488 was lost in one of the merges. This is now restored. Cleanup of unused global quality files and removal of infill_pattern in the solid intent profiles (redundant). Added fan number to Method extruders. --- .../ultimaker_method_extruder_left.def.json | 1 + .../ultimaker_method_extruder_right.def.json | 1 + ..._f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg | 4 +--- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...thod_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...od_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ...um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 1 - .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 1 - .../um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...hodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...m_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...dx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ...m_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...odxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ...um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...m_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg | 1 - ..._methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...xl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ..._methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 1 - .../um_method_global_Normal_Quality.inst.cfg | 15 --------------- 25 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index cb8e86a33b..44680a3468 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": 1 }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 520d8abae8..75eb50bdd8 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": 1 }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg index 9dd0190dbc..0aa1fc3d6d 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -12,10 +12,8 @@ type = intent variant = AA 0.4 [values] -build_volume_temperature = 35 jerk_print = 30 -material_bed_temperature = =default_material_bed_temperature + 5 -material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature = =default_material_print_temperature + 10 speed_print = 80 wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 09767ce8a7..fdfbe77c33 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1A [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 17b29cbbef..231cf74ea3 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d5fa82b7a..87cc96fb5a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1C [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index fe2f11dac9..4a05977a4e 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 05a61d6b82..6c9d832805 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = LABS [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 5375e81138..2087c38cba 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1A [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg index aa04992d12..3a1c0340fa 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 2a6f009282..021e1de2e1 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 7164ec03e8..330811df73 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1C [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg index 7d1ead2caf..f4029c6c1d 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1XA [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg index 9020c8fdcc..0a10d33053 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 13ff5b5b67..224e85f1af 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 271a651e20..2a672307bb 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = LABS [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index ce3c938e8c..52b091486e 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -13,7 +13,6 @@ variant = 1A [values] build_volume_temperature = 45 -infill_pattern = lines infill_sparse_density = 100 material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg index e5ad1ab92c..c0d0816b3d 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 1f6aad371a..0440ceb055 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 2ac7cdd32a..ce45abad85 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -13,7 +13,6 @@ variant = 1C [values] build_volume_temperature = 45 -infill_pattern = lines infill_sparse_density = 100 material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg index 5dd7ea0eb8..c0f3cce227 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1XA [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg index 3655b78cf1..bbad6fef50 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 0322b30164..4fa2252da3 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 242d166473..d5ea2ac7f0 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -13,7 +13,6 @@ variant = LABS [values] build_volume_temperature = 45 -infill_pattern = lines infill_sparse_density = 100 material_bed_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg deleted file mode 100644 index b1304e3b14..0000000000 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = ultimaker_method -name = Fine -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 23 -type = quality -weight = 0 - -[values] -layer_height = 0.1 - From 1ed10610b1e7df9a625d96dafaee663f3a06d033 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 5 Jul 2024 13:18:57 +0200 Subject: [PATCH 83/84] Change default_value to value This is necessary because the parent definition of the settings has changed --- resources/definitions/Mark2_for_Ultimaker2.def.json | 4 ++-- resources/definitions/dxu.def.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index a3c5f5e06b..2eedb7ef20 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -67,12 +67,12 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { - "default_value": 105.0, + "value": 105.0, "enabled": false }, "layer_start_y": { - "default_value": 27.0, + "value": 27.0, "enabled": false }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index ebe94ee169..602098aa05 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -52,12 +52,12 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { - "default_value": 180.0, + "value": 180.0, "enabled": false }, "layer_start_y": { - "default_value": 160.0, + "value": 160.0, "enabled": false }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, From a3349baf6c4f4a5e0e6089f4d2d6826a523ceef9 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Fri, 5 Jul 2024 11:20:44 +0000 Subject: [PATCH 84/84] Applied printer-linter format --- resources/definitions/Mark2_for_Ultimaker2.def.json | 8 ++++---- resources/definitions/dxu.def.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 2eedb7ef20..789d5d42ec 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -67,13 +67,13 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { - "value": 105.0, - "enabled": false + "enabled": false, + "value": 105.0 }, "layer_start_y": { - "value": 27.0, - "enabled": false + "enabled": false, + "value": 27.0 }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, "machine_acceleration": { "default_value": 3000 }, diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index 602098aa05..c5eb9720f3 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -52,13 +52,13 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { - "value": 180.0, - "enabled": false + "enabled": false, + "value": 180.0 }, "layer_start_y": { - "value": 160.0, - "enabled": false + "enabled": false, + "value": 160.0 }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, "machine_acceleration": { "default_value": 3000 },