From 1eaa38467655761cb27085057b45c2e4e8c98870 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:06:26 -0400 Subject: [PATCH 01/19] Tronxy Definition files Reposting the original set of def files from #7553. More to follow. --- resources/definitions/tronxy_d01.def.json | 29 ++ resources/definitions/tronxy_x.def.json | 267 ++++++++++++++++++ resources/definitions/tronxy_x5sa.def.json | 27 ++ .../definitions/tronxy_x5sa_400.def.json | 27 ++ .../definitions/tronxy_x5sa_500.def.json | 27 ++ .../definitions/tronxy_x5sa_pro.def.json | 27 ++ resources/definitions/tronxy_xy2.def.json | 29 ++ resources/definitions/tronxy_xy2pro.def.json | 29 ++ resources/definitions/tronxy_xy3.def.json | 29 ++ 9 files changed, 491 insertions(+) create mode 100644 resources/definitions/tronxy_d01.def.json create mode 100644 resources/definitions/tronxy_x.def.json create mode 100644 resources/definitions/tronxy_x5sa.def.json create mode 100644 resources/definitions/tronxy_x5sa_400.def.json create mode 100644 resources/definitions/tronxy_x5sa_500.def.json create mode 100644 resources/definitions/tronxy_x5sa_pro.def.json create mode 100644 resources/definitions/tronxy_xy2.def.json create mode 100644 resources/definitions/tronxy_xy2pro.def.json create mode 100644 resources/definitions/tronxy_xy3.def.json diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json new file mode 100644 index 0000000000..3a1b458276 --- /dev/null +++ b/resources/definitions/tronxy_d01.def.json @@ -0,0 +1,29 @@ +{ + "name": "Tronxy D01", + "version": 2, + "inherits": "tronxy_base", + "metadata": { + "has_machine_quality": true, + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy D01" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 220 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-32, 45], + [-32, -30], + [32, -30], + [32, 45] + ] + }, + "machine_start_gcode": { + "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 30 } + } +} diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json new file mode 100644 index 0000000000..c7518110b0 --- /dev/null +++ b/resources/definitions/tronxy_x.def.json @@ -0,0 +1,267 @@ +{ + "name": "Tronxy Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "AdderMk2", + "manufacturer": "Tronxy", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "tronxy_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "exclude_materials": [ + "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", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_tough_pla", + "generic_tpu", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { "default_value": "Creawsome Base Printer" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;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\n" }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, + + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + + "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_tree_enable else 20" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json new file mode 100644 index 0000000000..299d0f80fe --- /dev/null +++ b/resources/definitions/tronxy_x5sa.def.json @@ -0,0 +1,27 @@ +{ + "name": "Tronxy X5SA", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy X5SA" }, + "machine_width": { "default_value": 330 }, + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 400 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-48, 45], + [-48, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 z0.3 F3600.0 ; Move to start position\nG1 X1 Y320.0 z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y320.0 z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 z0.3 F3600.0 ; Move over to prevent blob squish"}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, + "gantry_height": { "value": 40 } + } +} diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json new file mode 100644 index 0000000000..f42179ea69 --- /dev/null +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -0,0 +1,27 @@ +{ + "name": "Tronxy X5SA 400", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy X5SA 400" }, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 400 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-48, 45], + [-48, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, + "gantry_height": { "value": 40 } + } +} diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json new file mode 100644 index 0000000000..80644d0a4d --- /dev/null +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -0,0 +1,27 @@ +{ + "name": "Tronxy X5SA 500", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy X5SA 500" }, + "machine_width": { "default_value": 500 }, + "machine_depth": { "default_value": 500 }, + "machine_height": { "default_value": 600 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-48, 45], + [-48, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y450.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y450.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, + "gantry_height": { "value": 40 } + } +} diff --git a/resources/definitions/tronxy_x5sa_pro.def.json b/resources/definitions/tronxy_x5sa_pro.def.json new file mode 100644 index 0000000000..6a0e9d8ba0 --- /dev/null +++ b/resources/definitions/tronxy_x5sa_pro.def.json @@ -0,0 +1,27 @@ +{ + "name": "Tronxy X5SA Pro", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy X5SA Pro" }, + "machine_width": { "default_value": 330 }, + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 400 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-48, 45], + [-48, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 z0.3 F3600.0 ; Move to start position\nG1 X1 Y320.0 z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y320.0 z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 z0.3 F3600.0 ; Move over to prevent blob squish"}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, + "gantry_height": { "value": 40 } + } +} diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json new file mode 100644 index 0000000000..9c952fcb4b --- /dev/null +++ b/resources/definitions/tronxy_xy2.def.json @@ -0,0 +1,29 @@ +{ + "name": "Tronxy XY-2", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy XY-2" }, + "machine_width": { "default_value": 255 }, + "machine_depth": { "default_value": 255 }, + "machine_height": { "default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30, 45], + [-30, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { + "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 40 } + } +} diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json new file mode 100644 index 0000000000..c592a6b781 --- /dev/null +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -0,0 +1,29 @@ +{ + "name": "Tronxy XY-2 Pro", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy XY-2 Pro" }, + "machine_width": { "default_value": 255 }, + "machine_depth": { "default_value": 255 }, + "machine_height": { "default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-48, 45], + [-48, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { + "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 40 } + } +} diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json new file mode 100644 index 0000000000..71ba36a4fe --- /dev/null +++ b/resources/definitions/tronxy_xy3.def.json @@ -0,0 +1,29 @@ +{ + "name": "Tronxy XY-3", + "version": 2, + "inherits": "tronxy_x", + "metadata": { + "quality_definition": "tronxy_x", + "visible": true, + "author": "AdderMk2", + "platform": "tronxy.stl" + }, + "overrides": { + "machine_name": { "default_value": "Tronxy XY-3" }, + "machine_width": { "default_value": 310 }, + "machine_depth": { "default_value": 310 }, + "machine_height": { "default_value": 330 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30, 45], + [-30, -30], + [27, -30], + [27, 45] + ] + }, + "machine_start_gcode": { + "default_value": "; XY-3 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y280.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y280.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 30 } + } +} From b592c1b0aa5d8f20687dd2ab280b2d86443ef1c7 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:07:31 -0400 Subject: [PATCH 02/19] Tronxy Quality pack These need to be renamed and tweaked before attempting a PR --- .../quality/tronxy/x/x_0.2_ABS_super.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.2_PETG_super.inst.cfg | 17 +++++++++++++++++ .../tronxy/x/x_0.2_PETG_ultra.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_0.2_PLA_super.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.3_ABS_adaptive.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.3_ABS_low.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.3_ABS_standard.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.3_ABS_super.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.3_PETG_adaptive.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_0.3_PETG_low.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.3_PETG_standard.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.3_PETG_super.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.3_PLA_adaptive.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.3_PLA_low.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.3_PLA_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.3_PLA_super.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.3_TPU_adaptive.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.3_TPU_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.3_TPU_super.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.4_ABS_adaptive.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.4_ABS_low.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.4_ABS_standard.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.4_ABS_super.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.4_PETG_adaptive.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_0.4_PETG_low.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.4_PETG_standard.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.4_PETG_super.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.4_PLA_adaptive.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.4_PLA_low.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.4_PLA_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.4_PLA_super.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.4_TPU_adaptive.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.4_TPU_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.4_TPU_super.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.5_ABS_adaptive.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.5_ABS_low.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.5_ABS_standard.inst.cfg | 14 ++++++++++++++ .../quality/tronxy/x/x_0.5_ABS_super.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.5_PETG_adaptive.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_0.5_PETG_low.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.5_PETG_standard.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.5_PETG_super.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.5_PLA_adaptive.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.5_PLA_low.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.5_PLA_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.5_PLA_super.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.5_TPU_adaptive.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.5_TPU_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.5_TPU_super.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.6_ABS_standard.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.6_PETG_standard.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_0.6_PLA_draft.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.6_PLA_low.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.6_PLA_standard.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_0.6_TPU_standard.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.8_ABS_draft.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_0.8_PETG_draft.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_0.8_PLA_draft.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.8_TPU_draft.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_1.0_ABS_draft.inst.cfg | 14 ++++++++++++++ .../tronxy/x/x_1.0_PETG_draft.inst.cfg | 16 ++++++++++++++++ .../quality/tronxy/x/x_1.0_PLA_draft.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_1.0_TPU_draft.inst.cfg | 13 +++++++++++++ .../tronxy/x/x_global_adaptive.inst.cfg | 19 +++++++++++++++++++ .../quality/tronxy/x/x_global_draft.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x/x_global_low.inst.cfg | 18 ++++++++++++++++++ .../tronxy/x/x_global_standard.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x/x_global_super.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x/x_global_ultra.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x_global_adaptive.inst.cfg | 19 +++++++++++++++++++ .../quality/tronxy/x_global_draft.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x_global_low.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x_global_standard.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x_global_super.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x_global_ultra.inst.cfg | 18 ++++++++++++++++++ 77 files changed, 1132 insertions(+) create mode 100644 resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_global_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x/x_global_draft.inst.cfg create mode 100644 resources/quality/tronxy/x/x_global_low.inst.cfg create mode 100644 resources/quality/tronxy/x/x_global_standard.inst.cfg create mode 100644 resources/quality/tronxy/x/x_global_super.inst.cfg create mode 100644 resources/quality/tronxy/x/x_global_ultra.inst.cfg create mode 100644 resources/quality/tronxy/x_global_adaptive.inst.cfg create mode 100644 resources/quality/tronxy/x_global_draft.inst.cfg create mode 100644 resources/quality/tronxy/x_global_low.inst.cfg create mode 100644 resources/quality/tronxy/x_global_standard.inst.cfg create mode 100644 resources/quality/tronxy/x_global_super.inst.cfg create mode 100644 resources/quality/tronxy/x_global_ultra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..0848eb9ef3 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..3349f1bbc9 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..e148f5988d --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..d7d7985337 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Ultra Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..98410560be --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..65b9068a2c --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..3eada6fcf0 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..1f38e6029d --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..2238328cd7 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..67d5c484d6 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..ad974ab065 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..66825d6ff7 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..22135478c8 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..bb15e9bbaf --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..caaba41c32 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..42061e2e96 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..a796d5353d --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..85e65ca40a --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..5184432d82 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..1bd9b88582 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..10dd5eac89 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..3a24b9ef4d --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..ca3f269b4f --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..b60b18fed0 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..1e3b8f4839 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..2fa8f9b44f --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..082d8785fd --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..b093bc92c6 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..0f673de1d1 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..8cbdb78d51 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..2b24c2093e --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..e94272eb38 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..6b9c32ba32 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..8755bc5831 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..eb3d4e62ea --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..effcc55b93 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..ce3e48e062 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..006e6bb2e3 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..0737dfb760 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..05816ba502 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..efefe7e636 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..d8a8a1f6b5 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..353c05f002 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..343f9f3144 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..6965e69431 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..536f5530da --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..6fb07abb42 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..4a144eb83a --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..81064bfddb --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..97e2a15ba0 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..7ba6a3308e --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..c8344c83a1 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..62526628c4 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..8da5b411b5 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..9ab49cf27c --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..1c0996fbe9 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..66096f8ede --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..7b9bb0fd31 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..1ab3d2ed7c --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..6c67fac263 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..8597e20ff7 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg b/resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..b5b34d0a5a --- /dev/null +++ b/resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_abs +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg b/resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..24c24c9d91 --- /dev/null +++ b/resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_petg +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg b/resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..bce6494dc1 --- /dev/null +++ b/resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_pla +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg b/resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..c0531b2a54 --- /dev/null +++ b/resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +material = generic_tpu +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_global_adaptive.inst.cfg b/resources/quality/tronxy/x/x_global_adaptive.inst.cfg new file mode 100644 index 0000000000..bd1e5b43d1 --- /dev/null +++ b/resources/quality/tronxy/x/x_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/tronxy/x/x_global_draft.inst.cfg b/resources/quality/tronxy/x/x_global_draft.inst.cfg new file mode 100644 index 0000000000..4af3a91990 --- /dev/null +++ b/resources/quality/tronxy/x/x_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x/x_global_low.inst.cfg b/resources/quality/tronxy/x/x_global_low.inst.cfg new file mode 100644 index 0000000000..c9fe3bb8b6 --- /dev/null +++ b/resources/quality/tronxy/x/x_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x/x_global_standard.inst.cfg b/resources/quality/tronxy/x/x_global_standard.inst.cfg new file mode 100644 index 0000000000..89bb23ba88 --- /dev/null +++ b/resources/quality/tronxy/x/x_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x/x_global_super.inst.cfg b/resources/quality/tronxy/x/x_global_super.inst.cfg new file mode 100644 index 0000000000..ce4a6e4bd0 --- /dev/null +++ b/resources/quality/tronxy/x/x_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/tronxy/x/x_global_ultra.inst.cfg b/resources/quality/tronxy/x/x_global_ultra.inst.cfg new file mode 100644 index 0000000000..9d2c431091 --- /dev/null +++ b/resources/quality/tronxy/x/x_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/tronxy/x_global_adaptive.inst.cfg b/resources/quality/tronxy/x_global_adaptive.inst.cfg new file mode 100644 index 0000000000..bd1e5b43d1 --- /dev/null +++ b/resources/quality/tronxy/x_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/tronxy/x_global_draft.inst.cfg b/resources/quality/tronxy/x_global_draft.inst.cfg new file mode 100644 index 0000000000..4af3a91990 --- /dev/null +++ b/resources/quality/tronxy/x_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x_global_low.inst.cfg b/resources/quality/tronxy/x_global_low.inst.cfg new file mode 100644 index 0000000000..c9fe3bb8b6 --- /dev/null +++ b/resources/quality/tronxy/x_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x_global_standard.inst.cfg b/resources/quality/tronxy/x_global_standard.inst.cfg new file mode 100644 index 0000000000..89bb23ba88 --- /dev/null +++ b/resources/quality/tronxy/x_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x_global_super.inst.cfg b/resources/quality/tronxy/x_global_super.inst.cfg new file mode 100644 index 0000000000..ce4a6e4bd0 --- /dev/null +++ b/resources/quality/tronxy/x_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/tronxy/x_global_ultra.inst.cfg b/resources/quality/tronxy/x_global_ultra.inst.cfg new file mode 100644 index 0000000000..9d2c431091 --- /dev/null +++ b/resources/quality/tronxy/x_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 From 19b374884c69c73763d7c0cc2cae36e823a15831 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:08:18 -0400 Subject: [PATCH 03/19] Tronxy Logo Mesh --- resources/meshes/tronxy.stl | Bin 0 -> 432684 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/meshes/tronxy.stl diff --git a/resources/meshes/tronxy.stl b/resources/meshes/tronxy.stl new file mode 100644 index 0000000000000000000000000000000000000000..840d98ec05ac504e93f8d16ec2737aef28c0997c GIT binary patch literal 432684 zcmbT9cYG9O`}Ic%1VZn<6PomzLNei^69^@AL=mJ)QNtq&0zpKv;A6wCh=>ZJ*bphn zpdvObJSYfuMMcB{SSTWI?z!eHXPv$C!`DCjoKMa<_xGONBvrv1w{6|Ie)oa>2M$Sl+)Ly@S z_wUR5q1QtHIM{(Uj7pammlNZ`poW8#S&LK9%GlmBCvV^_%3ufDFg6`7E|YS>poW8# zS&LK9$~fKH&Aa1eWv~Nn7*l7*%WL<6K@A5fvlgeIl`*YomAr>PR0ccHhVguf5;A%{ z7}Ri(GHY=PS{bL_|8{Gq@07s~v|%({TSDf(0tPi4q|92Jf>y@q*Pq#1<%lxafi{dj zqe{w*55S;?gOpi|Q_#vdam%$^pZ-%B>_8jFb5#>0_fs&a;UHz!;uN$peqWHj^^Q}@ zU&Uau?!$Hcd#VP3EIMx*3`qpV>umf!vH|Cd;66s+W6qvt@({k&F~rQK%3*}{#8*qeueUKvTO}bK`Y}( zg|gnB--r4PcAyR8>thwHWgMgoqoG$+_J0Y6t-&d1 zW#rs2$jez+*=Mi=Z5SONDJpl~S|a%O+}7X}v@)u1nd~*bcVD`B&e?%BjFcrsW#;UX z0mIhd6tpsy@67Q&YW1McUbc&dcV_zxcAyQT=7mLN z(_5tihONOVXl2w%T;SbX_8jFh8d;hV1+jWhONOV zXk}b{Q@VHhPi3$JZ5aQZSW1fY+!Ziv4NgHTqt}mV-r6V6_m6`eXv0XFk|0Ck_XiAH zgHzDTsOqM9(3${4jO#mh-*<1^TSHjLG$i%agx zKLduX!6|5EteKeX&0gBpXRrfp7~=*Mmuse-4j8rur=Wx9@(Pb zHjI_#{dsy^z_2wq1+9!qiS4|E50ZQaJJ5#l-sU)IRkB#Xur)XZt&G=4wf1J^r1}hY zpbewZEphVROJLXFdA6tps4xS_GPtbPxl z!49-xl$1EB@G=;-2B)BvamNESz3hbkK7$=-!}zO7oRm$#>nmG>Q_#wIXiaf%$jhUA z20PG(@oB|4*_R52t-&d1Wz0G9Mt=IbOMM1A(1wvys^I)pA24i>Hn0$4zyvcZCG2HCmskG zwg#u5l`(R5hPUB;Wv~Nn7&V&Ik~J0Lf`4mm4NgHTcn!(k+ah4t8k~Yw#(8ryJb6nQ>_8jFyWdrl(u3T9 zVQX*-S{aYd%kU<@p$vAQ4WrMts!~5|Xuz;FI0dbYzvmY`=i8OR4zywXG_kTgoW3w% z*czOIRz{0O8D6zll)(!Ic18o?1uV!>kmaV}l zXl3;6I^R1{xvKx(`6)M1_H@p5&0625B}$2$`M$>2?G58_16mui4_@K*UA59@umkNM zM^d8nSbVk5%gM4e)=&ys8QT_3^1j~kxzAt++AwN2PL%Cm&I}l~2B)Bvao2_q?{HeFi(whSA`o#3%J}W3?%w$1M4!P9v{`pci3T#W>GphO*czOIR>ql2yLnq)XzDZA zfi~;n^{z5(4NgHTsvL+)|mXZ6LlzDo$3YDTDYF)*pq0^ReLwH9iyq^OGH5{bOTAYGb#)9qrykk9;!49-xd_Jv`T$lZ2z@UbMlv#^Y(8_r0lYZWd zO_jk8v|&`3~5E2Pv}_r=XRQF*ws(eXBCqfi{evX4H^&>sAH~YB)%lwKxT>jGk9!dYvy+20PG( zAy?OwrCaU}7}Ri(GHY=PS{bcYWO{cuQwBTGhB1ClExBpnEdhfX4pL?=bRmA!j2>P3d+o+4gB@tY*w(17Z0k5KU{J$B%B;mHXk|>jvcGqIX=ShjZ5Vxit}EW; zfdPXW4pL?_8jF+8Y|lFKzb*3~D$?nYB0tt&B%9 z2749fR`MC_KpRH(w~b`*T{{8>H5{bOTAYGb#y2yDct_u^;4|2PHjG7G8q2C}8v_P4 z9Hh)zoPt)yZHKbGnJdcq40fOmW9Wj$^60Z`0|qr5q|92Jf>uVSeZ#zWHkbAp>_8jF zkDD4xiHlYQ3~D$?nYB0tt&A}_BfVRnE8#QPfi{eZhZ@VBJC+9wYB)%lwKxT>jC<-` z;9dHB5ud>hv|)TxE>TW@wJcyz!$Hcd#VKfI%zW%(Z_l11`R4U5JJ5!)xJ9DGt-B#$ zP{TpWti>s4Wo%tB&6}`mr_W#q+At=iB+7((ivtEV9Hh)zoPt)y^TYn*-IIQY&tM1I zFh-{*%FkCW3K-OIkTPp=3R)Te*)`vbpHj?cumf!vIJabUP8KyBq|92Jf>y@Kj`O|u z_Ej|u=fuh4GVq%&{`;EuipERbKRWvwU$-}m!wqO{e6%dbyX}RC{NrE;+U))1I`MLJ zLnoh?lSK^&DYF)*pp{W>s4Wz;)5(R(W4 zE1$s*v|$Wb6fet%v=126aF8-y>yO)m6GUiP=oU{yx(C^Xqt@!49-xl>ViFabL55K@A5fvlgeIm2veK!@cs& z^_~WHpbew?l#;Ua>BN9R4F@T+7N?+Jui@B%HjIlhOUvp`RRRVz9Hh)zoPt)yk~;mplxy|< z2RqP)fwMbC=VYO={MM;WkTPp=3R)S?&Q~{`IkV6;zjv2?T0usny8eFK{8V24N>Pok z+Z)E=2DCPAb~bMQHDIs3%J}KBv@M$h20PG(k)Bje`g8%q z*5DMhGCCh!xurwEUjqe z6tprbe$aXA;Zw?B2ih=xO(-M3CW2vWa0*%(haOqDwfJ#mumf!vk4`NuU(^D_*5DMh zGM>BY>8)8ul)(@!i(i-zkF~Xv1jLx0EbDlOFt>+ZvpL zRz{E1s(Ih=*#m~H!6|5E zjD6(Fyy`b9gB@tY$o;;g%-afvt-&d1Wqk7M19|z~l)(O(U3|oU!(8{>- z^lN!tb}#UMC$a-=7_-hVDaYo4VQX*-S{c{=R3iV17xX%PcAyR8?%PYqp=My%8k~Yw zM)Aqn`5msA>mLU@(1x+BY6+?QN?P!}Yin={S{cvvTA9D+&nxubk6Y{}vtZGuVMPj4`v~W$&7l#x zB_|sUTZ2>3%6P0%XK(I-4nBh&Xv3J?HD31ro{HZkmIkMwl`-Rz0p3IJRreX}KpV#W z&EsYJZD80MoPt)y_4CJhRjd7xZeBC618o@VYsSlWjli%qI0dbYUz2mZ_AjmQ8SFqC z#=FJiWqrGp;IXnbI0dbYryig0wV#yWGuVMPjIjmR2>)0+IbhftoPt)yjbAPFX1#Kv zt9h*0fi?`huQfU+%huo&v@*=v1*b90bDrBEzjov`9A3AXb@BC3!(oRT(Ap?HqN}@e zf`46jZinsl=f>y>41NP>B*nNusoIAUd<+gk0_ON#4QOplXnT2no1Itr40fQ+-uG@umLh*%8T^gK*5DMhGXAJ~Ltd}T^>rdU(1!8I zW684f02sCgr=XP)f78QhBT|*Y4zyuBc6+j1{1+Iu2B)Bv@xqBY>7y^!$BG?j!x%Ry zS(>lW=O!o1*5DMhGKx%iBYn!-dVM=P(1sD$Fw<$?Jdt`pVur)XZt&G*bR&)23 z$nqKNKpRH2E0U!8Rk;Df*5DMhGA_NkzI*3?dixA^pbev9qa;~B8-Js>H8=&Wj4Mwz zaf_E0pTQ2aVeH!3MRImr7aWJJ!6|5E+)}BfJNu?IpTQ2aVGNknMOMwYAz;`VoPt)y zgDu*+d-L@kUUr}jV_`xUSupLUfMIKJ3R)SR7I$#3U99&mu>)-w;~wrT-SUpOYCAqVPwDX@2cAyQT{Ii{8{>0@0 z!`9#wv@&v6r?|~J>wS0ZKpV!cR-I(_miq#Rt-&d1Wt1P+)pbVeJ&No=8%E>DI!e}* zhXaPK!6|5EO!z9zz3&D6_naMQ!zfazqhwBB6)y@87iPE%4(jVGcAyPI_P3WO=ROlKYzjncl|8Fo2^h8pr=XS5>gVq6y4Un|J3G*ZQL=1Xd1K?70mIhd6tps4eyE3=a8$3Y zWe3_Ye(c>w?r8i$z_2wq1+9!n(t5f}+9`t_Xv3&Gx3ye(Xm7x2}H0 z_fhOX8^(i=wUTE`;#y8ygHzDT_;gq=cmAjPevln#!x;NUOUb?VU~n9^2B)Bv(PCFG z_tzfEUFo}GS+5Ic2ih=}{oX=8U34;F*czOIRz|6H zz1>GTDT5to!}!T*AvtkHg7;Cj2B)Bvv8YTR_p>ejIRJ+pXv3Ht*IY7w*Xy2hvTO}b zK`W#9ls;}+KV`53Z5TM4V02EFt-&d1WjvKOz*|#9?`in_V75FyA<2JCDi&OcH)*k6 z+kmgz8^+-Vv^E;9&-7MRs->^tf_4AdSafT)xYz0R6FFJ72B)Bv;VtOr^?5|^n_vgp zJU)|0WJ{mPxMsrE;1sknF1fX@SNEej{&BDaZ5XF(WXs*HaLt6R!6|5EyfUYcH>}}Id`IPgVQX*- zS{aoa_VB(~q6~JR4WroonNoZQ&WqX_oPt(H+poHNb#^O*9caV&a7jO@wK^d<4qJm$ z(8}0zLwB!Yn!bi(2ih=x8_-8uCprPc*5DMhGLouy_jYbm20PG(vAs+$IZ*w_;NMzX zgHzDT7`;ZkqoS{O*?~5UDj#;2-!k?D3|oU!(8`!ISiF^Ml)(uVAisDT_rVMtV4P(>#Zu0DaR|AHv!6|5E{J685_iT54|G^HlVVu7E4_b`u?09Xv66FOsX6ib8~PU zwg#u5mC?U^y7$yVJue8FruzW9lauWHJ5s$*lXPwrJJ5#Fab=1; z*c9hQZ4FLAE93Rl6z}@S_52k((1tO6Mv6?j4Ci-k4NgHTvnda z4ddv^WSPJA>VRQua0*%(RSIToKR?3t8SFqCMw@SvW$8%#ZNk>z6tptB&aLj%Ts6RF zumf!v_?wr}Ia#&_r=XQ_{+HD^pAN1aeC5WABY&g6W9c}_53aMs*X<4Ca06N!>vk8} z@tr1uHJHez+ea3Ff!L)DE&KuVQX*-S{e5@dt=Mn z!8MTVKpV!$J!7SKTQF=5PC+Z$I7eCz_2wq1+9!*R`uOl zGPur?9caT?-}eH^tOtgz!6|5EEZlzm)`oxTaj*kz7uA=W%3gC zDT5to!x+A4l+^qJ3|oU!(8}ofbep{AUsDD<(1y{s%_y1p1{k&mr=XQ_EN5ii%*T|$ z4zyvs^UO$TzYYvrgHzDT_}|gn^Tv%*20PG(vE$7Va^*BIYz_12RtLk@;1sknp6XaV-)W}TS+WCd824TaJpJ;1v3R)R?CtlCL zvg&l7!49-x-2cZ=sS^)|t-&d1WemRUOn#{k$NCI*pbg`VRYRp$A6z?VYj6r$87;lq z-rh-iEhjtBhOuz$P`Pa;t{t>BI0dbY#~$hAZJna8uh@Y$jN$c%O82X9?Vzo}DQIP! z_k3@!U28p`$PTn&;2g5iIa#&_r=XSLUpg3EJGkKBjL7Q}ycRL*;_IP?!wxr~wK22* zRc`q{SDX91oXZE#kkTLOxni^p17Ei{jKd9RZCqKZulw4(x}IT7X*W?O?bW{zoZ2`^ zWVy~u!Po5#<8T978=pRu=?-d9%V)3yZH{A5iz(8$Rn_3!lC8lhXl3lXae&+7LH{0i zhaG6cNZvO^rhkI-iM9r(pp|j!Cs}TvUH-jG4m;3>@x{WavSCJ@;5cjzPC+Z<&GbQT z=C}U6;SM{{hS9FhH2Lte`T@h%;1skn2IUQQm%i!W=jE^iZ5Z{QohB<18wU(qgHzDT zI58pHO`GW7uja4=Z5a13%IJ612={bqg3n+F+AzMUH(f@*+cG!~TZ2>3%9z(=wEOuV#e4=k(1x*m!E`CO zJ|tk+8k~Yw#`0xj-PYpx40fOmW7)gY<((1uJC3cvDQIP!tTx_VllZIu`-&ZC!`NJE zhSX@;Avg|OgHzDK^Rak}+ckBM&tM1IFiI!Qkb~>+H?Mw{2B)BvadY`A+@uwc`wVuV z4FkV-jV`$F&eGr%v@#BUHNj2p`$Kxcuif0&-7FbBy|I6vdAX!4+1R$3ukrOz!(oRT z(Av0i!{zQ*>z*_WhaG6M_m1te`wVuV4P!{lEZN?; zbHK1QI0dbYn$InC-#XmK{|q;FpbcY1>nyqF^KJpd*5DMhGQO)l&%M4uZ~r-G2ihWW4zyw17B^5XT=r1Fur)XZt&9QB zj&`S4(ckUtKpRHStbx+*xpe`<*5DMhGTLn%;cnYk(*NDg4zyvkdu*WOEzAoTwg#u5 zm2pApFn949{kN7KXv6rZ_#pYL><0nE*5DMhGBTQEyR$rf&A<+{VLW%`Ah~Szfq-Fa za0*%(b0-dVH}~}C;yCO;8%D3+2Fc(ZCj*A9!6|5Ev^_M?9XiIJA>^uYLupbca4 z_94=#d}6?`H8=&WjGNZ=ckkL>!~fo82ih3%IJC^(|!A0e;$Ct z4zyuB)qAMq*X$WEYzEmKq_4CNBsWwg#u5mGQvF zzV6INl)(p4%yb=6tptd zU)RTN(xjgMoU;RM7&~f?l`Eg$8a!6E2B)Bv@ywt;?%k7>!49-xj9hl1eC56qFl-G@ zK`Wz1<38>!E0n@UfaFzzApp_ASkLzxJ+rOS6cU6gtFGe#zN8tn6OvTO}bK`Z0_-(2^H zamru^+Aubxjg~JHIt2_{gHzDTc%yNK+pUE%*nu{TLHQ$P*zOtu!`9#wv@%+Z$Z&uA zRj-p_2ih>k4;&%)&phK9os(s2a0*%(C6;Blx4fVXcA(9=^^OgbC-UD77`6tdpaaI6 z8E&1+l)(Lmmey9pI90&YzVc%iiVp2Mk+-Q_#xTT~gd)r}f%FcAyR8@81W>@;BQA3|oU! z(8}=oi`#I$GT4DOjPGt5B#ApRgE{oJ2B)Bvar^z^W(-vZJJ5#ldecGjTKQ{(dHS{n zr=XRw@egr39Mo%4*?~5U13L#w^$*WaH##TF*5DMhGFngS?tXrWGT4DO>)tqbp!B%y z`ha0;a0*%(*Z$hw{cf9HBg_u8VVr0?P_nX~4;Z!vr=XRwd1Vhb^(Vb%n;mGwxaQX^ zS$XQ?fMIKJ3R)R$Ztdy*@xET)&JMI;jNFtZFU~p{Fl-G@K`UdxC%xRulJs5xcAyR8 z!<)0@?~GEe(K%VR2B)BvQEyKlcbHe#HRoR0fi~-Qo{}ZUud5m`YzpSr=XSb?XiCD*b;gV7CX>}(PzL+Nu7+(UbZzj1+9#Rcl32fe4zJW zu>)-wXU@!!i$2BYRNESyf>uVK*?rviQ|kH82RqP)QGV?VdGdUG#-XjjDQIO}eM4`z z#RR=(f*okXcr|l|TsRz`&uMFL3R)R0yk2g-G5UL#9caTC@$GckF&3YfYHM%`S{ct* z?BzbuTL1lE2ih>I&MEj?YIl6@tF6H)Xk{Fj*VAqCoif;gHVip$y4+sw@8Erut-&d1 zWu*Sm!(DTO{#(lqv|%*3?o#=D)QNy$Yj6r$8ABHIaMxDT*9`1H8^#}JrpflnzXc3i zgHzDTxU)hJ_vZVQ!49-x#Q$fSyqEe*z_2wq1+9!fp6>1*DyOfn*nu{T`@WefH-G#? zz_2wq1+9#)2X}Wrx<(o7KpVy{nNwv+#({ugYj6r$8P#@+8(&dh@3I4J7^f4a$kb~- z4j8rur=XS5D@EKVw=07kXu}xs;w1UJ=+1y)Yj6r$8P7h`&3$f?zQ^VAvX*f>uV|^%?F%x9EFkcAyPoW%u#2 z>iks!!`9#wbntw1%5bl(rsrhXfi{d4PmPn&Pv3>-!_wdsv@)`{y6yvyD1#kn!@!v^ zqjR!s4NgG^k5yiil!EK@J@fi%%;@oQ$B8QbYn($DO_1-8tH#&u4dZYFS{qMZUNZHQ zfWZ#5+57n;FOmQKp}d?dTZ2>3%4oOgn$*PsgB@tYn9+Trv^xfdt-&d1WlT$cEp^Y| z`dG08Z5TxxPLgka0>jqe6tpsKU7XPM$Y{x(V8_znzPgHzDT=>J_x*R7|N z!49-xOxrwJwtfbNt-&ei;5d%wblrMf8SFqC#%Hsq$jbkLajT`lDQIO}bJqi1TmPmE zcAyR8yGB!G=<8tE8k~Yw#@uSJb)EK;GT4DOj6H7@Tsyb{3|oU!(8_3b>yfUDzEK7{ z(1!8%xM}j}DllvfPC+ZQ*pp4NgHTW5?i*X>+zIgB@tY zNS=MEte69at-&d1WmFh3I&Jr(%3ufDFn<2|Qn_?27`6tdpq0^j-Qu*VS1E%XXv3&G zZn|V-fMIKJ3R)R;Rz00oqOvmBfi{fxO=rl0zbXgsIc*J2K`Ud!u#;)GS6<-%Zf6JD zFiyWSLk2zthONOVXk|Rrs8jlaKj!%icAyQT*x;G6E)xt}gHzDTxaH#O(wAh;@fqwu z8^-@$o+&qfS}Ay}YzVJJ5#FZqh87br~482B)BvG3(?)x9@es{CUXiKpV#A6K6?@GGN#moPt)y z_q(rgb6%|PpCe-j+Awgo&FGvgTZ2>3%GlVeyI1t4ME^N2o!Vcj-1)ixy7udm1LREm z?|hA~+Z)E=2DCQbe!06>xv0;`We3{q{e`y%NTY#21+S^8;UHz!;uN$pPJYte8?djj zIgVU*pbg`Ld0A5B@UehF4F@T+7N?+<@!W&my^9;`aj*kz7&kN+D3i;c3>egKkTPp= z3R)Rod@bI!XOzJXv|%*eI#8b7d?sK}!$Hcd#VKfI6uG^dcixRn{l|(OXv1&@43byo z772a^so@}H*5VYjGHNe&y>?$U_ZjR!8^*Yg2Fa$c;sORW9Hh)zoPt)y-eq0Aj?G&6 z40fOms4 zWyIC$;Jx}oXP?0iv|+s7XNY|I9nOnV!$Hcd#VKfIbZgeqTRkVuXRrfp7^Alikz+TN z4vvEw4pL?#!20PG(abD|eNr=O_aB4V6nYB0tt&C&uR`(7Ud^Ujj zIcEpjFiNe+mgz(BcLQoTNSU=b1+9$AJxY6tO^5pocAyPoN5ORf6Bg*-LUOXG;UHz! z;uN$pzA67#{sX%&^cn0x8^)sRhDy?P`1gYv4pL?RLbq|92Jf>y?xC%5Kbd3c7;Up{fi{d&6-UUeyTPD_gOpi|Q_#w|?dxj!RnDL9KUVBO8%Bp` zM#$4`@g9d74pL?|Q_#vd)FZ>&RLp;!=#2THyHvjQcK>zl&Otq7M(T23Z_eu}RPromCO-&64DYF)*pp|jndl_Eusmfpn+A#8xd&=Qu4+RWr zI7pebI0YRXN0Dych*rvA2ih>oZt5xf>pqI(INNZLGHY=PS{ZwKbn`y>Qr{b}18o?G z-{>VvKYJ=*P{TpWti>s4W#rw~%^MuN|6m8&Fq(baTYhZ*Qox{wgOpi|Q_#w|^msR~ zYXvqM@;@x#y6aV{)9caUNAvII(N%|;YP{TpW zti>s4WxVyIcn@}020PG(u^>NF9y)J-z@UbMlv#^Y(8@UTiFnK7mB9|QVc;Bq(K%Vv zaF8-Za{0}>Zkg8$JYDz zvE;G?ZT4QOW4g?L64z`~!$Hcd#VKfI{M@IHH{|kq{&UU_v|-fzK3#@v>>fNH)Nqh8 zYjFx%8LRg7^5&;B@EPnt8%EWF8I2nnWCsjtI7pebI0dbYZ`StoYCm1@KEL376g$v{ zaq*H2IXHPjz@UbMlv#^Y(8_35wukr7LwZhz9caV2Ohl&ixHe!=!$Hcd#VKfITs}g) zwU6reE<4bMalBS{Dc=63fI$rhDYF)*pq26aFB#rA(cio5KpO`BjWRkXiy976W-U%Z zE2G@0!EWMZIs>9ad>7f(w~W8vK0~|6jIqUijj!7q#^DCEHd2!_+@h8A-&%H{&E6-j z?jpb3=LCLyL@X1=c+cAyPo%wgfPC+YUMfrGl?p33F z20PG(Q8PP9=F~hAFl-G@K`Wz=yEXm63Nw8MJJ5!)dVP|tyy0-bur)XZt&CQix~53Jw%*czOIR>o(2?%k59ui87~4Kcma;G6v7&~9lv#^Y(8{=R{ge4;UcB5qR=Mmz8%F!yDf0dV zJm=JKkTPp=3R)RUW_*{w`GHG(20PG(k@ZrFJU8KZ@O)6iLCUPfDQIQ%nOMr3@v@#< zVh7qV$}~?EZy$aJso@}H*5VYjG9F8;>vbL2*FO$+pbcZ%id0#+Mt`s5WKqLG%B;mH zXl0zYv88wG?_GTcJJ5!4VU4bG<`MlpR&X!b*@lCZS&LK9%Ba>L$@_M{o_l2n+AzMk zyQ?(bRwej-MGXfjvlgeImGOA1Zr;*U`Z|#vXu~*KElqY8uNN?=;UHz!;uN$pDqYdX zyC+RwGq3|~7e+v+d>HG{(rv|&8|a|y@;FN*tmCuOh$Z5Yp1Z7p54;610U!6|5Ey!n^76~FTT9_6qDZ5VO? zYb~qx-5nf-5vgzGT4DOjAA#mk^XIN3mCQrr=XQFc5-+3stL+q2ih>^ zb!sca@^1_nwg#u5l`-Ja?(Wt)%3ufDFj{=pRt_v(958GRPC+Z<$FI7(?*IJP)DAn) zhVjY#c9Pt1Ucj(5I0dbYs!e;i-!D`KJJ5zPq*{CF{rs$eVQX*-S{dJ7(Zd~)s0?3%8 zR+=){fi{dOk9L$7?nn<9wg#u5mGS!Rz1-t>`0r~ScAyPoXQ@syWp3wyVQX*-S{eDB zdb=y%)O+07fi{ebr+1Q<&$JF0wg#u5l~LnlZ@1}({=erAJJ5#l>ua6laFb>M!`9#w zv@&KK>f=7Tx~~7d%MP?*q*d%JS-&+17`6tdpp|h$^?q)(#{T&dhaG6cC^w?BBu=j# zFl-G@K`W!h%1rlUVlDqT*nu{TR(EukEq7E47`6tdpq1ggG{D_5PUqsV18o==yw+Jp zO|KL%Yz@gFO8pbZ1( z0F2JbvNbpbtqeDzo7=gue=fs$dPCjFb>VnzXx7Eo?G58_16mvA_ie%3H2*j@6sZtl zU|qw&*X<4Ca08kfPHq9m<+V8V`L1%(tKho#NTVRF4R*NE_Jy+2w&3dcaDyFg)PB5- z#1&lM9&WJ1jmm3F%asLx?F%>9;l_>mr6jrF+VgOO9c~={IzgO*E6KwRcDV6e)db1? zG**KhZuA*dQf7P*tHBO88m=uNb6<(oV22yemnb2l*T-tG!;Pu46i zij0iaV22w$W*3!D4^@c4V22y$jV&tW|12M)!45YD4k;?Xd{Hh&gB@;c z8CX=RuPPheFu&wncDQjxc2U{ZyiAM+JKU&wVNu!iR;d^bcDQk5W>MLAQ$maeJKRWF zQdDNnE*Yc24mUbJQdI7|wM2{tJKQL^he!5*86Ts;4mUo2zo_J_jMZR=8{NMuD#x#g z)nJDkna7ICxZ$xH>~Q1bVsWyvf2;;O+?ZY>PVUT%)nJDkIi(7I&ilk_u)~c{E5^yb z)L0F6xbat$I4PSDtHBO8N=lqmc)56tXOJCk?3xfK8+yfRu)~c;x5UYNFBOZyV22y; zZH|*xC1W+%;l@hydpA8U27?`LT-u_TlpI+!MuQ!0)O)U&e3pD(j0QX0i1iw-;8#h( z?-FisYTSV0a?P~U+oE1&_ziZrvHEmz$zAzpj0QX0n7l1sen~tMqrnb0a5gfsD{~M9 z|K+;e;8d-R`c>>G}z$=&XI<9#SKnn-dk2q zEPF8qgB@<*9BG)r4Nk4uSWae-SQ~@E4mWU)G|b=zr*Ouz@CK*iOH`C+l9tEV6+7I( z8P70-8=S)V%cw@K`H5l&XCO_ASIWuqfBgLaH@cDRA_eqjbTIEAx# zg*Q0$?swIs^dL9JuGrxQ&f$wf8%=Yt)bRWm7GDf;Ohq;PBWH)tK=De^N6rp6aCJ%)!#{FvaH>X=TC%1>T#O@Uha0#$CCuOk zr*N%FRKq`Vc5txOs54NiTZmMA51=AUg8?8y9=>+-t1!@V1lrO2PU!^m;?4R*M}S9ti1 zTthGnZg6VA>&bGg{T%;Mh-R?E4Se=Q_{h1zDSVPdxWOrA;4?JB4R*M}*PTQk2RAr{ z&jJZE*x?3WcM{Fu2B+|uCSe9U+~Dg@q8Z%aRP@w3eZKWMXNMbn-AOcq8=S&iz3_3c z!wpRP3pd!|24ATXy(?~T3R4Ti40gDIS&HEXJKVs8$8dukZeZ?YxWNuL`1+aXBj*OE zFh4WQV22x+>KSgZ!wtUTCVE%g;1s5lh8gT|12a>@4R*K@eZ3EVw{wG2nEe`Nu)__$ z20Hr4xxp#SunjZV;Ras=9nIhdr!b2*%wUHbd<}FogBzT}OyMwt9d7V7(9sNTa0;`L z!whz~fr-uG20Pr~tEQuO#SKnj@^qNN4mU6lJKSK08+@I0^sczUDa`c_GuYt z2H&R>&EN*7qNly__bxl!;QMr<8QkDh^c_4l2B$E=E_~$daD%6NMDL0loZ?v>_6Dag zyDz*ecDTW_I-(ie;1o~Z@Eehz4|aHV2Crmia07D=!^go6H+YUlG=m$Q;;9(X$H5NI zwcwTP3~pd1WcWDP;ResRh-PquQ#`T4-ry9^B8YCV!wsHTVQ+AX=TAg8*x?Bh%#Lob z!wsGdVQ+AXCp|e89k(mtUnZm?gqnRCP6#Rn7jdHkwS-j!roY&$MChJBu{9W<1 z1$$PPDl1yi}A82)i^gHxD=6>jjlyhBVH3pd!|22Xm3essCPDNIZY zGuYt<=D39$>~Mo;LqzY28=S&Cx-f$sZt!e~Xa+Ypg}HiR20Pr~*$~kTZg2|o0mBS- zxPhsK;RZY0z%0dZgB@=0{E6t};0C8K6Ee(ThZ~qw8E&w{4W3vLy(?~T3KKWO40gDI zIiTSNJKVr@(r|+vZtzr$=;Po9r!ZwT%wUHbnEe`Vu)_^ZqzyON;Ra9Mh&~Q(a0-)k z!whz~5k1kN;MZsHU#`myPGLfD6eHLC`@vH@FfYTTnCBlyLE8M68|82VlQ5zfp$4Zg z*CNu$HH3fe3X?)iig}SoH`g?HEk5$largw&zyw6IE~I60JrOyM2!k7( z!Y4^YHT>h?U15IWKX({8@&Zn7)ZV#)$%s*mP=iyLa~N*$3`2Zkh)LNS>~Mo0x9H>G z#{{2(VHo@vMmN~u20q^+d>q{16h5sY++YWvH*xN};s!oRBFx}jaf)9PMISjk+`uPE zgc;o66u)MSX7KAld?JEbmtQ|dH`w6@KIG z**vO|Yj(vBKAYU6c%|s$V22xRzDbs)Bd?0__d#~JaeMIj=aF3%?8y9=>vDrrM^7fp z{IyrdV6ejtd`@|o!3|E8ubCoMZ<-f_!45a@IptvnH#pTlBSnrMoqv{*>mPW*k+Z{% z=`&Jf(q*}48(Ju6u)_^}vUzw{+~8Ell_~OI(`(N%BD-RT8&f|?k)yS*JKKotiXCp? zv(Ur4;s&QasFf-yS=XOsM0UjvH(HHPmA;#no^3>S#SS;{>FMEJaf4GmpGlP?V{Sgn zi0q0TZfqXjRmQrvpKU~T#SS;{dF$a_af4ICDy2z{@9&AhV22y{y!8kpvMX+I3ZI@H zX+(~k8=Ol0I!(N8D`M=59d6*$)58pIaO#d%(&eYLCt@(z;RZfEJ;(< z)ffzRxPebk4>P#IsX_T72@Q9~V6ejte0qAA!3|DT`LMhEma!)WgB@<*)6>HYZg6UQ znO<_B`j0Uf>~I60o*rRDexkU+DSQ@sq!IZp;RdIE8_-8uCpz6CjR=DsZs4=f3vX}= zpKKm!M0UjtPJOtfpVV4iaKmKi=Yt(?;FHZGjR=DqoGNyIrWD^%E(U`gZs3#6!whb4 z>aNH8%i}vLpJhaL#SS-~STjKSJzV2#Bl3K(!wq~EdU#jd;M9bbS(4tP?pa1;SL|@( z=bH!0uJsMiHX^%Xha33x^zg2@!Kqo32g#t1o5WzS!wr0TdYHitPL*muSW0YY5re@F zH=;jdz2LATj}KFo7>!dK zCy6XC>pRCvj+IxN>AK8|{uhTGZmjQnfn?T;wJUCLs_ybJGPP2y#-J8cq;adN{;raj zUnDz|G{w7(-W5CC$XtJ+^zRgl!3|E0+%r~+w~f_E-Zw?2f1*EYuiSXCj7ZfK?>2f@ z>~Q0brQ;+&B^HAloZ@4OFbcj?a$Vll7YhqM2Wdtf|8Zkpq*3sllIya=jdpdW$%miS zkMUi?4Nld2cABh6Y#iP2cg4=VT`rX$)0_T_U2)^a=P#9Ijbi-_@~$}bO}*(d`rU$$ zx#NEg{9UoLd_loyS$1yoFLuR^W$#XxcSf{}W`rJHPHiqVLu$0_5Z&;1#ZKv@8FFx4 z$A7UaZd^WihLrxW(^*Er`sTmr=bTdu4$g>tA4h+e@XrDNob%63bc27M`L_@M{6{zV z_Z9z+YPoEPTsS4xqstCAhHn}rHNS}U8;%>C>f2_NOnl@2YH;dwjcmEQl|DDo$H5La z-g#!Ev|ksC!3|DL9+545Cet&hPhi0_$PPDlyg5RyoED404Nfh(HCx>4I-mV6i7?pV z#=fE>q-FJ33~q3$qL(d`7I%rkV22y`UNBr9ej)AuXmINDgW2-i$25N}c#v4R+pG zHB@@_N%hxdcJ%k|W49;E#eeA){EPb6kz1WB{P!Gu#eZ~z9d2xER9Cij92esq3pY5` z=jXcOO&%Dd!MhqaDOsAY(esqdi{2GG+=%O#EPGGKIy=Y>PThDiNq#svH^#2m`EFB^ zeD;W*N#m95yW&Q*E0U!8Rk6;h@mid!*eFTX&!%%^k)K+2cJ1sUIXm>c7_VgC6*mUV z>LROV+z{i)c`Z&YOz0vDrri{y!OpmcJ4?5`WqyiRvhRu;2U~QOmXl(gzv8txRsPvd zGJoRo7`tL;SF27kd&_?2KI8P8J^A{4aJD)!5lq_N;m(27`CCh*BlX zwv{(Fz8T%fHLqm2!Kvv}YRiF1v3@?-;l_`>+sGY_KZwEL2B*f)sU~jJKPxiMoY=P_F#0w zXK;g4Kh3Bi?bfY~Zuks#xH0DI^CfZEk?4lc;0C9946805Hhem|;WOCb#}uwZ2Vsg20PqHc%rF%`$3s#hW}V`gHxw_HkB#s zW1S;o=jB;VJKQ*MU83aGsvdnDK7$*a z+E}Kdyf^RX7>^Y@+^D{+u}ocEI|hRroSOe=c{$$hbPNVN+;EmRlvB?nMl<{)=LV+^ ztZE=F4mOW&_(#qSPE~4NPS&RW<9pXlKVa4!u8T z2B$`>EFz#-vUDj~ zRYjlYP(up^4R*M3QD$jb-Kk3Sk^2m8aEf;uIr3byD_)m(`0$(r$(&R#27?`L94J*@ zHYfk%Y?RO72B*@0EGgUWk9B^Rov21qIqB2o9}NG*s?VZnS;5jI3)Fi@^;}mHwrKG{3J|j7OIpZv2{1Mt)8F2g5&dZgA?+siozM zTK{PHN6rmS9nUS;)yP;sgY0nQlij7Hb-7p!Zg48EZV4&C$B3h;~)MUqfIl3X%*(i3narf;dKX!wxr&yc91@Bo>1koLXNqUcPIj zXLKU}8u;H=>~Q1$=JB%qwpa~zxG}kFyzKuyR)ZaGEY6OXoa|U!w3G0U2&t@gNK}!OjH<1?xUj@?Y$V8|4Z<3ufV)`_rS|6%{;-xlxmUI8`>gk*xUqp%@Kz5`Jtb z*EUS?Q+#~(XOJ5k<~5X${@W|9@Lh3gTd{_6)k~Z5!VPw|lxQF`n{LlHsdL*EHx{3$ zC;7eGdSM2y#i^Cg){{vkdd6t5GvVTTGWfnReu`JJKUUm0_-tJ%^~?1!7`zszIv%Pc z&C^!JXs|Q2TpejP_0@l|D{ic9SX-JW9*Duaf20NI{Zc@y)?}{6k(jI2;TAad^_Hct8OlCj#U2y|b+QSUq6{j$z zJ=|ailiAOGSKPpq_ArBY#VJf_4>#DsWcG946*n-YJE)v?#97n_H*AA zH!!6=27^A?fm4{$9&WIM$?WI8D{f#)dzitG6{j$zJ=|ailiAOGSKPpq_ArBY#VJf_ z4>#DsWcG946*n-YJNdIoWhj$aDyF8WBk7ZeUV+q!HN_H#mjK?2$%fSL|>DQ`*A~cDR8#>){4F+`v5aNF#C_+~5=@vqu_{ z<6wsyn9?3@u)_^ZW)C;m;Rfccha2p012fknjmVL6gHxEy9%)35oE>gp&U(1P4mU6l zJ<^EmiW{85WcElSvMYADfhq0b20Prqob_;n9d2MAdZZCK4sLJ?li4GU$Z@d44NPed zH`w6@CbNed>~I5f*24{UxPj^Bkw)amxxpz+W{)%?N6rp6Fr_`*V22x+%pPvA!wt+? z4>#E12F?^k8j&OC2B$EYJ<^CAIXm3Il=g6g9d2MUd$_?4H!zt!++c?rICmCqu)__U zVT&{(j}!4Ceiaqhd~ z2L5^yX7H{!g}=~*8|>h(Kiflylz|H*n`un8CZ^6z+8hH*kl7ad1zA(e?&AQH|iP zi!g&5xHrS3aA!xP5qS;A>+%k9M?|C%dF{gvH*l{*q!D3ogHyPNBHUny8@MAP(unMe z9d6+6h)5%{D{gQKcSJ-Q5e7Tlz}*p%Mufo)PT`J-NF%~vha0#%BGQO3xWOsh5fN!b z80>HZ_c}xx5e7Fng?lK%4R*MJJ0c>D$gbGo2JViCG$Om=2B&aGM5Ga6u)_`9xe#eY z7~J3#?x6@b*x?55rwBLL;Rf!Ah%_R{!45ZYcSNKSISy`c3U@?A8W9FN+`!!tkw%2U z4Nl>Xh)5&CV22yH*CEn~Fu1`f+(Qv=u)_`95fN!bcEt`iaIZt85!n?tIE8yC!VPw~ zfjc51jmWOp;RfzEh%_R*;s&R14@J1a4mWVGL!=Se6+7I(9T9~$IEA|-3U6=~I5jM-<-R6z+%!H`w6@?sX`20KxW;2w$?4RW}F zyCVv3a0+)sgd6N|1NS-<-ryAOp$IqF;Rf!A2shZ_2JVh1yum5l5fN^%!wuXWQFwz> zxLYCIV22yHpQ7*vr*J<-xWNwYh%hN;N1p>=ha0#fBFtci8@M~7@CK)F??Jf14mWT= zMd1xj;eLv6gB{#MVN%SFeyrHx2JWW_Gq}Mi+-VWjDEK!$H|kv+?({b)e%BYhD|Wbn zX#!DhZ~q~UU-93m}nkuu)_^ZH!r-wDNHmEH`w6@rkfYu;1uSQha2p0 z1M|=eZ*U6J%?odE3iHXs4R*MJdFX{VIECrvg*P~b`Q+gSJKVrL^uimQ!gTY(8=S&? z@^FJ4ZeSjI;SEkXxWNuLFsr=q2B$CsJ=|c28<=PwZm`1*OgAsQ!6{5M z4>#E12Bw=A-ry7_nuihZ~qxUU-93n1LQ{u)_^ZG!Hk};Ra@v z7vA6$W}t@~>~I4U&BG0LxPj^Bg*P~biRR%3JKVr@^THdP!hG^@gB@;Q9(v&oPGP!v z;SEkL7Fx|ZH2B$F5JltT18<=ihc!N`zXdZ5`!wpO~FTBAiOa%@% z*x?4I1sC4n6s8b|8|-icGljzqcDRB0!i6_Dg(<}020PrqOyO{Y9d2O0aN!M3VWx1n z!45YtU%2oFr!Z4E++c?rm@iy-gHxC(9B#0~4NN31yum5V6b?7o;Rfal7vA6$CIp8Y z>~I4Ui3@LV3R8ij8vdCH%nmjVW(pe}v*DjLV22x+TO7p*H8{n`7kw^+e`+yp+^oyL zF`^sna08!15Z)CxIE5MLg*P~bN$KGRJKVs`^}-vR!Y3Dm8|>iI15Aq9(T^27+`wlN zgc5Mkay?9_Hx4G(8y#wBp`gJIH!vwb!id@66ejaW8o64@ z_1M9b|8w6JH}I(f5k|~iaSESe5NSkq#ST6Z;oNt{4SWJagb{OBoWdtQL>iG@v4c;K zIQLy~1D{qAVZ_`Or|{_*kw#=!?C|$7fA>WHeDL|iAuY3Hd*jZoS(ndcMmN~uM*H3= z^8SP)USwC1<6wsy9ouKgz2jT@yl4hDIF z6>p!jEqom8aN~71OGZy`9D~6PPEA{pDht;XkHKJv8{4z8WbrR`V=%bEsm@cfxRS^BB8ghZ}$YK1i0o*(N{C;0C8=97vPw%r-F?>~Q0)DT8J2^7~^jxWTDX z|BtdWfwQUn|M)49rLu1&DhX*rgfVmVWGOPX?8=rU*)p=5du89ol47)otjQKC%*>s8 zDN>uj`lVO*9JY!bZcHuognDe*q#PLB;MC@o zPpF@czWy%_P7PE_^{)Ry4qL?zH_H9qS}n`^JO>6hICbHcM^v6_Q*vOi!;Ox|9#O^8 zX64Xeha26RwN>-`U(I2wxWTE~N!bRy)=D%hLbS z;8bSq2I}PW*K%mE!;PCZHBjG{U6ezE9d4ZbxS^V~e`O90cDS)Iv4c98Kc`m)Zg8s7 zkw)r7<#%&nu)~c`+dHaWHCp^jgHxYWY^+*T+MYv$9c~oq@uYg{?*9MM;MDqrCTec2 zJvlVk;l`VJJFC|Zj{lbir&6<;sMoIfHirf~+_)j(aaH`q135I<;l_fMT~vovbN;2l zsYCgis;kw0&Y{5$H`Z@!s>(Mzl|zFaZY+GHn|ia#oBz__)XtH~s`$y@b7-)`jfuB6 zQ@w8bD~AR<+^Cq*Os(B~HHQW}+!(i`yDHIW-M=(Au$=S!45YHENG?rK2b1-20Pr?8hJnO zo?0k}20PpsGwumhYh2;jhCVmo?@!weJ=K9+pXuK|ZpWS*u)~cj`FpEpM(xYtcb6NS zI@9DCHNM{A*oNLJcG7=(Mory!?EkS<+_?VvK59q8nOKHCZs)Dy)E`&-s1JLci*4ww zV(0d8&#D9MFaAHaiW};hzG_y%zhfDmt>RRPp^@iLK5|VCKS6fd9_g#LKAB6Wc>m)3 z1gQ~j(oa3rCU-2uvsIib^j1H$yb8TCM7~e*4BJ5P>eYU#^Y?l6Sbsl0Kvf!L{_Z@D zNWnDN;l_hQBgcvN6wP6)xWOs=p7T~c+O)q)=w)6%m>2uKVuu^cX7yJWJ}r>LR&j$< z-+b0zHO+Hl4h?qZ{@q{wQPRAA@JRNp;>PQD4Nxop&gs>M$KurT`U6zOP4wy$`RSRT z$8+rls5=^(SD6Dn2B^F@n%56cLw12B)6v7TJ#-IW>5z zHg+AL+Aj8Pq5fV4WSeBGc&s8F2B-rS&2J)aZR~fK9d7XVFt)+Yt~vwM+uIF;e=B1f z>~P~)?g8qjPC5OybAwZ#UTCfMe3?^&9d7J?zrULL{l7Ih_1c&=DqojkIsERj!;Rc6 z`m48_{9A)lSGM<4%~t+fgHxA^v{h+e=G0(^8`UcIQ>mB#t--14tJ|to4;0T~&)MNd z*)Dxmy?X!F;MB`cv{UPb=hR?_8>de{tDb%G-x{2%J@{F*U}#PacGjHfqb{YH6tiQ0 zciG{_bJw?5hu7xBV22xjcj==Rz4>nqPVN0T^33Xu|JLACu}|8onfr2Tu)~d?%Ri%@ z_~_pnoZ3IQw_3P6rv^KHHuq8)`%Q}3vEN;GxUpky2le;aoEYqIqwcw$>f@jPt-+~W zcl1<0oyw`fPQOQbsH(r46tiRZgB@<19@~Mp(HYK^u6QzTzoTfo(&Av80JbJcy7k>ZPyl^%5 zofBU->*?pz5QiJkrqS<c9cVdgEWLGJc-=ajt5L&2O2*<8v|*fIvm&d^ zq~|n)9cW<;oHs9gZ8f|PQo}(?#^MyTVGRFvTvl?zP|aWmS{ToFofp1;IT+M%kdm=D z1#K9&eEme$d%Z_!20PHg`04g};fIUiU5y$JQZg2&pbg{vP4{LsYcWbQ*nt+tpl|1f zA07e*H5{a5EKWfi#?&J>W@Swrtr_e<3*)<~bHlZFfI$rhDH)4X(1!6-qhp!Rw@%dz zcA$mvP0hLCs%7wZP7Mbs8H-cUhLQW$U}oM!hQSWBFz)>R(=^1GaPoHg>mAJ7sI9VgJElM3feIGY`Zh@w@(d&9cW?r zo6Zh*h#r^N8k~YQjJ6{tCZ-HD40fP}al^P-;TJmKXKrh73feGUnEP&Gu1osw!(j(n z7z--Q3Lh>3hONOVXv27T#dnFnk2efoPsut?d_A2vL}y} z*Aj;vXkmQ$^NjGqx9}ciYj6tMFlr?CPHNI>xMr{eEsS9+W`rNF1%|D`DQLrJ(Pn1S z+1H-e40fP}adhyE@Rkf5GuRrOf;Nmpcf6mJ_lN$P!49-A_B}QueBmK5Yz3hB5V;n|-TOAJ+_apoOuj%#85z&S2OYoPsut zTbI`G)$abFX0QV-jLJo4g#RuAhONOVXv4S~d0h_-e0h`n?mj;wJ=|;QCq5asLqy*; zqJ!4>y1gL|H=s@9VubPA$o`unhyXj#!pj@s^;va~dw&Tv9He9{PC*;S@d#sPV7F$l z11*fywDfT1=!@UaTELClJE7mq85&DH)4X(1!8LC4X>T>4!9f9cW>U9+Ms}RcxNi zpoW8#jKwKv!|3prKUk@3Tg_kxS{SQS)5B{AE^!&uaFCL*I0bDOjW76vHQJ5T40fP} zF?VEo`1tkjxD0AINXb~7f;Nm9=l#L_39~hW9cW?H7?vL1us_pfP{Tn=#^MyTVVwQV zAKbKLg=Vk=EsRNn)590ff8sKz;UFbraSGZnDxLBNPxbpyGuVL^#`J;d;WwZ7(q&M? zK}yEr6trP{`m;ay%!5B^20PHgc%*N7_>C*yy9{bLNXb~7f;Nms2mHYnU2|p1-yl2C z!dTHOJ^bCdBQAp)4pK4}r=SgE&u)LP{0*fvgB@sLWOPdp`;tz(3~D$?$yl6%HjJhp z_=6364`>EE(83t`WO{hh{_`$_8V*u27N?*MBiCwwu-xv)HG>^!VH|0j9 z2PqkgQ_zO-+)RJ)+n@St20PHg__IZNxanNXrBcH|O2*<8v|+s0(;v*dGF3C!ffmNP zCh6gmDY(mm8V*u27N?*MW5wP6VB1@lXa+mb!YI@rJ={MRW?!k{ASGjQ3feHr?oJK9 z-0nloUvtO8ChqlcEgp@b%b+FxU|W8qlWk$j^omDFjaE9~$1&BT+NZmi@rjV;fah z)L+I9H=s=;GPF;&Nd8IV^*p=l@wm|P^_WJ08{&Y6hHR~ABn3aNJMN^pMs`E1wD28k zKaDcL!`JN%Fwnr(n#PgH&*H)Mx#YOSxqeVuxKoQ)^!XCTm94_p?G16b0c{%D7drTg zzkZ$m-NIS5jGL>#jBu}I=5HHcw>QM$2DE9E+|b{5%Qc(i@7!SrT6o2B%?QuRh1U{W zgHzCk(O~!x-y@x;Xa+mb!f1afE!?UiUK4E%PC*;S(MltHyGOLw40fP}@zw8X;W0(< z+HPxb3feGw-ZjcM>*NEP!49-A#+^(H|N0@`qihXMK^w;YR-=8VXBX8BcA$mP`$$^& z`6Rs8+8UgKHjE`jQhn2R|0VC|4m;4o7;_*kd^8ou47LWRpbcZgtW;mP&OXgx2U-|A zzD^65o`7Q?TZ2>3hVkLCRA0ey8JfWkv@nu)rG3BgZ5Y>V z_4}S}bdP4R11*e{6=~rii9fjKQMN`*%54}%>z#hzr&Y^n22$Fgai=X#3wN&hwac(I zI0bDO>-PD5-|f56?1wv+I7sQA$AYx*bDMU!3|r%CNqi}7>*5DMhVZ3n4?|Xe-STopx7RLFswD77sm%IC6Yj6tMFjoEQ_wBf2 zoo28DEsTezriG`q#%Gso4NgHDM$6y*z8A_b)C_i@g|TvCT6oS)v)%o$H8=%r7!%L? zeSHS#>u?S`(85R_mlp2dY=Xx#{exYGt-&d1 z!#H)p?<=)&pk}ZGEsTn(Y2k@GI=Bp5gHzCkQRgqeZ`<*aXv26ta{h74TLmXv2`>!^ppYoU`$H2F?v6g}K6*hLmC)Zs4dtrlA=;7N;=h8Pm`VcDR9~{+Nbl zaD!8ryNzjR20PrqQGZNBGq}Mi%t6OAG=m*(;HW=-gHt$$k7?+wVg{!$`ySKKTg47H za10;Q&Jyml5O8xHwvl-{2IEePbGW ztJuNOtE6Js$+8pXUm(We298U;3?7S9JZ~7ipE@AlD|WcSvzgIGWWxf{`BR~D14pva zt%{5<|6&`Q!f|P|q2vE-aEj+~^;QL>A`N!9f#XsygBzUU`RG^%JKVr=sh7bGPVu~Y zEQ1|x;JDPw;0CAo{(x8pJKVr=sh7bGPVs#Xnqht%k)H=U+`w^Zlo2qM*aoL?lo@SE zA<~L%aEkBnh~0B`xPhZgFM}JL;yYDh8SHQaN10v*H#o(2+{7~2;RcQ}V;J)7iry6@ z4ySTFveXT}=8gFeY1~Mqc{jxVW#lJnV4SqM^ z`#|`8CAPs1H~0>7dxKNB8(Y33u?=>(!FQP38=S&jaD(q6u{SuypFN3f zu)__$i^SgG6n};$w!scJ_%0HAgH!xjpx6dG+~B)N>(!S{sN z8=T@#bHz5;;RfFmVsCJY@9?lUIK`i1i*2yO4Zg#}-ry8}9xt}R4mbD?4|{`Ce7}Zn z1mq1$-lKB5%R*i`J&i~~{sm$jz88bHHp-Aj%=I?BFL|$#Ni_0b>KQli4ri{a znY6dTDZGn%8#qD|2gg^UnHTfjjd8evV>>T{9d6*5F@A$nI7an0*x?3_ed9Mch2wc| zgB@<*7(RZ3Q#enE-{2I^OS}zsxPkMX_zh0s{L0&4hZ{I=i{IcB&J(>2cDRA_&-e{a z;e6NIV22wxkB;Bq6s{V08|-ic*8}1=IE8Bt(MG`htp{S}8gX1IDNnt|7WGq|*63x8W20Prqb*AW6MfZanF)5l+wli>zOvc5vGcO~?p>c6d zE`Ebkxb7Ff!6{s4^fuVx2CiSmZ*U6NOT7(txPj}i@f)1Nwchv*PT|_Jx4{lKaLqb? zgHyOh?rpHc4P1MV-{2Ik^?Muaa07D)@f)1NJVpElr!X(#ZLq@)%(ujEa0>G~-Ud6| zz`RlX2B$DL6~DnL%!PRy>~I5fZ1EeM!knJB!45YtR~Wy+Da=iJ8|-icbDr@VoWdNd zw}C4Y;^2CKXnsA`ue;IrD0aAkvv4ni8=S&fxVM3;9OB^WhiKl~*sWrR8@z?F?;kin zmvM1^F513T>~I5D5TqT;;0C8~jl~I6u2I4n3g|mBagB@<*+CcmUr*J*M+hB(q zIJ@^Y*x?4Q4a9G73TOA;20Prq*>?N}r*J*M+hB(qxCY>Du)_^p4~XC36s|vb8~h4@ z>!On4R}A}W2{&*Z*300rIE5?4@f)1tSMb=aVuu@iW)a)qYZjO#kuAaOfOo6d;Rfbg z;x{;j`H%PwPGKe`+K9dnvcnD0_!La+p8vCf6y{iB7!gh&`k5GUFhe8S(~$Eh-C&0s z%uY$JJ?miBX9e{dTh2G-CaTYiHPZKsz145BS~+H=*7&-aX~?M|4mY4pBlvQc;2)dM z>(3iZ$quMFy>G53+g|3TF{IOd%ivSp z3Tp;C(88#A{R`@)@EVsv4F@S1i&M~sQT4{A!SqK;YX&>e!nmo+3u;uJ*)D?`4pK4} zr=SgE;dc##d28LS8SFp{qin_tYHfpOT?REAq+~2kK^w-G_7`+#4Tf0 z$FenC1~nX{WGqfW8^)g}Y6VYRUsW^MffmLisbf{H3D>v`YB)&ASe$}3jD|^7g9qNL zr5Wr%3**(pV^!C$-*DF!p@xH$jKwKv!#G>1a`1G8dYZuwv@n(>k5lhn%;Pes;UFbr zaSGZnwq)KGoRZW?GuVL^#<+}e>XRy!-KX79!$C^M;uN%DJX*L^F#M}tcQC*Xv@qJ< zH(nL)-qKwog&Gc0G8U(x4dbCY1%tWoe?spEJJ713Vv1Vy8T+?>-L5?+<-O>Swm>i!5OlKP=Fn1+4cevc8%6wYFoid_`px~`abMH3&S5_9I9nLOPZ2Q4F@S1i&M~s@n(ea*QNG)JsEbOh0(jB zUtL@ta`%H84pK4}r=ShvOk~ZP-|}wJ40fP}aj=qK)m*U2Wl+OGO2*<8v|$X3tS9qg zzCv>Ed4L^gVO+i2ubwFWj?18igOrTLDQLrZKeE=#lYchT40fP}vHxDbDwunv%b9h#thA12U-|&s`^#=-iuuZH5{a5EKWfi#?ie!bqs; zSC7?t-DOb2K}yEr6trO!`OzP|VaX-UUIVVKRCC= z?eZC{06Wma$Wne4%=4nlpoW8#jKwKv!zi%EAIvkUiDs|^EsX7r{c7BW=`MpB4pK4} zr=SgE-V6TV+YLr*20PHgxcdpeYLYbBWl+OGO2*<8v|&7>{K4$EUeOG8poMYnDZkpW zYn;oVhJ%!h#VKgR_;6KfaLMOiXa+mb!nk+1U!9ya++|S1K}yEr6trO!Y&SYMtDOEU za)2FZVbq!LSMRia)@4w`K}yEr6trQ~EHN@zcX=Z@{|K-HEsO(Uzgjf&DVISF2Pqkg zQ_zO7ZS~OLFN4Nt20PH2@w;CQ+Sk%$P{Tn=GbnYy)rQf%dP=awfdz&^4pPFnS|Xsn z`LvPCpoW8#jKwKv!_7{n$Mk^O`0iaUgBlJ}G8U(x z4Wmkx?!i+xp41F>poM|+TG1)V)NqiJu{Z^77-=hp2hR@dmK6Ejb$)v{@?P{;O}$>m z>NS4#$8e+Zb$de`Za|wxwZu`unLpmA8SFsIwg;9+-fO?Aq1h?Pwg#u54P*GJ(ZOr; zUaJ}GKnr7F732gg+%rWx!&3!_eoU#&k}#bwwUoPsut z8{YN@&pq5sGuVL^M$cY;^;uFSmtkvg3feF(N7f2k^YHze!49-Ans@T6F4gaJ8MX$e zpbaDaD}V4({^FX!4zw@|wDha`+snBOTZ2>3hOzLVKj&oPw;uJY3hSBd=fAEhv?`Q@)(84%aD{_7n zEaWn54NgHD#)`=CZkMsMG=m*zVZ2%`@_t^ofXlEoI0bDOOE3C^O>TQyGuVL^#-zw` z`^L$+U52f}DQLr(ciA8OJ6}c3U zkuz1zUZz2%ML)YjUDosw*8a0=Qm+DvS}WwFa(2U-~KtsSdcJOqZV!6|6N7`G#H z%hA8hey{^AjAQM`swUOJur)XZZ5T<-i)S>7e6Cu49_&Et{m463b-ou2TjM=SK^w-9 zdYv+gMLtU}40fP}aXfPEwN?c%Yz#?e2=s63a=T4*WB zwg#u54I}T~+L_}r41*nLVXO&`QRzp)ur)XZZ5Z44P0U<5z%bZ>7RE!J#;Eo0fMIKJ z3feGwUf7p;-;7lKy3xZ*5 za0=QmZmp7etQIyhKLdQ-({R|~2DE83 z{xI2h&u=C4&zv1-+4f=YO;-2ZfZr=ygHzCk(bRvR&)+;jGuVL^#-0U}Rf`NTYz1$?Epw$TiBpoQ_qn8~V0d;AUB8k~YQjAj{ol19JLTQk^!7RJSnlhxp#z_2wq z1#K9m3cQhYxk`#=umdd&=f25mWGB2{*&3XJHjLfv`X-GoFEl-B{evB7VZ6F=k{VwY?;o}Xr=Shv+ctkCPA_KO2ibuZ#-L{=sTt3J zVQX*-+A!u{ekU<8w|PHj2U-}z3r|wX%fPTTI0bDO#mkONe1Du_umdfOU2jiRAMOLg z*5DMhVQeZ?C2@CT9XdI_Vh36nuhf~S&i@UDt-&d1!+52|fx7#T8U{Pi!uWI31od3hH*_~{D-!0kn`HW)?25jjt`o1 z{g!2>sHV>q)$e`yx~Ji=!wqQDxGnOt7`l6cK0jv%TDHAnsVS;!M_iM!H8=%r7;m45 ztjl@*XPUtdv@q^0K1JPoM>+TX+}7X}v|)U4(C;hs-et{T2U-|23r|ruh3{|~wg#u5 z4I^#0-&b*LDSeHM9ccY?zHy5B{lU9jhOLppDOVdtRxq;WS(_S~fs}Tr@paxQYWv{I zF2mN~6trOsUF!FJpSO)>umdgou{GBeHGbqhF2mN~6trQyFxKxI(SDR>umdfO$NrwI z3O<7CyS4_WpbevP3%{?Q|0T^}2U-}tFHBbLKf-ltTZ2>3hB5OxzwhVT>otQNXkpxU zHgfE9xw`wkvNbpbZ5Zb#r23jY^_^z011*fjCnl?(f5g0jt-&d1!#K2Xw9j`ozdqh& z2U-|k9-gf74t&Vn4_kv%(1!8ryCZ!Q=G4&)cA$mv(f-M5$s0Isw>3BgZ5ZX64e?c- zGF3C!fffdioJFT3+ZvpLHjMFwZu4#5)=1u?0+mZnS3Qpe^tH)+E2gRZ&rHx7U-vW| zcDMm;8i(>$@jW!soDZ@CE!#e_!8FzQ>Qwi-sI9>%Xu~-A(nG%KeX8mAT6Um?aox$O z>b~q*F2mN~6trPH<}~n48(Cg6*nt*Cl~<>#%n#_F?E zbL*+<@7r--hOLppDOVfD@BXKJJ07~Cf3J|z4mF-GIaOUai~CD#4NgHD#>J0&`-&CX zqZ#Z#%YKagaf*5;`EB=mWovK>+A!vB8|eFf|0>O32U-}d*H2LoHr?PdYz7rX@Lg%xN;BAj7RKFur>M7QZ*>{A2B)A6 zh}oDeBG@hg^oO!6|6NxNeZ&S0HnOX0QXTzgPE9QGH7t za~ZZqZAw8KMsj4m@Nd3sWxiK#N*ttwvAFUS_1sryT!yW|DQLs!|GD4y=8v~&20PHg zs99l(s($bfmtkvg3feGMN7kp#f7dViSd<-TVH~)9irSF$x680KI0bDOLn3nq4Y#Cg z20PHgNGmr*jktKN`+ja~a0=S}UPac%O}lirX0QXTzgK0asK2h}aT)zBjhd8#HjL$w zbDYhex6*TW>_7_xXELHwl5Gu6K^sQL5&a|gqnc-#yi;MGs&~D)KWXG+bJddEM&s-D zhB(}SHjVa==BW(^JJ7Q2p%E{u)I5fll5A^m3feGsO>9=@Qsnz3=g#av3**{NFR5My zz_2wq1#K9Ql{{1Du*+ZvS{T7xFR4q#!LT(r1#KAL+}iOXOIS{TDS%u(M|1jE+g z6trP{vV2uSF_*y(v@q6Xyr^DLVAvX*f;No97p|%Mt9zY+9cW?vT=_-yLoYCF4NgHD z#`#gT>wX?tYg>Ni>_7`6ec^0XFC7e9gHzCkk@}gxZm!6>UT0KkcysNYOnrLfq3feGE4mwo#{LhBL4zw^_wl zy9`@{Q_zNy^?8A$cJoK;zd?4Og>l;*Gt}Q>pLQ9x2B)A6W5U~&lZp;8*Yw$e7Dnfj zY3iCKJzR#Z!6|6Nc&Fs!Nw@DGq4$FwXkpy3B~1-G($i(w8k~YQj65gDCe`X_=AGGr z7Dmmd(^U2C&$tX*gHzCkv2@3}qzZ)x>iu8`T7R!fr>UZup7R*%>V~gB@sLjBP(%4Ne>BGHeY_K^w-WdrSMief@FGUC6trO^ zooy7nw7;BY>fP*By}gA)i`Anq&e0lQw>QM$2DE9k%~HWmci*KM>_E%5*L`}i z8ow2vo3J%F1#K94r`HM|>{C@U*nt*C>3oaThHoaiKMz}jQ_zM{qhh7to7X?A8SFso z{aE>?>Ye$5%dj=-QVQBI-iv&G_x#3|W_7`+!Jb8`)pO6g3|oU!(1tO%K{%`UcYQU39cW>s&t0T?J~GH<*czOIHjMc# zmu1cW?K#b02U-|;S}#(W-3GV}TZ2>3hS9uMTGp>8pVtg_poP)y#zkuM_P#E|*5DMh zVO%`WKkM9?VVc1Xv@ov8UZ_4D-p6Iw8k~YQjNDH*%xZYoNX=jeS{Q@-Mi|fZb{Vz? zr=SgE`c37tc5E^4wd_C(qkNHtYT;bG584`>f;Nm2%dX4%_-k{_zz(!90&Cw;gRkP4 z!Pejuv|${ZyC-x0d~@u>4zw_?Hhe=p^BRtQYz^ z`4W!XZ4FLA8^#ZL%Vs|Kg<-G*EsW}oURT|Z;QYhZ;1slB-2L~7jL#1n20PHgD6sl9 zRiPaiwg#u54dcEID>LT1=Y#A(3uAr0*VN%-IOnuAI0bDO`F_%MP?KUTgoV z+WImWwg#u54Wrc?cVujhT=kN3XLg{4k?`6p>P!bPYzC z%~#{AfnjTK3feGA-`sD@Z1;KzJJ7=Dd?j72EDeUO!6|6N`0kk#n~%5*cA$l^tyH?2 zbORW+2B)A6_7_x*ZM@KB-b7?JbM%8sE>)%OH`iD@ zM)arCujuy-eBIsddlUH!IZ zumdfO=_Qt`$1nWqGHeY_K^w;A$mh>fhv(JTklBG2#>d5%s`~2N2U-|u1(&L<>%Vpxwg#u5 z4P)_ke=yhj@_LSi9cW?Poqwsy_sR~JVQX*-+AyA-poOvO;u3ZD%xsroYj6tMFe==T8XPv{vfdANpoLNH^b+-R zaI?#>H8=%r7(-f*3SL@ukDljb2U-|69bBS1yt>h4*czOIHjGWfh6gu%+(R?iffk1E zizRB<4eMNnt-&d1!4NgHD#+jA&U7}ulb&<=kH8=%r82wr`5BB<`m}am8Eeu>Q5uK83Yj6tMFt*Gc5G>q& zgZ^H;K@s{X8{s>fRM8E1Um-Vlcy(57+E`XRxR*^@Mb9cbD1&SRIVhUIXN zm#x7mXv1iK_lV#_UD|5~JJ7-?I3%)vHE^$*t-&d1!$>GSDi|tRO*7bm7Do4Hma5zS zyw9DlwKX^eZ5ZPp9UZK{t(a!811*d`PcBt^`{3R|TZ2>3hB2dHYOullOZqjD9cW=x zZMjsXy@Y!pZ4FLA8^(?4sgZT__G$(@(8Ac-XsKF03ioo_8k~YQjE^s+2Aj8fS2Ngw z7Dnx)r7BRNy!-R8H8=%r7@O+*gZ1B=uNmw>3*)64OV!|)aBr=x!6|6NSU)myTvF%- z&0q&w7$@#sst)hMJ;JsIr=Shv#U=jWpQYMr20PHgc(meDRpnqw_j_e)a0=Qm27lxa z4k&%EX0QV-jLo+%RVzL+_g1GQ+ZvpLHjJ%5`-3YR{-lqu*nt*C$(xs|>?-)&wynV_ zXv0W|98-V3yo6@311$`ke~3;=wlz2fZ5Y4bK1qMxIr-#=cYS?irE2GX#`(nXm8z_( z@%7k-oC&kT4QSIClsRwndG}n69cbD1X~kBmd+OjmeOrT5(1!8lXVtcZT?RYQ!tif= zOO=j(7Qoiv6trOsXuEVvC6~btv@j-idP|LZ5c^?ka0=Qm%3hllS{SFctWeih1jE+g6trRZ*38ZL(EYqKJJ7<|ld?iR zQ3ecKgHzCkG2zIU8AXqqYclLW3*+bmE7b6tz_2wq1#K7)94nYP*2L@0^>%ikg|YO# zWvcaMd?wD;;1slBR8E+f75rt0KHg;qS{S=VEmJ8Y!LT(r1#KA5wE7@x`kQ91h#hEQ zjDCEXI`kbrqiAbz3feH9ZIC-y=tVOp%nr2Pk2{yCr)~zr*4RZUXv28uK&9a8z3S=j z6+6(vIG1agT38*Q8MQSy1#KABRyPQiTyckHumdfOn|@iUdfti8JKGwZf;NnGZ?y}4 z(mtf;NnK zzxE2QTE9;-*nt)X&Z9)9B-+oAvtCPS3~IsAcb^ z={1Sb76!gdP^bS-!HWa%6F{BA1l@EOH1mtV+T}uTirP!x7PT&VdT^h zha1qQ@j-!7zCGvk8ov%Z(6S$EyS=TNKYYktf7jOF6trRFn|Ql##48Q;ey{^AjI=#( zt4@2yxeQx_Q_zOd@cAmfRi%?OgB@sLv~03Ul|K7~yB@Nw!6|6N_-a{o-;mBVHG>^! zVT{gRrK-MKHA!?zvaP`>Xv1hwIKfx!gZngt9cUSMcGcBt?>D<#hONOVXv3)Yr1Bkl z8k~YQj0zPR`@SoBt7fnREsXIOSF6hj-Cc&Q!6|6N zI9jxo@BVKKX$Cvc!oc64=#*qzgHzCk@ye(IzD6tBXhxSSE7a;euf_b`$+-Bsy&(?% zQl$ZH8j~*UO_&>5=U4vD$8Stm%T_Md42&xceBIsaz7QMW zmT=oNWcwrk0`mIKW1%6b*wv~I6`qR~c_!3|E~KEh}t%3y~ZvG28!c$C2nPT_vYC?ncnha0#{Gunu56+7I( zF?_TUWpIO2xZBj*V22yH2iDtQha0#v*V|x+8@ONC+hB(qvGZz?Z&Y;8+2ID}@w^On zxPjS4Z-X6fV9wLqV22x+iS;(v;Rfc1y$yD_fmv&BgB@;QF5TN;hZ~sT_cqw!2JSoX zHrU|??uPI-*x?55(eO6d;Rfy;@iy4u2JUC^HrU|??y~VV*x`og|DDmhFAMTZ@B3#1 zDcmg-Ww@n)j~yNt_b_=I>~I5jR(Tuja0B;yc^m9-BX%B#_naMWVBW~fV22x+&GI(b z;Rfc|ybX4^ftf#VgB@;QKGNG@ha3OAwuJ9iz{d?vVP4hCV22x+?e#X;;RfcQy$yD_ zff=*-4NhS$-P>S?8<;VR-{2JHzv4GIg}Vs64R*MJ`LFm5PGL4HeuGoEf5O{fhZ~s9 zir?TA?gQ~Q*x?3dv*I^6h5K2&4R*MJ*{t{tPUUn(SpKR4K6bc)*(@(3ra|*xxMuBb zu*2hGHY-Ud6|z-(6h2B$C=;%%_Q4a{c6Z*U58I^G65 zF%5T?EPexXUXsGxl()fGSol6|&y^zg#Xa^)5jU__LkuGzzq>pZr})`!(I=DY20Pr~ zC(gw-*x?302QRk44mbGee6bC7xWUg1jBT*P4StegY=a$c@beX88|-j{pZXZvV22z0 zEXvphJKW$WWX3kw;RZjqGq%AFH~49yu?=>(!Ou92ZLq@)e)4K;gB@;s(~7@G^L- zIE57?ybX4+2E>2gDsEtP2QP!Sic?st!P{U5t1bLLwu;tjz&Z+E25%LouquML!4B3n z`0rcAjo5V!+}C!`>lLT4?xc6C*ulz?)~yP7UPawCEOowfpsUnTg44d@iQD_8SHQ)W(~^Z$mYnufP8nk!6|+g zWt5>CF%GSI$xq0PZNxa#;OBNm8?s^1Cxz-mT&Wr}*ivu?%*&fz>d*3~q3WpHdrT=sjnL8~p6tXhZKgJKVtfncl79 z2B-KLz_AQ=xPkREy$o(}il1d1W#~O;ha3EaW!;FR~I4sZpJY5o^yj!u}?CSXym`hzkrV&ZeYbtFM}JL!upxs z20K^*Q&K!q^k?qbDsJF;Ze9jE+`wv>(MCY_TlSnAoWk0c(S|AfqroXW$u8Omm`cFM z4mYs2Wwa4xaD!8LBA>Ux4mV;~z>EN*Tg44d;mLwgMzp~WH}H&rXd}8G+~5?RkQi-5 z8SHQa&j^S%q6}_u3Qv0UHrU|?o)Hkg!6`hkGTMml2Rq!rGXkQG=zeg6Q+V=bv=L>n z!;P5d1>l$=!U_1e!6`gJ)XRu*=m`aQMnJR?-4AYXD)yNcZd`8_JKVrCG`tLUxPhk% z#BXp4&jRr_*x?4ADiFWHDLm7}+hB(qc&b4B2B+|B7H@+cZs4f`@f)1NGiJOEcDRA3 z3dC=43eU>%HrU|?p5Wtcu)_^Jhai4~Q+N`Qx4{lK@En5p4Nl>SO5O%L+=zWz0slpD zgHw1KSbPSj@GL2BgB@<*X<+dioWe7)ybX4^fv17RZ*U6F_VPCP^@?AK>bOsY_BPnz z2AT5^u)_^J2{nF$Q+Tdv{067+gm!O(9d6*crtuq`!jtB`4R*MJ=bFZEa4Pm0hy3cp z4ma>jMK6OLZs19%@f)1Nvmw0=cDR8jp~i1;3eULoHrU|?o`f2|!6`he)7xN&8+a0G z{067+%u#QH9d6)BsGdgja|QB=0o=3CpB@k$b9NW~w8K9exM$znV22r)m5txv6z~gf>{=&yLIEDN7y$#F>i-XyvfAV6#SG*a|;s&QMAMI_hgE{E`zE#}7e6*LrTg55NM|&IWU=I4fZxuH% zAMIuER&fgR(cT6-n1lZBTg45`M|&B(Rh+_nw704R*MJ`Dky09d2L_+S_1<8<>OkHrU|?=A*q0cDR8#Xm5iZZeR}D z+hB(qn2+{0*x?3dt-TF)xPdunZ-X6fU_RR0V22x+gZ4Jq;RfcQy$yD_f%#}}gB@;Q zMmgGu9>cN24a`SJ8_`$Mn1(wCEh)?oM;lQFJ3KDtqvJO?h1un3Bf3@0;1p(*qmAfR zvBM3_E=L~gdb-702q3Ny;lM)bSO4mU8n9Bo7y+~5@Ehog-sgB@;QK01DbQ~gdbWpIO2m>-Tdq6~Jpf%)iYBg)_gr!c!5ZRE({6lRp8 zjVOa1ZeVsf+K4i^!70orM;lQFJKVtRacUG1M|_|20PrqjIy`E4mU8n9BoARgBzT}9JIH=4mU8P9BoARoE>gpb~)OJZWT8; zg&E~&Bg$Zh8<<^=Hlhq}a0)ZZ-Ud6|!0dAT2B$Ei9BoARgB@;Qb~)OJ?guwGg&AdU zgB@;QK04ZnZWT8;g&AdUgB@;Qb~)OJ?guwGg&E~&Bf3@Wa09c;(MFWPjhGZY&0b$y ziZU=eEn{&5vo&4@H#mj);b~SJH+`xKkUIsTfh4t3F4R)}`+JE0FZeYDN zFN3#=Q&?}!+h7N4to`?`;s(}R^D=m=IED4rybX4+#@c`1DsEt9GcSX;ic?r)&D&sy z8(446+hB(qSTW7pV22x6Z!Laz&D&sy8(1;T+hB(qSUoL% zgHu>B&D&sy8(2LpeuGn3|IFK9hZ|ULEq;SjSUoL%gHy5&57tJGeT8F(8(446%isp5 zu-=-t!4B3~lN66+-zsiky)`d`$Kn*$Tk|&9!5VA-eXF>E_13%$-YQOEy)|!x9jvkT z-?xezSZ~eC;H}~m)?4#7*uffW|9z{tf%VqB4BjeEVZAkPgB`4~_TRUP8(446%iyiz z6xLhwHrT-$YyW+#xPjHvybRtdPRZBt^ce476dZ0~y|tVfXmASat$7>lV2w5GIYzQ? z6*sWnnwP7_4Dr7ftD=^ zgpOs;sea0RZicPFDQLr({D(g{vCdS@U_7`++HJ?PTOEDXeU6E(!6|6N_z?y&PQ zmtkv+q!hGaT)NXA^fy^%_QOqygOo5veR(3gX_bJ>ur)XZZ5UHlrv~%S`a(0nT!yW|DQLrZ?C8kgw}WeH20PHgD0Iu2?37kNxC~o^Q_zOdtp14L zWq(`EU_7{nZ0mE`6Xz9o z8MX$epbg``BYlFoXK&XGcA$mP}nd!l~Bqjr!DM23*(07PU!U7dM?A(;1slBsLVRSy=Cs#40fP} zaiu`6(A*A>y9`@{Q_zNye(tVdk-|zd*nt*C|H^qn8AaN<3|oU!(1uZXc(LHssm(Qm z9cW=Btj-s@TC%Ilur)XZZ5a1$xGwnQ3G<9YcA$mv@EbRVa;@m&GHeY_K^w-o8NX(| zf2ph94|br1(K&aK(6iSKb{Vz?r=Sg^*rGDQj-wj~<@c(`wKs%Tj^0vF#=U-F-q0cS zuGaXvy&(=apiSe`7b^w#F0Uty06Wma+xcSdQ1*$nnwOGH4F@S1i&M~s(OuOHw)&{L zX0QV-jJ@>D zvhV3X&t*`_7{nMDY{ZV~13A8Psr)lCd}iZ5R(tjXaP3*}P~2ru!$C^M;uN%Dl>OQt z3@5d8V*u27N?*M^!VO)6YSoZYcD_sUP9He9{PC*++M&z1IW`l$+^1WgQS{S${W4>3^aFCL*I0bDO ztv+YBFEdzrZ4pK4}r=Shvt(|4J zeBme)I2XWzz(!9dTdmodk2C+4F@S1 zi&M~sQTFk>GlpC?zgO%)3uDYziJ_Wpz@UbMl#InGXv0`HxNFAti-y4tv@psxsU7mw z1cMq5QZg2&pbaDc)Y%zh&l?6i(86d|yhdnMK`^M{ASGjQ3feF-LR&Jnoi+@1poLNK z{;Hv4KW=kh+o|CoC1Y_4+As=cpUUWQ*f7|E7RLK??hUnn8w_eVNXb~7f;J3)vErF? zzA_AUpoLLF-5u)Q9}H?ZNXb~7f;NoA=WAzvnqe61KntT~^@^eX6~Ul}gOrTLDQLqe zS-wYRmvqBm2U-|`r|%5?xc3wH=RpkzDH)4X(1!8T#%Y;%^e_x|poOt+*X^P5qrjks zgOrTLDQLqucz9)Ib}7SP2U-|^4Jj9zUjhtjI7rD@oPsutJI?IPEc{lge*a(xS{Qws z-x^xIaScA$k(VrJ=3g9TgN{h)?}l#InGXv0{uy++pQ(<3#59cW<;K3y{Oa$Yc~;UFbr zaSGZn8vfQc>%pWEn!ygVFd95pB2@0_kKFyBhJ%!h#VKgRXgXkW)|c~#Xa+mb!kF<@ z(a>{eK5!Y-aFCL*I0bDO;qmWg`R*H_8SFp{W77P>p+R-SE`u5lQZg2&pbg{7mcv=Y z^7haScA$l^_058zb`7~nX{WGqfW8^-%L40a@c{EZU6kpGWvPg8k~YQjLlmPCrvg#bB7&hVe~z|lzy*l z4NgHDM*8@7lNy=dU56cLVf6ld3H^Q88k~YQjG6-`C+#(VgAO~;!no1DnEuXf4NgHD z#=XC_O{!^LOB{Bfg)t=iO?thuH8=%r7z?)7NIGL)6CHM-g|Xz!B6{7mH8=%r7~Pyw zNq?Hxc848kVZ51t5xsxd8k~YQj91oPPITX+9Co0EF{0o?dLOhkI0bDOWzXzPbl+3hH*>z9*OQToWl;ZF!Gdrm5vi_4NgHD#>3CoPIQk&9d@9FvE=3Xbi8Y8 za0=Qm#uY1`=pIu$>_7{n)v0-O+-_@d3feGAWuL0+o*OvqKntVHZFA}T!`9#wv|)T0 z+EUj&$8p$!7DnECU!wCUTZ2>3hEaIx?7Hr`n!^sXFm5mMBApM~8k~YQjLgAZ>$>Nh z4m;4o81VT_Iy6trRZn_o(BuK_shKnvrm ztf_RJ!Pejuv|)U?ZGD1!EyH04S{RpqokZ75YzCb-v@9Co0E(L3t}x_)JAa0=Qmek-@Bj(d&FVFy|mqgJNUbvRptQ_zO7 zcYoD7?zKLL9cW>ccy?&?+G0wwt-&d1!{~Z8p*F5rvI8v)T(cCNl5A^m3feGMUG@8h zUY{)2UY!=rHimYcoT;zl&TP6dbYa(et?_kxLmX~Eo5s$|e%~L9ZkKDw4m;4Y?M)ut z7`pMnJ?=GRTZ2>3hVjXHzi+{cnVP{4v@ja_HikNvJMS`V4NgHDM%FKWUv`~uHG>^! zVbrg-F;sSEKKJ~?*5DMhVKn*D?<>-vq|8k?>_7`6|Lq$?L%Wu88MX$epbew#JAU7d z?HXwYJJ7=DSYTu5&|`PG3|oU!(1vktjNfT1=*5DMh zVGQV$>bt4)QO#fnS{N_7|S=7sA+N81EkhONOVXv0|DV5qPB^l_TO4zw_y&$m95 z>%Pe@!`9#wv|*&Jd(NjmSgslDKnvs5*6)O7)xo_6wg#u54deCg&-ixC-l-YvKnvsT zvFk$jy@Y!vYzo&c5Bb|I!S0poI~dwKg=U4etH0H8=%r7^gmI>8sJGuv{;3 z*nt+tU!&KAF1(C;SZobWK^w-%_v`yk?$YwEfsABP=iVLW>5?NHSVxTnb0;1slBtXN&i*L;?~Z^>Z?S{U=5UKuLg*xV&7x|F~2JT)J+IzNHwv1Kz z@aoVl{TgYFuX`E}JKTUajaybf?0d3TMPWGXKnw4|@7IJHJ)fj`Dap15r=Shv$34lu zLf@3o40fP}v1-fO(77KUbQ!h=r=SgETA7Z%U%FkV8SFp{V@>4meADE+U52f}DQLrZ z^z9zLgo=lfYh4Jji8$ug%jdB^b2B)A6|#&0q&w7%d8I46U4d#Qltkt-&d1!zdi` z`(_NOt{Ln=3*&6$xV`NyV_b%Yg^^W%V<>IW zHkV;*a0=Qme)!Ap+jQ=6&0q&w7#}y@80u5z;;d(7VScyYEr9 z2B)A6qyOU0b&p&$40fP}(WlO&(5?^|wg#u54ddPdFV(FWxn?5!!49-AnqQt08kh!# zt-&d1!#I65RCnPi!(azm7#HSD4~=LBhONOVXv6s7?LX`0KV%r}KnvsMJTpUI=K{ml z;1slBj0)Y7IDe;MumdfO=UU7T4SZ{o`!lySI0bDOw-0_easRu9!49-AHV&H;x=(>& zYj6tMFs{k$mpE>gVXy-&j0K}#4*j`pqPriq2B)A6fVJL6U7hHy|!6|6Nm{RB2q<$5LYX&>e!nl9IqR@ecV_b%ld~YAkU%+fFU{+$8SFp{qvyjbLRUBUb@#*8 z;1slBjQhTzuS}?wX0QV-j8DIKE0odTX_sMZa0=QmrgtdkyRqY=n!ygVFn(zMcIbum z9bAU3!6|6NIG%F1ZQBZ>-&HL1 z>xAKY+wpaKLmX~Eo5q>Q?B<@_&u9ia(87Cubji@8-BaD~m94=kXu~*^J1gtq_xfoD zJJ73hH?7*3t2}; z4%Pd?4zw_8|5Ps2Is>omwg#u54Wr(-k7bqn%e?Ng11*eP)yjvyD}?u2TZ2>3hSBoY z;#vJ8^AqxW#SXME7N5N_hGYfuX80tmB`$){C%(kEsQQ}>xTAi2E*3i6trRVZM`hxiL-{m4zw`p_pBFM{v#N+2B)A6 zqs(oiG7>Ks20PHg*xjXm=-O*=er{`U3feH5-Bl~&`%8ww4zw`VzxilrQfV-34NgHD zM(Qdjm}?!3!^~cmZ62Uz_2wq1#K9~ zbsygHp37hdS{S=j+tBcOVAvX*f;NowyBBZ%-DR)?EsV+AJB4!B2gBCj6trRF8eY0q zd{%}XXkm=~c4O%1?M2=FpoW8#jKwKv!?-5vnyjzS7zR7g!q~83L+E^8FsR`m zC1Y_4+A!YQzdy5Ss`*?IJJ7=TZP@zI$LqkLhJ%!h#VKgRIQ~FJ=H}yu!49-AcHQ|- zX!@^UP{Tn=#^MyTVSL&3^~@~^=5t=`KnvsK#LYq2)K@A5f8H-cUhLP`Bhs-vM41*nLVN_3D6$(uGKg!NL&ZheR z-G9PKWFaD-R7S60fQPAQnD7Opf%&{^L0|9f5lSA!49-A zrmtJ&{JQ}RYFJ3gTAYH`j8BK>PkHx%X0QV-j0vglIlT{nK@AHjS&LK9nz3T$&&l(D z)C_i@g|TYc3g_hSU{J$CO4i~Ov}R;kv^jb61WQNuz?*5VYj zX3WbrEqP#cCV>20u>&oP3x6ze&Xog$8WvKr7N?*!W7nH)lT)r}20PHgXwr3&bEqyD z)Uc3}wKxT>8Q<5uJ-K&u?tmNzJJ7-?I{htYVRJC3VId`JaSB>9R?SJ?de)q`%?`9M zO3zr}B(?&B8WvKr7N?*!V`Yz4Ti2QM&)I<%#?M_}btbk2gBli6vKFVHHRH_eC%0TN z40fP}k^RCPCsTVcs9_-`YjFx%Gg=Ip*yu0Ku-JhX#vKpMbV_^25!B!mv}SzUrDEeR z41*nLVXRM>=H&ElkDvyppf%%C?@^5>83sGh!svJZWalsM=PIbdDQM03>DRX#H#Q7* zpoMYxF4NgI8#*=@1-1w6I*|pe#7Dnxn7yBU<5Td1+5vWr;j$CWEku~3!}ieXPsU7zzAw^3R*LMJbkk9Aj4n>S{Ps5 z^Nf?24UC`$r=T_C%|nCj=~LfNjox2bS4$puGJH5)y*HWb`|q4`ufC}?z8>5Vha1qk z@$az#_PzC8VT9R%mg9J9(lKY_hwqv9MX6ySC2MgCS~J`mPum-Y9#RZ;poKA@;I~fZ zlA8^K8WvKr7N?*!V{6H$?0a%uR19{Yg;DpVBhFL19mAl8g_NwtDQL}jy!7Mtf^M1B z;|Dv?!q{-^kW+f^SB60i3n^KPQ_!06%cTx>tsLreuVHqeg|WEsL1%iUgN8v33n^KP zQ_z}`clJZ}pgkqjaj*j|jMSR@ooh#q8wNEjq+~5lL2Jf{93gve-ztj14zw_~Rr$u* z^2-^+poWE%ti>s4&G>zE9s8ZB_b3KC(83s!X|Gc(;gVrc!$L~d;uN%IEWe|oo&8dC z#b5_o7)c-Ra-MnUieXU0LQ2-+6trfvEK|(>B%!rpumdfORS$pVjN4_I=Wx`pkdn1H z1+5ubzt3fNaXKmnJJ7;d|IrstzB-u=gBli6vKFVHHDgSJ8>t%U>_7_x@0W;9jHiZ$l&r-mXw8uG z$WD(6ZIQ>1vDHpFm`R>7s&8~}sy;i0uLn28;RdvBd>v(s-dt48*kT7-_CBS`DQD5L zW9Bn=)Uc3}wKxT>83Uq>OwUeH40fP}k*U%tCuK+;!=Q$Rl&r-mXwCQ_`dI$@s9lP| z4zw_yDu2r9{(SyaeS1*DLQ2-+6trecioW*fI3$mp=M`oLTGoB7)G23Zzpo908WvKr z7N?*!Bjsw6U2<3)qL)i8WvKr7N?*!qe66^Q^B7GCzx>umdfOk8V5VynA`JVNkHK+ahhb2|LQ2-+ z6trf%b3Dm@KjFG!umdfOL8nhTWv~2T7}T(klC?Mmtr^MDnNhX&6iktyU3Q>_aqZAa z=l9*$4TBmMQnD7Opf#iMr%86kfz=g*9cW=({QRU-ASH)+tfhv9l&r-mXw7J{KFO}_ zwp0vupoP)&!;{XIjD-z@8WvKr7N?*!qvzx#J8Sphiop)FFjh=I>D={C6~my0g_Nwt zDQL}j;GQJ=gPDsIgB@sLe9`@+Q~uwkhCvMrDOrnC(3;Wc!*TXgC%;k*cA$k(x8g}> z$$k1foy2%*SV+lQoPySjFa92Dzxs})p0~3DEsWu(PdG2#=x&aK8WvKr7N?*!9}(;5ug2_hJ}=@#VKgbsP@TO zVz2`(47p|3+~ufaN{kO`a0*&8$u9Z{_ zcA$kJziE$m`oJ)P8k~aG47q1`{T)j&*nt*?+++Ma0_SrEH8=&W8FCMoaPq6Ba+|XQ zEeyHmTe*LUIgX$Pr=T@M?x{bVxkxeCffk0`gI9Uvb;Ag1a0*&8pa!R)HA9|}ZBDq}M1HQ=ffj~5Q>$KX zpkV|xI0da4^33vHXTM^w11$`B#`(&~Ck-R0!6|6XkY~t)TWwGbcA$kJ&z!SWY;PDr z4NgI8hCI`+uynR!umdd&c?Hnqt`>$7)Zi4fX2>g+5q;5J2x@Q&S~KJoWVa!C6oVaTVaO}XH@4+7jGzXmpfy8Y z2`?G7OPx!`4zw`j6>`04*F&Nc1X@xpkV|xI0da4 z^3KHg%|#W19cW?5I~KpKTxS?T4NgI8hP)^9+o(_@`8{U`S{QgwMt`q@8k~aGjFX4H zPhHm}Ata0rvr?Qr7iu?`wHnrUoPE9SRvKRqZivGTXx%v4`Ipqn`=3$_cA$lK^wn)n z*`rkzFEKu-!6|6XDAfFVYTL2h6@wjUVO0I_Gw0zpl?)@O!6|6X81{KK`(&2K6oVaT zVU&7(hjV;=dBX^5a0*&8M(4cUF4eq)Vz2`(jMdF|I)kk;h7r`@6treEsaL|Tm9v#% zumdfO&o}ONUa48aFoGJKg4T?)mnzvqIyO@bcA$lk@aJA_7`+Y>s`-sse=!BdEbCXw4YkubG|q+e+#<*nt*?^~Zi^*QR`i5!B!mv}Uxg z^RS(=skmaW11*fxA0Kp5i{vtlpa!R)HN!dds2y&aM={ue7Do9e4m-JOWiyPR2B)A6 zqwEuQmMfNGumdfOwI`1_E&s^?MnHp8(3(*^V{g0hmp`lL?d(7cV|4ttPL@4?o5!f2 z2B)Ak}IKZ6@wjUVT^s}nDg41^M(=B;1slGv^_S^&h}u6Vz2`(jMYDX=k%*_ z+%SR~oPySjl{JUhtKVLw80%k3ixB;yjy$e=L?q$w*Zc{v~(_=|UF|e*M@b%z^INX5NjXC}8 zxZ%&L^Krt@9@!IlZB-q`z`DY~*L@9(9d1DD#-g5mLX$e4lG`I(yZpd%4H%wms;j`FsQ*PXw7(VV3$yh zt=ZLW&JMJ?J#ti!?Cq4rFoGIwCDR$M&iG_%`k!*oPySj zB70hf{@h+tG1!3?#+Y{>j6B;Yk6{EgI0da4snwf>@|Uix8057!w71`q)bCIYT4C8cE%=(fs}G+-9x9IkIZjZ z%rJr)oPySjrq#-a$_%_uG1!5Y<2coJVx(@Cl7J@ZywUmso8-R#?wEpjx2r%&)b6 zv$$$*f5l)2S{Qhg5S~I5GH{?8-`IDBZ*PQG?%ic47e9->*rwrzKNl=4R(3){5%4qac9`)Lp9cW=( z+;`B4e8FfE@QZd+p7DmB;58Aa8@t#ajgHzC&Q9a7&KjIz5UQUq z--jJ&VLW!?ke#??uweu>I0da4>!P!eIxTFc80%U?;M zrx(1W80;MUr=T^X-ET>uZiC)e40fP}ac#~KJMSsXTjwXeAkIAmyr)CFQ7@HpY)^1pRk-0sB z8k~aGjFF!wg=){Kq!{c#3!`I~WA;a{E;o#z2B)AkBeFUv^h>XJ#b5_o7%9`fvoFk8 zZ5TlfPC;u%g%^`TpRF0C80!49-A z9>48Jd%~=UVFWce1+5u-){PDIZhV`1jl&MKFq%Je#$Ng!u7efS;1slGH2P|EXx;V( ziop)FFp8}B)&Bac-R3xg8k~aGjEbj6gr*F6Rx#Lt7RID+ez(`vKVTR^4NgI8#`Mh3 zg?4tGs~GG+3!`49YxegQzBP=X2B)Akkxk#>l@1P8dc|gHzC& z@lLM+q0E!FDF!>x!WexlYh=yD(}oe$;1slGd>85$%9-IC#b5_o7jeyg)a?w-6TB5SRgaosMva-P!odT>J=Zb0kC+ohim{kmtGVz2`( zyg8Tuw7Z^~p?Hb$K@CnpYsSCrMut{D*HtxISlY-if*PEHHs32dDO9@NJ&M5&v@j}^KW0DF zz6QQm0S!(;YsNcYCxzyAze6$DffmMZmA|!T*DPZgK@CnpYsRO?qu;CJ*OKLDmmO$f zTx@;R9)C{(!w70{3R*KxoJ|Uy{zF}-+F}P<7zIuiXKc}l@j(qvL2JgfKa)b^kH4fC>_E%9dpaJrH;?4 z(brK^)^t(~cA$mv@OOvoeBUiKjGzXmpfzJ@^!4D|*(xXoJJ7;tH|CJNxejJ72Q@ea ztrSYU~P?h&1MR(rj$XeZ>eJ3(wl0KIRUk`4G z!wqQN=#W1{sB$57?vlk0wD1P~`bMNg&MbU zGPqkt!w710rxdhigyIT?^51By80jM+X1>uesk1YH$i#Gls4&8M@;{OT}OZ zS{QYIoDgYo=x@UaYH$i#Gg3aR7@E{qop)!k11*f%`$j}QcpT^U1vNMYtr_Fm*9={F zy`ee|cA$k(bI3E1Qj^Y^;|OYS3R*K7BsB;%9a&2;*nt+tv&*|hPIUdjFoGJKg4T?u zn>P!6cw1$~U_7`+Ymxeq&;G{wwLuL|L2Jgo%pF6|U(Kx;>_7|SfnTadM!mMp z97j-tQ_z~xr|9FM(tXu=!WKKw!ss-rOr-7Qt%ecQ;1slGoQm`ay<7SZ^%{pAXkpy( zX_3g1Tpt)lP=iy@ni2UYItl6Aam8QTj@viKLQZc49n^LY@h*!wt+D^)tA^DNGLaH`u}K&s*OWH!#)H&){8g3Nt$W4R$bP z^VWC84b0EUZ+%zXz)VO#gLlO# zOnCG+*ujj(Ti+EoFn!U_;9YSFvlRUeb}$X`)_27X%sKQkcvqalqo}{Z4mWsWMeIET zH#o)fCt@3znJ9GmM4QY@5zV~V20Pr~xhBC4PVtnI*aq(k6BlpZVQhnU!j0I8i+nH2 z4Nl=IDE`}n9bCuc)_27XT%p9z;9YSF*BkLS*ufP;ZhcqWz_md94Bi!|aAgmFgB@I( z#SL6Z!q4Dc zaSGRk@Hg1Ol^t$~KTQwUwD1F%7jV zcDRA7NyaqPuDHP|IoDQZi})Mta6`_Vm5C=Y4YezFxPj|W#x&HfxWOqob5m~K zH#0aT=fTPxFRu|z%fGNUyGtBy;EI)AL&a}ya7xaDmDyxoBP~JIYx|TZaZ*U6d^Lo1q>y|zaIfGanZp>`6$@zQl2md>AgNbc$3g;zz z46nfsHy&=e$;n-J|Nj`?uDHRe2SS^iCrkbDzebu2PT`DfZ&x0J9d6uLdy`Xg&uz`T zhR5Irr*LMu*YFtZa3e?b8o9%J-jN1_8=S%!@_q(8+;}|aCgCZG#K3A6eeMK4DZO<;Rfb&cn$Bn%MLdNmfYyHYB(^B zU2%g`m^0!ryj`)w4NO1r8s4th;YP8=A2_Ewh11v-H#mhUE*`_%6+7I(Y#FcN?TQ_4 zJa^j%PNo`D(%2O@IE5KG9>d!eJKVtJ9Qt2tI@19cEt@&VFHoI@OH%x zH!v5;Yk0e2ha0OWtaob6do7J!af4Hs@8mJOU9rOrOr7#K*x?3dVR;SjIN0HaGi#kQ zw9~@>9Y>lCPF)$h*7ve-uSSi&K8hCZ;ydFRwK=w-cEwK8=J%XcW4Hc4cEybryWe#l%bps`@a>9IJAYi^ zba@~W+fch=XTaIz&d?_A|6^C&=(}^7GvvZ2u?*j?IF&o;9j8?9Ph%TuSL{3=S?bKs zzWx8PD{d^iu*A84p>7A?=A2rZV~O)=rO(pX6+5HyE_T)|(<%Px31)Dk_O*r1g2JE2 zGJM}FP95C!wo`7*O%3(EVrTG+Z#gFp=+v$4iW^x=zUd6A_{D$hic`zxFK~Jdx~ZXd z#m*zYyyiT%TBmMpSKPR>^sCO96E`t@-z!dKuRhOtKkts%<50U|r_AkhoX|Zwb!)rg z#=LK?o=OqQ$y{FoqeeW`Ot^>~I5~JG?4huKf;YRFK6}`UvHymPz z8?7_<_1`o28l3v+lOD16KH+FQ`Y#;%iJaM&9`o+um>v6g&JH)8n)ZnQUQ{u-!KuEl zw28f^4oBnBf8h{2AOH5C_h`T?1@DR*eKxi5KjJ6`uf?es_BD-tR13?VWLNBze7K?a z$jK`O?}{633)S;KIx7aR#i@#S*NS}x5SBg3uGsl#ZguZj2Co#nD{d5SQN{mEMlpCT zPIahLG4|O~SoS2lVkg|Yy!VWZR|?)0H`ebhh=*jFInH4Zm8g{dLl{jNFqaEKjlV3vu$!45YjFUaq`Zi_t* zZg2`SS^NxkxPeJA{sueT*uFHc|21dy=))mya0(M|{0w%u@!g)>0k4F)!6{7c@iW-r z2IdL*8|-kSPsUu{tNYm7gBzT}TqHk(9d5)-Zi@MAEj!%Ewm7?Uvc*mBOsLy~8=S(_ zDgUn6;Ra@5`5WwTW6zu{PUKu#@33%#Q<&-HXRyN!Od9hy*x|;30~wt@-SxXhv9};M zIE9I6eg-?-z#KP!gB@9#?$XcAjBn&@;9d2MghrhuNH!wBC-(ZIum}TN`u)~c$gZ_w=%0lm+dq>U< zPGKgCpTQ0{Fe%30V22w^7GH`a{xJD}?*Vwb;s&QM@y5?!hZ~r~<8QFT4NM2}H`w9E z@CPnNX8e$p#&K|iQ zVd|8h!45Z;eR@7}v{$Dz7~J3#rf2yX>~N!D>GP2bt6QbP;0C8K1vT5&)52o2B$Fp%)cvkxY7Upvyt1+mP>=d4NhT>o1eiBH+pnA8@YR9 zp)?rW;MDbkXCpm#W&Mu^r!c|JzbkgQ@xaM5k*9k9n#N})xWOq*;`1}u;l{o8naIN% zcBaAL2B-dBc_#A8$W{N*;8g5c*yau~`oD099c~PG=S)PdGUz`JZg2|ciTfMuaAWAI zGm-j5o2S9x2B*T#naJEazx?lWOWu7uH#mheAL5k|7dUuGbj8EcDOO-n{$yiRl{j8xWOsR&hRtX;l^j9&qvB$eLW2ZH#mhE zAbtir+}IcQOXSg~H>APf2B$E~#Lr-d8^ucg8kv^#MH&ola0)Y7{0w%uk+1lLNa7>k zr@`O`r!ZT_&tQieHR@lCY`Ane4F)$jg&8@120Pq1oA_H~#O6$q^c$SQtRH`a9d4w2 zeJOJ8=UizpxWOsREb=qh;RYrt`5WwTqh!b5BQL#HD2-ilgHxCYS0kkk)=A?yxWOsRSo1U3 z;RYtZ`5WwT1M}$o4R*K@d#*k|%V38ax!OhF{aDv5jU(p20Pri zo->p4YS-3j?1~$l!mI{AgB@=0dAG6eMzO<dl9I8u47^Km!bj%9FzQ+39@?}VqO)!@ku ze6?=gZ7hQwZt!)ugBzTRy+Svhh{|(n-W8?}$@hwR9wRIbcDTV;IaiHnTK+}JZRaHH-^N1Ug2JOBG$Mbq*xdUnm1-JC4< zO;rx3cq&3HgYRXQK9KC3>X=X6@ACavY=a$cj9Ie9>H9!_)edfOs^#&IoW4bGPou%k z_Vb&a{(E$a*})8MOgOU1IbEhe8Vp{GQyVvKbp9BSR)d}2MttCWwqB=rrQlt0V{iEl z&MOzwV(?m=;zzhx20waDU$@HncfFJO@BYcoUuibj;YR5h z3!KDOX)(CLsr3odoSbPk*x|+<56yH+w@r(|4mW=8`l>VWKO3CNeqoN2sr^liaP(f( z#>5kutA!aUqH%t`=$N0x7>65}$&!A9Q$~+`aRajg{S4j}r!a%i-(Ux` z4R3u{+`wE#KZAG0Da>p1H`u`($XnkPH}IZ=pTQ0{FtsxM2B$C$)8AkRQ#K{V?AZGf zcDR9e*!&D`a0>5)_#5nS1Mh428|-ic?^5_1>~I6`8m8ai6yDeHH`w6@-lgz2*x?4= zbMQCV;RfC#O~1h@yyxI=u)__!=iqO!!wtMM;cu|R4ZJ&?euGnZf7jn&hZ}hR+TUP@ z8+ec0-(ZIuc<(*^2B+{|zrVo_H}Llae}f%v;O`XaH#mjAi})Mta07pP@i*Av2L8U| zZ?MA+{0+(9V22y{+f@1uPT_B1{sueTz~9^a4R*MJzv=lK>~I5rD@?z^Dg15H-(ZIu z`1_~7!45a@ch&S8oWkF6{S9`wfxi{|8|-ice}hiH!72Qe+}~h_8~9s#`VCIuZ};Yv{sF4Nl?nOkN|bE8&={+HeD(Ve%Rt zgV*8|J|~ragH!k~I60 zzw;U%gBzT}=l%Q*cDRAh5qb@8SKQzfKC9?8yj^jFQ}}G8*YFtZa08#Y^co(68=S(Y zLj4VPxPi}(dJS(^+~5>GpXxQdU2%g`_&luF@EGiH1D~_?8XkiioWdu8{S9`wfzJzj z4R2T6;1oWS>@~byaf4I%479(&4ma@GYOmq#iW{85r@y_1w<~tIfzOD04UfSMPT_Ot zUL#Egr|`LVe}f%v;Pdoe!`l@%IEByedkt?_>~I6;1$YgQ!3|E~JOr=dG1%b-&TsG< z9)la4!ub?l!(*_+4V2I*Z4V+8rHN4|shZ{IY)oXai!3|E~ zoLGN@9d6*fTd(2miXCp?d|t2N?TQ~I6;)O!tYSKQzf&f)hr z*x?4|1b7W^SL|>D^9Q_!w<~UN3iA%UhR0xs8gpCQJGaPGJU&zrhaX$w-RXu}97hH!#1(&)^29FfYg7U}9j?2HW%?{?IN{ZRBkG1S@ z12bAZhDO|U9Gt@JSFaJ)m9WhYX3F0BuDF4DwjM(eQBLf4ms6M{9@CJL%?>v(SvUO# zr!c+O-(Uw5f+fZ5*xQ30ZeR+rpTP}IVbZa`!49S=-}|jcF;I7n9A~U#w8Tft%JKVtR@bnv;!hCXngB{F3mlU&O ze-hc@2Ij2$8QkC$X1V(t>|kDe;I7nnml@o^H3|F-cDR8l_USh`g-QAT20NI>FDYhw z-(7Va>~I6uZ}2nN;Rdb|5Ytc$Zg2`$m56Cra-YZ!H*n>Gn1*6-gHyOVModF7*x?4Q zt&o0$Q@CbBOhfI88JxmZK4KbbSL|>DSCWWnC!@D16S9HX($FaIECx~_#5nS16L)AX{cSX!wp=CD5jxy#SKp3>Pj&U#bAdU zxS~=_Lov9)DO@EgrlA<@a06F{O25G=T(2sop?1X#PT~4kF%7jVcDRA-ZpAbdgBzT} zb-rR6iop&yaQ(2DhGKAoQ@CDPOhYl);RddQ7Sm7+Zg2`$YKv(o20Prq_1t0_iop#| z;p%lU4aH!G8@S3``VCIu+IKMxwJT5(f)`Wx(U1J{O3zriV7e=_|Br{woWuAS*`u)_^p zM>G8fr{wovt^w+Au)_^p4>bJ-r{sQ2u4U?Pu)_^p*EIbGr*O4Ze*;&C6-ORR~I6u-cG;4DS37-SGM*y*x?4QI-Y)mQ@GxG`VCIW>k_%9x4*#-H*iJx z^c$R#S7dUfaespyZs6MV={Gnv`0Mwb1DF1b!6|tyD%V)|GuYwA_w80Y<3H&79}Q0J z*uBz8zQ6Z>G&m)%!sS}={#~)djfCd!IXAWp_>Tss&c3?B`K~Le+r^}p~bN{QssR_wTowK>a|H0stysvdKaY7mmcDQl(!X?gk54`Xn4NhfwcCnK^ zVSH>OERQ(sJX~dw^TGhV6K2Ogez3!h2Y0{i^mu$?EJHowaD!9w9{I)wQ_^U#!;Kc* z-f~jvy!amtPQ9@E4QJh-H#O9ev(vib0;k=wNorkY#~wL5+&I(oHD^<^m;Pf{oLV?` zzVp`?H#O9**x58a*wrrSg9ik-jbzT%8( zt5f_P31)EP)~0xHqusTs&fw`c?MnSz@midErqN_)uX9sF9S1wFw0Y6ld{(D;rP$+O zhZ{HQjCbngn3~3I&J9lGJ~Y-zD05Ro?TQ_qe!?ro?h4a-~I6qh|+Ix3e$+vZ*U6pg!~P5xPfUz={Goqc|!gMJKVr*q4XP^!gL^igB@;Q8d3TU zPGK66zk%sO;$Z5KXkWwoNo0o`yxZ8{LH>!u94}$;PiSm|9d2NTnEyDq!70qo^f%by z-*a9mc31rSj2UaPF8}_=HrU|?=D7KH#SKnjR-C`V4(8F_`mVTvnRk8$?}}5HtLJa9 zgV}wzzAJ8E)~KJsyW$j2*h!2(k=o3DbyOu=?nyfhE9R~`nbVQAE-%XC_O)6ljj!wZ ziD@;&;RdvB#QoXSe(BAsiqU^+b@#=Uoz&yq-4(05*(X1tG`=3(5QiJky3xB@oIRn3 zVuaa&mScJ{rJ9@k9bSJ>!$L~d;uN%I6nH$&UQtam*nt*Ct2Wi#f8NFG4{BIQ$y%I( z){IjV;_QYus>t^$%nr0Lnjfs{7CC`eEYz@&lC?Mmtr=54inGUU(+qZ?g)#R?6}L(Y zyqchfg_NwtDQL~8c{$ELJzg`|ffmNWFDkq9cTO|UeW+m}C2MgCS~C*MhwRl4YX&>e z!gysxCHL-Y^9_R<7E-bnr=T^XZrhOkPI1j(2U-~QpRee4_;9gdP{Tq>*5VYjX7qb5 zWG}v0S>5LBKntT&g9>i!(@ z*qWaWgBli6vKFVHHKS>(X7;KZ>OL{d4zw`(UAfcE*v(S+kBRZru#l3qI0da4!^6$& zQ;ue^11*dvHxzfjsGHR=s9_-`YjFx%Gp@bc%w9N0GuVL^2JYKMC&p95LQ2-+6trfn zIM~#FB30kFm)u#`ojHEBdjAvm=dv!o9^4Rz8_>FuXrEXnuRY{3YDDIC9s}zN178nr zh{FwN-EjX(3QaiwLb5Ran%K_0RIZ@%k3ixB;yj^G?>Yn^&l-82Nwi_`SFL+n568IH+MEC2MgCS~ET?FfH}<#?LDT zJJ7sK(SVId`JaSB>9?pxnJwbq_7`6<*%pQ$)~}f zhJ}=@#VKgbSeoIDlq~nD-@!0D(86f&;8Sjy68d*DF`gP0QnD7Opfw}@(bg$_*JuVi z(87od_jFI*2L?4Pq+~5lL2E|eg_n|>oze_;poKAfaS!*QC&8eGg_NwtDQL~;V?UXE z>L1Nu2U-}@-h0yBHvkN3SV+lQoPySjzwVv3<kX(6K8EvD_7yjvaNio=g7Dnxl65M}h|6&-_u#l3qI0da4Z4M^c4Lasak)JDe zpoQ_m`snX@__AS8!$L~d;uN%I6#p#Aetl^b#b5_o7{yj5xKnfgV;I!1kdn1H1+5tm ztWUB(-_%ku*nt+tmBk6}6OH~g3~E?N$y%I(){IZ*MDMTK^j8dapoLNT^#ph5#0=*3 z2Q@6DWGzlXYsTjON%oxeQxt<8XkolOBf)KxlF2ZrVId`JaSB>9PS;JcbKbdFG1!3? zM#C2q+@#O57zQ;gq+~5lL2E|2Gvn;#Tap!n9cW=x8kOLFu{@h$P{Tq>*5VYjW?UaP z&MvmKnr7A&jk1F?{gRi zH7ulLElxpe#=M+k?bpi`R}6Nbg)!*S1b0Q_T!ujn3n^KPQ_z~Rz#VNDe668kumdfO zM<0kjhZ~sNFsNZ6C2MgC+8oFBk@ko|Jrsi-XkjGQPjELsp9jbBzlMdBT8mRgYsRDV zp0_`qKSeRH*3FF_6%*V>o%0$7H7ss$3R*J?*BD|~eSei=umdf}(WOX&n>SxR!=Q$R zl&r-mXwBG{__V!c`w_)p2U-}#vnIHIE(U`d7E-bnr=T^%UjL}QYj_^@`kWnTVc@+b zb=$;K!$L~d;uN%IEW4Iuf0=q$lj!e<)njskYrWQ~nXHA^9HQ~{;D$KdfYyx<$3L1p z_DWJn7~$&ox?_HQLNTzeF!1%@hB(}S){WxxGT50v@1___I+t*3w@OlsqF-$W8Fl>U_7`+NsZF(!`q)VjGzXmpf#g(lRHyC zvc@U~JJ7;-bVF(PdU%jw1T{DXtr-{I&7At-LCs(XS{U2zE8`xIA7~gs4NgI8#>E9E zQYs7?r;dXiXkpxax{Q0Y#sI?zYH$i#GahRZNtySZX0QV-jC~8ry8BA?H;kYLr=T^X zY5Y4Wk!t$BgdJ#MT#_o;H-O5eD2x@Q&S~DIz(lNQeVXy-&47`pKofsd~;1slG zJc&pP{bO_X+ zv=C+oTK4`xtvlWA)l$uEP7MnwS&LK9n$c_4!}jV%#TA1cXko-}EAGzQ^s!-3!$L~d z;uN%I<)o%%+-&%h3}Fh*1; z?w0Mk&M>H9Ath^Z3R*KRW*BDQ_5A|HUVFsNZ6C2MgCS~Kde9c^D~ z)L1dtffmMwL&e|_7|u7srM7vffmM|-NoD!`xYApH7ulL zElxpe#*>|r>`$7{X(~VM>_7|S+>v5#$INdTMo@!O(3)}mvr%^HrZ#cHUu9g~Dz|!G!Va`Lj@`xG4Ckiedlk^gPbp~4nANU@y=G+v z#b5_o7}uNL=?*wP$uNQ%oPySjyQfsQ7u0Q{80<8@%7k- z{Is*f4QSmMcKhj%gb^)-*@2e5Z?740`xstgJT)w&WGzlXYetiI`+W=sJJ7;7v9+nY zb)7!G#CU30NXc59g4T@V1Kp41ukLaj>_7`+UWX>`yKBLqhJ}=@#VKgb$Ws3HE!Pc$ z9cW>!{k@S}bPX8Pu#l3qI0da4*~`RlxoQ~fKnvsg;)d>DtH7X!g_NwtDQL|I6?=Kh zUxvXBv@lwAZQ$Ph9vIZHkdn1H1+5u5?M+)Q8U{Pi!bm7l-(9r~3~E?N$y%I(){Hf8 zp5F44VXy-&j1uSSxt$k-K@AHjS&LK9no((8zO4rhgB@sLH2$QnTjEVHs9_-`YjFx% zGYbDuYpZJ*>_7`+=CV5OnR#GP!$L~d;uN%ItpB?6)@6pl4zw_So>kjjJ{=5dSV+lQ zoPySjiNjymI@U1Qffh!-$+g_jBrvF9Ath^Z3R*LMI{Nz72MvQAXkqMssiwPd3>eg~ zkdn1H1+5wFx^3EeBl_7`+|1;6|MLz?B8WvKr7N?*!YGAj9lH3nNq2if)Bz zU{J$CO4i~Ov}Q#5Tu9FJgFX&+poP&bTLt&RgJ4j@LQ2-+6treEoLV^L<8L&B9cW>+ z{I|UO+dto!+k+YwQnD7OpfzLL6HQW9ZqW>OpoLL4PkDFJVlb#-Ath^Z3R*KhO@1cj z;klZ@4zw^P*DL2{i35Wg7E-bnr=T?>Y5S~{Pao3^cA$l^ZfIF|$F8r<_lg=8QnD7O zpf%&gsT)&{TAINQv@i;9E8|vu1Pp3eNXc59g4T=yH@-{hJW7AQogHXll&@6Aow#GK zISy)ANXc59g4T?G+uxR&d!7EAK0DCDxbLmfZne5#P{Tq>*5VYjW~`o2DK$KPjJm&K z2U-{>%anG<&Ddj(gBli6vKFVHHDm7QZBnyFUw6uVB0JE+czRI~+!ZsxpoWE%ti>s4&3O6cX({18n!ygVFb+g|y5H0U zgBli6vKFVHHDm74At@_f(F}H=g|Q=3Pq+KQL*{!$4GSq*i&M~=G4rc-DPOMC40fP} z@lL%S?%fl>poWE%ti>s4%^0$#Zc4p~X0QV-j0~NgbZgcHgBli6vKFVHHDmAWJ5!47 z(F}H=h4Dh~?rzJo2hI128WvKr7N?*!Bhk&4^6yd2U*5VYjX4Kp9W%5Vo^l`8QEsX4C9(Su&0fQPA zQnD7Opf#iC9qW>hUepYBpoQ_!50ANPFCQ?s2Q@6DWGzlXYew;nuO@%;yJoNhEsX7R zy13ssU{J$CO4i~Ov}TmPYkcz7=y@jcT$CMXVU)hRvpaS!7}T(klC?Mmtr@NJbx*!( zUZ1lAEsWncb#!0t4+b?Xq+~5lL2E|tLQRs_T-C?H4zw^%R(#aW_8=J4u#l3qI0da4 z-|sAu{HJ*@gB@sLOqtlh{jdTU)Uc3}wKxT>8S6jIn0(f}C&Lc3FkbqyojW}T7}T(k zlC?Mmtr9mjC$P){^FZICh|gk-114 zxBYiuP{Tq>*5VYjX5=k6Ve2TvUpE_sDABMpW zv@m+TexEz-12CvzAth^Z3R*M1eQAsLHx_oFg@M01iB611BPse9ETm*DPC;u%{pc}N zYPv|yAGCH{PjJiRDAZimntLt5ty(R=()fCCLmX~E>qeiyqvt5j9jVSGV+UGzSN=|L zXN=0Nc!}}Uu#l3qI0da4Mb0GIx#k^G40fP}k?nGVyX()}41*dLQnD7Opf%&nt|Ytg z_>$^x^z1+jWBb_zxBrr?hCvMrDOrnC(3&xHd6Hc=ZzsiI2U-~S9#3$88kfm1s9_-` zYjFx%GqydGWbY|6RWaCs7RKc0d8v_CEW@CNg_NwtDQL}@T`$Y zf<6a}9cW>UU6kO~z3`i1P{Tq>*5VYjX54XnjQw1=l=^%LJJ7=D^m2lmA@vu-poWE% zti>s4&8XOUw7qV03&mguS{OBlCAe=`XAOfI7E-bnr=T@s-yb9F3u6W;20PHgDD-%O zn|aGmhCvMrDOrnC(3;V>*mHKfFXt!*JJ7~9b;2;HVId`JaSB>93g7>fJ!iop)FFyxk9SfYVp z1T{DXtr_x@*#65oiop)FFytq+>4*0iMo@!O(3&B?QJ2OHQVe#Wg(1IbmkQJ~jGzXm zpfyA888(h?p&0By3q$TPLiOqxMo@!O(3&Cla3jN|6oVaTVaPq-@;hr8Mo@!O(3&Cl z)R``3R19{Yg(3IgE558@7(oqAL2HIQ;+!aZpsD=qvI8v)c_jMu-fD&s)Zi4fX2>IF zox$%b20PHgkVn+;q{@a7)Zi4fX2>&ugJq^F20PHgkY@&u&#Pb_7`+^z7E|w!B~jH8=&W88h5(wl4Ws|Ln2@ zEsXA~;@wjjzzAw^3R*L|=C_h>T-OYCpoP))y>{+zzr~r~^PmQ&pf%%^RW!N0VXy-& zjGfauxF^2{BdEbCXwA4K@CnpYex4aBa(-i^P|{-7RD=YMc?0j6O5n+r=T?>Dz-HXknZi-__048;qa^r=T_C+*5AyG;^*cJJ7|pa!R)HDkh|Rw?t>Y6d&d!uT+6Pxsn5FoGJKg4T@TiwC4ko2?n_Knr93 zw>{mNZNUg?a0*&8N^O{$@^U}TU_7{n;O_kH>`%Z5YH$i#Gb#-})AYon`tgGuXkm2gb-TMT8y;(e8k~aGjP4sF zO`9Im40fP}(LP53H}wH9f*PEH){HTaEo|DMp?*AP2U-{pepe}?>C7Qtwv@oWODdax%GZ;Y)PC;wNmrd(6 z-D7J8JJ7-yJG!tttPq~J2Q@eatr@i{7H)dkJf~&{S{R?qDdNtJ10$%xDQL|o75=-) z!4vv8*nt+t+U<9^2YZ1L)Zi4fW<1(pXOm~oX$Cvc!kAa6nA`V7FoGJKg4T@3uD;tO zk9j@F4zw_KyinX7z7&k02B)AkS|+Ps&+4zw_)PAKhmJ_|-rgHzC&QKxZ%CXbu< zWY~cg#=X(=SV~<3BdEbCXw4{{@9)N?%==gDKno+w@aXwCneqNrP=iy@ni1dk+r|?O zgB@sLT$otiZJ85{pa!R)HRHpgpEN#b805A@{5?};1I0da4cTSklc%)&l11*f9 z#VfndmIWiI!6|6XD6+3t<2MY09cW=Je5{Ilv;r7G4NgI8MxD>^ZM?}a*nt+trNvd< z&!ZPN6P*|z)Zi4fW|UoCq45sGU(o&S3^w^0o+f*PEH){Fu7#-{c) z+hty3CZFbsB}g^|Bn zE%)boIF6tOr=T_Ci_Y^KML%<=j)NU&VJvyCw)?L4cbuRGr=T_CiR6SvR}6z4Xkk27 zyRMs~A&w)c!6|6X$WXmfqv%`%bsX$K3!}&OdTv4U_pikGpa!R)HKWV##~c1@80u)sxgB@sL z;O~Q?6XSy#oPySj!W*lHGUjd~#}N+az0EEEt^WJ+i~Do9@Aj*r?mzH#U&CUD8_>FO zW?8jRwJc55_lg~8*?a!YIo+IZS2y=pK@CnpYsM!Rs)o+3)C_i@g|Tp2F88)~YZ^vS zgHzC&(X(vTP}|;d>Nwbe7RIj~a=W(;!Dl~$8k~aGjCV>$KSA6oq!{c#3u8;hJnq1g z_zX)>gHzC&G3?IDq4PDHDF!>x!f4zsk6Z6DK8q97;1slGEU#NB^vhMvU(!1Ejjsnc#Nh_CZoJX|p-?zONyT6XS{MfgWp!U^I#=-$_7{nYsswc^RMnQjGzXmpfzL4weF$cldh)9_lg~8VLWs=i@WDcmXPSg_@D--pf#gW zj{c#IKkZNqcA#b5Pv6esF5OkpFoGJKg4T?Q@xwyR{&`I?*nt+t`GHy7UAyBABdEbC zXw6t#W>je0jmH#&9cW=3zdwt6!5w25K@CnpYsN=w$Al_2EUy^sKnvqU-7N0E!(KLw zpa!R)H6!_pv7we7vML5U(86%;ir(g_uNy{CgHzC&(Q4YbP?o)iQ{?B09cW?nz9Wm< zvfF!x5!B!mv}P2@mlT>^Xsu$f11*fTxw5$SGg}NJsKF^{%{cmWQt18>FDnK+(872z zV-|O2ww;C%)Zi4fX7pa16dIeUn_{p7EsQV!$?O(rcfv4&8k~aGjN#jpLdRdNsu=7* ztJ~vJW_M}NzYHU&(VJ4xnsNSEQs{jC%=-2)DRGbzM&0w7-JPqmna@)PH8=&W8HwkU zLY)eJF6Wq7>_7{n^y$p*yDJMCMo@!O(3;U8`niwYug+BrcA$lk^HgRx-^XPQBdEbC zXwB#n{fx}4dpj!zJJ7;7@_lA^!%wvgBdEbCXmcFV_pUy;P*^e8ffmM)W0~E?En46> z0veox)(kuPo=>3#JJh*L>_7`+NdffmN3BbnU~ zQW6X!sKF^{%{UNcTq|8bG1!3?##hnjMAxs3GK`=Gr=T?>dfm*>>W;JIdUqB((8A~! zWejOI*)W0{oPyR2`5b4FGW(;m2Q7;oXkpwNWn}$+j$s5fI0da4@*J+l$SKhoik8I= zv@qn^8J^oE#s@Vx1+5uXpL-;3*yvH}xle%ux4ZT8zGch0Yv<>8Yb=?oG`=3(5QiJk zx-ormkGRdBj8qJEpoLdpa6WfT*J+BE7$4N&6trf%SZqk#_?;v4ahSElK}r~r9(mmy z_7`+*xFp~`of(IBdEbCXw6ugYi-=-*=qKV z#SXMEn*Ey7Ei&;w!w70{3R*Kt{OiV*+cZEO2RqQh*w-YdTP{@FFoGJKg4T>p0}sdL z{#4DAvDkqY#=6&|@12w=Wf(yXPC;u%|37|k&2B)Ak zqt>M?p{|v?Dh4~y>h>6Mn|rLmxm3}K@j;Ddl!DfbhsqTQtsUE5-yS9<4pOr2-VG>Mo@!O(3)|{DjmA-z=Mjx4zw^XjLq&A?f!~k1T{DXtr;0IRtxo5&{Q$lffmMw zoY~#cMe7(wP=iy@n(_QIjYIu=)ldv}poM|g&Y~0JgBqNI){Ifr$AuDqy{w)me)V`E zw@dEb>gQ)@mqPBxGrm+BUk`4G!wqQNxM~dzz5LH|^%{pAXxaPQ@rB$gH$F2zyFm?3 zL2Jg!-=7Sf%l5ZoumdfOrE!Ja)xEbFMo@!O(3;V7b?ea8ZAI1X!49-A4pl1TKCvxg z7(oqAL2E|d{k1|LS7@LZ?ED{PX98|h^}q3B)?glzS#l*pG7op3r3|_5Eh&^j=r#z| zC6(bGMWF#{K!cQ`Uuh6hxX0Z|MN!fum6SONX^`?i-?jF;|L<G)`6C8twG^Eb#2v~<*Zy0Sa?ktJS76u~KI z)6wVSqv^Y54ARHJ4zzTPN>3ffDKC2+Q3R);O-KJ3>(jriIZSu311%jJKCa|mRqq9_ zBZ}Y@wCOl?k@XLr30_8 zMCW8h5uAcH9e-UNcP`&|j+1(sn3$Ya&KyB@q$Ykb`zV(c&hZHUKq zb#~JJY9JjkcA%y2iRl&G=PPy4eK}cC1gD@)$I)*uauz>VUw5zrEghq(S9E`Rwz=04 zMQ{q*bX2^stCKiVPj|2bEgch|s^}JfGR^CVA~*$YI`Z9aPS%-qbq71p((%g~mE2^x zT3$yK!6|6d@$O9*J2Q&b)*b9XOUL0UmD~emD|;PL1gD@)$DW=UPOnF5=ni(ErDNH_ zO76h_o#u5!5uAcH9nJ5_bUHp?O?R*ZEgd&yRCf0qF6MPa5uAedejcqZb@m;qtUK6& zmJa8M%I<52|MdRO^CJjOL7R??Ug+(_ikH_N>_AJ$&~Gcdv8N7r9Z>|QpiRf?-TFCm ze=Ds!*nyUgQz}<+hnD=o>xd#a1#LRY9U0(EoBvn3{GGD{Ege^PsN#;lbgS19MQ{q* zbUfSlM(4A~H|q{|przx%-c{TKPk!okL=l{VHXWtU9PM=f)ZBm04zzTvxUz~nwd^Ne zM-;&+Xwz~3_VLa=bBgKXUh_S;2v?0!EccF7)j(Kcn2U_O-Q27#W{Yf8te}hp3r=U&8o-Li7 zUFFQ)9PB_#$HPlXxT9vR_d22oPC=WF;<=rjF{4ZeJJ8Z`;F^-|>%G=`9Z>|QpiM`& z3pzU+KQtZeKubr13Z>keK3wf}L=l{VHXX13teksmHq?LT>_AJ0yS|j$qQaYAM-;&+ zXwxxqhH@UCYC70~mX0nNr??%Oz36pB5uAcH9glt+cY5^EuS;U=KubsKey6)F+CAuX zL=l{VHXZA0#+}|5G}7NIcA%xB>PKbV`;X^(9Z>|QpiRex3mxbB6{dq7XzBQ4d|7vK zBFF29A~*$YI@YDG0hpJ%7C;_%*@2c0yiyaLlNCj93fk&Oym<4W{O^0!%a^gUX!h_q)puv~-+X|L^>(7L@clq6khwn~uq;zrlySzd?4O zrK4KKn7b;$I=Zkck)YrcpXs$r=U$oX6i9OJJ8aR7*fo2uifr-L=l{VHXY?tuNlgi z*95WHXY;pOmOy}*wZQXaFwWCbZ7pY3@fsQDGQ_!a4?;!)6V{`u29qd3$$3LBS=KnM$-FqyFA~*$YI=23Bx${GlvikXh z9cbxTFmq@A(5E_i9Z>|QpiM{7xtBOg)>qLT>_AJ$f#W;#i;wE)bwm-If;Jr`TJ?0! z9a3F)umdd}ZSL8X|8DsXUPlzcDQMGi{-%qa_IKCP9qd3$$MFBX_cm9l*+jt#O1gD@)$Nc-dI+Ny__cGXlmX41X?#aLZjaFVq z6u~KI({Xp7F3#{u<~&m~OD62g zf1um>UPlzcDQMF%@tO;rS|iOl4m;4&v0>8w{Cl=F^*W*mPC=WFMfY@eP915^4cLK} zj`4GU%D<_16R#tR;1sm!*w$M)4{b89+u4DZj&pwgIsfP1(!7o+f>Y3@qu&Y3@ahQNM z#MA~~c9><>Dvq%OEpuNo_OJX8kC?vHHFpsNr=U$oa%-!OznQh8W9&dnN0kkKVT_$$?!mP6$V+UF~hPD1Jf6*p%L=l{VHXXwbzSwcsA-x86j2&p{xGw)l z{)5ZV5k+tc+H|xz?emV$q}B_Qa~yV{rQ?l}hw>*qhK?wLQ_!a4i5bN@HT%|dumdd} zrMn!=|MoU?L=l{VHXVCktJCSc)Y@ut9PB_#N98UD^7r>ZM-;&+Xw$LuG}Woeo2G*u zXz92wXMg_j+USTPI0bDwwmCO-T5a~Iim?MN9hJ81%^z|wj>nP+f>Y3@1{C>vsLUVh36}?r69(|L)K5dN+#T6twA>d+|5vUu@NTBE{H&*59i$cIF>=7adVV z8%jZ&js|a(b&gEETptHJ(9$vGw4M2#mZKwz;1sm!NNaPxvoz0qUds-&bPO-GGym#W z&=Ey&3fgo`xgyhfW=A!B9PB_#$JpXK^GCgajwpgt(56GJzR@}7(~tAy@roU2=~$jR zhr9P_bVL!Hf;Jt0eQ~Grahrj5uAcH9am=LI-`z0uCHfc2Uf73Xk&vLeGjF zJW~IMS$WR}Lf|nt&|%GrQ+PxT5PDYZ;4!iAvtj~|c7YCSR-D3PSAfv7Vuv523irss z1l}(TbXc?E6yE)^33l-Qm81$cD<<&Hl-O9=Vgm00*&RG9PT?IL zn_vg;$rOH8OyJ!XyMt%NDZF=L6YSvKkHXK23B0dickrw@g?A}zf*riiQ21Ff5qzH^ z^=t0^3qB8Wia&LdYv}PW;jn{GmkK{CCh)mY;K&pIes<@Le$cXHup=P^J51botfpJ^>R6D_vtow{e9{z{l|^t0pBvc( zJNV>BQrsQ<39`ckKGO+w=p$!>Q+GXG$F2U#o;5y^O3S~5!wwVpOvfh-@GpW>_=LtL z*x^rNxI1{{>@b0=I_wT6IE8C80z~59N6x7UJ34EyD5_w_qggd7JuOyK&7z^rr!6P)VPHq9Nd=jD(Nc9_8R z6Ltp^oN9A>L-(>b=Lb9Vtk_}V!G-6z&5l17B=paN9VT$ag*_`KIQ7K`joimRdLY=L zXT=T^k8C~HJ-72cK|;@p9VT#%hCM4LIHkU5?4I%csE`hJn7}m}b_Wxj>XF&R{d3XH zAsy^65xkNkb;$BBA%BBRaBAS{Chn?lhXy+|!44D68lLBto^nkH!44C{rk&?b{$HOU zAro`hVFK3+2fkMp!6{t*YZL6?`dvwJxBqu;bufV|bL|cui&MDH)+X4&m9mAO6%)7y z*6!e0aSB(o+5|heCbjUhVggs2+8sPAPT|^7n_vf5e-?gLOyIgsyMt%NDO{y#6YTKS zm^@PS?-dic3&!r?u{ec$S^|Xrt7QjwrAUfLik=k{xZfnuVf}q@3U`kL2t6xyaQ{c- ztTe&%Wuo>+E!`P+znt_tQfc{@aM)o2_k#F@j{lqB)E&hy4R+`TA=qI8_ksjE^sJcR z6z=Q@5DDpEhwtFvk%B)#c9_7Ovw;q4R-D3pumM8PiXGg^Dk<)co)r_gM>Wu4&5BdF z<1|3%S+RqAMhibHCU7@spu?IKr*Lm)fY7sI2X|){epXE2zRN&|H7icxF3JF*XT=Wg zgDm{4n7|#5fevd{oWlKz0YcA;9lkHIaKBefV6C4(hczosVdb6xp=ZSo*4~j+;bz4I zR@Dh~ShM03*2oDEdRFXUm7BuPiV3V=6X>vJ#VM>t6Cm`g*ui=-g`X7@SScpZVa4inQ4)^@vA9u+bxCO9=dtB(8mL$`$xSWiS| z^>?S5?#)U$nSxh;C+h7eeRL}pdtyc+JU&J2_pamSRx@-o!KqJ<*LHVY zv@zs3c(p+62Pxk-o~_-1<6r_iJqjI7a0>f2+5}bz6$iU*issn{JJ?|Y`)Jx7OmK>i zDcHf|@(i)(sNa!#%$0u$y^pu-aw-lJSe?`-4Dc_4Q`kGzClUrp=zY9pw^nhO!0Mzv z;dk&@oWdTkKH+z;!$fdRS+5}Vzl7fTTlT4yu{eeOC;bk8R#@p&9PI2Mn)`x34|bTq zo(*;f6P&^h3^swaQN_W&8KQZ%!CA4x1a`!*JDA`UA5*Y{$K@Gf_Yk{-9VW0YYrzDk zunUS!u)_q_Wi6QC6n1m533iykx~v5goWia&Ho*=P*ek~-*kJ-|zZOhz3VZ(81UpP% zCnB3*hY9SDWE1>%fE`05#eX-!-$Ztpz+NDB2NRsa&K@?w4)*3K{H&P3t{Zj-&x%vn zL&GN6!7dnupA{3>-@@+TS#b)xRoDbO*l(invtj}}N!T4cD^6iw2%BIBJ3AD9R!m^e z2D^i2#VPE-U=!?M4~4?diV5tFV0ZAWIEB3qY=Rx^R#5m^F@b#u><*q4r?9JlO|XM~ z0SZ4WCa~ha-NCcs6xQ#z33jjof8l4v1lHEKJ9t){;#W1n$3%XOgT1h2Tz(Z5B-mjB zyIk9|VuDlHv)U%u!LHMVpA{3>PulL_S#b)xL)!#9*x$MEvtj}}H`^UND^6h_W}9FK zJ1G}_R!m@zWV?fB#VPD~Y!mEY&*H+*iV5sSYT`d#>$JK+pOFP0 zeb`|Fd)e9@OmM3CsBHIerB)#w>@b17Z0!yvI8~*8w%h5=)*&72FoC^n?G7e5RWY9J z&a2fnq=OwMu$Qgf!33wUGi|{Hr_QgR?LOY6UC6B1VFEkT+8s=AYC`dB_u2E>hjg&R z1a_viJDA{9aHm*)*MJ=+c+c73?=HWG^vLmSx9Xm1dhUgL|B8wAe`mY(POTDh@cyTUR`&>^p8W{9b|%2{BC5hgO6O^>)ZI-Db{x(Nbu1zQFU!Sw{h>y zA+utK33=yk*s~@7|L0-8RjKb46P%Lw{dP?#b`pY9uch`MT)#1FR_rh#?;5UoFc#9m z1gGTv#NVDtZK9KU%^3V%F~O-Rt?Iia(mxF$*kMB613Z7`Zzmx*)w1l_?!EKFI@n=C zo{3r>JQUKw1gGSArAXd^lMtNh{?FO&p+CcB#SRnlyz)eBUq}ZNoVvPHntQO@mJos+ zCggdg_}jZqLU2l+CE^EuI0?b2VvQTRX%B?WiXA58G5@lsz7OeOf>WQ}l=@uly|4~; zn2^W(4j+9N(!m6$$jbq3hS?Pd+z#1r+B2`-v>KPWWV3Y-TG(Paj?Tg z^XIN}_grTBf*nk7DmL;ucjdd=LXLx-y60WzE>1To9x1wmiDusnbr-JwI;4Zg;#AKr zjos(Z{w#!GhlvdnhPu-`hjlQ)saX|+A>4e4Mf?a?9bN7tAXj}$y|c9^Jt$`JSP zk*`8JnBY{cADXybx`!P(J4`ehKG`WXw!0o>83w<0sQgjCs zC1*BsU%xf%IM`w0ok7>QgPu2i!44)k_1S&R-Ff4}I@n<%yT{e;fa}6KnBY|Ddi~wT z=bnt|sQ#JXAi+)wkvI+);8 z-DZ8=@sFI0;M9!gFL3uh8a69-nD}+s74GB1!aA7XREKw3y0xAR>tKh89StvcOLYtD zV1iRqCtc>gnRYUQQ?>TDa{JB?n-x1u+_&LU_n}k6I+);8cC9w)VqNoceoyJNNgO!U%Sl$giH^mf3hRf>W>l+TK0$ zl`w)GCN3>?u{$IGWCW)ky{x0V=+!WS9VU8h>*~5IPDXI*`<0#Cm9K>n>@cyex#M2< zdKkeD6GP@)WFxiilAAcSD2U$#Em62zDMhTHSqh z>P!D&R!l7Uvbx*z)fYlKcvhVHcvE%v`z`ZB2zK}yFCHoQd&O6n@fCD@MOu*HE9K7o zpqBem-LZNmd}UpbV2265jxb2@HG(5o)N!}hxm9=YHHATf9VVV_TG!23H!|dV#RR7= zUsBioJ24`JU}x<`_1x`Q!~esqm}s`Up8Ivvn?pKyR-D>0_bhiyonavaJHHI7?=G!- z(|?#16YsP?+r75=jUgR8D^5*q)WCf=^M(+Dorz7;+;wBF{|~cbg0F!M{>=IM))ws= zyG5rA)g632Y>;4wiT9ID+~>Cs2{{fXI8|b3Q@6JhMzGVcVRQG$vxEP`teCj@)E4f| zry4r?I5<_YTub+bQP+kX2RnURw|1v&AM_t)#YDfpZQT6F3>`fyPTe`Nt@~HcFoK=! zOWU~>i~W~bF|qtmdw1uGfgwlEKS55_Z`;wmWJDOjPUe(OZqxcE#Un)@ITHhRq`L#Z z7;utVacW%GxSKaEj9_QeQsp-4WKxBj6%&c`E_BEJe9cK_#i>D4vfbG1J|P4^-W$@vV{z)*E!l3RIWt2Db{c$^?QT2c$^S4b zCN4_Rd(VC$q=RS0sg6%&g;$#$Q5EkC4#$Kq6j zP1)`%CDw-!>>S*X?T-896P@CbqG!d#Y42yd_ulqZNC%I_snPFbyBQB|4D)stqsmA7;fwPMd6Z z`R!#xI(Sx`THi3+ZQr+C2*FOjGqT-s<;(wvSus(gWa<;e`G$`EnRBYbuc^-|%2WuM z6+1=WyUu;#9g_+iUtsklc9>}S&~@(D*H;YbV1iSm7?xAs&{=@f* ziG$OJx*LBsboBR%Q*QO4?l+g7?75axZ@h7p+onmCkRxY@iTbmKxKBP8*1-g)R{uWO zow7TOV5e=j!EU`;W+psR@W|O=B0X_!>b|0r9S5go*1Fnll^I5`!^D{RgWQV;o{Zqs zFE?D{W)2A>*kR&<7YDjqZax{oskFxjxJ5>U5J{}$$t#44#u}YwMN+wh!(5(_2sl_V zO;T8+(@a~fI&Fd-Ca^}QO|ZiR*6Xwhc9_5# zoi@P^6Ii3uCfH#D>vh@$J4|4WPMctd39Qj+6YMa7^*U{W9VW0wr%kZK1lH)Z33iyk zdYv}G4ii|T(1qT!44BxuhS>Y3xL!r<4kZ0>u36e|C)gvCa_+oPxu{7a0=^O+62~t6bI{BijF4O zVFD{|+8s=A3M+it1lDL22P;R4=Gg{by#^d6uDtXA_fCx_IED2y?O9<}M{%$Yq-dUP zu!9{Yuxh2QY2BlB<9ZYZvYf#z*J6K&#Qan=dZ;%}(u@b0KCvAcqCa?yjO|ZiR)}6Eoc9_7rlQzK)6Ig@NCfH#D z>rUDPJ4|5RNt@b0KCvAcqCa?yj zO|ZiR)}6Eoc9_7rlQzK)6Ig@NCfH#D>rUDPJ4|5RNtvC*@9VT#HPJl@LOcF_Un7}nUHo*=PxGu*g*kJ@b1ra%_SfCUA|8O|ZiRuFJ6rc9_6*IX1x#6SzjlCfH#D*X7s* zJ51oZ9GhT=30$LN6YMa7>vC*@9VT#Hj!m$`1g_Ds33iykbvZV{4imU8$0pce0@vu+ z1UpRNx*VHehY4JlV-xH!fopVZf*mGsU5-t#!vwC&u?cpVz%@EH!44C+F2^R=VFK6X z*aSOF;2Is9V224@mtzy`FoElGY=RvoaFvZsu)_qdhAEif6t2s$33iykH99uI4imU8 z$0pce0$17C1UpRN8l8d(PT?vWn_!0tT%%Jk!6{sqV-xH!fvb0Hf?uoQDsM^gYdilH znSRZ{4imVl-0on4Q@D!VCfLCh@r9oi6SxB3?%-K*3RnEw1UtBUpzyO|0(UFe9Xu;e z;qC~VU9o(Z>_*pT5 zdm`-)o)xEX52j79gPk1;KPx712dLe_v*Hx)CH0Af`Bh9L*!as5*IEB3@Y=Rx^{~#$IDR|`U zFo9hq{0{#(*kJ;DPxyp?987Qu_dXX)a0+)w`-DF$c9_7u);{6SiV05P9&Vdp2ls|c zibo25ciCYA_odq%OmGVKyW0dixR1W@vtk1G@Y@|cD^6i;0GnV3YYr5CR!m^M1G|G~ z#VM?#U=!?MeTKr%iV3U@VR!JXIE7tMY=RxEXIS`I{hN>-QS1(x6&xn8mSVvKr?6gQ z!33wUqNGi*!vt1hESTUFR(rGwc9_6=jW)p!6Ii>kV1iRv;n618VFK$l+5|gHU?s+a z2~J^!N1I@W39Q#>6YMa7)gB8bIED2ZZGs&puy$j?1gEgVqfM~G1lDV`33iyk+KmMh zoWgpIHo*=PSnaW3f>T)G(I(ho0_!!}1UpP%?Z$!$PGP-9n_!0ttgBcs!6~fpXcO!( zfz=*uf*mHXUZYL0!vt1IESTUFR(P}tc9_6wk2b*$6IkKVCfH#D>owX0J4|4e#DWP< zVTDJVV225;_GlCAFo6{wZGs&puwJ80u)_q_RVSOmGS-JlX_1OklM~n_!0ttk-B0>@b0~8w(~lh4mV3f*mHXc4NT=r?A4KO|ZiR z)@!s0c9_80jRg~&!g`H1!44BxyRl$`Q&{2ACfH#D>owX0J4|5h#)1h>VZBD1V225; z-B>WeDXj2l6YMa7^%`x09VW1LW5EQcuwJ80u)_padn}mX6xM6B33iykYL5jIoWgpI zHo*=PSnaW3f>T(p(I(ho0;@e1OmGV8HQEF_OklOgf(cGx^+lUthY76qSTMmUtoB$i z!6~fQXcO!(fz=)hCOCz4AZ>!rQnBlTr1+fLe%}XY+f2wvvM+?)!DDes&R&YP&u*Jxqk6P&_6Uq0b?u)~C$ zy~-Y^KH+yT!71z?<`aGgJ4|4gF`w`|*kJ;@kJ$t}Okl?`n_!0t>^No<>@b1d$83Tf zCa~j}O|ZiRb{w+_c9_8KV>ZDK6WDRgCfH#DJC4}|J4|5rF`HnA3G6s#6YMa79mi~f z9VW2*m`$+51a=&=33iykj$<~#4ingY%qG}j0y~b`1UpP%$1$5=hY9RHW)ti%fgQ(e zf*mHXZ@!!44DHKg=fBVM5-~lYPkwCOC!t!)$^bCgdGG*_W(f zf>YQ(%qG}jLf+AneaQ+YIEDSgY=RvoOvw9;@hxE;OmGVOlGz>ne2#raCB?4{g0BU|n3o!q18c>@#e4@T@q6{flja9qfx-_*pT5J(=weo)xFC*RxHqgFU1RKPx7%f3@Ag zv*Hx?#kL7{u-|s!XT=2e`nEfGR-D2f;x@q!_9idyaO%FzW!;U-!(RKa!$i^1 z<=ygMb_kgj6P!w`UEZBE;ba7-+!E#7KZb<8_F;#K%RVjVHmnoY!33vT%qr(@cq{C6 z2|Kr4UCzBQ%cOWD|L-I9UPB_uYX$LINW8XCkl;0s5<`l)?zP+3$lrG1)>~pC=SxiUQfy=bO$?3@VZzzS$SUpH&3hY{j10d0t%Hg(FoaK>2aNU#GfeNE3_ zp>{4#(|tKvM8uGiu{Z^7I<~!EGH>I%<8=o+(9*H}oRw<9n1)^l5iz7>EKWh2j+~{B zt-dTPS9h=jEgk*K=Be^K(LqEEDH)4X(5B&m~Esnph{`tfF9_M655uAcH9oJ2soZkKHG5R>zftHT6 znH$ueS?2F1Co78J6twAB_}rrOif`VkJJ^Aij+)grs;M8J<^AqP5uAcH9jDJ)pMGJ@ zVY-7IXz6%w=ErLKD|Nk&D1uYarlaH9ed&`DLv#l_(9-esKbzGH=hgN)q6khwn~qP0 z6n9S4=&w82ftHTb2Ysf-X4ddJq6khwn~u91RdnJ_F4G_AJ$(VVI3?f2(+9Yn;ClCd}iZ8|=h z+B3QCu<2k2S~`a9oTl21n(uWG5kpGG;uN&$ICV(RWV^KL`tO4sXzA$M^8uCf!y>PP zh!|2b7N?+1$EvzLlgG!K4tAiWqx4@7sqz)x^g4)$AthsR3fgph^JYf!+|o7laj*j| z9mgilREaCsdL2Z>kdm=D1#LRMY@3ms{EF#d2Um8jKwKv)A7$~7bmNZt*txQftHRNTFh0&(hhkYM8uGiu{Z_o9Y=}o$#LuI=ni(E zrDO2vPpUhI9m8?_KM_Mp#^MyT>8P}!Yx35f^>hb2(9-eG`%kGwJcUIn&JP67*aA8r=U&8ibpR@KG&py?qCO6Iw~G| zM*VX7DP9K=F{ETHPC=WFPZBD*?1_fDgB@t;C^6_+)$Z!ky$&K`NXb~7f;Jr;OE}3_ zN1UrW*nyUgnJb=C(+8FFI*5oNC1Y_4+H~Alu48ii>*whXcA%vr=lBA(yH-W7gNPVX zdMr+P+H}mE(l&YT$n$jv#`-sL<9RQr_OtOCj))i&oPstToBFg&-nyif?qCO6j^q5y zg=+k#RlVaNB8HTV#VKghvF4g)$;?E1-N6pDbWFWwky`jEUhfhSLrTWt6tw9mmuQqc z^DF&YG{FwEbTl3GqI&ho>fUh>5kpGG;uN&$82Id2$+zCyWhrB4S9%Se$}39SiC`lGn1#Xz7S$ zwymtXEKWh24(HIR$w!Oz)gA0WOULN^GgW5CXT1(0Vo1qYoPstT)1Nvs`Pm0Obq71p z(oyn%)m8R)&v+d~#E_D)I0bDwzM0q{IWO}<-N6pDbo6?$hFaQmp4UM{3@I6lQ_!Yk z+xn)-*r^?K2RqQxapT&WYId!sybdB_NXb~7f;Jsj?P--9QMaY;UmVYAl#InGXwxyJZ};S}0p@i(JJ8bcSF1*9(Y{=-gNPVXG8U(xO~)m7U7TF= zvpL6M2UjAR>m8jKwKv)6s4~k7UMrbFRh?v~-;HT~pP1>tL^gh!|2b z7N?+1$Hf&gk~Mdjb53@krDJm8jKwKv({bCXjO5uxO$R&B($UaurOw@w?sX6mLrTWt6twAh{zyi0{9ERI z26mvOkdm=D1#LPeot=6w;||lo4zzTXTHa3WJle?XAR>m8jKwKv z)3NH3p2>}l>0k$1I@WFOpmwjV?R5|lLrTWt6twBsHM(c=f-m8jKwKv({cafJ(KrrH}7Au11%k8uZXJ~HDaomvub|Iua4-PEFxk^$yl6%HXRi=^-MnenCV~#TE?Bzv5Q)9#aCVj5iz7>EKWh2 zj=Y^clb79LI@p1hj-S8irp}nK+Up=9hLnuODQMF%=FgtVKd&(z>_AJ$*oS(k6Jww8 zI*5oNC1Y_4+H_1iH8Yvk&2+E>Egjzv%2c&4zT4{{B8HTV#VKgh(dNv|9``EnXGz3e~y!22U^D6*zy{6?uw`KOa~D$q+~2kL7R>mT{Dw?em5QL zK+CvKtQ@3nd!%~ObPy3kO2*<8wCR|Y`aG(y`8+DY4z!HBWbjb+Zpj0k$1IyzUrS?zD| zp4UM{3@I6lQ_!ZPcdyK3w>_qV9cbw|QRf!5?}@`+2N5x(WGqfWn~o)^j`w$)4tAiW z9{D>(ce1`cA#ZkdPwZ_+@32~T!HpC;TjyHCkt~=O)mbvG4jHxziyZ7^m zA~*$YI)>W-+OJJ^Aij!(MBRQ`^oUPlzcDQMHtBGplR>KVF&9cbxru866;9n-vy zD1uYareoLfTqonoI=X`$XzAE>ZA>j3bCK5(MQ{q*blj8bSXH`_?qCO6I(CeRsX5Q? z_Z}0Y2u?wpj$)~f>~~x04tAiW5eB?b3MiHEXHXW1y%yqsPoUJ?9 zftHS5i(+b0rN)jqjwpgt(59o!AGuD$Y2$PUJJ2%joE0%utIBY%BZ}Y@wCR}nTds5P z_%z+Y4zzT9^Fd4{`#$D%L=l{VHXRdw&2?VAXO8Y*2UTPIzb*ATq6khwn~oia za-IF9|ED|HftHSq2V-jK&6~ZBD1uYarep5Uxz2m}t8@oD(9-dG@gk~O@@KCjir^Hq z=@`2&*LiF2C%S_jXz3_YqljAlXL0WwCyL+{wCQNSBi9+X>o?uO4zzS!*|Uhc?S7mO zMiHEXHXYkP$#oui;mpdIcpXs$r=U&8-_vuQ&j*dv9qd3$$FVX+)$2bE@H(OhPC=WF&6nmn;}<-tJJ^Ai zjs=5?s_hTn;&nt3oPstT0}o7aT4t=&9qd3$$ET}{s!lBvUPlzcDQMGC;nE4tYkB*0 z2RqQxaeZ1bb+r3^UPlzcDQMI2+7;uSZw6J$liw?Lprs@JL^1Wz^as6;D1uYarsK4= zW1YM^+UX8ohNq8(jDwTOGne5B~-KHPk6@>MQ{q*bnLrigtNQoO5MQ@v~+xXtc03>J3gC; zA~*$YI&m~mF_R4 zIxRMzf8}IF5uAcH9oIH(<9xQIh3;SnS~~iUD6O_kFrT;OWJM92f;JtszN_dY7WdK} z>_AJ$j-jWhwqGvve&$gGr=U&8rmCCLi`KnKcd!F39gmDWRn=a*$m@tAI0bDw9=~dM zdgD@e>JE0Gr6X(lX{ux9i(W?*!6|6d(fy72oo=`wS9h=jEgc8fp02u2Kt~k8DQMI2 zaz@kD3)bq61Ut~u(XT>T^~bg7AR>m8jKwKv({a(&rSf*IG4~s=11%jljxMKS#n3@S z3@I6lQ_!a4mHOTC*4G>>->U>W(9%)#aCuerX8g>Fh#@6oaSGaWeD=(^yo;;ep*z@t zmJWRGEIKEPh!|2b7N?+1$BNYX;8hDt>(@T-_x&e+^IhiJY@9F4xcGWBAr2GJhFEuw z+aUFA(!WW(~ccnaDJ>0Wld`PwDlRU0yd_9^F zhi3?Fh@ML_l6RG>;Yi2er$)!ytTyZTTv~TTd|tPzN;>fMXhIw&pbha;>OK7;+t1V; z>_AILof_B2I~=a0`%?GgL=c>UHXW^ZU6TA}P!-+54zzTvzVWK~bN7|=I-&?pL7R>p zPxVdqE^?~wUL=l{VHXXCuS>3@7v~=WeI5%D z%lTeM6u~KI)A8-{+~m^Rl|QpiRen`*M@_jsCc!{LI;bmX6&;8^*hRg=?dt2u?wpj^B>vCg%>B zt~=O)mX3_cY4Js$P4|u?ir^Hq>DYWMH#zTUrtV+|S~_mOA}#J*KgH{aA~*$YI(8q= zO`g`fj_zOwS~^ZNO^dHujQ1I$2u?wpj;z#cpR}js87q|TU^RHuUNC^1WgQS~`~PZ4mE1sFT+bMQ{q*beu?aj4Z$CtyD#V9cbz3 zxW7UCmi%+Q4kBVm$yl6%HXVCY9plxPZ%YR|(9$vFNP~E#QD=A^M8uGiu{Z^7I`UE- z-7?z9Yw83$(E58-BrRTVR57oEh!|2b)-p;#n~o`|j>Xf)=ni(ErDJuKw0O<2-+1pK z6A?p7#^MyT>BvfTtl9IJ?qCO6I*K<-i$6YliPu3y3@I6lQ_!ZPN~+_V35#_HJJ8Z` zMrK-kcH4Ws4kBVm$yl6%HXYkjf9LHFBy|Tn(9)3@nHDegLUXT!h}7+hrd`J36twAh zBh}%~*r+?$ftHT-kEX?sO?b}xtcZvhQZg2&piRd^sgCh^U+E5Zprs@Ah!$`5=-sPD z=VTEPLrTWt6twBME!EL>?f1Ha9cUT1@lR>-<_ez=5)ng6#^MyT=@^*mXtH;g?qCO6 zI{MXU7@yI8K++rs5iz7>EKWh2jy|c5DI@fGZGs(W85ifZrh|wWQZg2&piRdRr}FCZ zpXKUvwez1i5w9`BtO#eM-$>O0d0r}2d`hGhf4tAiW);1sm!IJ#y@-q}Bn)E(?VOUIY@e;%)WBUS{8A~*$YIzB70F7H64 zn{@{}(9+R%%ZKsX2e$Oioudd&L7R?G_k5n$q5loKgB@t;XmP}izf!e@*AYc<3fgqk z8MrI2|Gc5PgB@t;s9g4~_(QXsc^y#%r=U&8&1WCY+m;-pJJ^AijwU@`jeqwu)kf9HrDMZ~&&O}9f39~NQ3R);O~;98rzCIL+gEq611%ltE1!%X zbsBmdQ3R);z2nHQkeoc~GTp%rv~+yh{*idktg~?(5d^28O-H{Y)ssu#%g`O{KugEh zw>%JU)vun{5k+tc+H?$?-yr!-iwkuJJJ8ax;O@!syRNV8bwm-If;Jtu-rgeFZ(1AO z!49-^{C;k3e8=P(UPlzcDQMG?^LwY{`A;;~9qd3$$NnmJ#W&Zg?sY^FoPstTU%cNn z+2WFVx`Q2P>A?HDqI0sM2u?wpjwL(4Nguc@TRIZA);vo+_MG{99#F5AT36aUe&FjC z5o3o5XhZaWbz}P1t#8uD!49;{eMk9f>eGwxm>5NH3fgqsdnB1&;_~6TgB@t;C{nJH zYLkJ-_9%i=(5B;uNw1~tc2Ege;#8mpc? zhW8Vr2u?wJ9a}P-&O1y8JJ8bMF1SN|z2SN9I9`h&I0bDwmcN_f{C3oIumdd}54xd#a1#LRUy^-PUFJnG~WCvP04*YSOx_aqSuOo`!6twAB@l=MBd#>qV2Ut35uAcH9amnF;aoh`bg%<0 z9s8cYLH)dXlh+YNa0=RVWS2~J{9-!TftHS|e;cB1KlHWN5k+tc+I0NynI6v2Q8o4B zE<4cDaqq(e)g71a_Bx^nPC=WFZFPD$i>lYs9qd3$N88)`t7bnQ@;agjPC=WF-4iZ$ ze%xa^*nyUg&QJAKUoQL0>xd#a1#LRseY3ms#?IRMIM{)fj#0%fSADL>XQ@#Hr=U&8 zfOon%)2h|g9qd3$$GioXs-sWfbLS|6Q_!ZP|D3MQ^Ha@hQFfrEbmi#dark* z2u?wpj?9JRQi?qCO6Iy%?yqBdNOeUYOGPC=WFwnZJM{B7sz4tAiWA1gdT#bI=Os^w~;1sm!D88z#^J}~Fbq71p z($TeUx^j==TrG;=6twAhe|<~mG^dsBUY3@qgGmD=jfnx-N6pDbj&K+R{gRT=jTxbr=U&8$9FYw zX7@Jd=j=dBN7ZVr)m=mDdq49if>Y3@W6$|Dor9nD(8s|Jv~<+GvW5DyYns;)MQ{q* zbTn>I&S}@_a^1lWv~)c9L{s(Qhv#@5Q3R);O~>>a#hlXL_tzclKugE|)#s`ot2g#K zq6khwn~st197%tt&b7LO9cbxT{&bo;ug`g2M-;&+Xw%XA%RT99{~4k?*nyS~oau|s z$%-O41#LRMoYup6Ziar%ka+fz|EY$htE`c+etlz+dT2;-t?_k>h_S;2v>`5-(Zg9f z)x0iY2U_}eH(03hAKl}9{t-oR3fgpZdaQ@@<3!WJ4zzT zCwn*z?=&6kKugEMW((BW9bWP}q6khwn~wVz^>CWqWIEV^mX1x?^HsNEL%fbCf>Y3@ zWA58MoOPF(4tAiWBjeqt)!Y~HnO79SDQMHNZc`5@tBvVk2UQ_!a4hAA0NPFK^x4zzT9efaRr=U&8gRf;c>nfNIcA%x> zyQb>?$j+pavcA%vr=e7IPfscE89Z^Iexd#a1#LQ7{gmNkykk1pftKUIyF2=rvZ4r1L7R@A#i}HGHM&$k zM_t`}mHO(+tJcU^r{1wreWeC!jju-&;xGYih`RN6=WQQuKJ#J+TKcBWd|PeYHCXrM zWJM92f;Js9UYMJ==hRX9IM{)fj*FgoOAYLCo!1dXa0=RVOg&IB@4G9_`-$v8OUFwK zR;U&uvb~Ndf>Y3@V^>~g$Invt@uuGEi?IVO9gXL`sebB>jwpgt(5BY3@qhjYH>8m=M*NN;vOUJUNZ>X(LU+Hy35uAcH z9aBr3?v%T|QpiM`S_s@4Ozo4z|Uxd#a1#LQJ4s7pCOEl9R>_AIL-fu6f)( z{pVj&{~L6c*AYc<3fgph{y{fqOnLME6+6(t3th zlT?p&yfZFiW!#xm)&JB9Yt^o z+H?#|b?hJ9M0c?S>j3PJ%Z8}E$nYy0(x9fEWJJ8bcVdtbO zeajTDBZ}Y@wCULRdv0?6)QP%-9cbz3-a4tyJA9tk5k+tc+H|~gB@t;IHg8X75n2WZ{4UUf>Y3@qs_tGhnDflBOey;1sm! zIQT3z{11%jFEXh-E zWp430q6khwn~qOj%1u_h{}SE74zzU4dNNOC9{Snqh$1)zZ8~0_o||m&=1ASa4zzU4 zoSdhgTvg0_9*iP51#LPy-I%&A{IhAggB@t;s5U%LE&aQ!*AYc<3fgqs*fKY{A#=X& zUyN5?0hs9Hqduf`6vbkzQ9wR&nz3$G)J;1sm! zxb>Xz$>Zl#(;e(UOGo>ytJQmt<8@*b!6|6d(Y)xmY3@ql+4qd_QxJ?qCO6I<|CPtzutfdL2;&r=U$ojn79U&+D~9cd!F39WR`* zTE+YH@;agjPC=WFr8i%j9QeXv-N6pDbPRZVmD;qXkJk}Ja0=RVl$v^R^7pUJ=jZG| zOGoV~tJEoOKd&Q-;1sm!_;ttm$;>m&c@#U)(t-DVMCW8h5uAcH9Wzqr2Ia0Oqo2>) zpGd0rS2We1rQm!(#>Lm832~T!HiW!SlDaHP&eak(H{a)XU|i|I*DWH(4inIZ$owbQ zIsU!A?=G?7rG08euljKwS2VtE5ixeq$Fw0PT+z&_Fr|G`jt0BCNh&t?8}<9%GWnwM z^=LvICZG**U+MFm!Ta0l4tAiWW7gN-s`R^0(|tKvQ3R);O-Iuc7dY`#TI&vWprzxD z(%aRlrq~}Rir^Hq>1flVt<&wb^K}P1(9%)jtnbzNyGwe<5k+tc+H|b`zLV4XjmElz z9cbxjdd?1Y)pNzYjwpgt(5B<3r!I0f9ICH7*nyUgPip+2{_AJ$@lLzczK?$K zI-&?pL7R@rSKZ`XUuL83Un88!9Js2RqQx zkv43Ps@dcVuOo`!6tw9WanoJS=gTkG9qd3$#~)kvsILZZ@;agjPC=WFrfQsX_vEI! zgB@t;c)i75HERDluOo`!6twARa{qXz&pl;y2RqQxad^^RHEh{xuOo`!6tw9$Yxo4G z=Bgd5ts&9Uw5zrEgjc%+NW;$?Md%Aq6khwn~v%WbDgY3@qf2T%Y3@8L2D1uYarsLETxy~7Py)O4{$Jl|Ej)9x@soNGD^WMLT zA~*$YIu@lmO5J?9?qCO6I!1i5PgOX)+3ScRI0bDw4y8I4?R`bofQYdJEghF^-ly_E zebMWPA~*$YI#MfBINkcZ)J{6sftHS{sgB&cCwLuE1gD@)$F5Yz&DD47H96RUmX0q! z-lygcP4haU2u?wpj%BHi%;pz$kmFznS~_0bxKBNQ*JIv$;ZX#qpiRe^RL3VBCg~1# zprzyK4g1u_+Oxg2yrT$CL7R@&sg5h&d`5S$11%jJQh$SAe7nc{Y$A%_6twC1J#}8& zx5NtF!49-^bbV)^`mxHDj_91MD1uYarX!i^==a!q-N6pDj9V{npW1N`_DYE&I0bDw zW~Mss{p3sC!49;Z`-*+)y>mbJjw6c5;gqLM$M96gv?@R74y3e0#HCC2sYCCSjGOOO z6u~KI(~(-+&`E!5ukK(6TE@k@38o{8;1sm!kiU!6zl6MJf<5TP;rAABJxhQP$YF;G zyo2Bqsqy7skl+-q%kc>VqzHDHz&i*96P&{P0RbW*vtkEl^pfK4oGfoj`Z(BO0_W<1 z4vXLv&b$MJo)tSdcP{*_n7~iTEcWX`B5bQ94voOEIgAxuCoWePkPb3TyBshh4pnbycV225uQ~8A7!33x9 zPP$L{9qcfHb1I+kJDA`UJ`wN$Q}~3& zC;Sd}n7}!ePxu{7a0;I^*#tXG;PWq^@Mpyi6F3X=34c~ha0;K}`GnuW4ih*F^9jF$ z2~OejNSk1X34BWG6aK8&VFKrEKH<-b2~OeDUZ3zg*kJo-JDA`UuH^9vzk?knaD9$Q@C!;C;Sd}n84Yj zPxu{7a0=Jo`GnuW4ih+=^a;O%2~OcULZ9$E*kJ-^lRn{hFu^HY59t$r2Rlpz&MX7x zA53rx*LB(*0f)|IaW?4_{&6tDDO{iG6aI0q!$jygXR0URFu^HYXKQz`!$j~JVHrI2 zU+Q1NzmizSV#2y|AfbU2!44DnyxyOc0scjBDtP69Oa~pfgF}yXe1Y0st75)rKBo@8 z(hoR9Y(HnES}>-erlSc?^)H*J%I^##aLY8YVhe#syl}rTO*oh8$5D$nE2=Yr_`eHMM655;1nN| z-;w$$CIU0z8Q#!ht}2#xNYBtGdbOLair3#A?9c=|Obn{? zn0nxGFRLuSPe6Szag?qGsbrT=Sh1UEgmkdOMDVVZ)VEds zCFF0A2~NHA`+e%zcQZpe*kJ{)L4qA7cn^7>&_54$ zn81De_Hi)5sY#Rjs7Wm*rrQKNOswtSTTK{Q+zAkRR_ri=JN*NM{$4S`sdp~9RCUek z64JpA6M?(_@d{aYFu|$s2W6_-7vCN1&_uwYbq2;h)I*&Z`%I9~M;>s9z}f)zku$-m zpTFp)&X}+|*r8{|4ij@ac2O&?_$o-~S+T=JaLs{KRQ@I8k%0+LZC%+}H9zIoV238y zVWR96adqRSlJUTiOO3-06Ik0aKQY8m8UB1g9Fht<)O%2Rlq){Y<-q2~KU>*;q|%d0R*aJ4|5xOuK^#PW{!Yky^AbH>86dCa`{{-N6K> zZdsqEj-GmNutWcru){>7r_WaFuD?G>=-(1{n81pg_N3l>A?HmHpi_K|;@p9VW1Hs68ttI5j%| zOqJR3*^mx)n83=Rb_WxjdT3uYb=qamg>gPU2bJ8Ca?~u-N9pViucY9zTRbr39JJe=t#{h z;qUJ&4yUlHXMjljo8T1h8XTMzJ4|3zPrHK&PVw%?!47tqz^a~s4t?ZIa0+X5+5|gT zWm8f-QuM5t!1|eX2am-mtcDpN^v{C{PVsKk!CA4x1XjZgbm;FD6P&`@mNvl-R;QE{ zj}$#CCa~^gphF)ykHsnM2p%Bxaj?TgaCOR5)ccoknBWw4s|a)?j;dd~>DePV36MhFfOklSPpYS`F;1u>? z@(I6#9VW0_g-`e$OmGT&N%@4|!44DHt->e#4kkE-J+W+p9VW0_g-`giVuDlH+sh~X zS+T-*VUIGO@H^OH0=rfCgx|pgr?A(WPxu||FoE4Fe8TTwf>XgAD!hW! z|AK#m*l|k6<-g|O;}tthJTmfBReSBCkk=*bFoE5t{NwPCoC!{0FDaW~C*9j+N>V&h z@Hp6E0{cAK9ZYa)$Iw$$+b<-N6K> zu&29Cu!CLM3qLC+u;04f!L#BNc26&u;8dmiOQ}wa!_K4FVFJ6S+Z{}B3VWd!OmM2z z+a* z77Qw?wm*1FNC!Ji1olP8CqL#{jmM&W)sK}as$TzTKuAZxAp(1$+sDBKr+!;oL`@u- z5z@g96W9yg?qGsb%O(|3J7cXwI@k#i-X80A2NPj?p%+Z>&gNJ4ETV3^|6iY&=${8W zOz@uN!DlrlI8~%Z5w-fy;vq-Q4img*d9Z^CPQ6~dh-#MnIry2EJ`Q%6;62NO9ZYa) za{4QCRJ)2(!mZB`)0?~@6JcTPs8=koE;{3U-aOtnBY|R zX)$%zgugr4e^Kl(!TX{IJDA|qCF5dhTkVEK11Q)Z@*NO^>{TI8VbLt}N&Le{gi34`HsdLNUuK8aGx(?Xj=FaP% zT5BEzmF_;j@4Wx*wS$Y<>2^>dvGIYobtFI%=i8Ug>u*kit~L5T(Ru!p-*|Pytf)M6$&;Od>b0m=Ga@1YLSQG9f|+6%u;xG9f|+3A*&0 zXF`MwDkSv$XhMVx5_IW#)gnQKgr12_h%hTEB=oFpLWEh7pi9s8CPc`fLPF0BCq&2~ zL6@FUPKb~}g@m4cPKb~}f-XI4T_mWG(DU305oSe&gq{;mh%hS>bm_VDga{c_Na%U@ zga{cV=+g7`MS=Ufk8VOCT~s4r4`f-d!8 za-uaO`)MTIf7R2;T+B|7!l{r@4=K+G0hU36E_EGCh%hTEB-9tHJwccHZ8_1fY1yo( zsE?Pqn4NAp6%y(p<{2@fl|h0o^(J$o5s^mHNnAb8=6_Zs)Njo*<~b|6)W^*UpA{AL zhnxRdkx*|s&zR?|=u*!+Cwx{^)Jv~)RxK+1dyvpss%QADsE|;9!1e@PIlsuu}vEnhdSCl?7SB((0^o}f!B&_#j@39UvK2`VJC zo?IlTkkGnsdx9>lKo-E-p@Z1{D(O z8q=PjOFdwm@L4f~F7Q=gnGa@;Ta_8Qr{ORJc9}e^?-50Gf2>-E-p@Z1{D(O z8q=PjOFdwm@L4f~F7Q=gnGa@;Ta_8Qr{ORJc9}e^?-50Gf2>-o-9sy1{D(O z8q=PjOI>4%1QqptF&DGLIgW1!6%y*=Qp})2LS19p6LhHuj1xX9X3(X+FHZQYONE4b zz&POQ=gu2GGC+JcS7$KfCYpi4bqobXqd8FZ=dixd9pQX!!p zFiv;|3A)tx#R<=#LP9-YobU`1bgA!)6P`hZggUx7;Ta_8Qm2?AL4}0+zBu8tqC!GF zV4Uz-k)TU`U!3p^DkRi3#tF|LL6H*_~&x!ign^XHX%b z-YHIa1_`>!e1*Abg5HJ zk)T3CU1N#_6%y(cQzWR6P~R6Pe9NhjP^Skce9KADrA{$Lf(i-seJK)DNT_R!6TTfJ z=u+PoCwx1okWdd8Cp?1$UF!SdglAA8p&l?!cm@f&)c3^+&!9p=Jz$*h3=(vy?~4MS=P%9c6$!eyO`Z`x z9~_r6RM(JV1{D(OAd(Ovg9Kgb0g@2m^Ff7#dXBUw=u!ufgb1@@23_hJk`Q55R7j|U zNJ4}R5_G9+NJ4}RDkRiFBq2fu3A)rZBq2fu6%y(ok`N(-1YPPHk`N(-3JLWbNr;d^ zB5~ziLlPons85M0B-BA9AwmWTy3{o!AwmWf66zq55FvvEUFsT=5FvvKiM#V|Bnc5R zNYJG|BMA{QsE|Kalc zsE|+xk@f^#>H$(DsE|<4k@f^#>LAjdpi5mtiUbuB>LAjdpi4bKiUbuB>N(P$pi3P@ z+7ooCYe!a2 zgGhUVF7@Xq5>!a2=SX{kF7+I7qP3T{pGK34`iz*1*?vS82r4AhLBumcf@P4POMOO) z1QinMMp7hrw5_g%=Hk(Lx*b$Vs54?Qg9KgbzE~uvsKev@&x(Y)NES0VE4p}2m2NrD zm(-Wj#^w1{N>CxebHkM2nWFlcS_aQ7Q-b{q^zVThp??pwxaCwx=-&f%q7mPUjV2Wm z`d33EvDj9-HSgGIt)@}?O&M8Rdd{-j2ZTgJU}M%32*!9sZk zh>Bb`7G0`i#>p3++FW?=lR^d+)s}Jl;v;JV`!1YkfT+l2W6`BLW_14b#O8`OUmh~3 zsJ4v7S07pH|KcKf28fDWHWpo~W5%#`e%*ZW)jx#{Dyl8xu$@NM)?9muJOe~UE*pz3 z)iL9aQx0kNf8_I!K}EG?JU)12?V;6|&NDz%BX?GqbRR9lAj ziB@+F0#T96#-dAg%s6|=kEflu*J0IGMrD!SQMKhRJ12Y&=KgF{?ef*n54C<@PMAVM zbtH~nwNLZaU4IrbsHnENufFQ2+LqT}n12S#2)b0qjDAy>Z|?TsULk{uYRh=7vC;H_%{O=N8#1VSbWQowG&^wI?pI0=u#ases<(B&5s5@5HhH!wv3^xj;w95&~^MYUzTw&2Lxg?HbOXOt0isg4<&95cB2^yT}63@WNEaZ7 zGODvj)Xw?G-FZeCL6_>7vB*XB<_n{{LIxGpmhr}uBWgW2OwBXO2)b0qjB(G_oBQm% zM983`+A_9$d_?WMJ*VdxWdvQSW5&(@syDB>;*9O=wW6ZhGA6f7@k;BMdg>itY-1TzR9nV^IM(hOR7TLH zI%a(S`7Ir5U2(kauNqHIyT10Dxo3v?HZQ!sw(nDCgj&BZ5EUvUR7av`k0Bi|fA7?= zPo$#Sw&RsuuCE<;-|6{lRYuUII%cfAcSpza7Yqp*R8(8WzMouIyX=8Ro>4~7r8;Ju z-FKyqYjzqIGN`Dwi~*yst8F&9o@bO1bg7ORuU`KCfCoE=hYTvJEn`x@>uO{A4$m{n z2)b0qj0qk04Y>Nbm_bFgWxO-~+S;mPhvpe&1YN3Q#*+Jv8L&@BJ!}UR)t2$W+Sk?w z?lUCMC?n`n9W!Rmt`AtW5i_W$wv2a2j;X!8`QSXGjG#+(%$TzKpaDwu~=7 z>8=gk`m{WwjG#+(%-CkgIs+blEM`zqZ5g}m-CcX+=u`8IGJ-DEG2`PO|7W`mUx^u1 zREO7U;x)D7A3P<`C?np5OLfdRc!57|H|~S{waQ(l$YmLe&b_*}>Tb#?Bj{2cGtT_O z7TYcKMa-b0+A_X>`EP40JbH4z9c2Vvs$<3@pKUd{`BluIqS`X1u6tGO%fBn5jG#+( z%viPKtSKk|D`rqpZ5hqGuBfdsL9bOAL6_>7@!bzUopSQ4F@uU~%lOft%WHQop!aSW zL6_>7F>}Iqr{4Ea%%Gy$GWH&OS#9~Zlu<^|r8;KpvgsaE&%PyQP*H6eo6Nbiw%9-Q zIWHsVQXMmPIRAvH3yz2xR8(8WI|p7`>*%L_Vi`e~>X@U!E<&JoF>coLDgNka)*l>$WYQNl2#|&izU8-ZoryDIjZTpe& z`<#ku%h>Fpi)+iR9*={%29*(Xsg4;NcYc4`>IV%C--A?CTgD6jdvR_5wc~MD*Pt?j zF4ZyP&|CMPmURve8B|nT#-6KOTw7|(v-0;<89|rom@)V8i>7V7*~uY;ifYT~oi(bq z(9h4#Gs+0MRL6|1`()F)-aaN|P*H6eS}(D>Yfu?Mm+F}D@PF#nt=`(&&J7yZywX$K zq4r{!?~IpvYR4S^RH*g)0#TttLUkk_pHZ(Kv3lQdjzdMY&Hb=vdumJW_E`Q}l@WBQ zju{vJs$O07jtfEt71fr}@2@?z^`~cfMj1hu>X>oanBmpK?s_U@P*H6eAK%|od+3#W z^NccrF4ZyPq>f?Lot|AOoI6udZ5g-R(Np{E@;md4GJ-DEG2_9-hgAPPcGr+WMYUyY zI;N*K>G_-Uj52~Q)iL9~-cza*Z#+F@P*H6ed!N};Tm822c}5vQm+F{t{lpWhtFLrJ z$e^OyGCuufPp#h)WAltMf-coDW24LduR8009u65)R9nVJojtW#uV0gAlo52Pjv0r) zd02Jnmp=>{R8(8WI;-{6I=9gpSs6i>>X@-XZQttd*DW3PB~(;f#*y!htsUJ*Ykg$| zU8-Zoy`y%juJS~`kU>SYWn4LVZ0&#nqw?3PjG#+(%(&<~Kd2u3+EyWhifYRkeb(68 zN-t@Bw~U}mb<8;9-nFV9{B75eK}EG?Y`*K*+KsQBmv2WIL6_>7aoqncUOjK_{vm^k zYRmZPB4cZ-?iAO^y9SjJbg7ORU)}h2$LuA388WD-whXOUSlu8Y)@VZ0up-I!e(A2O(@wu~7gdTP@bUNpbPQby3FI%e$n?USoV&b%mOP*H6e zhu_juTjLa6S1TjvQXMnixN~rI>+SXo8B|nT#-5W~-%)4i`d}GBm+F}D?%hMHKfQjP zkU>SYWvn;7r*`J7FZ0hw89|ron6c~%!>hOcan4lxn^RG384LWSr#9%oIeA7IL6_>7 zarP&}t2@uWCuC4jZ5fqWJ+*bu`83ZcBj{2cGwvK#uYR%O=^=xPYRjlT*Hi1*_rpA+ zjG#+(%(&;#dUe8g)(aU_R9nWgFZR@CO#6GDQAW_EI%eGbVZHk6jc&Jl4JuSrTgC@3 z_taLI{Cb{IM$n}?X7qenuiid>X1Hg9ifYTy5vSE%gUSfHRL6|pZn;}^`<>&xA0N%R z-tYI&KFY?`@5>2ONT`lP|JlckYaLEE?X}WfAsp9g{l1(qMKd8CiPq4K_+P{CLLp&w zdiAyC&VL$-q6{O_?P%E>5lIQUv=8=K8PK9qf-YVw4tEH(-1gJ(tJ5|X3GIW6861l) zUh_^fsF2V;xR^nLE?&F$jD~Fo6%xFoz=^QsR7hyAU7QsOx_D!ZNUBih8v}Q$uE?p&cq7jisl?n;1YdGNqbs^ z1_`=!6{tvPjl>jPueF+aVSnWrR7mJbY%zlbUAnGXBseZ-sH@gRf(i+(&$K7#($)7O zL4}0YXWA2VX|<(2L6`13C=ygiXtkw1L6`2IC=ygiXtkw1L6`0WDH2pjq-!$y+pzV2 zjVj+ix_)ls^8Hr+-X)VE)rBo=qhP@f-YV2 zbfOXWK#i)dRGPx;js+s$Wi_f)NN~2vXV6z`xT<2cRw=9wgl3f}T8A;0)=QkwtP+AQ ztx`DQ8B|DU#li{CAVHT_DV*>ODkQXG;e=<9pi65GPIv|t5?bSM!ZS$Fr4@_z1YKIC zaKdLrg@jftobXwZpi8S1PIv|t5?Zlv!ZS$FrBw`TCs4#Gf2>-RSG9Og9-_)SUBMsBXkg9Ke#rEtPCsF2W#g%h4Zf-aqx zIN=#oNa#4&3C|!wm(FpD1QilG_bC!oNa%d0NKhf6^PM6=g@n$1iUbuBI^QW0R7mK2 zr$|sCp>v-iL4}0QcZviR5;{*P5>!a&+^0Q3m(G2P1Qng{n2XuzQ8*P6I`=7Nkf2NF zB1M7<37z}2C+O1IL_)MahmGWZN}Y?CYo0{wbJ$1}5;{XlG71D;+`jbH)tQiurE@B) znU@m$oNM*N2<|abf(i+(wiLI61YKI)DH2q)QZ)awBB7P3Vg_eLmsY}x1Qo5l&i|}P zXic`5!CBFzb=V?7g@jgd+Y@wY9kxhNA)!^=_5@v8xh)b@NN63lNKhf6RowOjU0R1N z5>!ZN6}LS>m)2p61Qilm#cfZ}rS;uN{A=8n%|j30BHUkcMQ3mJJ(5tk!&F_#T$gprYDlGUU!E*SbEQ zw#$}>g$ydHE#s{vdb5B1aQXb6I}jDQY%ID|$BcXX-81c5FC7~)sHnD#*)NUHCQnfY zh>Bb`7G0`i#+LhCJngeFCxr|usx4!eo5p8*{Ah)IJ3v(Ava#q=9W$01bkwwgd!H6E zsHnD#fBbrUHg=*iKvd+ivFK7AGj2YxV_J6pkdQ$|wPl>X;rQ&f6;{l*14KnG8;dU0 zF=N+<)|__uM?*sf71fsUr{~6HCv+(TL`5zei!RkMWAx~Srak!bu#iDTwPhT3-ni_! zN0b4gBA1Otm+F|Y(S+xweth=ukU>SYWvspFxa{?nSIS>25EZ#>EV@+3j1#W>!_+?i zi5XN>TgIJF{w_P?AZ384$Yo>Er8;H|8hq~5uH)-rJE*9(jO`cwU3Soe$^cQ3%f_Nh zb<8;8k#(nj^k~eWqS`W^+WdyB?-DELuN8=jTs9V6s$<5a^F~bh(PuG(ifYT)X1|{7 z#0`}Jq9T`#MVIQBap;FvZ@Xjb8T8gZu|h?)WegZRHv7)El~G2}r8;KpcjYVFt@l>U zprYC`Cfsm+_RNR+dz2A$sg4=vUUuMs({6|vR8(8WuCuSpcE4H~WdvQSW5#lGt{$+; zjxmFZYRkC#)a$Y>4pl}OL6_>7vG$tH0gJvGJ|7h-sx9NqHLuGyUqcyX1YN3Q#-h8v zGvLI1V+Iw~mhsxd*JeL@Li>_3f-coD&fX+%a&ku-~mvQEeH|_itsasEjg#F4Zw(=V$imxcjKV;qyU7wPoz~@tACr8}%Jk zM$n}?W?b>?SslA?drHWlqS`X{oH8a`puaN82)b0qj5TkY(6Q2azX=&sR9nWlkz=yk zZr3qG89|rom@)1zFLiv-ab(D#qS`VR{l78U<{K!ZjG#+(%ox1Ss@2hzfgyv6YRmZk zPse0KM(Y@^jG#+(%(!-Ly}8Q7CBuE;_q^Jh{d})$nl|o)mwU5cT=h(-_4{(d6cVZ< z@x>SQ=ECc*X&DVFsx9xB7kjhbIg91@o`a~!Wn)Lh>Bb`7G0`i#!voJZ~o`K9YO{b)t2$gzx8Gt4B0-<08x?4#-dAg%-Cj5y*Yl^ zfgyv6YRkB4R&RFh69?rPAS!a%Sahk58SnkO-u&RM<3k1&)t1pcvp2h7(-ZRy5EZ#> zEV@+3jKf+zYc71{tdK!PwPhUtWN&uto_anCL`5zei!RkMwu}}3 z+?!px%; z86YZh*;sU`jv05nQ*X}sdn_buh{cA4JxWFE zr8;KZKD*w0boSCAgNka)_`z+heehP#theA&9Wy?@vEKail6%L$NACJ2@vCckvt=$- z4^t2ojzyR1nDMjA>do)mbacp|qT06Op38f)b*Jl@I1m-NY%ID|$BZXWt2b|&dq&8h zqS`WMj_S?Mt5x!IH4qiKY%ID|$BY&BuQ%%-j}94BR9nWB^Lw)u-(E1!08x?4#-dAg z%y@Ledh?)J<3a`%)s}JmnZ4O7d#k@Fh>Bb`7G0`i#slvRZ?1gSl#oG1wPk!Xv^VQ} zj-D9>QIX5WqDytmxbu?X%|CB5J7iE%Z5bUW_hxSnUp#-UKvd+ivFK7AGsZ1Hym{S> z@T_HnifYT)|G3uYykp5c14KnG8;dU0G2?~3hc)MnUcsIjZBS8d8QUJ!o3;KmyF3F# zMJ^kQF4ZyPi1mjy$NpopkU>SYWxRW6Z`N3TnLGnTMJ^kQF4ZyP%?$@P-xz#g$e^Oy zGLAT~H`{xI*i*V|5QvIgHWpo~W5$lBo!lIF$OR#TifYTaX|LYwl7+sNZwH8qTs9V6 zs$<5=cOBbYXMsr}gNka)n7mtW_P@Q#08x?4#-dAg%((yG2Q|NSZ67=TXi!mY8Cs{d zx@!=Kid;4pU8-Zo8?Ez?XAW4%zRxRnE^uSk@3u#`x3P52VYPl=PMAVMbtHcMWj5uw z*71*J+`8lB?Ak?Ugba;q8Tx%WVG0S=k!Za{VSHswI$}U4$5m~=PlyHyQ#2D1Hrq(d zn7P1|kLJc+NOSw#ob^Ar!!wkp-h~U4C;Uxx#%r!!2ad^3 zJv^Q->-Xh^DI`=!qR$%#Ryz(`BxF!gZF$3Y9g`ifp3cw92)b0qj4P)dU43YW$L(`o zp`zL{epnroJvdmO^D=@i)iGn_rzckLn|fKuprYC`_S`Q`kU>SYWh}hbnC$(UzH7?}x>U!E(LWwuo%rdycFa(rqS`WUT6s+N&@MV= zC?n`n9W&ONF}!-q0S|->Dyl8xmSx9e$1S8|pE80j)iGnjM)m3mYldUE3Ki9svCQJF z*Q%>e{ykVm(4{(N{PDhV7uD+ApZOv`|0pBqQXMlEYV`yB#f&{d1{KwovE#qGv-@69FN-pQF4Zw(;QjUL znbplg1{KwovCu!ev)w!NZ$Xq1bg7ORPq%u79kNv4kU>SYWvu*OclP!tZ{)9489|ro zn6b-?_3DL(Efg}SsJ4tDZ+B<6&3!)4C?n`n9Wx$%vtIq%7O#cl5-O@KqyOvO+1>lh z%rnXex>U!E4d1I*4>SYW&H5v?riDL9?mn$2)b0qjDLPqudX$ILdc+^+A=P9 zzB_yT1@*u#Bj{2cGe&({ul{P=unt$DqS`Vx{9AXn@M2n9DkJDp9W!?ScfISYWz=SNXWOiJRi05s(4{(Nyxr>8 zxASU03>j2ZTgK!kyR%=sAOAgtu0dr4U8-ZoimhYBJMUdBWKdCU8K*wcon8CcN%?k^ z5p=1J8K1N=RycQokU>SYWek42JF6bMU!GA$(4{(NT;1v?^Ird1p`Q#D)s`{!(eCWA zZMV!b$_Tnt$BY$PeQ{sg>Xwi}MYUygKGK~Xwg2*YMj1hu>X>nKE2I0I3ql4J)t1rc z;qL786P^p#Te=375p=1J8NIEHpX{=4$e^M+WIWWJeSXKtJfoC=t506Xj3-+etJcea5|Z>_bJhjr)hzIl~(_e7_@Rlo52P zjv1e~G6oDgHe^syZQ~x%%DDKHgTi@9*Pt?jF4ZyPt5(L(esjen+YTzKEraJit=?@V z1YN3QhK=3&Y1sLc&N)ocxq;Q`IZp8B1Qimxx|n2GOqB`=ohP&>=+aStLWJ#L23@+Y znh;@DR7mKkKOsT}3A%KBI3Yp?6%sn?Z%@#rWB7y!vtkBax-y;+VOCT~=omgBLIw%C zbcH`5LIxEQI)+b(kU@ej-KmfeA%hAD9mBUL=+Y5+LWEf{gD%~pkq}{4R7mKEJRw2` z3A%KzNkW7SDkOA7o)95}1YNpkCLuxw6%slkZ%@#ri*W@JCDjzIYpP#cScj%14&B$vHxsF2XHZ*f*6=;HP0G=mBW9s3qDNYKUW>S+cQ5<2!RW{{xk`26k! zCt9zp{WScJ1XD=p*w=|*|0Y2f?{i4Eg9-^9`xY}u(8c>TLWa+Z3JKmtlFo_>2^}pL zXGMZ8-VKvxP$8kC9q-aL)jn12r49W ze4WgyNZ^QEN6QJ(una0X-ZdAq!*`@geChh;wTZ7Ycx6OaWsEKmib)g_oNfB*a^KE7NBF&x5>!a=o{(~a zF5cmh5>$AP2D4Lw3JKnQQBKgsd(u;a3JKnQQBKgsd+Sqz3JKnQQBKgsdnw8Zy7*K< zN>Cxednw8Zy7+WNN>Cxednw8Zy7-hwN>Cxednw8Zx_DL4^eGb0{b1;#~`YXxP_{eMj+L z13tS}Abd|vg#@2UOJ_xbE^c2+a8|tQfq71Z?cj4PdYZ$&akzK&Ew_zN6cTz)qxkL2 zvFPI2QaUR=A7f+bITouq+jLe`NN|P;k*v4rXrQ=8W}Dplul3VNR?kT2yEd*4Mt6~* zOGg9qCUge`2^|3>M8jr9g@ld<5+ZB|3A(J-JsSS^2!xKQY%Cp-S=+c>fk)T3CD+uigy0l_ZB&d+k zN=SQxF0H&22`VJCqSKzBODjl4f(i+p$rK4HB((a~o}f$LT}6Tl39aI_C+O05RFR-U zLaUMO3A(i6StO`vRn=U~PWSCpNa(x0m_dbv)_U6$bm^F(NKhf673lT^U0U%j5>!ZN zCA~dCmsakJ1QimxBG8_oOIIL@1QimxveBNPOIJ_Y6LjfnO_88NLRW#>6LjgSQ<0!T zLRYie6Ljh7S&^VZLRaP56LjgyUweWsU1=;5R7mIwW_yAzT`?^ZR7mJbYbiiB39OwnqT z)tqhlc976|SuulS(WUjdBEfMvL#<^M2`VJC64sueORHZ+f(i+(Wfci3B(xINo}f!> zSw(^h39W>+C+N~zR*|4WLMvhI3A(iURV1j8&{|fJph7|`VeJXJw3byQsF2V~SbKsl ztz{JnDkQWL)}EkCt6xQe3JI-c6$vUNv{KZbpi8S?MS=UDkQX))t;bB>sLiW st6ZjN^~>sVf(i-FHr0h?mce~xN>Cx8t0%?nAVC+;WV#0ZKO-g#VgLXD literal 0 HcmV?d00001 From 98f3dbb028962ab843b735bf3d7c378151ff3b82 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:10:21 -0400 Subject: [PATCH 04/19] Tronxy Variants Needs to be updated with relevant settings --- resources/variants/tronxy_d01_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_d01_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_d01_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_d01_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_d01_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_d01_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_400_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_400_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_400_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_400_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_400_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_400_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_500_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_500_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_500_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_500_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_500_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_500_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_pro_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_pro_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_pro_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_pro_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_pro_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x5sa_pro_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_x_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2pro_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2pro_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2pro_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2pro_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2pro_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy2pro_0.8.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy3_0.2.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy3_0.3.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy3_0.4.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy3_0.5.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy3_0.6.inst.cfg | 12 ++++++++++++ resources/variants/tronxy_xy3_0.8.inst.cfg | 12 ++++++++++++ 54 files changed, 648 insertions(+) create mode 100644 resources/variants/tronxy_d01_0.2.inst.cfg create mode 100644 resources/variants/tronxy_d01_0.3.inst.cfg create mode 100644 resources/variants/tronxy_d01_0.4.inst.cfg create mode 100644 resources/variants/tronxy_d01_0.5.inst.cfg create mode 100644 resources/variants/tronxy_d01_0.6.inst.cfg create mode 100644 resources/variants/tronxy_d01_0.8.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_0.2.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_0.3.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_0.4.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_0.5.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_0.6.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_0.8.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_400_0.2.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_400_0.3.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_400_0.4.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_400_0.5.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_400_0.6.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_400_0.8.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_500_0.2.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_500_0.3.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_500_0.4.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_500_0.5.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_500_0.6.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_500_0.8.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_pro_0.2.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_pro_0.3.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_pro_0.4.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_pro_0.5.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_pro_0.6.inst.cfg create mode 100644 resources/variants/tronxy_x5sa_pro_0.8.inst.cfg create mode 100644 resources/variants/tronxy_x_0.2.inst.cfg create mode 100644 resources/variants/tronxy_x_0.3.inst.cfg create mode 100644 resources/variants/tronxy_x_0.4.inst.cfg create mode 100644 resources/variants/tronxy_x_0.5.inst.cfg create mode 100644 resources/variants/tronxy_x_0.6.inst.cfg create mode 100644 resources/variants/tronxy_x_0.8.inst.cfg create mode 100644 resources/variants/tronxy_xy2_0.2.inst.cfg create mode 100644 resources/variants/tronxy_xy2_0.3.inst.cfg create mode 100644 resources/variants/tronxy_xy2_0.4.inst.cfg create mode 100644 resources/variants/tronxy_xy2_0.5.inst.cfg create mode 100644 resources/variants/tronxy_xy2_0.6.inst.cfg create mode 100644 resources/variants/tronxy_xy2_0.8.inst.cfg create mode 100644 resources/variants/tronxy_xy2pro_0.2.inst.cfg create mode 100644 resources/variants/tronxy_xy2pro_0.3.inst.cfg create mode 100644 resources/variants/tronxy_xy2pro_0.4.inst.cfg create mode 100644 resources/variants/tronxy_xy2pro_0.5.inst.cfg create mode 100644 resources/variants/tronxy_xy2pro_0.6.inst.cfg create mode 100644 resources/variants/tronxy_xy2pro_0.8.inst.cfg create mode 100644 resources/variants/tronxy_xy3_0.2.inst.cfg create mode 100644 resources/variants/tronxy_xy3_0.3.inst.cfg create mode 100644 resources/variants/tronxy_xy3_0.4.inst.cfg create mode 100644 resources/variants/tronxy_xy3_0.5.inst.cfg create mode 100644 resources/variants/tronxy_xy3_0.6.inst.cfg create mode 100644 resources/variants/tronxy_xy3_0.8.inst.cfg diff --git a/resources/variants/tronxy_d01_0.2.inst.cfg b/resources/variants/tronxy_d01_0.2.inst.cfg new file mode 100644 index 0000000000..2c68a89553 --- /dev/null +++ b/resources/variants/tronxy_d01_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_d01 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_d01_0.3.inst.cfg b/resources/variants/tronxy_d01_0.3.inst.cfg new file mode 100644 index 0000000000..273fa67d62 --- /dev/null +++ b/resources/variants/tronxy_d01_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_d01 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_d01_0.4.inst.cfg b/resources/variants/tronxy_d01_0.4.inst.cfg new file mode 100644 index 0000000000..ed7399d68f --- /dev/null +++ b/resources/variants/tronxy_d01_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_d01 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_d01_0.5.inst.cfg b/resources/variants/tronxy_d01_0.5.inst.cfg new file mode 100644 index 0000000000..f2e1140363 --- /dev/null +++ b/resources/variants/tronxy_d01_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_d01 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_d01_0.6.inst.cfg b/resources/variants/tronxy_d01_0.6.inst.cfg new file mode 100644 index 0000000000..e40f0f534a --- /dev/null +++ b/resources/variants/tronxy_d01_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_d01 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_d01_0.8.inst.cfg b/resources/variants/tronxy_d01_0.8.inst.cfg new file mode 100644 index 0000000000..ead9789597 --- /dev/null +++ b/resources/variants/tronxy_d01_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_d01 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_x5sa_0.2.inst.cfg b/resources/variants/tronxy_x5sa_0.2.inst.cfg new file mode 100644 index 0000000000..43d7ca49ec --- /dev/null +++ b/resources/variants/tronxy_x5sa_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_x5sa + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_x5sa_0.3.inst.cfg b/resources/variants/tronxy_x5sa_0.3.inst.cfg new file mode 100644 index 0000000000..e541d8f03c --- /dev/null +++ b/resources/variants/tronxy_x5sa_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_x5sa + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_x5sa_0.4.inst.cfg b/resources/variants/tronxy_x5sa_0.4.inst.cfg new file mode 100644 index 0000000000..7acad15016 --- /dev/null +++ b/resources/variants/tronxy_x5sa_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_x5sa + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_x5sa_0.5.inst.cfg b/resources/variants/tronxy_x5sa_0.5.inst.cfg new file mode 100644 index 0000000000..b897a2dcbc --- /dev/null +++ b/resources/variants/tronxy_x5sa_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_x5sa + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_x5sa_0.6.inst.cfg b/resources/variants/tronxy_x5sa_0.6.inst.cfg new file mode 100644 index 0000000000..5a47e1192d --- /dev/null +++ b/resources/variants/tronxy_x5sa_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_x5sa + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_x5sa_0.8.inst.cfg b/resources/variants/tronxy_x5sa_0.8.inst.cfg new file mode 100644 index 0000000000..4c678f7bfb --- /dev/null +++ b/resources/variants/tronxy_x5sa_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_x5sa + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg new file mode 100644 index 0000000000..da621f3bc3 --- /dev/null +++ b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_x5sa_400 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg new file mode 100644 index 0000000000..76fea3ab99 --- /dev/null +++ b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_x5sa_400 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg new file mode 100644 index 0000000000..f57e7690ce --- /dev/null +++ b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_x5sa_400 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg new file mode 100644 index 0000000000..f20a2d82f8 --- /dev/null +++ b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_x5sa_400 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg new file mode 100644 index 0000000000..881d51da13 --- /dev/null +++ b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_x5sa_400 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg new file mode 100644 index 0000000000..0def254f0a --- /dev/null +++ b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_x5sa_400 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg new file mode 100644 index 0000000000..95dcce8235 --- /dev/null +++ b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_x5sa_500 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg new file mode 100644 index 0000000000..a0469547fc --- /dev/null +++ b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_x5sa_500 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg new file mode 100644 index 0000000000..9e1920325c --- /dev/null +++ b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_x5sa_500 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg new file mode 100644 index 0000000000..141ce39563 --- /dev/null +++ b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_x5sa_500 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg new file mode 100644 index 0000000000..f7204b435c --- /dev/null +++ b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_x5sa_500 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg new file mode 100644 index 0000000000..288618ce00 --- /dev/null +++ b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_x5sa_500 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_x5sa_pro_0.2.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.2.inst.cfg new file mode 100644 index 0000000000..a422f13c25 --- /dev/null +++ b/resources/variants/tronxy_x5sa_pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_x5sa_pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_x5sa_pro_0.3.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.3.inst.cfg new file mode 100644 index 0000000000..b6b8868e75 --- /dev/null +++ b/resources/variants/tronxy_x5sa_pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_x5sa_pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_x5sa_pro_0.4.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.4.inst.cfg new file mode 100644 index 0000000000..1d5c8e44c6 --- /dev/null +++ b/resources/variants/tronxy_x5sa_pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_x5sa_pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_x5sa_pro_0.5.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.5.inst.cfg new file mode 100644 index 0000000000..3823a73fdc --- /dev/null +++ b/resources/variants/tronxy_x5sa_pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_x5sa_pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_x5sa_pro_0.6.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.6.inst.cfg new file mode 100644 index 0000000000..d49d503cf2 --- /dev/null +++ b/resources/variants/tronxy_x5sa_pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_x5sa_pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_x5sa_pro_0.8.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.8.inst.cfg new file mode 100644 index 0000000000..d4c9e967de --- /dev/null +++ b/resources/variants/tronxy_x5sa_pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_x5sa_pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_x_0.2.inst.cfg b/resources/variants/tronxy_x_0.2.inst.cfg new file mode 100644 index 0000000000..3d95a7aa9c --- /dev/null +++ b/resources/variants/tronxy_x_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_x + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_x_0.3.inst.cfg b/resources/variants/tronxy_x_0.3.inst.cfg new file mode 100644 index 0000000000..a3af8bc61c --- /dev/null +++ b/resources/variants/tronxy_x_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_x + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_x_0.4.inst.cfg b/resources/variants/tronxy_x_0.4.inst.cfg new file mode 100644 index 0000000000..1f97e8c1b9 --- /dev/null +++ b/resources/variants/tronxy_x_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_x + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_x_0.5.inst.cfg b/resources/variants/tronxy_x_0.5.inst.cfg new file mode 100644 index 0000000000..81991322eb --- /dev/null +++ b/resources/variants/tronxy_x_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_x + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_x_0.6.inst.cfg b/resources/variants/tronxy_x_0.6.inst.cfg new file mode 100644 index 0000000000..944c3d1fee --- /dev/null +++ b/resources/variants/tronxy_x_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_x + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_x_0.8.inst.cfg b/resources/variants/tronxy_x_0.8.inst.cfg new file mode 100644 index 0000000000..a8d1d15e29 --- /dev/null +++ b/resources/variants/tronxy_x_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_x + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_xy2_0.2.inst.cfg b/resources/variants/tronxy_xy2_0.2.inst.cfg new file mode 100644 index 0000000000..99ecdc22b8 --- /dev/null +++ b/resources/variants/tronxy_xy2_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_xy2 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_xy2_0.3.inst.cfg b/resources/variants/tronxy_xy2_0.3.inst.cfg new file mode 100644 index 0000000000..f974ec2a06 --- /dev/null +++ b/resources/variants/tronxy_xy2_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_xy2 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_xy2_0.4.inst.cfg b/resources/variants/tronxy_xy2_0.4.inst.cfg new file mode 100644 index 0000000000..a30d1a96a2 --- /dev/null +++ b/resources/variants/tronxy_xy2_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_xy2 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_xy2_0.5.inst.cfg b/resources/variants/tronxy_xy2_0.5.inst.cfg new file mode 100644 index 0000000000..4d530416aa --- /dev/null +++ b/resources/variants/tronxy_xy2_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_xy2 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_xy2_0.6.inst.cfg b/resources/variants/tronxy_xy2_0.6.inst.cfg new file mode 100644 index 0000000000..7900a3ff6e --- /dev/null +++ b/resources/variants/tronxy_xy2_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_xy2 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_xy2_0.8.inst.cfg b/resources/variants/tronxy_xy2_0.8.inst.cfg new file mode 100644 index 0000000000..ad74053a99 --- /dev/null +++ b/resources/variants/tronxy_xy2_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_xy2 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_xy2pro_0.2.inst.cfg b/resources/variants/tronxy_xy2pro_0.2.inst.cfg new file mode 100644 index 0000000000..24fc9f3321 --- /dev/null +++ b/resources/variants/tronxy_xy2pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_xy2pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_xy2pro_0.3.inst.cfg b/resources/variants/tronxy_xy2pro_0.3.inst.cfg new file mode 100644 index 0000000000..4745878f66 --- /dev/null +++ b/resources/variants/tronxy_xy2pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_xy2pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_xy2pro_0.4.inst.cfg b/resources/variants/tronxy_xy2pro_0.4.inst.cfg new file mode 100644 index 0000000000..5cbe2127a0 --- /dev/null +++ b/resources/variants/tronxy_xy2pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_xy2pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_xy2pro_0.5.inst.cfg b/resources/variants/tronxy_xy2pro_0.5.inst.cfg new file mode 100644 index 0000000000..ae746d14e8 --- /dev/null +++ b/resources/variants/tronxy_xy2pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_xy2pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_xy2pro_0.6.inst.cfg b/resources/variants/tronxy_xy2pro_0.6.inst.cfg new file mode 100644 index 0000000000..d81a2a82d0 --- /dev/null +++ b/resources/variants/tronxy_xy2pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_xy2pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_xy2pro_0.8.inst.cfg b/resources/variants/tronxy_xy2pro_0.8.inst.cfg new file mode 100644 index 0000000000..058ff40d15 --- /dev/null +++ b/resources/variants/tronxy_xy2pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_xy2pro + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tronxy_xy3_0.2.inst.cfg b/resources/variants/tronxy_xy3_0.2.inst.cfg new file mode 100644 index 0000000000..8ca979e3e7 --- /dev/null +++ b/resources/variants/tronxy_xy3_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = tronxy_xy3 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_xy3_0.3.inst.cfg b/resources/variants/tronxy_xy3_0.3.inst.cfg new file mode 100644 index 0000000000..11b38c7b78 --- /dev/null +++ b/resources/variants/tronxy_xy3_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = tronxy_xy3 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_xy3_0.4.inst.cfg b/resources/variants/tronxy_xy3_0.4.inst.cfg new file mode 100644 index 0000000000..1801980320 --- /dev/null +++ b/resources/variants/tronxy_xy3_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = tronxy_xy3 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_xy3_0.5.inst.cfg b/resources/variants/tronxy_xy3_0.5.inst.cfg new file mode 100644 index 0000000000..49b8dc3345 --- /dev/null +++ b/resources/variants/tronxy_xy3_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = tronxy_xy3 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_xy3_0.6.inst.cfg b/resources/variants/tronxy_xy3_0.6.inst.cfg new file mode 100644 index 0000000000..0476e145ab --- /dev/null +++ b/resources/variants/tronxy_xy3_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = tronxy_xy3 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_xy3_0.8.inst.cfg b/resources/variants/tronxy_xy3_0.8.inst.cfg new file mode 100644 index 0000000000..bb5a7a2236 --- /dev/null +++ b/resources/variants/tronxy_xy3_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = tronxy_xy3 + +[metadata] +setting_version = 13 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 From 5123623b500cf0976b844015bec21eb004dad1eb Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:21:44 -0400 Subject: [PATCH 05/19] Create tronxy_base_extruder_0.def.json --- .../extruders/tronxy_base_extruder_0.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/extruders/tronxy_base_extruder_0.def.json diff --git a/resources/extruders/tronxy_base_extruder_0.def.json b/resources/extruders/tronxy_base_extruder_0.def.json new file mode 100644 index 0000000000..2d4052a0ab --- /dev/null +++ b/resources/extruders/tronxy_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "tronxy_x", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} From 66b05f5f5074da376b1509bc6b1629ec6be35741 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:35:52 -0400 Subject: [PATCH 06/19] Update tronxy_d01.def.json repaired old inherit --- resources/definitions/tronxy_d01.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index 3a1b458276..d082c29147 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -1,7 +1,7 @@ { "name": "Tronxy D01", "version": 2, - "inherits": "tronxy_base", + "inherits": "tronxy_x", "metadata": { "has_machine_quality": true, "visible": true, From fe90632a383fda4481a93e606eccf45b9b7a0deb Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Tue, 28 Apr 2020 23:37:25 -0400 Subject: [PATCH 07/19] Update tronxy_d01.def.json --- resources/definitions/tronxy_d01.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index d082c29147..cb82aeeae5 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "has_machine_quality": true, + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" From 90637fa451ab2b29c35444440517dcc1ec510ca4 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:28:44 -0400 Subject: [PATCH 08/19] Overhauled all quality profiles Overhauled all quality profiles to give a more fluid interface while choosing between 0.2 through 0.8 nozzles. Added a larger layer choice and rescaled the options per nozzle. Also included some small overrides based on material choice. --- ...ltra.inst.cfg => x_0.2_ABS_extra.inst.cfg} | 9 ++++----- ...ultra.inst.cfg => x_0.2_ABS_fine.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.2_ABS_super.inst.cfg | 3 ++- .../tronxy/x/x_0.2_PETG_extra.inst.cfg | 18 ++++++++++++++++++ .../quality/tronxy/x/x_0.2_PETG_fine.inst.cfg | 18 ++++++++++++++++++ .../tronxy/x/x_0.2_PETG_super.inst.cfg | 8 ++++---- .../quality/tronxy/x/x_0.2_PLA_extra.inst.cfg | 13 +++++++++++++ ...ultra.inst.cfg => x_0.2_PLA_fine.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.2_PLA_super.inst.cfg | 2 +- ...tive.inst.cfg => x_0.3_ABS_extra.inst.cfg} | 5 +++-- ...ndard.inst.cfg => x_0.3_ABS_fine.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.3_ABS_low.inst.cfg | 1 + ...per.inst.cfg => x_0.3_ABS_normal.inst.cfg} | 5 +++-- ...per.inst.cfg => x_0.3_PETG_extra.inst.cfg} | 7 ++++--- ...dard.inst.cfg => x_0.3_PETG_fine.inst.cfg} | 7 ++++--- .../quality/tronxy/x/x_0.3_PETG_low.inst.cfg | 3 ++- ...ve.inst.cfg => x_0.3_PETG_normal.inst.cfg} | 7 ++++--- ...tive.inst.cfg => x_0.3_PLA_extra.inst.cfg} | 4 ++-- ...super.inst.cfg => x_0.3_PLA_fine.inst.cfg} | 4 ++-- ...ard.inst.cfg => x_0.3_PLA_normal.inst.cfg} | 4 ++-- ...tive.inst.cfg => x_0.3_TPU_extra.inst.cfg} | 4 ++-- ...super.inst.cfg => x_0.3_TPU_fine.inst.cfg} | 4 ++-- ...ard.inst.cfg => x_0.3_TPU_normal.inst.cfg} | 4 ++-- ...uper.inst.cfg => x_0.4_ABS_extra.inst.cfg} | 5 +++-- ...ptive.inst.cfg => x_0.4_ABS_fine.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.4_ABS_low.inst.cfg | 1 + .../tronxy/x/x_0.4_ABS_normal.inst.cfg | 17 +++++++++++++++++ ...dard.inst.cfg => x_0.4_ABS_rough.inst.cfg} | 5 +++-- .../tronxy/x/x_0.4_PETG_extra.inst.cfg | 17 +++++++++++++++++ ...dard.inst.cfg => x_0.4_PETG_fine.inst.cfg} | 7 ++++--- .../quality/tronxy/x/x_0.4_PETG_low.inst.cfg | 3 ++- ...er.inst.cfg => x_0.4_PETG_normal.inst.cfg} | 7 ++++--- ...ive.inst.cfg => x_0.4_PETG_rough.inst.cfg} | 7 ++++--- ...tive.inst.cfg => x_0.4_PLA_extra.inst.cfg} | 4 ++-- ...super.inst.cfg => x_0.4_PLA_fine.inst.cfg} | 4 ++-- ...ard.inst.cfg => x_0.4_PLA_normal.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.4_PLA_rough.inst.cfg | 13 +++++++++++++ ...tive.inst.cfg => x_0.4_TPU_extra.inst.cfg} | 4 ++-- ...super.inst.cfg => x_0.4_TPU_fine.inst.cfg} | 4 ++-- ...ard.inst.cfg => x_0.4_TPU_normal.inst.cfg} | 4 ++-- ...ptive.inst.cfg => x_0.5_ABS_fine.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.5_ABS_low.inst.cfg | 1 + ...per.inst.cfg => x_0.5_ABS_normal.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg | 15 +++++++++++++++ ...dard.inst.cfg => x_0.5_ABS_rough.inst.cfg} | 5 +++-- ...dard.inst.cfg => x_0.5_PETG_fine.inst.cfg} | 7 ++++--- .../quality/tronxy/x/x_0.5_PETG_low.inst.cfg | 3 ++- .../tronxy/x/x_0.5_PETG_normal.inst.cfg | 17 +++++++++++++++++ ...ive.inst.cfg => x_0.5_PETG_rapid.inst.cfg} | 6 +++--- ...per.inst.cfg => x_0.5_PETG_rough.inst.cfg} | 7 ++++--- ...super.inst.cfg => x_0.5_PLA_fine.inst.cfg} | 4 ++-- ...ive.inst.cfg => x_0.5_PLA_normal.inst.cfg} | 4 ++-- ...dard.inst.cfg => x_0.5_PLA_rapid.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.5_PLA_rough.inst.cfg | 13 +++++++++++++ ...super.inst.cfg => x_0.5_TPU_fine.inst.cfg} | 4 ++-- ...ive.inst.cfg => x_0.5_TPU_normal.inst.cfg} | 4 ++-- ...dard.inst.cfg => x_0.5_TPU_rapid.inst.cfg} | 4 ++-- ...ard.inst.cfg => x_0.6_ABS_normal.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg | 15 +++++++++++++++ .../quality/tronxy/x/x_0.6_ABS_rough.inst.cfg | 15 +++++++++++++++ ...rd.inst.cfg => x_0.6_PETG_normal.inst.cfg} | 7 ++++--- .../tronxy/x/x_0.6_PETG_rapid.inst.cfg | 16 ++++++++++++++++ .../tronxy/x/x_0.6_PETG_rough.inst.cfg | 17 +++++++++++++++++ ...ard.inst.cfg => x_0.6_PLA_normal.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg | 13 +++++++++++++ ...raft.inst.cfg => x_0.6_PLA_rough.inst.cfg} | 4 ++-- ...ard.inst.cfg => x_0.6_TPU_normal.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg | 13 +++++++++++++ ..._draft.inst.cfg => x_0.8_ABS_low.inst.cfg} | 5 +++-- .../quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg | 15 +++++++++++++++ ...raft.inst.cfg => x_0.8_ABS_rough.inst.cfg} | 7 ++++--- ...draft.inst.cfg => x_0.8_PETG_low.inst.cfg} | 7 ++++--- .../tronxy/x/x_0.8_PETG_rapid.inst.cfg | 17 +++++++++++++++++ ...aft.inst.cfg => x_0.8_PETG_rough.inst.cfg} | 9 +++++---- ..._draft.inst.cfg => x_0.8_PLA_low.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.8_PLA_rough.inst.cfg | 13 +++++++++++++ ..._draft.inst.cfg => x_0.8_TPU_low.inst.cfg} | 4 ++-- .../quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_0.8_TPU_rough.inst.cfg | 13 +++++++++++++ .../quality/tronxy/x/x_1.0_PLA_draft.inst.cfg | 13 ------------- .../quality/tronxy/x/x_1.0_TPU_draft.inst.cfg | 13 ------------- .../quality/tronxy/x/x_global_low.inst.cfg | 18 ------------------ .../tronxy/x/x_global_standard.inst.cfg | 18 ------------------ .../quality/tronxy/x/x_global_ultra.inst.cfg | 18 ------------------ .../quality/tronxy/x_global_adaptive.inst.cfg | 19 ------------------- ...super.inst.cfg => x_global_extra.inst.cfg} | 4 ++-- ...aptive.inst.cfg => x_global_fine.inst.cfg} | 6 +++--- .../quality/tronxy/x_global_low.inst.cfg | 4 ++-- ...dard.inst.cfg => x_global_normal.inst.cfg} | 4 ++-- ...draft.inst.cfg => x_global_rapid.inst.cfg} | 8 ++++---- ...draft.inst.cfg => x_global_rough.inst.cfg} | 8 ++++---- .../quality/tronxy/x_global_super.inst.cfg | 10 +++++----- .../quality/tronxy/x_global_ultra.inst.cfg | 18 ------------------ 94 files changed, 492 insertions(+), 265 deletions(-) rename resources/quality/tronxy/x/{x_0.2_PETG_ultra.inst.cfg => x_0.2_ABS_extra.inst.cfg} (56%) rename resources/quality/tronxy/x/{x_0.2_ABS_ultra.inst.cfg => x_0.2_ABS_fine.inst.cfg} (73%) create mode 100644 resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg rename resources/quality/tronxy/x/{x_0.2_PLA_ultra.inst.cfg => x_0.2_PLA_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.3_ABS_adaptive.inst.cfg => x_0.3_ABS_extra.inst.cfg} (71%) rename resources/quality/tronxy/x/{x_0.3_ABS_standard.inst.cfg => x_0.3_ABS_fine.inst.cfg} (73%) rename resources/quality/tronxy/x/{x_0.3_ABS_super.inst.cfg => x_0.3_ABS_normal.inst.cfg} (72%) rename resources/quality/tronxy/x/{x_0.3_PETG_super.inst.cfg => x_0.3_PETG_extra.inst.cfg} (65%) rename resources/quality/tronxy/x/{x_0.3_PETG_standard.inst.cfg => x_0.3_PETG_fine.inst.cfg} (66%) rename resources/quality/tronxy/x/{x_0.3_PETG_adaptive.inst.cfg => x_0.3_PETG_normal.inst.cfg} (65%) rename resources/quality/tronxy/x/{x_0.3_PLA_adaptive.inst.cfg => x_0.3_PLA_extra.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.3_PLA_super.inst.cfg => x_0.3_PLA_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.3_PLA_standard.inst.cfg => x_0.3_PLA_normal.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.3_TPU_adaptive.inst.cfg => x_0.3_TPU_extra.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.3_TPU_super.inst.cfg => x_0.3_TPU_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.3_TPU_standard.inst.cfg => x_0.3_TPU_normal.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.4_ABS_super.inst.cfg => x_0.4_ABS_extra.inst.cfg} (71%) rename resources/quality/tronxy/x/{x_0.4_ABS_adaptive.inst.cfg => x_0.4_ABS_fine.inst.cfg} (73%) create mode 100644 resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg rename resources/quality/tronxy/x/{x_0.4_ABS_standard.inst.cfg => x_0.4_ABS_rough.inst.cfg} (72%) create mode 100644 resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg rename resources/quality/tronxy/x/{x_0.4_PETG_standard.inst.cfg => x_0.4_PETG_fine.inst.cfg} (66%) rename resources/quality/tronxy/x/{x_0.4_PETG_super.inst.cfg => x_0.4_PETG_normal.inst.cfg} (65%) rename resources/quality/tronxy/x/{x_0.4_PETG_adaptive.inst.cfg => x_0.4_PETG_rough.inst.cfg} (66%) rename resources/quality/tronxy/x/{x_0.4_PLA_adaptive.inst.cfg => x_0.4_PLA_extra.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.4_PLA_super.inst.cfg => x_0.4_PLA_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.4_PLA_standard.inst.cfg => x_0.4_PLA_normal.inst.cfg} (75%) create mode 100644 resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg rename resources/quality/tronxy/x/{x_0.4_TPU_adaptive.inst.cfg => x_0.4_TPU_extra.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.4_TPU_super.inst.cfg => x_0.4_TPU_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.4_TPU_standard.inst.cfg => x_0.4_TPU_normal.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.5_ABS_adaptive.inst.cfg => x_0.5_ABS_fine.inst.cfg} (73%) rename resources/quality/tronxy/x/{x_0.5_ABS_super.inst.cfg => x_0.5_ABS_normal.inst.cfg} (72%) create mode 100644 resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg rename resources/quality/tronxy/x/{x_0.5_ABS_standard.inst.cfg => x_0.5_ABS_rough.inst.cfg} (72%) rename resources/quality/tronxy/x/{x_0.5_PETG_standard.inst.cfg => x_0.5_PETG_fine.inst.cfg} (67%) create mode 100644 resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg rename resources/quality/tronxy/x/{x_0.5_PETG_adaptive.inst.cfg => x_0.5_PETG_rapid.inst.cfg} (70%) rename resources/quality/tronxy/x/{x_0.5_PETG_super.inst.cfg => x_0.5_PETG_rough.inst.cfg} (66%) rename resources/quality/tronxy/x/{x_0.5_PLA_super.inst.cfg => x_0.5_PLA_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.5_PLA_adaptive.inst.cfg => x_0.5_PLA_normal.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.5_PLA_standard.inst.cfg => x_0.5_PLA_rapid.inst.cfg} (75%) create mode 100644 resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg rename resources/quality/tronxy/x/{x_0.5_TPU_super.inst.cfg => x_0.5_TPU_fine.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.5_TPU_adaptive.inst.cfg => x_0.5_TPU_normal.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.5_TPU_standard.inst.cfg => x_0.5_TPU_rapid.inst.cfg} (75%) rename resources/quality/tronxy/x/{x_0.6_ABS_standard.inst.cfg => x_0.6_ABS_normal.inst.cfg} (72%) create mode 100644 resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg rename resources/quality/tronxy/x/{x_0.6_PETG_standard.inst.cfg => x_0.6_PETG_normal.inst.cfg} (66%) create mode 100644 resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg rename resources/quality/tronxy/x/{x_0.6_PLA_standard.inst.cfg => x_0.6_PLA_normal.inst.cfg} (75%) create mode 100644 resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg rename resources/quality/tronxy/x/{x_0.6_PLA_draft.inst.cfg => x_0.6_PLA_rough.inst.cfg} (77%) rename resources/quality/tronxy/x/{x_0.6_TPU_standard.inst.cfg => x_0.6_TPU_normal.inst.cfg} (75%) create mode 100644 resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg rename resources/quality/tronxy/x/{x_0.8_ABS_draft.inst.cfg => x_0.8_ABS_low.inst.cfg} (76%) create mode 100644 resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg rename resources/quality/tronxy/x/{x_1.0_ABS_draft.inst.cfg => x_0.8_ABS_rough.inst.cfg} (63%) rename resources/quality/tronxy/x/{x_0.8_PETG_draft.inst.cfg => x_0.8_PETG_low.inst.cfg} (69%) create mode 100644 resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg rename resources/quality/tronxy/x/{x_1.0_PETG_draft.inst.cfg => x_0.8_PETG_rough.inst.cfg} (58%) rename resources/quality/tronxy/x/{x_0.8_PLA_draft.inst.cfg => x_0.8_PLA_low.inst.cfg} (77%) create mode 100644 resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg rename resources/quality/tronxy/x/{x_0.8_TPU_draft.inst.cfg => x_0.8_TPU_low.inst.cfg} (77%) create mode 100644 resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg create mode 100644 resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg delete mode 100644 resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg delete mode 100644 resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg delete mode 100644 resources/quality/tronxy/x/x_global_low.inst.cfg delete mode 100644 resources/quality/tronxy/x/x_global_standard.inst.cfg delete mode 100644 resources/quality/tronxy/x/x_global_ultra.inst.cfg delete mode 100644 resources/quality/tronxy/x_global_adaptive.inst.cfg rename resources/quality/tronxy/{x/x_global_super.inst.cfg => x_global_extra.inst.cfg} (86%) rename resources/quality/tronxy/{x/x_global_adaptive.inst.cfg => x_global_fine.inst.cfg} (82%) rename resources/quality/tronxy/{x_global_standard.inst.cfg => x_global_normal.inst.cfg} (86%) rename resources/quality/tronxy/{x/x_global_draft.inst.cfg => x_global_rapid.inst.cfg} (74%) rename resources/quality/tronxy/{x_global_draft.inst.cfg => x_global_rough.inst.cfg} (75%) delete mode 100644 resources/quality/tronxy/x_global_ultra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg similarity index 56% rename from resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg rename to resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg index d7d7985337..ab88a687bd 100644 --- a/resources/quality/tronxy/x/x_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg @@ -1,16 +1,15 @@ [general] version = 4 -name = Ultra Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = ultra -material = generic_petg +quality_type = extra +material = generic_abs variant = 0.2mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*8 -#retraction_extra_prime_amount = 0.5 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg similarity index 73% rename from resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg rename to resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg index 3349f1bbc9..0c35c41490 100644 --- a/resources/quality/tronxy/x/x_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Ultra Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = ultra +quality_type = fine material = generic_abs variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg index 0848eb9ef3..4b84a99b87 100644 --- a/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Super Quality +name = Super Fine Quality definition = tronxy_x [metadata] @@ -12,3 +12,4 @@ variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg new file mode 100644 index 0000000000..ea2b2aae90 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = extra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +layer_height_0 = 0.14 +speed_layer_0 = 15 +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg new file mode 100644 index 0000000000..e7b935d32d --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Fine Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = fine +material = generic_petg +variant = 0.2mm Nozzle + +[values] +layer_height_0 = 0.14 +speed_layer_0 = 15 +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg index e148f5988d..3ec422e06a 100644 --- a/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Super Quality +name = Super Fine Quality definition = tronxy_x [metadata] @@ -11,7 +11,7 @@ material = generic_petg variant = 0.2mm Nozzle [values] +layer_height_0 = 0.14 speed_layer_0 = 15 -wall_thickness = =line_width*8 -#retraction_extra_prime_amount = 0.5 - +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg new file mode 100644 index 0000000000..6ec227e0df --- /dev/null +++ b/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = extra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg rename to resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg index 65b9068a2c..920594342d 100644 --- a/resources/quality/tronxy/x/x_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Ultra Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = ultra +quality_type = fine material = generic_pla variant = 0.2mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg index 98410560be..d4bc218d0e 100644 --- a/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Super Quality +name = Super Fine Quality definition = tronxy_x [metadata] diff --git a/resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg similarity index 71% rename from resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg index 3eada6fcf0..efecddf720 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Dynamic Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = extra material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg similarity index 73% rename from resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg index 2238328cd7..0b7f462e3f 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Standard Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = fine material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg index 1f38e6029d..5f725dcd54 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg @@ -12,3 +12,4 @@ variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg similarity index 72% rename from resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg rename to resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg index 67d5c484d6..888bddcf60 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Super Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = normal material = generic_abs variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg similarity index 65% rename from resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg rename to resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg index bb15e9bbaf..c5061d8c40 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Super Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = extra material = generic_petg variant = 0.3mm Nozzle [values] +layer_height_0 = 0.18 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg similarity index 66% rename from resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg index 22135478c8..133b673f12 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Standard Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = fine material = generic_petg variant = 0.3mm Nozzle [values] +layer_height_0 = 0.18 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg index 66825d6ff7..069580b352 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg @@ -11,6 +11,7 @@ material = generic_petg variant = 0.3mm Nozzle [values] +layer_height_0 = 0.18 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg similarity index 65% rename from resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg index ad974ab065..9350bf57d0 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Dynamic Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = normal material = generic_petg variant = 0.3mm Nozzle [values] +layer_height_0 = 0.18 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg index caaba41c32..bb10a9f1ce 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Dynamic Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = extra material = generic_pla variant = 0.3mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg rename to resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg index 85e65ca40a..129d1e21b4 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = fine material = generic_pla variant = 0.3mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg index a796d5353d..6d61017cdb 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_pla variant = 0.3mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg index 5184432d82..78fc88b468 100644 --- a/resources/quality/tronxy/x/x_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Dynamic Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = extra material = generic_tpu variant = 0.3mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg rename to resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg index 10dd5eac89..30e2fd54d2 100644 --- a/resources/quality/tronxy/x/x_0.3_TPU_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = fine material = generic_tpu variant = 0.3mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg index 1bd9b88582..0536db95a1 100644 --- a/resources/quality/tronxy/x/x_0.3_TPU_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_tpu variant = 0.3mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg similarity index 71% rename from resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg rename to resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg index 1e3b8f4839..97bac41f60 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Super Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = extra material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg similarity index 73% rename from resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg index 3a24b9ef4d..52bc14d716 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Dynamic Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = fine material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg index ca3f269b4f..4572335890 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg new file mode 100644 index 0000000000..546e57f5f4 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Normal Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = normal +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +cool_fan_enabled = False +cool_fan_speed = 0.0 +cool_fan_speed_min = 0.0 \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg similarity index 72% rename from resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg index b60b18fed0..030bda0fa9 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Standard Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = rough material = generic_abs variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False diff --git a/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg new file mode 100644 index 0000000000..ab01e760fc --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = extra +material = generic_petg +variant = 0.4mm Nozzle + +[values] +layer_height_0 = 0.25 +speed_layer_0 = 15 +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg similarity index 66% rename from resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg index b093bc92c6..7b9f355926 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Standard Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = fine material = generic_petg variant = 0.4mm Nozzle [values] +layer_height_0 = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg index 082d8785fd..3c0778c8ec 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg @@ -11,6 +11,7 @@ material = generic_petg variant = 0.4mm Nozzle [values] +layer_height_0 = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg similarity index 65% rename from resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg rename to resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg index 0f673de1d1..991bff9501 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Super Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = normal material = generic_petg variant = 0.4mm Nozzle [values] +layer_height_0 = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg similarity index 66% rename from resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg index 2fa8f9b44f..88ab304a4e 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Dynamic Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = rough material = generic_petg variant = 0.4mm Nozzle [values] +layer_height_0 = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg index 8cbdb78d51..b0fa4e1bbf 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Dynamic Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = extra material = generic_pla variant = 0.4mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg rename to resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg index 6b9c32ba32..ff8727c6ec 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = fine material = generic_pla variant = 0.4mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg index e94272eb38..ec25304a38 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_pla variant = 0.4mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg new file mode 100644 index 0000000000..6867eae591 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rough +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg index 8755bc5831..ec6619e1da 100644 --- a/resources/quality/tronxy/x/x_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Dynamic Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = extra material = generic_tpu variant = 0.4mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg rename to resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg index effcc55b93..73214c9be8 100644 --- a/resources/quality/tronxy/x/x_0.4_TPU_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = fine material = generic_tpu variant = 0.4mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg index eb3d4e62ea..3d62c676b7 100644 --- a/resources/quality/tronxy/x/x_0.4_TPU_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_tpu variant = 0.4mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg similarity index 73% rename from resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg index ce3e48e062..1b2a0b2b31 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Dynamic Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = fine material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg index 006e6bb2e3..35af5ce337 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg @@ -12,3 +12,4 @@ variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg similarity index 72% rename from resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg rename to resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg index 05816ba502..f57ec13610 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Super Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = normal material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg new file mode 100644 index 0000000000..8123a8b5fa --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg similarity index 72% rename from resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg index 0737dfb760..d5fba681db 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Standard Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = rough material = generic_abs variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 +cool_fan_enabled = False diff --git a/resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg similarity index 67% rename from resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg index 353c05f002..227eabbf88 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Standard Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = fine material = generic_petg variant = 0.5mm Nozzle [values] +layer_height_0 = 0.3 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg index d8a8a1f6b5..9a4c728b43 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg @@ -11,6 +11,7 @@ material = generic_petg variant = 0.5mm Nozzle [values] +layer_height_0 = 0.3 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg new file mode 100644 index 0000000000..646a21e49a --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Normal Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = normal +material = generic_petg +variant = 0.5mm Nozzle + +[values] +layer_height_0 = 0.3 +speed_layer_0 = 15 +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg similarity index 70% rename from resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg index efefe7e636..e9ab7a2380 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg @@ -1,16 +1,16 @@ [general] version = 4 -name = Dynamic Quality +name = Rough/Fast Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = rapid material = generic_petg variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg similarity index 66% rename from resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg rename to resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg index 343f9f3144..3ec2cf1c19 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Super Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = rough material = generic_petg variant = 0.5mm Nozzle [values] +layer_height_0 = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg rename to resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg index 4a144eb83a..0d35c80652 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = fine material = generic_pla variant = 0.5mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg index 6965e69431..c2391d2db0 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Dynamic Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = normal material = generic_pla variant = 0.5mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg index 6fb07abb42..3b5729812d 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Rough/Fast Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = rapid material = generic_pla variant = 0.5mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg new file mode 100644 index 0000000000..d23f57aa45 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rough +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg rename to resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg index 7ba6a3308e..be3bd5f580 100644 --- a/resources/quality/tronxy/x/x_0.5_TPU_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = fine material = generic_tpu variant = 0.5mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg rename to resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg index 81064bfddb..906b30f3a3 100644 --- a/resources/quality/tronxy/x/x_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Dynamic Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = normal material = generic_tpu variant = 0.5mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg index 97e2a15ba0..2ed303f2a6 100644 --- a/resources/quality/tronxy/x/x_0.5_TPU_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Rough/Fast Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = rapid material = generic_tpu variant = 0.5mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg similarity index 72% rename from resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg index c8344c83a1..6a21e478f4 100644 --- a/resources/quality/tronxy/x/x_0.6_ABS_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_abs variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg new file mode 100644 index 0000000000..8eb8ecbb33 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*4 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg new file mode 100644 index 0000000000..b593dfa06f --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Rough Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rough +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*4 +cool_fan_enabled = False diff --git a/resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg similarity index 66% rename from resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg index 62526628c4..7775d94c2d 100644 --- a/resources/quality/tronxy/x/x_0.6_PETG_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_petg variant = 0.6mm Nozzle [values] +layer_height_0 = 0.4 speed_layer_0 = 15 wall_thickness = =line_width*3 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg new file mode 100644 index 0000000000..7a3a183089 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_petg +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg new file mode 100644 index 0000000000..3a97828328 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Rough Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rough +material = generic_petg +variant = 0.6mm Nozzle + +[values] +layer_height_0 = 0.25 +speed_layer_0 = 15 +wall_thickness = =line_width*4 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg index 1c0996fbe9..04826486ac 100644 --- a/resources/quality/tronxy/x/x_0.6_PLA_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_pla variant = 0.6mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg new file mode 100644 index 0000000000..78a3c7ffd9 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg index 8da5b411b5..0e69a1728d 100644 --- a/resources/quality/tronxy/x/x_0.6_PLA_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Draft Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = rough material = generic_pla variant = 0.6mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg b/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg similarity index 75% rename from resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg rename to resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg index 66096f8ede..53a7298a0b 100644 --- a/resources/quality/tronxy/x/x_0.6_TPU_standard.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal material = generic_tpu variant = 0.6mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg new file mode 100644 index 0000000000..ecda19c46f --- /dev/null +++ b/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg similarity index 76% rename from resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg index 7b9bb0fd31..6658d60c3a 100644 --- a/resources/quality/tronxy/x/x_0.8_ABS_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Draft Quality +name = Low definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = low material = generic_abs variant = 0.8mm Nozzle [values] wall_thickness = =line_width*3 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg new file mode 100644 index 0000000000..96d97f57ea --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg similarity index 63% rename from resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg index b5b34d0a5a..4e4225c4d8 100644 --- a/resources/quality/tronxy/x/x_1.0_ABS_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 -name = Draft Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = rough material = generic_abs -variant = 1.0mm Nozzle +variant = 0.8mm Nozzle [values] wall_thickness = =line_width*3 +cool_fan_enabled = False \ No newline at end of file diff --git a/resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg similarity index 69% rename from resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg index 1ab3d2ed7c..95e9a507a4 100644 --- a/resources/quality/tronxy/x/x_0.8_PETG_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Draft Quality +name = Low definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = low material = generic_petg variant = 0.8mm Nozzle [values] +layer_height_0 = 0.5 speed_layer_0 = 15 wall_thickness = =line_width*3 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg new file mode 100644 index 0000000000..46482f78ac --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_petg +variant = 0.8mm Nozzle + +[values] +layer_height_0 = 0.5 +speed_layer_0 = 15 +wall_thickness = =line_width*3 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg similarity index 58% rename from resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg index 24c24c9d91..b59f97e640 100644 --- a/resources/quality/tronxy/x/x_1.0_PETG_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg @@ -1,16 +1,17 @@ [general] version = 4 -name = Draft Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = rough material = generic_petg -variant = 1.0mm Nozzle +variant = 0.8mm Nozzle [values] +layer_height_0 = 0.5 speed_layer_0 = 15 wall_thickness = =line_width*3 -#retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg index 6c67fac263..76c20de407 100644 --- a/resources/quality/tronxy/x/x_0.8_PLA_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Draft Quality +name = Low definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = low material = generic_pla variant = 0.8mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg new file mode 100644 index 0000000000..ef1eb58757 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg new file mode 100644 index 0000000000..347831e586 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rough +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg similarity index 77% rename from resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg rename to resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg index 8597e20ff7..64a0c73269 100644 --- a/resources/quality/tronxy/x/x_0.8_TPU_draft.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Draft Quality +name = Low definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = low material = generic_tpu variant = 0.8mm Nozzle diff --git a/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg new file mode 100644 index 0000000000..55f14bd233 --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough/Fast Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rapid +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg new file mode 100644 index 0000000000..ef9ce1ed8f --- /dev/null +++ b/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Rough Quality +definition = tronxy_x + +[metadata] +setting_version = 13 +type = quality +quality_type = rough +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg b/resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg deleted file mode 100644 index bce6494dc1..0000000000 --- a/resources/quality/tronxy/x/x_1.0_PLA_draft.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -version = 4 -name = Draft Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = draft -material = generic_pla -variant = 1.0mm Nozzle - -[values] diff --git a/resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg b/resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg deleted file mode 100644 index c0531b2a54..0000000000 --- a/resources/quality/tronxy/x/x_1.0_TPU_draft.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -version = 4 -name = Draft Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = draft -material = generic_tpu -variant = 1.0mm Nozzle - -[values] diff --git a/resources/quality/tronxy/x/x_global_low.inst.cfg b/resources/quality/tronxy/x/x_global_low.inst.cfg deleted file mode 100644 index c9fe3bb8b6..0000000000 --- a/resources/quality/tronxy/x/x_global_low.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -version = 4 -name = Low Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = low -weight = -4 -global_quality = True - -[values] -layer_height = 0.28 -layer_height_0 = 0.28 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x/x_global_standard.inst.cfg b/resources/quality/tronxy/x/x_global_standard.inst.cfg deleted file mode 100644 index 89bb23ba88..0000000000 --- a/resources/quality/tronxy/x/x_global_standard.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -version = 4 -name = Standard Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = standard -weight = -3 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.2 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x/x_global_ultra.inst.cfg b/resources/quality/tronxy/x/x_global_ultra.inst.cfg deleted file mode 100644 index 9d2c431091..0000000000 --- a/resources/quality/tronxy/x/x_global_ultra.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -version = 4 -name = Ultra Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = ultra -weight = 0 -global_quality = True - -[values] -layer_height = 0.08 -layer_height_0 = 0.12 -top_bottom_thickness = =layer_height_0+layer_height*10 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*12 diff --git a/resources/quality/tronxy/x_global_adaptive.inst.cfg b/resources/quality/tronxy/x_global_adaptive.inst.cfg deleted file mode 100644 index bd1e5b43d1..0000000000 --- a/resources/quality/tronxy/x_global_adaptive.inst.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[general] -version = 4 -name = Dynamic Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = adaptive -weight = -2 -global_quality = True - -[values] -layer_height = 0.16 -layer_height_0 = 0.20 -top_bottom_thickness = =layer_height_0+layer_height*4 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true diff --git a/resources/quality/tronxy/x/x_global_super.inst.cfg b/resources/quality/tronxy/x_global_extra.inst.cfg similarity index 86% rename from resources/quality/tronxy/x/x_global_super.inst.cfg rename to resources/quality/tronxy/x_global_extra.inst.cfg index ce4a6e4bd0..05ed3ef8d0 100644 --- a/resources/quality/tronxy/x/x_global_super.inst.cfg +++ b/resources/quality/tronxy/x_global_extra.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Super Quality +name = Extra Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = super +quality_type = extra weight = -1 global_quality = True diff --git a/resources/quality/tronxy/x/x_global_adaptive.inst.cfg b/resources/quality/tronxy/x_global_fine.inst.cfg similarity index 82% rename from resources/quality/tronxy/x/x_global_adaptive.inst.cfg rename to resources/quality/tronxy/x_global_fine.inst.cfg index bd1e5b43d1..f827fa1d8c 100644 --- a/resources/quality/tronxy/x/x_global_adaptive.inst.cfg +++ b/resources/quality/tronxy/x_global_fine.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = Dynamic Quality +name = Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = adaptive +quality_type = fine weight = -2 global_quality = True [values] -layer_height = 0.16 +layer_height = 0.15 layer_height_0 = 0.20 top_bottom_thickness = =layer_height_0+layer_height*4 wall_thickness = =line_width*3 diff --git a/resources/quality/tronxy/x_global_low.inst.cfg b/resources/quality/tronxy/x_global_low.inst.cfg index c9fe3bb8b6..a6aa67eb14 100644 --- a/resources/quality/tronxy/x_global_low.inst.cfg +++ b/resources/quality/tronxy/x_global_low.inst.cfg @@ -11,8 +11,8 @@ weight = -4 global_quality = True [values] -layer_height = 0.28 -layer_height_0 = 0.28 +layer_height = 0.25 +layer_height_0 = 0.25 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x_global_standard.inst.cfg b/resources/quality/tronxy/x_global_normal.inst.cfg similarity index 86% rename from resources/quality/tronxy/x_global_standard.inst.cfg rename to resources/quality/tronxy/x_global_normal.inst.cfg index 89bb23ba88..819feb8549 100644 --- a/resources/quality/tronxy/x_global_standard.inst.cfg +++ b/resources/quality/tronxy/x_global_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Standard Quality +name = Normal Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = standard +quality_type = normal weight = -3 global_quality = True diff --git a/resources/quality/tronxy/x/x_global_draft.inst.cfg b/resources/quality/tronxy/x_global_rapid.inst.cfg similarity index 74% rename from resources/quality/tronxy/x/x_global_draft.inst.cfg rename to resources/quality/tronxy/x_global_rapid.inst.cfg index 4af3a91990..8d885ed72f 100644 --- a/resources/quality/tronxy/x/x_global_draft.inst.cfg +++ b/resources/quality/tronxy/x_global_rapid.inst.cfg @@ -1,18 +1,18 @@ [general] version = 4 -name = Draft Quality +name = Rough/Fast Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = rapid weight = -5 global_quality = True [values] -layer_height = 0.32 -layer_height_0 = 0.32 +layer_height = 0.375 +layer_height_0 = 0.3 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x_global_draft.inst.cfg b/resources/quality/tronxy/x_global_rough.inst.cfg similarity index 75% rename from resources/quality/tronxy/x_global_draft.inst.cfg rename to resources/quality/tronxy/x_global_rough.inst.cfg index 4af3a91990..8e41c91094 100644 --- a/resources/quality/tronxy/x_global_draft.inst.cfg +++ b/resources/quality/tronxy/x_global_rough.inst.cfg @@ -1,18 +1,18 @@ [general] version = 4 -name = Draft Quality +name = Rough Quality definition = tronxy_x [metadata] setting_version = 13 type = quality -quality_type = draft +quality_type = rough weight = -5 global_quality = True [values] -layer_height = 0.32 -layer_height_0 = 0.32 +layer_height = 0.3 +layer_height_0 = 0.3 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 support_interface_height = =layer_height*4 diff --git a/resources/quality/tronxy/x_global_super.inst.cfg b/resources/quality/tronxy/x_global_super.inst.cfg index ce4a6e4bd0..f3110d3392 100644 --- a/resources/quality/tronxy/x_global_super.inst.cfg +++ b/resources/quality/tronxy/x_global_super.inst.cfg @@ -1,18 +1,18 @@ [general] version = 4 -name = Super Quality +name = Super Fine Quality definition = tronxy_x [metadata] setting_version = 13 type = quality quality_type = super -weight = -1 +weight = 0 global_quality = True [values] -layer_height = 0.12 +layer_height = 0.08 layer_height_0 = 0.12 -top_bottom_thickness = =layer_height_0+layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*10 wall_thickness = =line_width*3 -support_interface_height = =layer_height*8 +support_interface_height = =layer_height*12 diff --git a/resources/quality/tronxy/x_global_ultra.inst.cfg b/resources/quality/tronxy/x_global_ultra.inst.cfg deleted file mode 100644 index 9d2c431091..0000000000 --- a/resources/quality/tronxy/x_global_ultra.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -version = 4 -name = Ultra Quality -definition = tronxy_x - -[metadata] -setting_version = 13 -type = quality -quality_type = ultra -weight = 0 -global_quality = True - -[values] -layer_height = 0.08 -layer_height_0 = 0.12 -top_bottom_thickness = =layer_height_0+layer_height*10 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*12 From d08d8a26ed32839faea6d6d0197fce0339d7eb5c Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:30:40 -0400 Subject: [PATCH 09/19] Update tronxy_x.def.json replacing incorrectly uploaded file that was used during troubleshooting --- resources/definitions/tronxy_x.def.json | 140 ++++-------------------- 1 file changed, 20 insertions(+), 120 deletions(-) diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index c7518110b0..8b6c56c925 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -20,125 +20,25 @@ "preferred_variant_name": "0.4mm Nozzle", "preferred_quality_type": "standard", - "preferred_material": "generic_pla", - "exclude_materials": [ - "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", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] + "preferred_material": "generic_pla" }, "overrides": { - "machine_name": { "default_value": "Creawsome Base Printer" }, - "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;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\n" }, + "machine_name": { "default_value": "Tronxy Base Printer" }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel}\nG0 E3 F200\nG92 E0\n" }, + "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" }, - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 50 }, - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_x": { "value": 100 }, + "machine_max_acceleration_y": { "value": 100 }, "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 5000 }, - "machine_acceleration": { "value": 500 }, + "machine_max_acceleration_e": { "value": 100 }, + "machine_acceleration": { "value": 100 }, - "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_xy": { "value": 20 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, @@ -146,29 +46,29 @@ "material_diameter": { "default_value": 1.75 }, - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, + "acceleration_print": { "value": 100 }, + "acceleration_travel": { "value": 100 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "jerk_print": { "value": 8 }, + "jerk_print": { "value": 20 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, - "speed_print": { "value": 50.0 } , + "speed_print": { "value": 60.0 } , "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, + "speed_wall": { "value": "speed_print / 1.33" }, "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, + "speed_topbottom": { "value": "speed_print / 1.5" }, "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, - "speed_layer_0": { "value": 20.0 }, + "speed_travel": { "value": "60.0 if speed_print < 50 else 75.0 if speed_print > 60 else speed_print * 1.5" }, + "speed_layer_0": { "value": 30.0 }, "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 3" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, From 12ccd8298c11d62f36165fe6db4fd22c4489b45f Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:18:14 -0400 Subject: [PATCH 10/19] Machine profile update Updated and condensed machine profiles. Edited formatting to make more sense and be consistent across all files. I3 printers present print to the front, CoreXY move to 0. Speeds are set per machine based orr factory firmware, which should provide more accurate "Estimated time" values "out of the box". --- resources/definitions/tronxy_d01.def.json | 16 ++++++++--- resources/definitions/tronxy_x.def.json | 12 ++++----- resources/definitions/tronxy_x5sa.def.json | 9 ++++--- .../definitions/tronxy_x5sa_400.def.json | 12 ++++++--- .../definitions/tronxy_x5sa_500.def.json | 14 +++++++--- .../definitions/tronxy_x5sa_pro.def.json | 27 ------------------- resources/definitions/tronxy_xy2.def.json | 21 ++++++++++----- resources/definitions/tronxy_xy2pro.def.json | 22 ++++++++++++--- resources/definitions/tronxy_xy3.def.json | 19 +++++++++---- 9 files changed, 89 insertions(+), 63 deletions(-) delete mode 100644 resources/definitions/tronxy_x5sa_pro.def.json diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index cb82aeeae5..a6e7350c06 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -20,10 +20,18 @@ [32, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" - }, + "gantry_height": { "value": 30 }, - "gantry_height": { "value": 30 } + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, + + "machine_max_feedrate_x": { "value": 150 }, + "machine_max_feedrate_y": { "value": 150 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_acceleration_x": { "value": 150 }, + "machine_max_acceleration_y": { "value": 150 }, + "machine_max_acceleration_z": { "value": 150 }, + "machine_max_acceleration_e": { "value": 150 }, + "machine_acceleration": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 8b6c56c925..decb49d3ee 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -32,10 +32,10 @@ "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 50 }, - "machine_max_acceleration_x": { "value": 100 }, - "machine_max_acceleration_y": { "value": 100 }, - "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 100 }, + "machine_max_acceleration_x": { "value": 120 }, + "machine_max_acceleration_y": { "value": 120 }, + "machine_max_acceleration_z": { "value": 120 }, + "machine_max_acceleration_e": { "value": 120 }, "machine_acceleration": { "value": 100 }, "machine_max_jerk_xy": { "value": 20 }, @@ -46,8 +46,8 @@ "material_diameter": { "default_value": 1.75 }, - "acceleration_print": { "value": 100 }, - "acceleration_travel": { "value": 100 }, + "acceleration_print": { "value": "machine_acceleration" }, + "acceleration_travel": { "value": "machine_acceleration" }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 299d0f80fe..6ac76b6c80 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -1,5 +1,5 @@ { - "name": "Tronxy X5SA", + "name": "Tronxy X5SA/X5ST/Pro", "version": 2, "inherits": "tronxy_x", "metadata": { @@ -20,8 +20,9 @@ [27, 45] ] }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 z0.3 F3600.0 ; Move to start position\nG1 X1 Y320.0 z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y320.0 z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, - "gantry_height": { "value": 40 } + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" } } } diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index f42179ea69..2a63d1d6b2 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -1,5 +1,5 @@ { - "name": "Tronxy X5SA 400", + "name": "Tronxy X5SA/X5ST/Pro 400", "version": 2, "inherits": "tronxy_x", "metadata": { @@ -20,8 +20,14 @@ [27, 45] ] }, + "gantry_height": { "value": 40 }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, - "gantry_height": { "value": 40 } + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 80644d0a4d..c34c70714c 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -1,5 +1,5 @@ { - "name": "Tronxy X5SA 500", + "name": "Tronxy X5SA/X5ST/Pro 500", "version": 2, "inherits": "tronxy_x", "metadata": { @@ -20,8 +20,14 @@ [27, 45] ] }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y450.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y450.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, - "gantry_height": { "value": 40 } + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n "}, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + + "machine_max_feedrate_x": { "value": 150 }, + "machine_max_feedrate_y": { "value": 150 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 } } } diff --git a/resources/definitions/tronxy_x5sa_pro.def.json b/resources/definitions/tronxy_x5sa_pro.def.json deleted file mode 100644 index 6a0e9d8ba0..0000000000 --- a/resources/definitions/tronxy_x5sa_pro.def.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "Tronxy X5SA Pro", - "version": 2, - "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", - "visible": true, - "author": "AdderMk2", - "platform": "tronxy.stl" - }, - "overrides": { - "machine_name": { "default_value": "Tronxy X5SA Pro" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 330 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-48, 45], - [-48, -30], - [27, -30], - [27, 45] - ] - }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 z0.3 F3600.0 ; Move to start position\nG1 X1 Y320.0 z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y320.0 z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ; Move to Zero\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\n" }, - "gantry_height": { "value": 40 } - } -} diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index 9c952fcb4b..f7f8e03e7f 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -10,8 +10,8 @@ }, "overrides": { "machine_name": { "default_value": "Tronxy XY-2" }, - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 255 }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [ [-30, 45], @@ -20,10 +20,19 @@ [27, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" - }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, - "gantry_height": { "value": 40 } + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_acceleration_x": { "value": 150 }, + "machine_max_acceleration_y": { "value": 150 }, + "machine_max_acceleration_z": { "value": 150 }, + "machine_max_acceleration_e": { "value": 150 }, + "machine_acceleration": { "value": 80 } } } diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index c592a6b781..8b3301c4b9 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -20,10 +20,24 @@ [27, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" - }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, - "gantry_height": { "value": 40 } + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + + "machine_max_acceleration_x": { "value": 120 }, + "machine_max_acceleration_y": { "value": 120 }, + "machine_max_acceleration_z": { "value": 120 }, + "machine_max_acceleration_e": { "value": 120 }, + "machine_acceleration": { "value": 150 }, + + "machine_max_jerk_xy": { "value": 20 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 } } } diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 71ba36a4fe..106250d6bd 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -20,10 +20,19 @@ [27, 45] ] }, - "machine_start_gcode": { - "default_value": "; XY-3 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y280.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y280.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" - }, - - "gantry_height": { "value": 30 } + "gantry_height": { "value": 30 }, + + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, + + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_acceleration_x": { "value": 150 }, + "machine_max_acceleration_y": { "value": 150 }, + "machine_max_acceleration_z": { "value": 150 }, + "machine_max_acceleration_e": { "value": 150 }, + "machine_acceleration": { "value": 80 } } } From b96383770b8a2366b07237ca1ba3cad952ffc54e Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:33:19 -0400 Subject: [PATCH 11/19] Update tronxy_x.def.json Fixed error in speed_travel_layer_0. calculation was incorrect. --- resources/definitions/tronxy_x.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index decb49d3ee..2efee1a910 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -68,7 +68,7 @@ "speed_travel": { "value": "60.0 if speed_print < 50 else 75.0 if speed_print > 60 else speed_print * 1.5" }, "speed_layer_0": { "value": 30.0 }, "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 3" }, + "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, From 6c9e414e8ad79e327dc1ac062d46f260339dbf8a Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:33:57 -0400 Subject: [PATCH 12/19] removed obsolete variants X5SA Pro was condensed down into X5SA/X5ST/Pro model --- resources/variants/tronxy_x5sa_pro_0.2.inst.cfg | 12 ------------ resources/variants/tronxy_x5sa_pro_0.3.inst.cfg | 12 ------------ resources/variants/tronxy_x5sa_pro_0.4.inst.cfg | 12 ------------ resources/variants/tronxy_x5sa_pro_0.5.inst.cfg | 12 ------------ resources/variants/tronxy_x5sa_pro_0.6.inst.cfg | 12 ------------ resources/variants/tronxy_x5sa_pro_0.8.inst.cfg | 12 ------------ 6 files changed, 72 deletions(-) delete mode 100644 resources/variants/tronxy_x5sa_pro_0.2.inst.cfg delete mode 100644 resources/variants/tronxy_x5sa_pro_0.3.inst.cfg delete mode 100644 resources/variants/tronxy_x5sa_pro_0.4.inst.cfg delete mode 100644 resources/variants/tronxy_x5sa_pro_0.5.inst.cfg delete mode 100644 resources/variants/tronxy_x5sa_pro_0.6.inst.cfg delete mode 100644 resources/variants/tronxy_x5sa_pro_0.8.inst.cfg diff --git a/resources/variants/tronxy_x5sa_pro_0.2.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.2.inst.cfg deleted file mode 100644 index a422f13c25..0000000000 --- a/resources/variants/tronxy_x5sa_pro_0.2.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.2mm Nozzle -version = 4 -definition = tronxy_x5sa_pro - -[metadata] -setting_version = 13 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.2 diff --git a/resources/variants/tronxy_x5sa_pro_0.3.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.3.inst.cfg deleted file mode 100644 index b6b8868e75..0000000000 --- a/resources/variants/tronxy_x5sa_pro_0.3.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.3mm Nozzle -version = 4 -definition = tronxy_x5sa_pro - -[metadata] -setting_version = 13 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.3 diff --git a/resources/variants/tronxy_x5sa_pro_0.4.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.4.inst.cfg deleted file mode 100644 index 1d5c8e44c6..0000000000 --- a/resources/variants/tronxy_x5sa_pro_0.4.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.4mm Nozzle -version = 4 -definition = tronxy_x5sa_pro - -[metadata] -setting_version = 13 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 diff --git a/resources/variants/tronxy_x5sa_pro_0.5.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.5.inst.cfg deleted file mode 100644 index 3823a73fdc..0000000000 --- a/resources/variants/tronxy_x5sa_pro_0.5.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.5mm Nozzle -version = 4 -definition = tronxy_x5sa_pro - -[metadata] -setting_version = 13 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.5 diff --git a/resources/variants/tronxy_x5sa_pro_0.6.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.6.inst.cfg deleted file mode 100644 index d49d503cf2..0000000000 --- a/resources/variants/tronxy_x5sa_pro_0.6.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.6mm Nozzle -version = 4 -definition = tronxy_x5sa_pro - -[metadata] -setting_version = 13 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 diff --git a/resources/variants/tronxy_x5sa_pro_0.8.inst.cfg b/resources/variants/tronxy_x5sa_pro_0.8.inst.cfg deleted file mode 100644 index d4c9e967de..0000000000 --- a/resources/variants/tronxy_x5sa_pro_0.8.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.8mm Nozzle -version = 4 -definition = tronxy_x5sa_pro - -[metadata] -setting_version = 13 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 From 5a0eda9cfe7005b742dcec012ef1f67552a1297b Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Fri, 1 May 2020 10:22:37 -0400 Subject: [PATCH 13/19] fixed indentation --- resources/definitions/tronxy_d01.def.json | 2 +- resources/definitions/tronxy_x5sa.def.json | 2 +- resources/definitions/tronxy_x5sa_400.def.json | 2 +- resources/definitions/tronxy_x5sa_500.def.json | 2 +- resources/definitions/tronxy_xy2.def.json | 2 +- resources/definitions/tronxy_xy2pro.def.json | 2 +- resources/definitions/tronxy_xy3.def.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index a6e7350c06..f1c0c7d9ec 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 6ac76b6c80..194f9b156b 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index 2a63d1d6b2..4c55ac0995 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index c34c70714c..2bf4b09cd2 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index f7f8e03e7f..92b66d6a27 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index 8b3301c4b9..6c15048bf9 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 106250d6bd..35d2c8c693 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "tronxy_x", "metadata": { - "quality_definition": "tronxy_x", + "quality_definition": "tronxy_x", "visible": true, "author": "AdderMk2", "platform": "tronxy.stl" From 2ab2a204a89c4a3a39ba2777e937665512afbcf4 Mon Sep 17 00:00:00 2001 From: 64bittuning <47930605+64bittuning@users.noreply.github.com> Date: Fri, 1 May 2020 10:33:24 -0400 Subject: [PATCH 14/19] Update tronxy_x.def.json --- resources/definitions/tronxy_x.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 2efee1a910..3273d7dd41 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -65,7 +65,7 @@ "speed_wall_x": { "value": "speed_wall" }, "speed_topbottom": { "value": "speed_print / 1.5" }, "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": "60.0 if speed_print < 50 else 75.0 if speed_print > 60 else speed_print * 1.5" }, + "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" }, "speed_layer_0": { "value": 30.0 }, "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" }, From c79123e6faf1046cf376a02e67d0e5858384a4bd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 May 2020 09:51:20 +0200 Subject: [PATCH 15/19] Use spaces to indent --- resources/definitions/tronxy_d01.def.json | 2 +- resources/definitions/tronxy_x.def.json | 1 - resources/definitions/tronxy_x5sa.def.json | 2 +- resources/definitions/tronxy_x5sa_400.def.json | 8 ++++---- resources/definitions/tronxy_x5sa_500.def.json | 8 ++++---- resources/definitions/tronxy_xy2.def.json | 2 +- resources/definitions/tronxy_xy2pro.def.json | 2 +- resources/definitions/tronxy_xy3.def.json | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index f1c0c7d9ec..f939dcfc34 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -23,7 +23,7 @@ "gantry_height": { "value": 30 }, "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, - + "machine_max_feedrate_x": { "value": 150 }, "machine_max_feedrate_y": { "value": 150 }, "machine_max_feedrate_z": { "value": 20 }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 3273d7dd41..caf6510a1d 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -162,6 +162,5 @@ "minimum_interface_area": { "value": 10 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" } - } } \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 194f9b156b..89a093de13 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -21,7 +21,7 @@ ] }, "gantry_height": { "value": 40 }, - + "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" } } diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index 4c55ac0995..26c64807c6 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -21,11 +21,11 @@ ] }, "gantry_height": { "value": 40 }, - + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, - - "machine_max_feedrate_x": { "value": 100 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + + "machine_max_feedrate_x": { "value": 100 }, "machine_max_feedrate_y": { "value": 100 }, "machine_max_feedrate_z": { "value": 20 }, "machine_max_feedrate_e": { "value": 120 } diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 2bf4b09cd2..2856e09181 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -21,11 +21,11 @@ ] }, "gantry_height": { "value": 40 }, - + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n "}, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, - - "machine_max_feedrate_x": { "value": 150 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, + + "machine_max_feedrate_x": { "value": 150 }, "machine_max_feedrate_y": { "value": 150 }, "machine_max_feedrate_z": { "value": 20 }, "machine_max_feedrate_e": { "value": 120 } diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index 92b66d6a27..15f0f11f26 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -21,7 +21,7 @@ ] }, "gantry_height": { "value": 40 }, - + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index 6c15048bf9..6e771fafd3 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -21,7 +21,7 @@ ] }, "gantry_height": { "value": 40 }, - + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 35d2c8c693..5e0ada7916 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -21,10 +21,10 @@ ] }, "gantry_height": { "value": 30 }, - + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, - + "machine_max_feedrate_x": { "value": 100 }, "machine_max_feedrate_y": { "value": 100 }, "machine_max_feedrate_z": { "value": 20 }, From 156925d48e16b4ce9b3d8ef05843cb5c8389695f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 May 2020 10:51:44 +0200 Subject: [PATCH 16/19] Update to setting_version 14 This is necessary before merging since these profiles would otherwise still need to be updated during runtime. Contributes to issue CURA-7384. --- resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg | 2 +- resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg | 2 +- resources/quality/tronxy/x_global_extra.inst.cfg | 2 +- resources/quality/tronxy/x_global_fine.inst.cfg | 2 +- resources/quality/tronxy/x_global_low.inst.cfg | 2 +- resources/quality/tronxy/x_global_normal.inst.cfg | 2 +- resources/quality/tronxy/x_global_rapid.inst.cfg | 2 +- resources/quality/tronxy/x_global_rough.inst.cfg | 2 +- resources/quality/tronxy/x_global_super.inst.cfg | 2 +- resources/variants/tronxy_d01_0.2.inst.cfg | 2 +- resources/variants/tronxy_d01_0.3.inst.cfg | 2 +- resources/variants/tronxy_d01_0.4.inst.cfg | 2 +- resources/variants/tronxy_d01_0.5.inst.cfg | 2 +- resources/variants/tronxy_d01_0.6.inst.cfg | 2 +- resources/variants/tronxy_d01_0.8.inst.cfg | 2 +- resources/variants/tronxy_x5sa_0.2.inst.cfg | 2 +- resources/variants/tronxy_x5sa_0.3.inst.cfg | 2 +- resources/variants/tronxy_x5sa_0.4.inst.cfg | 2 +- resources/variants/tronxy_x5sa_0.5.inst.cfg | 2 +- resources/variants/tronxy_x5sa_0.6.inst.cfg | 2 +- resources/variants/tronxy_x5sa_0.8.inst.cfg | 2 +- resources/variants/tronxy_x5sa_400_0.2.inst.cfg | 2 +- resources/variants/tronxy_x5sa_400_0.3.inst.cfg | 2 +- resources/variants/tronxy_x5sa_400_0.4.inst.cfg | 2 +- resources/variants/tronxy_x5sa_400_0.5.inst.cfg | 2 +- resources/variants/tronxy_x5sa_400_0.6.inst.cfg | 2 +- resources/variants/tronxy_x5sa_400_0.8.inst.cfg | 2 +- resources/variants/tronxy_x5sa_500_0.2.inst.cfg | 2 +- resources/variants/tronxy_x5sa_500_0.3.inst.cfg | 2 +- resources/variants/tronxy_x5sa_500_0.4.inst.cfg | 2 +- resources/variants/tronxy_x5sa_500_0.5.inst.cfg | 2 +- resources/variants/tronxy_x5sa_500_0.6.inst.cfg | 2 +- resources/variants/tronxy_x5sa_500_0.8.inst.cfg | 2 +- resources/variants/tronxy_x_0.2.inst.cfg | 2 +- resources/variants/tronxy_x_0.3.inst.cfg | 2 +- resources/variants/tronxy_x_0.4.inst.cfg | 2 +- resources/variants/tronxy_x_0.5.inst.cfg | 2 +- resources/variants/tronxy_x_0.6.inst.cfg | 2 +- resources/variants/tronxy_x_0.8.inst.cfg | 2 +- resources/variants/tronxy_xy2_0.2.inst.cfg | 2 +- resources/variants/tronxy_xy2_0.3.inst.cfg | 2 +- resources/variants/tronxy_xy2_0.4.inst.cfg | 2 +- resources/variants/tronxy_xy2_0.5.inst.cfg | 2 +- resources/variants/tronxy_xy2_0.6.inst.cfg | 2 +- resources/variants/tronxy_xy2_0.8.inst.cfg | 2 +- resources/variants/tronxy_xy2pro_0.2.inst.cfg | 2 +- resources/variants/tronxy_xy2pro_0.3.inst.cfg | 2 +- resources/variants/tronxy_xy2pro_0.4.inst.cfg | 2 +- resources/variants/tronxy_xy2pro_0.5.inst.cfg | 2 +- resources/variants/tronxy_xy2pro_0.6.inst.cfg | 2 +- resources/variants/tronxy_xy2pro_0.8.inst.cfg | 2 +- resources/variants/tronxy_xy3_0.2.inst.cfg | 2 +- resources/variants/tronxy_xy3_0.3.inst.cfg | 2 +- resources/variants/tronxy_xy3_0.4.inst.cfg | 2 +- resources/variants/tronxy_xy3_0.5.inst.cfg | 2 +- resources/variants/tronxy_xy3_0.6.inst.cfg | 2 +- resources/variants/tronxy_xy3_0.8.inst.cfg | 2 +- 139 files changed, 139 insertions(+), 139 deletions(-) diff --git a/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg index ab88a687bd..f87f49442c 100644 --- a/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg index 0c35c41490..35b88b01cd 100644 --- a/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg index 4b84a99b87..2d36750855 100644 --- a/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg index ea2b2aae90..d6753ba909 100644 --- a/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg index e7b935d32d..ad766ac1df 100644 --- a/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg index 3ec422e06a..3208e17a5e 100644 --- a/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg index 6ec227e0df..63503c22e0 100644 --- a/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg index 920594342d..cd4af6d93c 100644 --- a/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg b/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg index d4bc218d0e..9ae846e2a4 100644 --- a/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg +++ b/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg index efecddf720..23a165b63b 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg index 0b7f462e3f..1193cfbab6 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg index 5f725dcd54..4b3fcacc3c 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg b/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg index 888bddcf60..3a7d1444e0 100644 --- a/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg index c5061d8c40..6c699268b0 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg index 133b673f12..2c23815426 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg index 069580b352..fe00bb4ce3 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg b/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg index 9350bf57d0..7f7c567f8e 100644 --- a/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg index bb10a9f1ce..1fe75bbe7b 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg index 129d1e21b4..a88546f00f 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg index 42061e2e96..6e2730fc22 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg b/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg index 6d61017cdb..dbb7badd3a 100644 --- a/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg index 78fc88b468..01a3109603 100644 --- a/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg index 30e2fd54d2..6da4c588f7 100644 --- a/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg b/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg index 0536db95a1..d66bd76bf6 100644 --- a/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg index 97bac41f60..858bf28c03 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg index 52bc14d716..1fcf707bee 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg index 4572335890..45222a40ab 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg index 546e57f5f4..62291a6d1b 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg b/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg index 030bda0fa9..be7a9856b3 100644 --- a/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg index ab01e760fc..d91380012c 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg index 7b9f355926..31485774b1 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg index 3c0778c8ec..292f982b9a 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg index 991bff9501..393220314a 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg b/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg index 88ab304a4e..7432ddb970 100644 --- a/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg index b0fa4e1bbf..1f420d44c6 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg index ff8727c6ec..2b2fee483f 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg index 2b24c2093e..9d02998918 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg index ec25304a38..13c23bca80 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg index 6867eae591..56be8112a7 100644 --- a/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg index ec6619e1da..006ee8b897 100644 --- a/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg index 73214c9be8..529fa0a959 100644 --- a/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg b/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg index 3d62c676b7..c87f476cb8 100644 --- a/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg index 1b2a0b2b31..4a8b285e09 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg index 35af5ce337..1a836db428 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg index f57ec13610..168bf0a17b 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg index 8123a8b5fa..104abc05d6 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg b/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg index d5fba681db..6cee274daf 100644 --- a/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg index 227eabbf88..5bd5dd7452 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg index 9a4c728b43..fedcf33680 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg index 646a21e49a..56db3fee8a 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg index e9ab7a2380..849ba42d13 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg b/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg index 3ec2cf1c19..d3a2ea37fe 100644 --- a/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg index 0d35c80652..84b561cedc 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg index 536f5530da..1f15b27015 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg index c2391d2db0..a45c0933f7 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg index 3b5729812d..aa500b5add 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg index d23f57aa45..b158372762 100644 --- a/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg index be3bd5f580..1747a5a606 100644 --- a/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg index 906b30f3a3..5b45b3d0ed 100644 --- a/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg index 2ed303f2a6..51c2b56d9f 100644 --- a/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg index 6a21e478f4..b6066ab10f 100644 --- a/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg index 8eb8ecbb33..529c6bc901 100644 --- a/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg b/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg index b593dfa06f..9c0b71fa67 100644 --- a/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg index 7775d94c2d..a0350e106d 100644 --- a/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg index 7a3a183089..3271ac0f00 100644 --- a/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg b/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg index 3a97828328..fc1028b50e 100644 --- a/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg index 9ab49cf27c..ec1187dca1 100644 --- a/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg index 04826486ac..98b2e2be84 100644 --- a/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg index 78a3c7ffd9..3f42dd7e8e 100644 --- a/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg index 0e69a1728d..40f9d8e6b5 100644 --- a/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg b/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg index 53a7298a0b..500e5780c4 100644 --- a/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg index ecda19c46f..a6abd9debf 100644 --- a/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg index 6658d60c3a..17812aba9d 100644 --- a/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg index 96d97f57ea..b357eca6c2 100644 --- a/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg b/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg index 4e4225c4d8..4f35bdbddc 100644 --- a/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg index 95e9a507a4..301d0a0fd9 100644 --- a/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg index 46482f78ac..f861c52416 100644 --- a/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg b/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg index b59f97e640..1fcea8d5a8 100644 --- a/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg index 76c20de407..28850b84c1 100644 --- a/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg index ef1eb58757..9a0a0841b1 100644 --- a/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg b/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg index 347831e586..3d3e5f74ad 100644 --- a/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg index 64a0c73269..2510a92618 100644 --- a/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg index 55f14bd233..c3a1c31a23 100644 --- a/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid material = generic_tpu diff --git a/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg b/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg index ef9ce1ed8f..12b3cb14af 100644 --- a/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg +++ b/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough material = generic_tpu diff --git a/resources/quality/tronxy/x_global_extra.inst.cfg b/resources/quality/tronxy/x_global_extra.inst.cfg index 05ed3ef8d0..558c0a0d3c 100644 --- a/resources/quality/tronxy/x_global_extra.inst.cfg +++ b/resources/quality/tronxy/x_global_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = extra weight = -1 diff --git a/resources/quality/tronxy/x_global_fine.inst.cfg b/resources/quality/tronxy/x_global_fine.inst.cfg index f827fa1d8c..231f41b7df 100644 --- a/resources/quality/tronxy/x_global_fine.inst.cfg +++ b/resources/quality/tronxy/x_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fine weight = -2 diff --git a/resources/quality/tronxy/x_global_low.inst.cfg b/resources/quality/tronxy/x_global_low.inst.cfg index a6aa67eb14..852e0bce45 100644 --- a/resources/quality/tronxy/x_global_low.inst.cfg +++ b/resources/quality/tronxy/x_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = low weight = -4 diff --git a/resources/quality/tronxy/x_global_normal.inst.cfg b/resources/quality/tronxy/x_global_normal.inst.cfg index 819feb8549..307a9f6c75 100644 --- a/resources/quality/tronxy/x_global_normal.inst.cfg +++ b/resources/quality/tronxy/x_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/tronxy/x_global_rapid.inst.cfg b/resources/quality/tronxy/x_global_rapid.inst.cfg index 8d885ed72f..ea1f2f7c4c 100644 --- a/resources/quality/tronxy/x_global_rapid.inst.cfg +++ b/resources/quality/tronxy/x_global_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rapid weight = -5 diff --git a/resources/quality/tronxy/x_global_rough.inst.cfg b/resources/quality/tronxy/x_global_rough.inst.cfg index 8e41c91094..f33a3ea0ef 100644 --- a/resources/quality/tronxy/x_global_rough.inst.cfg +++ b/resources/quality/tronxy/x_global_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = rough weight = -5 diff --git a/resources/quality/tronxy/x_global_super.inst.cfg b/resources/quality/tronxy/x_global_super.inst.cfg index f3110d3392..a23f789560 100644 --- a/resources/quality/tronxy/x_global_super.inst.cfg +++ b/resources/quality/tronxy/x_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = super weight = 0 diff --git a/resources/variants/tronxy_d01_0.2.inst.cfg b/resources/variants/tronxy_d01_0.2.inst.cfg index 2c68a89553..32fc5b010c 100644 --- a/resources/variants/tronxy_d01_0.2.inst.cfg +++ b/resources/variants/tronxy_d01_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.3.inst.cfg b/resources/variants/tronxy_d01_0.3.inst.cfg index 273fa67d62..ff62b78743 100644 --- a/resources/variants/tronxy_d01_0.3.inst.cfg +++ b/resources/variants/tronxy_d01_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.4.inst.cfg b/resources/variants/tronxy_d01_0.4.inst.cfg index ed7399d68f..5f5302847e 100644 --- a/resources/variants/tronxy_d01_0.4.inst.cfg +++ b/resources/variants/tronxy_d01_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.5.inst.cfg b/resources/variants/tronxy_d01_0.5.inst.cfg index f2e1140363..1a6300950e 100644 --- a/resources/variants/tronxy_d01_0.5.inst.cfg +++ b/resources/variants/tronxy_d01_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.6.inst.cfg b/resources/variants/tronxy_d01_0.6.inst.cfg index e40f0f534a..d0fcdb2e44 100644 --- a/resources/variants/tronxy_d01_0.6.inst.cfg +++ b/resources/variants/tronxy_d01_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.8.inst.cfg b/resources/variants/tronxy_d01_0.8.inst.cfg index ead9789597..50d3dfee87 100644 --- a/resources/variants/tronxy_d01_0.8.inst.cfg +++ b/resources/variants/tronxy_d01_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.2.inst.cfg b/resources/variants/tronxy_x5sa_0.2.inst.cfg index 43d7ca49ec..d075c5416e 100644 --- a/resources/variants/tronxy_x5sa_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.3.inst.cfg b/resources/variants/tronxy_x5sa_0.3.inst.cfg index e541d8f03c..3123b7ee45 100644 --- a/resources/variants/tronxy_x5sa_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.4.inst.cfg b/resources/variants/tronxy_x5sa_0.4.inst.cfg index 7acad15016..edb6d70a1f 100644 --- a/resources/variants/tronxy_x5sa_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.5.inst.cfg b/resources/variants/tronxy_x5sa_0.5.inst.cfg index b897a2dcbc..a5c08e5872 100644 --- a/resources/variants/tronxy_x5sa_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.6.inst.cfg b/resources/variants/tronxy_x5sa_0.6.inst.cfg index 5a47e1192d..cdb69183b2 100644 --- a/resources/variants/tronxy_x5sa_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.8.inst.cfg b/resources/variants/tronxy_x5sa_0.8.inst.cfg index 4c678f7bfb..12d414246c 100644 --- a/resources/variants/tronxy_x5sa_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg index da621f3bc3..99c84da610 100644 --- a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg index 76fea3ab99..49c62a3352 100644 --- a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg index f57e7690ce..fb970eef96 100644 --- a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg index f20a2d82f8..2efb45f713 100644 --- a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg index 881d51da13..4cce13451d 100644 --- a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg index 0def254f0a..7230a3b3d9 100644 --- a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg index 95dcce8235..6a89ceb42c 100644 --- a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg index a0469547fc..0305182b06 100644 --- a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg index 9e1920325c..a5a1e8be61 100644 --- a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg index 141ce39563..c917a1a055 100644 --- a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg index f7204b435c..b56b4657e3 100644 --- a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg index 288618ce00..4818d7685e 100644 --- a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.2.inst.cfg b/resources/variants/tronxy_x_0.2.inst.cfg index 3d95a7aa9c..cdbe4ee137 100644 --- a/resources/variants/tronxy_x_0.2.inst.cfg +++ b/resources/variants/tronxy_x_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.3.inst.cfg b/resources/variants/tronxy_x_0.3.inst.cfg index a3af8bc61c..430be91287 100644 --- a/resources/variants/tronxy_x_0.3.inst.cfg +++ b/resources/variants/tronxy_x_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.4.inst.cfg b/resources/variants/tronxy_x_0.4.inst.cfg index 1f97e8c1b9..cac224035e 100644 --- a/resources/variants/tronxy_x_0.4.inst.cfg +++ b/resources/variants/tronxy_x_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.5.inst.cfg b/resources/variants/tronxy_x_0.5.inst.cfg index 81991322eb..cb9fad016d 100644 --- a/resources/variants/tronxy_x_0.5.inst.cfg +++ b/resources/variants/tronxy_x_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.6.inst.cfg b/resources/variants/tronxy_x_0.6.inst.cfg index 944c3d1fee..0a0e993642 100644 --- a/resources/variants/tronxy_x_0.6.inst.cfg +++ b/resources/variants/tronxy_x_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.8.inst.cfg b/resources/variants/tronxy_x_0.8.inst.cfg index a8d1d15e29..f79030b183 100644 --- a/resources/variants/tronxy_x_0.8.inst.cfg +++ b/resources/variants/tronxy_x_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.2.inst.cfg b/resources/variants/tronxy_xy2_0.2.inst.cfg index 99ecdc22b8..6d88e37de9 100644 --- a/resources/variants/tronxy_xy2_0.2.inst.cfg +++ b/resources/variants/tronxy_xy2_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.3.inst.cfg b/resources/variants/tronxy_xy2_0.3.inst.cfg index f974ec2a06..05ac15e151 100644 --- a/resources/variants/tronxy_xy2_0.3.inst.cfg +++ b/resources/variants/tronxy_xy2_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.4.inst.cfg b/resources/variants/tronxy_xy2_0.4.inst.cfg index a30d1a96a2..b4b4e7054f 100644 --- a/resources/variants/tronxy_xy2_0.4.inst.cfg +++ b/resources/variants/tronxy_xy2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.5.inst.cfg b/resources/variants/tronxy_xy2_0.5.inst.cfg index 4d530416aa..5d68d10e02 100644 --- a/resources/variants/tronxy_xy2_0.5.inst.cfg +++ b/resources/variants/tronxy_xy2_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.6.inst.cfg b/resources/variants/tronxy_xy2_0.6.inst.cfg index 7900a3ff6e..f217430e56 100644 --- a/resources/variants/tronxy_xy2_0.6.inst.cfg +++ b/resources/variants/tronxy_xy2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.8.inst.cfg b/resources/variants/tronxy_xy2_0.8.inst.cfg index ad74053a99..0b6df5ded0 100644 --- a/resources/variants/tronxy_xy2_0.8.inst.cfg +++ b/resources/variants/tronxy_xy2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.2.inst.cfg b/resources/variants/tronxy_xy2pro_0.2.inst.cfg index 24fc9f3321..a659b7f321 100644 --- a/resources/variants/tronxy_xy2pro_0.2.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.3.inst.cfg b/resources/variants/tronxy_xy2pro_0.3.inst.cfg index 4745878f66..0b3b450d3f 100644 --- a/resources/variants/tronxy_xy2pro_0.3.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.4.inst.cfg b/resources/variants/tronxy_xy2pro_0.4.inst.cfg index 5cbe2127a0..da12abf634 100644 --- a/resources/variants/tronxy_xy2pro_0.4.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.5.inst.cfg b/resources/variants/tronxy_xy2pro_0.5.inst.cfg index ae746d14e8..f6ae777da7 100644 --- a/resources/variants/tronxy_xy2pro_0.5.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.6.inst.cfg b/resources/variants/tronxy_xy2pro_0.6.inst.cfg index d81a2a82d0..b649036725 100644 --- a/resources/variants/tronxy_xy2pro_0.6.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.8.inst.cfg b/resources/variants/tronxy_xy2pro_0.8.inst.cfg index 058ff40d15..ab31124a22 100644 --- a/resources/variants/tronxy_xy2pro_0.8.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.2.inst.cfg b/resources/variants/tronxy_xy3_0.2.inst.cfg index 8ca979e3e7..db8496ac09 100644 --- a/resources/variants/tronxy_xy3_0.2.inst.cfg +++ b/resources/variants/tronxy_xy3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.3.inst.cfg b/resources/variants/tronxy_xy3_0.3.inst.cfg index 11b38c7b78..9f6e3f5612 100644 --- a/resources/variants/tronxy_xy3_0.3.inst.cfg +++ b/resources/variants/tronxy_xy3_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.4.inst.cfg b/resources/variants/tronxy_xy3_0.4.inst.cfg index 1801980320..5fa116a7f1 100644 --- a/resources/variants/tronxy_xy3_0.4.inst.cfg +++ b/resources/variants/tronxy_xy3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.5.inst.cfg b/resources/variants/tronxy_xy3_0.5.inst.cfg index 49b8dc3345..ae07fea3a1 100644 --- a/resources/variants/tronxy_xy3_0.5.inst.cfg +++ b/resources/variants/tronxy_xy3_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.6.inst.cfg b/resources/variants/tronxy_xy3_0.6.inst.cfg index 0476e145ab..0440909071 100644 --- a/resources/variants/tronxy_xy3_0.6.inst.cfg +++ b/resources/variants/tronxy_xy3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.8.inst.cfg b/resources/variants/tronxy_xy3_0.8.inst.cfg index bb5a7a2236..2af18ef2df 100644 --- a/resources/variants/tronxy_xy3_0.8.inst.cfg +++ b/resources/variants/tronxy_xy3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 13 +setting_version = 14 type = variant hardware_type = nozzle From a0f4305420c045d130f8f808704353a8f15d3a92 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 May 2020 11:02:37 +0200 Subject: [PATCH 17/19] Remove warnings that will never be visible This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled. Contributes to issue CURA-7384. --- resources/definitions/tronxy_x.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index caf6510a1d..78025c12f2 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -101,15 +101,15 @@ "filter_out_tiny_gaps": { "value": false }, "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value_warning": "machine_max_feedrate_e", "maximum_value": 200 }, "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value_warning": "machine_max_feedrate_e", "maximum_value": 200 }, "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value_warning": "machine_max_feedrate_e", "maximum_value": 200 }, From 7210dd308cfcc20200dddd3789fc0efc40e5102e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 May 2020 11:39:26 +0200 Subject: [PATCH 18/19] Rename Tronxy quality profiles to something more specific to Tronxy To Cura the folder doesn't matter. It only reads the filenames and uses those as unique IDs. So for these filenames we'd like to have an ID that is more speciic to this printer to prevent people from crashing. I'm guessing that the author here already encountered that problem. He copied the files from Creality which has the same problem. However Creality profiles are already published and will be much harder to change the names since they would need to be changed in a version upgrade. Contributes to issue CURA-7384. --- .../{x/x_0.2_ABS_extra.inst.cfg => tronxy_0.2_ABS_extra.inst.cfg} | 0 .../{x/x_0.2_ABS_fine.inst.cfg => tronxy_0.2_ABS_fine.inst.cfg} | 0 .../{x/x_0.2_ABS_super.inst.cfg => tronxy_0.2_ABS_super.inst.cfg} | 0 .../x_0.2_PETG_extra.inst.cfg => tronxy_0.2_PETG_extra.inst.cfg} | 0 .../{x/x_0.2_PETG_fine.inst.cfg => tronxy_0.2_PETG_fine.inst.cfg} | 0 .../x_0.2_PETG_super.inst.cfg => tronxy_0.2_PETG_super.inst.cfg} | 0 .../{x/x_0.2_PLA_extra.inst.cfg => tronxy_0.2_PLA_extra.inst.cfg} | 0 .../{x/x_0.2_PLA_fine.inst.cfg => tronxy_0.2_PLA_fine.inst.cfg} | 0 .../{x/x_0.2_PLA_super.inst.cfg => tronxy_0.2_PLA_super.inst.cfg} | 0 .../{x/x_0.3_ABS_extra.inst.cfg => tronxy_0.3_ABS_extra.inst.cfg} | 0 .../{x/x_0.3_ABS_fine.inst.cfg => tronxy_0.3_ABS_fine.inst.cfg} | 0 .../{x/x_0.3_ABS_low.inst.cfg => tronxy_0.3_ABS_low.inst.cfg} | 0 .../x_0.3_ABS_normal.inst.cfg => tronxy_0.3_ABS_normal.inst.cfg} | 0 .../x_0.3_PETG_extra.inst.cfg => tronxy_0.3_PETG_extra.inst.cfg} | 0 .../{x/x_0.3_PETG_fine.inst.cfg => tronxy_0.3_PETG_fine.inst.cfg} | 0 .../{x/x_0.3_PETG_low.inst.cfg => tronxy_0.3_PETG_low.inst.cfg} | 0 ...x_0.3_PETG_normal.inst.cfg => tronxy_0.3_PETG_normal.inst.cfg} | 0 .../{x/x_0.3_PLA_extra.inst.cfg => tronxy_0.3_PLA_extra.inst.cfg} | 0 .../{x/x_0.3_PLA_fine.inst.cfg => tronxy_0.3_PLA_fine.inst.cfg} | 0 .../{x/x_0.3_PLA_low.inst.cfg => tronxy_0.3_PLA_low.inst.cfg} | 0 .../x_0.3_PLA_normal.inst.cfg => tronxy_0.3_PLA_normal.inst.cfg} | 0 .../{x/x_0.3_TPU_extra.inst.cfg => tronxy_0.3_TPU_extra.inst.cfg} | 0 .../{x/x_0.3_TPU_fine.inst.cfg => tronxy_0.3_TPU_fine.inst.cfg} | 0 .../x_0.3_TPU_normal.inst.cfg => tronxy_0.3_TPU_normal.inst.cfg} | 0 .../{x/x_0.4_ABS_extra.inst.cfg => tronxy_0.4_ABS_extra.inst.cfg} | 0 .../{x/x_0.4_ABS_fine.inst.cfg => tronxy_0.4_ABS_fine.inst.cfg} | 0 .../{x/x_0.4_ABS_low.inst.cfg => tronxy_0.4_ABS_low.inst.cfg} | 0 .../x_0.4_ABS_normal.inst.cfg => tronxy_0.4_ABS_normal.inst.cfg} | 0 .../{x/x_0.4_ABS_rough.inst.cfg => tronxy_0.4_ABS_rough.inst.cfg} | 0 .../x_0.4_PETG_extra.inst.cfg => tronxy_0.4_PETG_extra.inst.cfg} | 0 .../{x/x_0.4_PETG_fine.inst.cfg => tronxy_0.4_PETG_fine.inst.cfg} | 0 .../{x/x_0.4_PETG_low.inst.cfg => tronxy_0.4_PETG_low.inst.cfg} | 0 ...x_0.4_PETG_normal.inst.cfg => tronxy_0.4_PETG_normal.inst.cfg} | 0 .../x_0.4_PETG_rough.inst.cfg => tronxy_0.4_PETG_rough.inst.cfg} | 0 .../{x/x_0.4_PLA_extra.inst.cfg => tronxy_0.4_PLA_extra.inst.cfg} | 0 .../{x/x_0.4_PLA_fine.inst.cfg => tronxy_0.4_PLA_fine.inst.cfg} | 0 .../{x/x_0.4_PLA_low.inst.cfg => tronxy_0.4_PLA_low.inst.cfg} | 0 .../x_0.4_PLA_normal.inst.cfg => tronxy_0.4_PLA_normal.inst.cfg} | 0 .../{x/x_0.4_PLA_rough.inst.cfg => tronxy_0.4_PLA_rough.inst.cfg} | 0 .../{x/x_0.4_TPU_extra.inst.cfg => tronxy_0.4_TPU_extra.inst.cfg} | 0 .../{x/x_0.4_TPU_fine.inst.cfg => tronxy_0.4_TPU_fine.inst.cfg} | 0 .../x_0.4_TPU_normal.inst.cfg => tronxy_0.4_TPU_normal.inst.cfg} | 0 .../{x/x_0.5_ABS_fine.inst.cfg => tronxy_0.5_ABS_fine.inst.cfg} | 0 .../{x/x_0.5_ABS_low.inst.cfg => tronxy_0.5_ABS_low.inst.cfg} | 0 .../x_0.5_ABS_normal.inst.cfg => tronxy_0.5_ABS_normal.inst.cfg} | 0 .../{x/x_0.5_ABS_rapid.inst.cfg => tronxy_0.5_ABS_rapid.inst.cfg} | 0 .../{x/x_0.5_ABS_rough.inst.cfg => tronxy_0.5_ABS_rough.inst.cfg} | 0 .../{x/x_0.5_PETG_fine.inst.cfg => tronxy_0.5_PETG_fine.inst.cfg} | 0 .../{x/x_0.5_PETG_low.inst.cfg => tronxy_0.5_PETG_low.inst.cfg} | 0 ...x_0.5_PETG_normal.inst.cfg => tronxy_0.5_PETG_normal.inst.cfg} | 0 .../x_0.5_PETG_rapid.inst.cfg => tronxy_0.5_PETG_rapid.inst.cfg} | 0 .../x_0.5_PETG_rough.inst.cfg => tronxy_0.5_PETG_rough.inst.cfg} | 0 .../{x/x_0.5_PLA_fine.inst.cfg => tronxy_0.5_PLA_fine.inst.cfg} | 0 .../{x/x_0.5_PLA_low.inst.cfg => tronxy_0.5_PLA_low.inst.cfg} | 0 .../x_0.5_PLA_normal.inst.cfg => tronxy_0.5_PLA_normal.inst.cfg} | 0 .../{x/x_0.5_PLA_rapid.inst.cfg => tronxy_0.5_PLA_rapid.inst.cfg} | 0 .../{x/x_0.5_PLA_rough.inst.cfg => tronxy_0.5_PLA_rough.inst.cfg} | 0 .../{x/x_0.5_TPU_fine.inst.cfg => tronxy_0.5_TPU_fine.inst.cfg} | 0 .../x_0.5_TPU_normal.inst.cfg => tronxy_0.5_TPU_normal.inst.cfg} | 0 .../{x/x_0.5_TPU_rapid.inst.cfg => tronxy_0.5_TPU_rapid.inst.cfg} | 0 .../x_0.6_ABS_normal.inst.cfg => tronxy_0.6_ABS_normal.inst.cfg} | 0 .../{x/x_0.6_ABS_rapid.inst.cfg => tronxy_0.6_ABS_rapid.inst.cfg} | 0 .../{x/x_0.6_ABS_rough.inst.cfg => tronxy_0.6_ABS_rough.inst.cfg} | 0 ...x_0.6_PETG_normal.inst.cfg => tronxy_0.6_PETG_normal.inst.cfg} | 0 .../x_0.6_PETG_rapid.inst.cfg => tronxy_0.6_PETG_rapid.inst.cfg} | 0 .../x_0.6_PETG_rough.inst.cfg => tronxy_0.6_PETG_rough.inst.cfg} | 0 .../{x/x_0.6_PLA_low.inst.cfg => tronxy_0.6_PLA_low.inst.cfg} | 0 .../x_0.6_PLA_normal.inst.cfg => tronxy_0.6_PLA_normal.inst.cfg} | 0 .../{x/x_0.6_PLA_rapid.inst.cfg => tronxy_0.6_PLA_rapid.inst.cfg} | 0 .../{x/x_0.6_PLA_rough.inst.cfg => tronxy_0.6_PLA_rough.inst.cfg} | 0 .../x_0.6_TPU_normal.inst.cfg => tronxy_0.6_TPU_normal.inst.cfg} | 0 .../{x/x_0.6_TPU_rapid.inst.cfg => tronxy_0.6_TPU_rapid.inst.cfg} | 0 .../{x/x_0.8_ABS_low.inst.cfg => tronxy_0.8_ABS_low.inst.cfg} | 0 .../{x/x_0.8_ABS_rapid.inst.cfg => tronxy_0.8_ABS_rapid.inst.cfg} | 0 .../{x/x_0.8_ABS_rough.inst.cfg => tronxy_0.8_ABS_rough.inst.cfg} | 0 .../{x/x_0.8_PETG_low.inst.cfg => tronxy_0.8_PETG_low.inst.cfg} | 0 .../x_0.8_PETG_rapid.inst.cfg => tronxy_0.8_PETG_rapid.inst.cfg} | 0 .../x_0.8_PETG_rough.inst.cfg => tronxy_0.8_PETG_rough.inst.cfg} | 0 .../{x/x_0.8_PLA_low.inst.cfg => tronxy_0.8_PLA_low.inst.cfg} | 0 .../{x/x_0.8_PLA_rapid.inst.cfg => tronxy_0.8_PLA_rapid.inst.cfg} | 0 .../{x/x_0.8_PLA_rough.inst.cfg => tronxy_0.8_PLA_rough.inst.cfg} | 0 .../{x/x_0.8_TPU_low.inst.cfg => tronxy_0.8_TPU_low.inst.cfg} | 0 .../{x/x_0.8_TPU_rapid.inst.cfg => tronxy_0.8_TPU_rapid.inst.cfg} | 0 .../{x/x_0.8_TPU_rough.inst.cfg => tronxy_0.8_TPU_rough.inst.cfg} | 0 .../{x_global_extra.inst.cfg => tronxy_global_extra.inst.cfg} | 0 .../{x_global_fine.inst.cfg => tronxy_global_fine.inst.cfg} | 0 .../tronxy/{x_global_low.inst.cfg => tronxy_global_low.inst.cfg} | 0 .../{x_global_normal.inst.cfg => tronxy_global_normal.inst.cfg} | 0 .../{x_global_rapid.inst.cfg => tronxy_global_rapid.inst.cfg} | 0 .../{x_global_rough.inst.cfg => tronxy_global_rough.inst.cfg} | 0 .../{x_global_super.inst.cfg => tronxy_global_super.inst.cfg} | 0 91 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/tronxy/{x/x_0.2_ABS_extra.inst.cfg => tronxy_0.2_ABS_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_ABS_fine.inst.cfg => tronxy_0.2_ABS_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_ABS_super.inst.cfg => tronxy_0.2_ABS_super.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_PETG_extra.inst.cfg => tronxy_0.2_PETG_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_PETG_fine.inst.cfg => tronxy_0.2_PETG_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_PETG_super.inst.cfg => tronxy_0.2_PETG_super.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_PLA_extra.inst.cfg => tronxy_0.2_PLA_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_PLA_fine.inst.cfg => tronxy_0.2_PLA_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.2_PLA_super.inst.cfg => tronxy_0.2_PLA_super.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_ABS_extra.inst.cfg => tronxy_0.3_ABS_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_ABS_fine.inst.cfg => tronxy_0.3_ABS_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_ABS_low.inst.cfg => tronxy_0.3_ABS_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_ABS_normal.inst.cfg => tronxy_0.3_ABS_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PETG_extra.inst.cfg => tronxy_0.3_PETG_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PETG_fine.inst.cfg => tronxy_0.3_PETG_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PETG_low.inst.cfg => tronxy_0.3_PETG_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PETG_normal.inst.cfg => tronxy_0.3_PETG_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PLA_extra.inst.cfg => tronxy_0.3_PLA_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PLA_fine.inst.cfg => tronxy_0.3_PLA_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PLA_low.inst.cfg => tronxy_0.3_PLA_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_PLA_normal.inst.cfg => tronxy_0.3_PLA_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_TPU_extra.inst.cfg => tronxy_0.3_TPU_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_TPU_fine.inst.cfg => tronxy_0.3_TPU_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.3_TPU_normal.inst.cfg => tronxy_0.3_TPU_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_ABS_extra.inst.cfg => tronxy_0.4_ABS_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_ABS_fine.inst.cfg => tronxy_0.4_ABS_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_ABS_low.inst.cfg => tronxy_0.4_ABS_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_ABS_normal.inst.cfg => tronxy_0.4_ABS_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_ABS_rough.inst.cfg => tronxy_0.4_ABS_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PETG_extra.inst.cfg => tronxy_0.4_PETG_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PETG_fine.inst.cfg => tronxy_0.4_PETG_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PETG_low.inst.cfg => tronxy_0.4_PETG_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PETG_normal.inst.cfg => tronxy_0.4_PETG_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PETG_rough.inst.cfg => tronxy_0.4_PETG_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PLA_extra.inst.cfg => tronxy_0.4_PLA_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PLA_fine.inst.cfg => tronxy_0.4_PLA_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PLA_low.inst.cfg => tronxy_0.4_PLA_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PLA_normal.inst.cfg => tronxy_0.4_PLA_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_PLA_rough.inst.cfg => tronxy_0.4_PLA_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_TPU_extra.inst.cfg => tronxy_0.4_TPU_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_TPU_fine.inst.cfg => tronxy_0.4_TPU_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.4_TPU_normal.inst.cfg => tronxy_0.4_TPU_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_ABS_fine.inst.cfg => tronxy_0.5_ABS_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_ABS_low.inst.cfg => tronxy_0.5_ABS_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_ABS_normal.inst.cfg => tronxy_0.5_ABS_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_ABS_rapid.inst.cfg => tronxy_0.5_ABS_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_ABS_rough.inst.cfg => tronxy_0.5_ABS_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PETG_fine.inst.cfg => tronxy_0.5_PETG_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PETG_low.inst.cfg => tronxy_0.5_PETG_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PETG_normal.inst.cfg => tronxy_0.5_PETG_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PETG_rapid.inst.cfg => tronxy_0.5_PETG_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PETG_rough.inst.cfg => tronxy_0.5_PETG_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PLA_fine.inst.cfg => tronxy_0.5_PLA_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PLA_low.inst.cfg => tronxy_0.5_PLA_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PLA_normal.inst.cfg => tronxy_0.5_PLA_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PLA_rapid.inst.cfg => tronxy_0.5_PLA_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_PLA_rough.inst.cfg => tronxy_0.5_PLA_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_TPU_fine.inst.cfg => tronxy_0.5_TPU_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_TPU_normal.inst.cfg => tronxy_0.5_TPU_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.5_TPU_rapid.inst.cfg => tronxy_0.5_TPU_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_ABS_normal.inst.cfg => tronxy_0.6_ABS_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_ABS_rapid.inst.cfg => tronxy_0.6_ABS_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_ABS_rough.inst.cfg => tronxy_0.6_ABS_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PETG_normal.inst.cfg => tronxy_0.6_PETG_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PETG_rapid.inst.cfg => tronxy_0.6_PETG_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PETG_rough.inst.cfg => tronxy_0.6_PETG_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PLA_low.inst.cfg => tronxy_0.6_PLA_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PLA_normal.inst.cfg => tronxy_0.6_PLA_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PLA_rapid.inst.cfg => tronxy_0.6_PLA_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_PLA_rough.inst.cfg => tronxy_0.6_PLA_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_TPU_normal.inst.cfg => tronxy_0.6_TPU_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.6_TPU_rapid.inst.cfg => tronxy_0.6_TPU_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_ABS_low.inst.cfg => tronxy_0.8_ABS_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_ABS_rapid.inst.cfg => tronxy_0.8_ABS_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_ABS_rough.inst.cfg => tronxy_0.8_ABS_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_PETG_low.inst.cfg => tronxy_0.8_PETG_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_PETG_rapid.inst.cfg => tronxy_0.8_PETG_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_PETG_rough.inst.cfg => tronxy_0.8_PETG_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_PLA_low.inst.cfg => tronxy_0.8_PLA_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_PLA_rapid.inst.cfg => tronxy_0.8_PLA_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_PLA_rough.inst.cfg => tronxy_0.8_PLA_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_TPU_low.inst.cfg => tronxy_0.8_TPU_low.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_TPU_rapid.inst.cfg => tronxy_0.8_TPU_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x/x_0.8_TPU_rough.inst.cfg => tronxy_0.8_TPU_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_extra.inst.cfg => tronxy_global_extra.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_fine.inst.cfg => tronxy_global_fine.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_low.inst.cfg => tronxy_global_low.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_normal.inst.cfg => tronxy_global_normal.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_rapid.inst.cfg => tronxy_global_rapid.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_rough.inst.cfg => tronxy_global_rough.inst.cfg} (100%) rename resources/quality/tronxy/{x_global_super.inst.cfg => tronxy_global_super.inst.cfg} (100%) diff --git a/resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_ABS_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_ABS_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_ABS_super.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_PETG_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_PETG_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_PETG_super.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_PLA_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_PLA_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.2_PLA_super.inst.cfg rename to resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_ABS_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_ABS_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_ABS_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_ABS_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PETG_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PETG_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PETG_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PETG_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PLA_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PLA_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PLA_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_PLA_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_TPU_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_TPU_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.3_TPU_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_ABS_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_ABS_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_ABS_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_ABS_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_ABS_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PETG_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PETG_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PETG_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PETG_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PETG_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PLA_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PLA_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PLA_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PLA_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_PLA_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_TPU_extra.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_TPU_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.4_TPU_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_ABS_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_ABS_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_ABS_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_ABS_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_ABS_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PETG_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PETG_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PETG_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PETG_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PETG_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PLA_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PLA_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PLA_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PLA_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_PLA_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_TPU_fine.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_TPU_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.5_TPU_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_ABS_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_ABS_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_ABS_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PETG_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PETG_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PETG_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PLA_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PLA_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PLA_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_PLA_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_TPU_normal.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.6_TPU_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_ABS_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_ABS_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_ABS_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_PETG_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_PETG_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_PETG_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_PLA_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_PLA_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_PLA_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_TPU_low.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_TPU_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg diff --git a/resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x/x_0.8_TPU_rough.inst.cfg rename to resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg diff --git a/resources/quality/tronxy/x_global_extra.inst.cfg b/resources/quality/tronxy/tronxy_global_extra.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_extra.inst.cfg rename to resources/quality/tronxy/tronxy_global_extra.inst.cfg diff --git a/resources/quality/tronxy/x_global_fine.inst.cfg b/resources/quality/tronxy/tronxy_global_fine.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_fine.inst.cfg rename to resources/quality/tronxy/tronxy_global_fine.inst.cfg diff --git a/resources/quality/tronxy/x_global_low.inst.cfg b/resources/quality/tronxy/tronxy_global_low.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_low.inst.cfg rename to resources/quality/tronxy/tronxy_global_low.inst.cfg diff --git a/resources/quality/tronxy/x_global_normal.inst.cfg b/resources/quality/tronxy/tronxy_global_normal.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_normal.inst.cfg rename to resources/quality/tronxy/tronxy_global_normal.inst.cfg diff --git a/resources/quality/tronxy/x_global_rapid.inst.cfg b/resources/quality/tronxy/tronxy_global_rapid.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_rapid.inst.cfg rename to resources/quality/tronxy/tronxy_global_rapid.inst.cfg diff --git a/resources/quality/tronxy/x_global_rough.inst.cfg b/resources/quality/tronxy/tronxy_global_rough.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_rough.inst.cfg rename to resources/quality/tronxy/tronxy_global_rough.inst.cfg diff --git a/resources/quality/tronxy/x_global_super.inst.cfg b/resources/quality/tronxy/tronxy_global_super.inst.cfg similarity index 100% rename from resources/quality/tronxy/x_global_super.inst.cfg rename to resources/quality/tronxy/tronxy_global_super.inst.cfg From 0bb65c86ecbbd0fafb619603989a9a7966292438 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 May 2020 11:40:14 +0200 Subject: [PATCH 19/19] Fix default quality level Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers. --- resources/definitions/tronxy_x.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 78025c12f2..f638148112 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -19,7 +19,7 @@ "variants_name": "Nozzle Size", "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "standard", + "preferred_quality_type": "normal", "preferred_material": "generic_pla" }, "overrides": {