diff --git a/resources/definitions/anycubic_kobra_s1.def.json b/resources/definitions/anycubic_kobra_s1.def.json new file mode 100644 index 0000000000..09fc5c64e2 --- /dev/null +++ b/resources/definitions/anycubic_kobra_s1.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Anycubic Kobra S1", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "takanuva15", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "platform": "anycubic_kobra_s1_buildplate.obj", + "has_machine_quality": true, + "has_materials": true, + "has_textured_buildplate": true, + "has_variant_buildplates": false, + "has_variants": false, + "machine_extruder_trains": { "0": "anycubic_kobra_s1_extruder_0" }, + "platform_texture": "anycubic_kobra_s1_buildplate_texture.png", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm" + }, + "overrides": + { + "machine_buildplate_type": { "default_value": "PEI Spring Steel" }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "; move printhead away from object\nG1 Z22.000 ; for object exclusion\nG1 E-.76675 F2400\n; fan off\nM106 S0\nM106 P2 S0\n;TYPE:Custom\n; filament end gcode\nG92 E0\nG1 E-2 F3000\nG1 Z24 F900 ; Move print head further up \nG1 F12000; present print\nG1 X44; throw_position_x\nG1 Y270; throw_position_y\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM106 P1 S0 ; turn off fan\nM106 P2 S0\nM106 P3 S0\nM84; disable motors \n; disable stepper motors\nM106 P3 S204\n\n; CONFIG FOR SCREEN PRINT PREVIEW\n; total filament used [g] = {filament_weight}\n\n; CONFIG_BLOCK_START = begin\n; filament_type = {material_type}\n; nozzle_temperature = {material_print_temperature}\n; bed_temperature = {material_bed_temperature}\n; CONFIG_BLOCK_END = end" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": + { + "default_value": "Anycubic Kobra S1", + "description": "Anycubic Kobra S1" + }, + "machine_start_gcode": { "default_value": "M106 S0\nM106 P2 S0\n;TYPE:Custom\nG9111 bedTemp={material_bed_temperature} extruderTemp={material_print_temperature}\nM117\nM106 P3 S153\nG90\nG21\nM83 ; use relative distances for extrusion\n; filament start gcode\nM900 K0.035 ; Override pressure advance value\nM106 S0\nM106 P2 S0\n\nM420 S1 ;load stored mesh to avoid auto-leveling" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 710ee29a40..2149116a03 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -74,8 +74,8 @@ { "maximum_value": "max(35, min((material_bed_temperature + 20) / 2, 70))", "maximum_value_warning": "max(30, min((material_bed_temperature + 10) / 2, 70))", - "minimum_value": "max((material_bed_temperature - 30) / 2, 30)", - "minimum_value_warning": "max((material_bed_temperature - 20) / 2, 30)" + "minimum_value": "max((material_bed_temperature - 40) / 1.5, 30)", + "minimum_value_warning": "max((material_bed_temperature - 35) / 1.5, 30)" }, "cool_min_layer_time": { "value": 3 }, "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 12" }, @@ -86,6 +86,7 @@ "gantry_height": { "value": 35 }, "gradual_support_infill_steps": { "value": "3 if support_interface_enable and support_structure != 'tree' else 0" }, "group_outer_walls": { "value": "False" }, + "infill_angles": { "value": "[-40, 50] if infill_pattern in ('grid', 'lines', 'zigzag') else [ ]" }, "infill_before_walls": { "value": "False if infill_sparse_density > 50 else True" }, "infill_enable_travel_optimization": { "value": "True" }, "infill_material_flow": @@ -94,7 +95,7 @@ "value": "(1 + (skin_material_flow-infill_sparse_density) / 100 if infill_sparse_density > skin_material_flow else 1) * material_flow" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'triangles'" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'gyroid' if 15 < speed_infill / ( infill_line_width * 300 / infill_sparse_density ) < 25 else 'triangles'" }, "infill_sparse_density": { "maximum_value": "100" }, "infill_wipe_dist": { "value": "0" }, "inset_direction": { "value": "'inside_out'" }, @@ -199,6 +200,7 @@ "value": "skin_material_flow" }, "roofing_monotonic": { "value": "True" }, + "skin_angles": { "value": "[-40, 50]" }, "skin_material_flow": { "maximum_value": "100", diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 165a7719b2..96b86f4632 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -387,6 +387,7 @@ "unit": "m/s\u00b3", "value": "jerk_wall_0" }, + "keep_retracting_during_travel": { "enabled": false }, "machine_gcode_flavor": { "default_value": "Cheetah" }, "machine_max_acceleration_x": { "default_value": 50000 }, "machine_max_acceleration_y": { "default_value": 50000 }, @@ -436,12 +437,14 @@ "meshfix_maximum_resolution": { "value": 0.4 }, "min_infill_area": { "default_value": 10 }, "optimize_wall_printing_order": { "value": false }, + "prime_during_travel_ratio": { "enabled": false }, "prime_tower_brim_enable": { "value": true }, "prime_tower_min_volume": { "value": 10 }, "prime_tower_mode": { "resolve": "'normal'" }, "retraction_amount": { "value": 6.5 }, "retraction_combing_avoid_distance": { "value": 1.2 }, "retraction_combing_max_distance": { "value": 50 }, + "retraction_during_travel_ratio": { "enabled": false }, "retraction_hop": { "value": 1 }, "retraction_hop_after_extruder_switch_height": { "value": 2 }, "retraction_hop_enabled": { "value": true }, diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 529abc0940..a9883d268f 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -158,7 +158,7 @@ "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, "machine_name": { "default_value": "MakerBot Sketch Sprint" }, - "machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" }, + "machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nSET_SERVO SERVO=my_servo ANGLE=180\nSET_FAN_SPEED FAN=external_fan SPEED=1\nSET_FAN_SPEED FAN=internal_fan SPEED=1\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" }, "machine_width": { "default_value": 221.5 }, "material_bed_temp_wait": { "value": "False" }, "material_bed_temperature": diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 4df6e50a85..73b08ec6ef 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -75,10 +75,6 @@ "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", @@ -186,9 +182,7 @@ "machine_extruder_trains": { "0": "zyyx_plus_extruder_0" }, "machine_x3g_variant": "z", "preferred_material": "generic_pla", - "preferred_quality_type": "normal", - "quality_definition": "zyyx_plus", - "setting_version": 3 + "preferred_quality_type": "normal" }, "overrides": { diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 3fdfbe27d7..385cf9b0ff 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -73,10 +73,6 @@ "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", @@ -185,8 +181,6 @@ "machine_x3g_variant": "z", "preferred_material": "generic_pla", "preferred_variant_name": "Carbon0.6", - "quality_definition": "zyyx_pro", - "setting_version": 3, "variants_name": "SwiftTool" }, "overrides": diff --git a/resources/extruders/anycubic_kobra_s1_extruder_0.def.json b/resources/extruders/anycubic_kobra_s1_extruder_0.def.json new file mode 100644 index 0000000000..c850757b6e --- /dev/null +++ b/resources/extruders/anycubic_kobra_s1_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "anycubic_kobra_s1", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/images/anycubic_kobra_s1_buildplate_texture.png b/resources/images/anycubic_kobra_s1_buildplate_texture.png new file mode 100644 index 0000000000..1f80dd346d Binary files /dev/null and b/resources/images/anycubic_kobra_s1_buildplate_texture.png differ diff --git a/resources/meshes/anycubic_kobra_s1_buildplate.obj b/resources/meshes/anycubic_kobra_s1_buildplate.obj new file mode 100644 index 0000000000..c206e9d45d --- /dev/null +++ b/resources/meshes/anycubic_kobra_s1_buildplate.obj @@ -0,0 +1,917 @@ +# Blender 4.5.2 LTS +# www.blender.org +mtllib anycubic_kobra_s1_buildplate.mtl +o anycubic_kobra_s1_buildplate +v -129.054123 -130.091019 -0.700027 +v -131.999741 -125.129326 -0.700027 +v 24.434870 -134.329071 -0.699997 +v 17.018261 -141.131271 -0.700027 +v 17.993422 -138.654526 -0.700017 +v 17.573563 -138.625687 -0.700039 +v 7.467300 -130.848297 -0.700027 +v 10.650862 -131.688293 -0.700024 +v 10.835647 -131.177765 -0.700052 +v 10.634915 -131.406662 -0.700027 +v 28.897467 -129.170013 -0.700027 +v 129.731293 -141.134842 -0.700027 +v 28.763437 -139.157059 -0.700023 +v 19.657635 1.777050 -0.700027 +v 130.689468 -140.855942 -0.700027 +v -126.003876 134.864807 -0.700027 +v 94.529488 119.736588 -0.700027 +v -127.664345 134.508484 -0.700027 +v -53.626228 131.701767 -0.700027 +v -58.244865 131.375092 -0.700011 +v -56.412327 131.738388 -0.700027 +v -58.738430 134.509171 -0.700027 +v -51.261589 134.509155 -0.700027 +v 59.504433 134.866333 -0.700027 +v 58.738407 134.509140 -0.700027 +v 56.373764 131.701767 -0.700027 +v 129.054123 133.823685 -0.700027 +v 6.849222 -131.822647 -0.700027 +v 5.973866 -131.306747 -0.700027 +v -125.937408 -131.133133 -0.700027 +v 16.145327 -140.860641 -0.700027 +v 15.498124 -140.467697 -0.700027 +v 19.726137 -139.083862 -0.699903 +v 19.846451 -139.155289 -0.699967 +v 19.694454 -138.804977 -0.700012 +v 19.672100 -138.985672 -0.699999 +v 17.791988 -138.688354 -0.699921 +v 24.677004 -131.159836 -0.700026 +v 5.082874 -131.134628 -0.700027 +v -131.642151 -126.798012 -0.700027 +v -130.345932 -128.984650 -0.700027 +v -131.129166 -127.883667 -0.700027 +v -127.521126 -130.824478 -0.700027 +v 24.189461 -134.309204 -0.699963 +v 28.900984 -139.058914 -0.699964 +v 28.937689 -138.922531 -0.699970 +v 131.429153 -140.236237 -0.700027 +v 131.829224 -139.561752 -0.700027 +v 131.999878 -138.837708 -0.700027 +v 24.932178 -131.709625 -0.699983 +v 24.986902 -131.483047 -0.700003 +v 24.872414 -131.261368 -0.700028 +v -131.972137 129.010681 -0.700027 +v -131.690811 130.387451 -0.700027 +v -129.850983 133.212265 -0.700027 +v -130.957367 131.920441 -0.700027 +v -59.504433 134.866333 -0.700027 +v -55.206390 131.169067 -0.700027 +v -54.353245 131.252808 -0.700027 +v -55.876461 131.360275 -0.700027 +v -61.206200 131.340363 -0.699992 +v -61.103699 131.284119 -0.700031 +v -58.337986 131.290283 -0.700022 +v -61.257591 131.533386 -0.700020 +v -60.041721 132.993088 -0.699486 +v -59.706219 133.092285 -0.699463 +v -59.445782 133.003464 -0.699889 +v -128.750000 133.995499 -0.700027 +v -58.214905 131.529205 -0.699996 +v -59.081882 134.772491 -0.700027 +v -50.918118 134.772491 -0.700027 +v 54.123543 131.360275 -0.700027 +v 54.793610 131.169067 -0.700027 +v 55.646759 131.252808 -0.700027 +v -50.495571 134.866333 -0.700027 +v 58.372162 131.283875 -0.700029 +v 61.090813 131.281311 -0.700040 +v 61.215893 131.350204 -0.699977 +v 131.996445 128.883270 -0.700027 +v 131.642151 130.530670 -0.700027 +v 53.603378 131.725235 -0.700027 +v 50.495571 134.866333 -0.700027 +v 59.437256 133.000992 -0.699896 +v 50.918118 134.772491 -0.700027 +v 51.261566 134.509171 -0.700027 +v 59.081882 134.772491 -0.700027 +v 59.768948 133.092285 -0.699463 +v 61.261791 131.523209 -0.699989 +v 60.038094 132.999237 -0.699867 +v 130.345932 132.717316 -0.700027 +v 131.129166 131.616333 -0.700027 +v 125.947678 134.864441 -0.700027 +v 127.521126 134.557144 -0.700027 +v 15.477744 -140.445251 -0.000027 +v 6.921199 -131.894821 -0.000027 +v 6.172548 -131.389053 -0.000027 +v 5.182955 -131.133942 -0.000027 +v -126.021477 -131.129410 -0.000027 +v -127.664345 -130.775818 -0.000027 +v -128.750000 -130.262833 -0.000027 +v -129.850983 -129.479599 -0.000027 +v -130.957352 -128.187790 -0.000027 +v -131.690811 -126.654793 -0.000027 +v -131.999237 -125.072853 -0.000027 +v -131.999634 128.862701 -0.000027 +v -131.642151 130.530670 -0.000027 +v -131.129166 131.616333 -0.000027 +v -130.345932 132.717316 -0.000027 +v -129.054123 133.823685 -0.000027 +v -127.521126 134.557144 -0.000027 +v -125.943855 134.864960 -0.000027 +v -59.504433 134.866333 -0.000027 +v -59.081867 134.772491 -0.000027 +v -58.738400 134.509140 -0.000027 +v -56.382183 131.713150 -0.000027 +v -55.646759 131.252808 -0.000027 +v -54.793610 131.169067 -0.000027 +v -54.123543 131.360275 -0.000027 +v -53.588142 131.744583 -0.000027 +v -51.261597 134.509155 -0.000027 +v -50.918118 134.772491 -0.000027 +v -50.495571 134.866333 -0.000027 +v 50.495571 134.866333 -0.000027 +v 50.918118 134.772491 -0.000027 +v 53.590721 131.735840 -0.000027 +v 51.261597 134.509155 -0.000027 +v 54.353245 131.252808 -0.000027 +v 55.206390 131.169067 -0.000027 +v 55.876461 131.360275 -0.000027 +v 56.411842 131.744568 -0.000027 +v 58.738411 134.509155 -0.000027 +v 59.081882 134.772491 -0.000027 +v 126.004631 134.864685 -0.000027 +v 59.504433 134.866333 -0.000027 +v 127.664345 134.508484 -0.000027 +v 128.750000 133.995499 -0.000027 +v 129.850983 133.212265 -0.000027 +v 130.957367 131.920441 -0.000027 +v 131.690811 130.387451 -0.000027 +v 131.998947 128.807678 -0.000027 +v 131.999741 -138.838501 -0.000027 +v 131.720840 -139.824554 -0.000027 +v 131.101089 -140.564301 -0.000027 +v 130.426453 -140.964417 -0.000027 +v 129.667175 -141.134506 -0.000027 +v 17.248808 -141.134827 -0.000027 +v 16.351576 -140.962082 -0.000027 +v 19.707363 -138.788864 -0.000041 +v 24.162891 -134.333496 -0.000053 +v 19.663969 -138.943939 -0.000087 +v 19.797115 -139.148376 -0.000032 +v 28.767149 -139.155899 -0.000027 +v 28.914742 -139.033264 -0.000058 +v 28.935387 -138.848969 -0.000056 +v 28.901199 -138.794693 -0.699900 +v 24.398291 -134.300629 -0.000029 +v 17.543394 -138.596664 -0.000027 +v 10.667012 -131.718216 -0.000029 +v 17.720654 -138.684357 -0.000258 +v 18.011297 -138.637558 -0.000064 +v 24.922869 -131.725021 -0.000033 +v 24.982822 -131.458267 -0.000442 +v 24.862761 -131.252243 -0.000026 +v 24.679277 -131.160583 -0.000028 +v 10.902476 -131.165527 -0.000039 +v 10.718793 -131.272064 -0.000636 +v 10.623919 -131.451797 -0.000026 +v 61.245735 131.562759 -0.000011 +v 61.253937 131.430710 0.000029 +v 61.149254 131.294632 -0.000034 +v 60.027687 133.012787 -0.000037 +v 59.431732 132.991699 -0.000385 +v 59.678104 133.087860 -0.000445 +v 58.228245 131.561798 -0.000019 +v 58.211628 131.530136 -0.699993 +v 58.355827 131.286514 -0.000025 +v 58.224735 131.394821 -0.000031 +v 58.258984 131.349060 -0.699994 +v -58.215385 131.472092 -0.000096 +v -58.242355 131.581573 -0.000025 +v -58.251167 131.362717 -0.000042 +v -58.354370 131.287048 -0.000028 +v -59.444996 133.012695 -0.000070 +v -60.042431 132.997391 -0.000213 +v -59.797066 133.087875 -0.000445 +v -61.231110 131.585205 -0.000019 +v -61.179737 131.318527 -0.000114 +v -61.088017 131.281326 -0.000014 +v -61.257828 131.433472 0.000060 +v -27.913065 -9.021112 -0.000027 +v -96.694077 101.654877 -0.000027 +v 7.098911 -130.230896 -0.000027 +v 25.810665 -131.897369 -0.000027 +v 31.053526 -138.925018 -0.000027 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -0.0001 -1.0000 +vn -0.0003 0.0004 -1.0000 +vn 0.0006 -0.0007 -1.0000 +vn 0.0001 -0.0001 -1.0000 +vn 0.0005 -0.0001 -1.0000 +vn -0.0005 0.0002 -1.0000 +vn -0.0000 0.0006 -1.0000 +vn -0.0020 -0.0000 -1.0000 +vn -0.0001 0.0001 -1.0000 +vn -0.0000 0.0008 -1.0000 +vn 0.0001 -0.0000 -1.0000 +vn 0.0012 -0.0006 -1.0000 +vn 0.0002 -0.0003 -1.0000 +vn -0.0017 -0.0001 -1.0000 +vn -0.0000 0.0001 -1.0000 +vn -0.0001 -0.0001 -1.0000 +vn 0.0002 0.0008 -1.0000 +vn 0.0002 0.0006 -1.0000 +vn 0.0012 0.0005 -1.0000 +vn -0.0017 -0.0006 -1.0000 +vn 0.0001 -0.0003 -1.0000 +vn -0.7069 -0.7074 -0.0003 +vn -0.7069 -0.7073 0.0021 +vn -0.5073 -0.8607 0.0428 +vn -0.5596 -0.8283 -0.0279 +vn -0.1896 -0.9815 0.0281 +vn -0.2494 -0.9674 -0.0430 +vn -0.0000 -1.0000 0.0053 +vn -0.0000 -1.0000 0.0009 +vn -0.2103 -0.9773 0.0249 +vn -0.1913 -0.9814 -0.0177 +vn -0.4269 -0.9036 -0.0363 +vn -0.4314 -0.9018 -0.0256 +vn -0.5789 -0.8137 0.0518 +vn -0.6486 -0.7573 -0.0768 +vn -0.8138 -0.5789 -0.0518 +vn -0.9018 -0.4314 0.0256 +vn -0.9036 -0.4269 0.0363 +vn -0.9814 -0.1913 0.0161 +vn -0.9775 -0.2095 -0.0251 +vn -0.7573 -0.6486 0.0768 +vn -0.9992 0.0001 -0.0392 +vn -1.0000 -0.0000 0.0007 +vn -0.9775 0.2095 0.0251 +vn -0.9797 0.2002 0.0038 +vn -0.9036 0.4269 -0.0363 +vn -0.9018 0.4314 -0.0256 +vn -0.8137 0.5789 0.0518 +vn -0.7573 0.6486 -0.0769 +vn -0.5789 0.8137 -0.0518 +vn -0.4314 0.9018 0.0256 +vn -0.4269 0.9036 0.0363 +vn -0.1915 0.9814 0.0162 +vn -0.2098 0.9774 -0.0250 +vn -0.6486 0.7573 0.0768 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 1.0000 -0.0002 +vn 0.2168 0.9762 -0.0000 +vn 0.6085 0.7936 0.0001 +vn 0.6084 0.7936 -0.0000 +vn 0.7659 0.6430 -0.0000 +vn 0.7646 0.6444 -0.0097 +vn 0.5765 0.8171 0.0046 +vn 0.5301 0.8468 -0.0439 +vn 0.2739 0.9600 0.0575 +vn 0.0975 0.9936 -0.0575 +vn -0.0975 0.9936 0.0575 +vn -0.2740 0.9600 -0.0575 +vn -0.5250 0.8501 0.0418 +vn -0.5830 0.8123 -0.0180 +vn -0.7648 0.6442 0.0022 +vn -0.7651 0.6439 -0.0000 +vn -0.2168 0.9762 -0.0000 +vn -0.6085 0.7936 -0.0000 +vn -0.6084 0.7936 -0.0000 +vn 0.6085 0.7936 -0.0000 +vn 0.7653 0.6437 0.0041 +vn 0.7658 0.6431 -0.0000 +vn 0.5743 0.8186 -0.0020 +vn 0.5346 0.8439 -0.0458 +vn 0.2740 0.9600 0.0575 +vn -0.2739 0.9600 -0.0575 +vn -0.6084 0.7936 -0.0001 +vn -0.0000 1.0000 -0.0004 +vn 0.2098 0.9774 0.0250 +vn 0.1917 0.9813 -0.0159 +vn 0.4269 0.9036 -0.0363 +vn 0.4314 0.9018 -0.0256 +vn 0.5789 0.8137 0.0518 +vn 0.6486 0.7573 -0.0768 +vn 0.8137 0.5789 -0.0518 +vn 0.9018 0.4314 0.0256 +vn 0.9036 0.4269 0.0363 +vn 0.9814 0.1914 0.0172 +vn 0.9773 0.2102 -0.0249 +vn 0.7573 0.6486 0.0768 +vn 1.0000 -0.0000 0.0002 +vn 1.0000 -0.0000 -0.0036 +vn 0.9612 -0.2719 0.0468 +vn 0.9733 -0.2294 -0.0001 +vn 0.8586 -0.5093 -0.0583 +vn 0.7652 -0.6411 0.0582 +vn 0.6411 -0.7652 -0.0582 +vn 0.5092 -0.8587 0.0583 +vn 0.2186 -0.9756 0.0204 +vn 0.2792 -0.9592 -0.0437 +vn -0.0000 -1.0000 -0.0050 +vn -0.0000 -1.0000 0.0004 +vn -0.1887 -0.9804 0.0572 +vn -0.2957 -0.9539 -0.0511 +vn -0.5090 -0.8607 0.0128 +vn -0.5188 -0.8544 0.0290 +vn 0.7072 -0.7070 0.0023 +vn 0.7071 -0.7071 0.0032 +vn 0.5103 0.8596 0.0275 +vn 0.8759 0.4821 -0.0186 +vn 0.9923 -0.1228 0.0189 +vn 0.9629 -0.2695 -0.0116 +vn 0.8374 0.5454 -0.0347 +vn 0.0002 1.0000 -0.0099 +vn 0.0008 1.0000 -0.0016 +vn -0.5808 0.8140 0.0018 +vn -0.9937 0.1113 -0.0150 +vn -0.9656 0.2599 0.0095 +vn -0.9613 -0.2744 0.0257 +vn -0.6390 0.7690 -0.0157 +vn -0.7070 -0.7071 -0.0082 +vn -0.7078 -0.7061 -0.0201 +vn -0.0806 -0.9961 0.0363 +vn 0.1382 -0.9900 -0.0291 +vn 0.7072 0.7070 0.0012 +vn 0.7078 0.7063 0.0139 +vn 0.2757 0.9610 0.0226 +vn 0.4433 0.8962 -0.0181 +vn -0.1656 0.9859 -0.0225 +vn -0.1589 0.9871 -0.0199 +vn -0.7072 0.7071 0.0009 +vn -0.7074 0.7068 0.0062 +vn -0.9720 0.2347 -0.0140 +vn -0.9756 0.2193 -0.0082 +vn -0.8885 -0.4588 0.0111 +vn -0.8640 -0.5035 -0.0053 +vn -0.4611 -0.8874 0.0052 +vn -0.4469 -0.8946 0.0005 +vn 0.0004 -0.9998 0.0175 +vn 0.0013 -1.0000 -0.0011 +vn 0.5015 -0.8645 -0.0328 +vn 0.7513 -0.6589 0.0367 +vn 0.9982 0.0565 0.0193 +vn 0.8842 -0.4668 -0.0162 +vn 0.9870 0.1597 -0.0160 +vn -0.9979 -0.0621 -0.0194 +vn -0.9663 0.2563 0.0230 +vn -0.7923 0.6096 -0.0270 +vn -0.4824 0.8757 0.0236 +vn -0.7657 -0.6432 0.0011 +vn -0.7697 -0.6381 0.0184 +vn 0.3636 -0.9315 -0.0095 +vn -0.2098 -0.9772 -0.0334 +vn 0.2652 -0.9638 0.0284 +vn -0.3267 -0.9450 0.0134 +vn 0.7682 -0.6401 0.0107 +vn 0.7651 -0.6439 -0.0025 +vn 0.6368 0.7708 -0.0192 +vn 0.4990 0.8665 0.0084 +vn 0.9995 -0.0210 -0.0228 +vn 0.9670 0.2529 0.0308 +vn 0.0009 1.0000 -0.0037 +vn -0.0029 0.9998 -0.0188 +vn -0.9815 0.1908 0.0149 +vn -0.5913 0.8064 -0.0101 +vn -0.6733 0.7393 0.0070 +vn -0.9708 -0.2391 -0.0202 +vn -0.9504 0.3109 -0.0031 +vn -0.7654 -0.6432 0.0181 +vn -0.7676 -0.6409 0.0093 +vn 0.3460 -0.9382 0.0061 +vn -0.2087 -0.9774 -0.0333 +vn 0.2834 -0.9585 0.0308 +vn -0.3227 -0.9464 0.0128 +vn 0.7650 -0.6440 0.0047 +vn 0.7682 -0.6399 0.0183 +vn 0.3758 0.9267 -0.0047 +vn 0.8271 0.5619 -0.0138 +vn 0.4810 0.8767 0.0092 +vn 0.9846 -0.1733 -0.0244 +vn 0.9657 0.2571 0.0370 +vn -0.0021 1.0000 0.0046 +vn -0.0022 1.0000 0.0041 +vn -0.0000 -0.0000 1.0000 +vn -0.0001 0.0002 1.0000 +vn 0.0002 -0.0004 1.0000 +vn -0.0008 0.0006 1.0000 +vn 0.0010 -0.0005 1.0000 +vn 0.0010 0.0029 1.0000 +vn -0.0010 -0.0039 1.0000 +vn -0.0005 0.0006 1.0000 +vn 0.0008 -0.0010 1.0000 +vn -0.0007 0.0009 1.0000 +vn -0.0001 0.0003 1.0000 +vn -0.0001 0.0005 1.0000 +vn -0.0000 -0.0006 1.0000 +vn -0.0001 -0.0000 1.0000 +vn 0.0008 -0.0005 1.0000 +vn 0.0012 -0.0008 1.0000 +vn -0.0010 0.0002 1.0000 +vn -0.0000 0.0003 1.0000 +vn -0.0000 0.0004 1.0000 +vn -0.0001 0.0001 1.0000 +vn 0.0003 0.0015 1.0000 +vn -0.0023 -0.0033 1.0000 +vn -0.0000 -0.0001 1.0000 +vn -0.0000 0.0001 1.0000 +vn -0.0000 -0.0005 1.0000 +vn 0.0004 -0.0001 1.0000 +vn -0.0014 -0.0012 1.0000 +vn 0.0003 -0.0001 1.0000 +vt 0.000000 0.000000 +vt 0.000107 0.058203 +vt 0.016454 0.037622 +vt 0.394244 0.478671 +vt 0.016996 0.998790 +vt 0.001448 0.984261 +vt 0.000121 0.978240 +vt 0.133726 0.879669 +vt 0.286443 0.988604 +vt 0.276187 0.999660 +vt 0.279358 0.988093 +vt 0.540230 0.035080 +vt 0.526857 0.039508 +vt 0.540433 0.034155 +vt 0.574484 0.007985 +vt 0.561949 0.000747 +vt 0.565302 0.000027 +vt 0.597730 0.033470 +vt 0.999878 0.008326 +vt 0.720558 0.987447 +vt 0.713609 0.988715 +vt 0.991098 0.000046 +vt 0.998752 0.004815 +vt 0.012310 0.039392 +vt 0.008205 0.042301 +vt 0.519592 0.036165 +vt 0.022652 0.036358 +vt 0.004032 0.046963 +vt 0.001265 0.052495 +vt 0.558636 0.002548 +vt 0.526167 0.033461 +vt 0.566417 0.009197 +vt 0.574994 0.007280 +vt 0.574631 0.008489 +vt 0.567037 0.008919 +vt 0.568114 0.009061 +vt 0.523292 0.035196 +vt 0.540622 0.035760 +vt 0.541267 0.036099 +vt 0.593443 0.036109 +vt 0.022945 0.999896 +vt 0.003298 0.988224 +vt 0.006339 0.992151 +vt 0.011213 0.996143 +vt 0.268058 0.988106 +vt 0.267978 0.987584 +vt 0.268216 0.987186 +vt 0.274587 1.000000 +vt 0.278953 0.987065 +vt 0.268591 0.987023 +vt 0.279330 0.987333 +vt 0.279457 0.987685 +vt 0.289243 0.987038 +vt 0.292425 0.986655 +vt 0.294945 0.987343 +vt 0.296968 0.988715 +vt 0.274751 0.993207 +vt 0.272600 0.993165 +vt 0.277488 0.998706 +vt 0.273704 0.993558 +vt 0.308709 1.000000 +vt 0.305808 0.998706 +vt 0.307109 0.999660 +vt 0.608914 0.007209 +vt 0.617588 0.008008 +vt 0.609438 0.007577 +vt 0.609480 0.008255 +vt 0.592353 0.024675 +vt 0.591541 0.024638 +vt 0.594342 0.034112 +vt 0.594123 0.035786 +vt 0.594533 0.035019 +vt 0.996497 0.002108 +vt 0.993956 0.000667 +vt 0.694129 0.998706 +vt 0.709065 0.986656 +vt 0.705884 0.987038 +vt 0.711585 0.987343 +vt 0.702989 0.988695 +vt 0.720555 0.988028 +vt 0.720989 0.987063 +vt 0.999829 0.978042 +vt 0.731580 0.987122 +vt 0.731963 0.987555 +vt 0.731920 0.988003 +vt 0.691227 1.000000 +vt 0.692828 0.999660 +vt 0.722448 0.998706 +vt 0.724957 0.993040 +vt 0.727273 0.993212 +vt 0.723749 0.999660 +vt 0.725349 1.000000 +vt 0.726232 0.993558 +vt 0.977220 0.999882 +vt 0.983483 0.998614 +vt 0.998672 0.983742 +vt 0.995905 0.989274 +vt 0.991731 0.993936 +vt 0.987626 0.996845 +s 0 +usemtl Material.002 +f 2/1/1 1/1/1 40/1/1 +f 14/1/1 9/1/1 7/1/1 +f 10/1/1 8/1/1 7/1/1 +f 14/1/1 20/1/1 21/1/1 +f 25/1/1 175/1/1 26/1/1 +f 26/1/1 76/1/1 17/1/1 +f 26/1/1 17/1/1 14/1/1 +f 29/1/1 7/1/1 28/1/1 +f 6/1/1 28/1/1 7/1/1 +f 7/1/2 9/1/2 10/1/2 +f 4/1/1 31/1/1 32/1/1 +f 4/1/3 33/1/3 34/1/3 +f 36/1/4 33/1/4 4/1/4 +f 4/1/5 35/1/5 36/1/5 +f 4/1/6 6/1/6 37/1/6 +f 6/1/1 4/1/1 32/1/1 +f 32/1/1 28/1/1 6/1/1 +f 14/1/1 38/1/1 9/1/1 +f 6/1/1 7/1/1 8/1/1 +f 5/1/7 4/1/7 37/1/7 +f 5/1/1 35/1/1 4/1/1 +f 39/1/1 7/1/1 29/1/1 +f 40/1/1 41/1/1 42/1/1 +f 1/1/1 30/1/1 43/1/1 +f 40/1/1 1/1/1 41/1/1 +f 2/1/1 14/1/1 1/1/1 +f 30/1/1 14/1/1 39/1/1 +f 30/1/1 1/1/1 14/1/1 +f 14/1/1 7/1/1 39/1/1 +f 14/1/1 11/1/1 38/1/1 +f 34/1/1 13/1/1 4/1/1 +f 12/1/1 4/1/1 13/1/1 +f 11/1/1 155/1/1 3/1/1 +f 44/1/1 35/1/1 5/1/1 +f 13/1/8 45/1/8 12/1/8 +f 12/1/1 46/1/1 11/1/1 +f 12/1/1 45/1/1 46/1/1 +f 11/1/9 46/1/9 155/1/9 +f 12/1/1 14/1/1 15/1/1 +f 47/1/1 15/1/1 48/1/1 +f 49/1/1 48/1/1 15/1/1 +f 14/1/1 49/1/1 15/1/1 +f 14/1/1 12/1/1 11/1/1 +f 50/1/1 11/1/1 5/1/1 +f 11/1/10 3/1/10 44/1/10 +f 5/1/2 11/1/2 44/1/2 +f 11/1/5 50/1/5 51/1/5 +f 51/1/2 52/1/2 11/1/2 +f 52/1/1 38/1/1 11/1/1 +f 16/1/1 14/1/1 2/1/1 +f 54/1/1 16/1/1 53/1/1 +f 16/1/1 54/1/1 56/1/1 +f 2/1/1 53/1/1 16/1/1 +f 14/1/1 16/1/1 62/1/1 +f 61/1/11 62/1/11 16/1/11 +f 62/1/1 63/1/1 14/1/1 +f 14/1/1 58/1/1 59/1/1 +f 58/1/1 14/1/1 60/1/1 +f 14/1/12 63/1/12 20/1/12 +f 56/1/1 55/1/1 16/1/1 +f 55/1/1 18/1/1 16/1/1 +f 64/1/13 57/1/13 65/1/13 +f 65/1/14 57/1/14 66/1/14 +f 57/1/15 67/1/15 66/1/15 +f 64/1/1 16/1/1 57/1/1 +f 55/1/1 68/1/1 18/1/1 +f 69/1/16 21/1/16 20/1/16 +f 57/1/17 21/1/17 67/1/17 +f 21/1/16 69/1/16 67/1/16 +f 14/1/1 21/1/1 60/1/1 +f 59/1/1 19/1/1 14/1/1 +f 14/1/1 19/1/1 23/1/1 +f 21/1/1 57/1/1 22/1/1 +f 70/1/1 22/1/1 57/1/1 +f 71/1/1 75/1/1 14/1/1 +f 71/1/1 14/1/1 23/1/1 +f 16/1/2 64/1/2 61/1/2 +f 14/1/1 75/1/1 82/1/1 +f 14/1/1 74/1/1 26/1/1 +f 17/1/1 24/1/1 92/1/1 +f 14/1/1 73/1/1 74/1/1 +f 73/1/1 14/1/1 72/1/1 +f 76/1/18 26/1/18 178/1/18 +f 76/1/1 77/1/1 17/1/1 +f 77/1/19 78/1/19 17/1/19 +f 14/1/1 17/1/1 49/1/1 +f 17/1/1 79/1/1 49/1/1 +f 79/1/1 17/1/1 27/1/1 +f 79/1/1 27/1/1 80/1/1 +f 14/1/1 81/1/1 72/1/1 +f 175/1/1 178/1/1 26/1/1 +f 175/1/12 25/1/12 83/1/12 +f 84/1/1 85/1/1 14/1/1 +f 84/1/1 14/1/1 82/1/1 +f 25/1/1 86/1/1 24/1/1 +f 14/1/1 85/1/1 81/1/1 +f 83/1/20 25/1/20 87/1/20 +f 88/1/2 17/1/2 78/1/2 +f 89/1/21 87/1/21 24/1/21 +f 88/1/16 89/1/16 17/1/16 +f 89/1/2 24/1/2 17/1/2 +f 80/1/1 27/1/1 91/1/1 +f 90/1/1 91/1/1 27/1/1 +f 27/1/1 92/1/1 93/1/1 +f 17/1/1 92/1/1 27/1/1 +f 24/1/22 87/1/22 25/1/22 +f 95/1/23 28/1/23 94/1/23 +f 28/1/24 32/1/24 94/1/24 +f 29/1/25 28/1/25 96/1/25 +f 28/1/26 95/1/26 96/1/26 +f 39/1/27 29/1/27 97/1/27 +f 29/1/28 96/1/28 97/1/28 +f 30/1/29 97/1/29 98/1/29 +f 39/1/30 97/1/30 30/1/30 +f 98/1/31 99/1/31 43/1/31 +f 98/1/32 43/1/32 30/1/32 +f 99/1/33 100/1/33 1/1/33 +f 99/1/34 1/1/34 43/1/34 +f 100/1/35 101/1/35 1/1/35 +f 41/1/36 1/1/36 101/1/36 +f 102/1/37 42/1/37 41/1/37 +f 102/1/38 103/1/38 40/1/38 +f 102/1/39 40/1/39 42/1/39 +f 103/1/40 104/1/40 2/1/40 +f 103/1/41 2/1/41 40/1/41 +f 41/1/42 101/1/42 102/1/42 +f 2/1/43 105/1/43 53/1/43 +f 2/1/44 104/1/44 105/1/44 +f 105/1/45 106/1/45 54/1/45 +f 105/1/46 54/1/46 53/1/46 +f 106/1/47 107/1/47 56/1/47 +f 106/1/48 56/1/48 54/1/48 +f 107/1/49 108/1/49 56/1/49 +f 55/1/50 56/1/50 108/1/50 +f 109/1/51 68/1/51 55/1/51 +f 109/1/52 110/1/52 18/1/52 +f 109/1/53 18/1/53 68/1/53 +f 110/1/54 111/1/54 16/1/54 +f 110/1/55 16/1/55 18/1/55 +f 55/1/56 108/1/56 109/1/56 +f 112/1/57 57/1/57 16/1/57 +f 112/1/58 16/1/58 111/1/58 +f 113/1/59 70/1/59 57/1/59 +f 113/1/59 57/1/59 112/1/59 +f 22/1/60 113/1/60 114/1/60 +f 113/1/61 22/1/61 70/1/61 +f 114/1/62 21/1/62 22/1/62 +f 114/1/63 115/1/63 21/1/63 +f 60/1/64 21/1/64 115/1/64 +f 60/1/65 115/1/65 116/1/65 +f 58/1/66 60/1/66 116/1/66 +f 58/1/67 116/1/67 117/1/67 +f 59/1/68 58/1/68 117/1/68 +f 59/1/69 117/1/69 118/1/69 +f 19/1/70 59/1/70 118/1/70 +f 19/1/71 118/1/71 119/1/71 +f 23/1/72 19/1/72 119/1/72 +f 23/1/73 119/1/73 120/1/73 +f 71/1/74 121/1/74 122/1/74 +f 71/1/74 122/1/74 75/1/74 +f 120/1/75 71/1/75 23/1/75 +f 71/1/76 120/1/76 121/1/76 +f 82/1/57 122/1/57 123/1/57 +f 82/1/57 75/1/57 122/1/57 +f 82/1/59 123/1/59 124/1/59 +f 84/1/59 82/1/59 124/1/59 +f 124/1/61 126/1/61 84/1/61 +f 126/1/77 85/1/77 84/1/77 +f 81/1/78 85/1/78 125/1/78 +f 126/1/79 125/1/79 85/1/79 +f 72/1/80 81/1/80 125/1/80 +f 72/1/81 125/1/81 127/1/81 +f 73/1/67 127/1/67 128/1/67 +f 74/1/68 73/1/68 128/1/68 +f 73/1/82 72/1/82 127/1/82 +f 26/1/70 74/1/70 129/1/70 +f 26/1/71 129/1/71 130/1/71 +f 74/1/83 128/1/83 129/1/83 +f 25/1/72 26/1/72 130/1/72 +f 25/1/73 130/1/73 131/1/73 +f 86/1/74 132/1/74 24/1/74 +f 24/1/74 132/1/74 134/1/74 +f 25/1/84 131/1/84 132/1/84 +f 86/1/75 25/1/75 132/1/75 +f 92/1/85 24/1/85 133/1/85 +f 133/1/57 24/1/57 134/1/57 +f 133/1/86 135/1/86 93/1/86 +f 133/1/87 93/1/87 92/1/87 +f 135/1/88 136/1/88 27/1/88 +f 135/1/89 27/1/89 93/1/89 +f 136/1/90 137/1/90 27/1/90 +f 90/1/91 27/1/91 137/1/91 +f 138/1/92 91/1/92 90/1/92 +f 138/1/93 139/1/93 80/1/93 +f 138/1/94 80/1/94 91/1/94 +f 139/1/95 140/1/95 79/1/95 +f 139/1/96 79/1/96 80/1/96 +f 90/1/97 137/1/97 138/1/97 +f 49/1/98 140/1/98 141/1/98 +f 79/1/99 140/1/99 49/1/99 +f 141/1/100 142/1/100 48/1/100 +f 141/1/101 48/1/101 49/1/101 +f 142/1/102 47/1/102 48/1/102 +f 47/1/103 142/1/103 143/1/103 +f 143/1/104 15/1/104 47/1/104 +f 143/1/105 144/1/105 15/1/105 +f 144/1/106 145/1/106 12/1/106 +f 144/1/107 12/1/107 15/1/107 +f 12/1/108 146/1/108 4/1/108 +f 145/1/109 146/1/109 12/1/109 +f 146/1/110 147/1/110 4/1/110 +f 31/1/111 4/1/111 147/1/111 +f 147/1/112 94/1/112 32/1/112 +f 147/1/113 32/1/113 31/1/113 +f 35/1/114 44/1/114 149/1/114 +f 35/1/115 149/1/115 148/1/115 +f 34/1/116 33/1/116 151/1/116 +f 33/1/117 36/1/117 150/1/117 +f 36/1/118 35/1/118 150/1/118 +f 35/1/119 148/1/119 150/1/119 +f 150/1/120 151/1/120 33/1/120 +f 34/1/121 151/1/121 13/1/121 +f 152/1/122 13/1/122 151/1/122 +f 45/1/123 13/1/123 152/1/123 +f 154/1/124 46/1/124 153/1/124 +f 153/1/125 46/1/125 45/1/125 +f 155/1/126 46/1/126 154/1/126 +f 152/1/127 153/1/127 45/1/127 +f 155/1/128 156/1/128 3/1/128 +f 154/1/129 156/1/129 155/1/129 +f 3/1/130 156/1/130 44/1/130 +f 44/1/131 156/1/131 149/1/131 +f 157/1/132 6/1/132 158/1/132 +f 6/1/133 8/1/133 158/1/133 +f 159/1/134 37/1/134 6/1/134 +f 159/1/135 6/1/135 157/1/135 +f 5/1/136 37/1/136 159/1/136 +f 5/1/137 159/1/137 160/1/137 +f 5/1/138 160/1/138 161/1/138 +f 5/1/139 161/1/139 50/1/139 +f 50/1/140 162/1/140 51/1/140 +f 162/1/141 50/1/141 161/1/141 +f 52/1/142 51/1/142 162/1/142 +f 52/1/143 162/1/143 163/1/143 +f 38/1/144 52/1/144 163/1/144 +f 38/1/145 163/1/145 164/1/145 +f 9/1/146 164/1/146 165/1/146 +f 38/1/147 164/1/147 9/1/147 +f 166/1/148 9/1/148 165/1/148 +f 166/1/149 10/1/149 9/1/149 +f 8/1/150 10/1/150 167/1/150 +f 10/1/151 166/1/151 167/1/151 +f 8/1/152 167/1/152 158/1/152 +f 88/1/153 169/1/153 168/1/153 +f 78/1/154 169/1/154 88/1/154 +f 170/1/155 169/1/155 78/1/155 +f 77/1/156 170/1/156 78/1/156 +f 171/1/157 89/1/157 168/1/157 +f 168/1/158 89/1/158 88/1/158 +f 83/1/159 173/1/159 172/1/159 +f 171/1/160 173/1/160 87/1/160 +f 173/1/161 83/1/161 87/1/161 +f 171/1/162 87/1/162 89/1/162 +f 175/1/163 83/1/163 174/1/163 +f 83/1/164 172/1/164 174/1/164 +f 177/1/165 176/1/165 178/1/165 +f 178/1/166 176/1/166 76/1/166 +f 175/1/167 174/1/167 177/1/167 +f 178/1/168 175/1/168 177/1/168 +f 77/1/169 76/1/169 176/1/169 +f 176/1/170 170/1/170 77/1/170 +f 20/1/171 179/1/171 69/1/171 +f 63/1/172 182/1/172 181/1/172 +f 181/1/173 20/1/173 63/1/173 +f 69/1/174 179/1/174 180/1/174 +f 179/1/175 20/1/175 181/1/175 +f 183/1/176 69/1/176 180/1/176 +f 183/1/177 67/1/177 69/1/177 +f 184/1/178 65/1/178 185/1/178 +f 183/1/179 185/1/179 66/1/179 +f 185/1/180 65/1/180 66/1/180 +f 183/1/181 66/1/181 67/1/181 +f 186/1/182 65/1/182 184/1/182 +f 186/1/183 64/1/183 65/1/183 +f 187/1/184 188/1/184 62/1/184 +f 189/1/185 187/1/185 61/1/185 +f 61/1/186 187/1/186 62/1/186 +f 186/1/187 189/1/187 64/1/187 +f 64/1/188 189/1/188 61/1/188 +f 188/1/189 182/1/189 63/1/189 +f 63/1/190 62/1/190 188/1/190 +f 104/2/191 99/3/191 190/4/191 +f 110/5/191 106/6/191 105/7/191 +f 110/5/191 105/7/191 191/8/191 +f 115/9/191 113/10/191 180/11/191 +f 190/4/191 115/9/191 191/8/191 +f 167/12/191 192/13/191 158/14/191 +f 150/15/191 147/16/191 146/17/191 +f 190/4/191 193/18/191 141/19/191 +f 190/4/191 177/20/191 130/21/191 +f 141/19/191 145/22/191 142/23/191 +f 100/24/191 99/3/191 101/25/191 +f 97/26/191 190/4/191 98/27/191 +f 101/25/191 99/3/191 102/28/191 +f 103/29/191 102/28/191 99/3/191 +f 99/3/191 104/2/191 103/29/191 +f 98/27/191 190/4/191 99/3/191 +f 190/4/191 105/7/191 104/2/191 +f 94/30/191 192/13/191 95/31/191 +f 158/14/191 147/16/191 157/32/191 +f 158/14/191 192/13/191 94/30/191 +f 147/16/191 158/14/191 94/30/191 +f 150/15/192 146/17/192 151/33/192 +f 150/15/193 148/34/193 147/16/193 +f 159/35/194 147/16/194 160/36/194 +f 159/35/195 157/32/195 147/16/195 +f 192/13/191 96/37/191 95/31/191 +f 96/37/191 192/13/191 97/26/191 +f 190/4/191 97/26/191 192/13/191 +f 166/38/196 192/13/196 167/12/196 +f 166/38/197 165/39/197 192/13/197 +f 192/13/191 165/39/191 190/4/191 +f 165/39/191 164/40/191 190/4/191 +f 105/7/191 190/4/191 191/8/191 +f 110/5/191 191/8/191 111/41/191 +f 107/42/191 106/6/191 108/43/191 +f 109/44/191 108/43/191 110/5/191 +f 106/6/191 110/5/191 108/43/191 +f 186/45/198 191/8/198 189/46/198 +f 191/8/199 187/47/199 189/46/199 +f 191/8/191 112/48/191 111/41/191 +f 191/8/191 113/10/191 112/48/191 +f 182/49/191 188/50/191 191/8/191 +f 182/49/191 191/8/191 115/9/191 +f 191/8/200 188/50/200 187/47/200 +f 182/49/201 115/9/201 181/51/201 +f 181/51/202 115/9/202 179/52/202 +f 115/9/203 180/11/203 179/52/203 +f 190/4/191 116/53/191 115/9/191 +f 117/54/191 116/53/191 190/4/191 +f 118/55/191 190/4/191 119/56/191 +f 190/4/191 118/55/191 117/54/191 +f 183/57/204 180/11/204 113/10/204 +f 184/58/205 113/10/205 186/45/205 +f 114/59/191 113/10/191 115/9/191 +f 113/10/191 191/8/191 186/45/191 +f 185/60/206 113/10/206 184/58/206 +f 183/57/207 113/10/207 185/60/207 +f 119/56/191 122/61/191 120/62/191 +f 119/56/191 190/4/191 122/61/191 +f 121/63/191 120/62/191 122/61/191 +f 146/17/191 152/64/191 151/33/191 +f 194/65/208 153/66/208 152/64/208 +f 146/17/191 194/65/191 152/64/191 +f 194/65/209 141/19/209 154/67/209 +f 141/19/191 156/68/191 154/67/191 +f 153/66/191 194/65/191 154/67/191 +f 149/69/191 160/36/191 148/34/191 +f 147/16/191 148/34/191 160/36/191 +f 193/18/191 160/36/191 149/69/191 +f 161/70/191 160/36/191 193/18/191 +f 149/69/210 156/68/210 193/18/210 +f 193/18/191 156/68/191 141/19/191 +f 190/4/191 164/40/191 163/71/191 +f 193/18/191 190/4/191 163/71/191 +f 161/70/211 193/18/211 162/72/211 +f 162/72/212 193/18/212 163/71/212 +f 194/65/191 146/17/191 141/19/191 +f 145/22/191 141/19/191 146/17/191 +f 143/73/191 145/22/191 144/74/191 +f 143/73/191 142/23/191 145/22/191 +f 190/4/191 126/75/191 122/61/191 +f 128/76/191 127/77/191 190/4/191 +f 190/4/191 129/78/191 128/76/191 +f 125/79/191 190/4/191 127/77/191 +f 129/78/191 190/4/191 130/21/191 +f 130/21/213 177/20/213 174/80/213 +f 177/20/191 190/4/191 176/81/191 +f 140/82/191 176/81/191 190/4/191 +f 140/82/214 170/83/214 176/81/214 +f 140/82/215 169/84/215 170/83/215 +f 168/85/208 169/84/208 140/82/208 +f 190/4/191 125/79/191 126/75/191 +f 122/61/191 126/75/191 123/86/191 +f 123/86/191 126/75/191 124/87/191 +f 131/88/191 130/21/191 174/80/191 +f 131/88/216 174/80/216 172/89/216 +f 171/90/191 168/85/191 140/82/191 +f 132/91/191 131/88/191 134/92/191 +f 131/88/191 171/90/191 134/92/191 +f 131/88/217 173/93/217 171/90/217 +f 134/92/191 171/90/191 140/82/191 +f 172/89/218 173/93/218 131/88/218 +f 190/4/191 141/19/191 140/82/191 +f 140/82/191 133/94/191 134/92/191 +f 140/82/191 135/95/191 133/94/191 +f 139/96/191 135/95/191 140/82/191 +f 138/97/191 135/95/191 139/96/191 +f 138/97/191 137/98/191 135/95/191 +f 136/99/191 135/95/191 137/98/191 diff --git a/resources/qml/WelcomePages/AddUltimakerPrinter.qml b/resources/qml/WelcomePages/AddUltimakerPrinter.qml index 0c9b7d4f7f..7b1a9ced20 100644 --- a/resources/qml/WelcomePages/AddUltimakerPrinter.qml +++ b/resources/qml/WelcomePages/AddUltimakerPrinter.qml @@ -129,7 +129,6 @@ Control text: catalog.i18nc("@button", "Sign in to Digital Factory") onClicked: function() { - Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/printers?add_printer=true&utm_source=cura&utm_medium=software&utm_campaign=onboarding-add-printer") text = catalog.i18nc("@button", "Waiting for new printers") busy = true; enabled = false; diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 54e95462e0..106582d1a1 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -210,7 +210,13 @@ Item anchors.bottom: parent.bottom text: catalog.i18nc("@button", "Sign in") - onClicked: Cura.API.account.login() + onClicked: function() + { + text = catalog.i18nc("@button", "Waiting for new printers") + busy = true; + enabled = false; + Cura.API.account.isLoggedIn? Cura.API.account.sync():Cura.API.account.login(); + } // Content Item is used in order to align the text inside the button. Without it, when resizing the // button, the text will be aligned on the left contentItem: Text { diff --git a/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_high_quality.inst.cfg b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_high_quality.inst.cfg new file mode 100644 index 0000000000..fe48dcc12c --- /dev/null +++ b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_high_quality.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = anycubic_kobra_s1 +name = High Quality +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 25 +type = quality +weight = 1 + +[values] +adhesion_type = brim +bottom_thickness = =layer_height*3 +brim_width = 5 +infill_sparse_density = 15 +initial_layer_line_width_factor = 125 +layer_height = 0.2 +layer_height_0 = 0.2 +line_width = 0.42 +material_bed_temperature = 55 +material_print_temperature = 215.0 +skirt_height = 1 +speed_layer_0 = 40 +speed_print = 180.0 +speed_travel = 300.0 +speed_travel_layer_0 = 60 +speed_wall = 180.0 +speed_wall_0 = 60.0 +speed_wall_x = 180.0 +top_thickness = =layer_height*5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_standard.inst.cfg b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_standard.inst.cfg new file mode 100644 index 0000000000..fd6a2962a3 --- /dev/null +++ b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_standard.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = anycubic_kobra_s1 +name = Standard +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 25 +type = quality +weight = 0 + +[values] +adhesion_type = brim +bottom_thickness = =layer_height*3 +brim_width = 5 +infill_sparse_density = 15 +initial_layer_line_width_factor = 125 +layer_height = 0.2 +layer_height_0 = 0.2 +line_width = 0.42 +material_bed_temperature = 55 +material_print_temperature = 215.0 +skirt_height = 1 +speed_layer_0 = 50 +speed_print = 300.0 +speed_travel = 300.0 +speed_travel_layer_0 = 80 +speed_wall = 300.0 +speed_wall_0 = 200.0 +speed_wall_x = 300.0 +top_thickness = =layer_height*5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg index e88b8d8308..577faaca43 100644 --- a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg @@ -13,4 +13,9 @@ variant = 0.4mm weight = -3 [values] +bridge_wall_speed = 40 +cool_min_layer_time_overhang = 12 +cool_min_speed = 40 +wall_overhang_angle = 30 +wall_overhang_speed_factors = [60] diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg index 7fe5437a80..a7e18af32d 100644 --- a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -12,4 +12,9 @@ variant = 0.4mm weight = -2 [values] +bridge_wall_speed = 40 +cool_min_layer_time_overhang = 12 +cool_min_speed = 40 +wall_overhang_angle = 30 +wall_overhang_speed_factors = [60]