Merge remote-tracking branch 'origin/5.9'

2025-08-08 14:34:01 -06:00 · 2024-11-20 13:11:12 +01:00 · 2024-11-20 13:11:12 +01:00 · 0286c6dda8
commit 0286c6dda8
parent 94b8728962 18cc0685d7
130 changed files with 9332 additions and 8317 deletions
--- a/resources/conandata.yml
+++ b/resources/conandata.yml
@ -1 +1 @@
-version: "5.9.0-beta.2"
+version: "5.9.0"
--- a/resources/definitions/ankermake_m5.def.json
+++ b/resources/definitions/ankermake_m5.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "ankermake_m5_platform.obj",
        "has_machine_quality": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" },
        "platform_texture": "ankermake_m5.png",
        "preferred_material": "generic_pla",
--- a/resources/definitions/ankermake_m5c.def.json
+++ b/resources/definitions/ankermake_m5c.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "ankermake_m5c_platform.obj",
        "has_machine_quality": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" },
        "platform_texture": "ankermake_m5c.png",
        "preferred_material": "generic_pla",
--- a/resources/definitions/dagoma_sigma_pro.def.json
+++ b/resources/definitions/dagoma_sigma_pro.def.json
@ -11,6 +11,7 @@
        "platform": "dagoma_sigma_pro.obj",
        "first_start_actions": [ "MachineSettingsAction" ],
        "has_machine_quality": true,
+        "has_textured_buildplate": true,
        "has_variants": true,
        "machine_extruder_trains": { "0": "dagoma_sigma_pro_extruder" },
        "platform_texture": "dagoma_sigma_pro.png",
--- a/resources/definitions/dagoma_sigma_pro_dual.def.json
+++ b/resources/definitions/dagoma_sigma_pro_dual.def.json
@ -11,6 +11,7 @@
        "platform": "dagoma_sigma_pro.obj",
        "first_start_actions": [ "MachineSettingsAction" ],
        "has_machine_quality": true,
+        "has_textured_buildplate": true,
        "has_variants": true,
        "machine_extruder_trains":
        {
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -15,9 +15,11 @@
        "preferred_material": "generic_pla",
        "preferred_quality_type": "normal",
        "machine_extruder_trains": { "0": "fdmextruder" },
+        "has_textured_buildplate": false,
        "supports_usb_connection": true,
        "supports_network_connection": false,
-        "supports_abstract_color": false
+        "supports_abstract_color": false,
+        "variants_name_has_translation": false
    },
    "settings":
    {
@ -1434,7 +1436,7 @@
                        "z_seam_corner_weighted": "Smart Hiding"
                    },
                    "default_value": "z_seam_corner_inner",
-                    "enabled": "z_seam_type != 'random'",
+                    "enabled": "z_seam_type == 'sharpest_corner'",
                    "limit_to_extruder": "wall_0_extruder_nr",
                    "settable_per_mesh": true
                },
@ -8942,6 +8944,7 @@
                    "type": "float",
                    "default_value": 0,
                    "minimum_value": "0",
+                    "maximum_value_warning": "50.0",
                    "unit": "mm",
                    "limit_to_extruder": "wall_0_extruder_nr",
                    "settable_per_extruder": true,
@ -8991,7 +8994,7 @@
                },
                "wall_0_acceleration":
                {
-                    "label": "Outer Wall Acceleration",
+                    "label": "Outer Wall Start Acceleration",
                    "description": "This is the acceleration with which to reach the top speed when printing an outer wall.",
                    "enabled": "wall_0_start_speed_ratio < 100.0",
                    "type": "float",
@ -9018,7 +9021,7 @@
                },
                "wall_0_deceleration":
                {
-                    "label": "Outer Wall Deceleration",
+                    "label": "Outer Wall End Deceleration",
                    "description": "This is the deceleration with which to end printing an outer wall.",
                    "enabled": "wall_0_end_speed_ratio < 100.0",
                    "type": "float",
--- a/resources/definitions/flyingbear_ghost_4s.def.json
+++ b/resources/definitions/flyingbear_ghost_4s.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "oducceu",
        "platform": "flyingbear_platform.obj",
+        "has_textured_buildplate": true,
        "platform_texture": "flyingbear_platform.png",
        "quality_definition": "flyingbear_base"
    },
--- a/resources/definitions/flyingbear_ghost_5.def.json
+++ b/resources/definitions/flyingbear_ghost_5.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "oducceu",
        "platform": "flyingbear_platform.obj",
+        "has_textured_buildplate": true,
        "platform_texture": "flyingbear_platform.png",
        "quality_definition": "flyingbear_base"
    },
--- a/resources/definitions/flyingbear_ghost_6.def.json
+++ b/resources/definitions/flyingbear_ghost_6.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "barrnet",
        "platform": "flyingbear_platform.obj",
+        "has_textured_buildplate": true,
        "platform_texture": "flyingbear_platform.png",
        "quality_definition": "flyingbear_base"
    },
--- a/resources/definitions/hellbot_adonis.def.json
+++ b/resources/definitions/hellbot_adonis.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "hellbot_adonis.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_adonis_extruder" },
        "platform_offset": [
            0,
--- a/resources/definitions/hellbot_hidra.def.json
+++ b/resources/definitions/hellbot_hidra.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "hellbot_hidra.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_hidra_extruder_0",
--- a/resources/definitions/hellbot_hidra_plus.def.json
+++ b/resources/definitions/hellbot_hidra_plus.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "hellbot_hidra_plus.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_hidra_plus_extruder_0",
--- a/resources/definitions/hellbot_magna_2_230.def.json
+++ b/resources/definitions/hellbot_magna_2_230.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_230.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" },
        "platform_texture": "Magna2_230.png"
    },
--- a/resources/definitions/hellbot_magna_2_230_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_230_dual.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_230.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_magna_2_230_dual_extruder_0",
--- a/resources/definitions/hellbot_magna_2_300.def.json
+++ b/resources/definitions/hellbot_magna_2_300.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_300.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" },
        "platform_texture": "Magna2_300.png"
    },
--- a/resources/definitions/hellbot_magna_2_300_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_300_dual.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_300.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_magna_2_300_dual_extruder_0",
--- a/resources/definitions/hellbot_magna_2_400.def.json
+++ b/resources/definitions/hellbot_magna_2_400.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_400.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" },
        "platform_texture": "Magna2_400.png"
    },
--- a/resources/definitions/hellbot_magna_2_400_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_400_dual.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_400.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_magna_2_400_dual_extruder_0",
--- a/resources/definitions/hellbot_magna_2_500.def.json
+++ b/resources/definitions/hellbot_magna_2_500.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_500.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" },
        "platform_texture": "Magna2_500.png"
    },
--- a/resources/definitions/hellbot_magna_2_500_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_500_dual.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_2_500.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_magna_2_500_dual_extruder_0",
--- a/resources/definitions/hellbot_magna_I.def.json
+++ b/resources/definitions/hellbot_magna_I.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "hellbot_magna.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_i_extruder" },
        "platform_offset": [
            0,
--- a/resources/definitions/hellbot_magna_SE.def.json
+++ b/resources/definitions/hellbot_magna_SE.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "hellbot_magna_SE.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" },
        "platform_texture": "hellbot_magna_SE.png"
    },
--- a/resources/definitions/hellbot_magna_SE_300.def.json
+++ b/resources/definitions/hellbot_magna_SE_300.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_SE_300.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_SE_300_extruder" },
        "platform_texture": "Hellbot_Magna_SE_300.png"
    },
--- a/resources/definitions/hellbot_magna_SE_Pro.def.json
+++ b/resources/definitions/hellbot_magna_SE_Pro.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "Hellbot_Magna_SE_Pro.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" },
        "platform_texture": "Hellbot_magna_SE_Pro.png"
    },
--- a/resources/definitions/hellbot_magna_dual.def.json
+++ b/resources/definitions/hellbot_magna_dual.def.json
@ -10,6 +10,7 @@
        "file_formats": "text/x-gcode",
        "platform": "hellbot_magna.obj",
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains":
        {
            "0": "hellbot_magna_dual_extruder_1",
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@ -16,7 +16,8 @@
        "preferred_material": "generic_pla",
        "preferred_quality_type": "standard",
        "preferred_variant_name": "0.4mm",
-        "variants_name": "Extruder:"
+        "variants_name": "Extruder",
+        "variants_name_has_translation": true
    },
    "overrides":
    {
--- a/resources/definitions/koonovo_base.def.json
+++ b/resources/definitions/koonovo_base.def.json
@ -12,6 +12,7 @@
        "first_start_actions": [ "MachineSettingsAction" ],
        "has_machine_quality": true,
        "has_materials": true,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "koonovo_base_extruder_0" },
        "platform_texture": "koonovo.png",
        "preferred_material": "generic_pla",
--- a/resources/definitions/peopoly_moai.def.json
+++ b/resources/definitions/peopoly_moai.def.json
@ -11,6 +11,7 @@
        "platform": "moai.obj",
        "has_machine_quality": true,
        "has_materials": false,
+        "has_textured_buildplate": true,
        "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" },
        "platform_texture": "moai.jpg"
    },
--- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
+++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
@ -25,7 +25,7 @@
        "preferred_quality_type": "extra_fast",
        "preferred_variant_name": "0.84mm (Green)",
        "supported_actions": [],
-        "variants_name": "Print core"
+        "variants_name": "Print Core"
    },
    "overrides":
    {
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@ -42,6 +42,7 @@
        "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" },
        "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" },
        "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" },
+        "extra_infill_lines_to_support_skins": { "value": "'none'" },
        "gradual_support_infill_step_height": { "value": "4 * layer_height" },
        "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" },
        "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },
@ -109,6 +110,7 @@
        "roofing_layer_count": { "value": "1" },
        "roofing_material_flow": { "value": "material_flow" },
        "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },
+        "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" },
        "skin_material_flow": { "value": "0.95 * material_flow" },
        "skin_material_flow_layer_0": { "value": "95" },
        "skin_monotonic": { "value": "roofing_layer_count == 0" },
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -51,7 +51,8 @@
        "supported_actions": [ "DiscoverUM3Action" ],
        "supports_network_connection": true,
        "supports_usb_connection": false,
-        "variants_name": "Print core"
+        "variants_name": "Print Core",
+        "variants_name_has_translation": true
    },
    "overrides":
    {
--- a/resources/definitions/ultimaker3_extended.def.json
+++ b/resources/definitions/ultimaker3_extended.def.json
@ -36,7 +36,8 @@
        "preferred_variant_name": "AA 0.4",
        "quality_definition": "ultimaker3",
        "supported_actions": [ "DiscoverUM3Action" ],
-        "variants_name": "Print core"
+        "variants_name": "Print Core",
+        "variants_name_has_translation": true
    },
    "overrides":
    {
--- a/resources/definitions/ultimaker_factor4.def.json
+++ b/resources/definitions/ultimaker_factor4.def.json
@ -43,7 +43,8 @@
        "supports_material_export": true,
        "supports_network_connection": true,
        "supports_usb_connection": false,
-        "variants_name": "Print core",
+        "variants_name": "Print Core",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_method.def.json
+++ b/resources/definitions/ultimaker_method.def.json
@ -83,6 +83,7 @@
        "supports_usb_connection": false,
        "variant_definition": "ultimaker_method",
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@ -26,6 +26,7 @@
        "supports_network_connection": true,
        "supports_usb_connection": false,
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
@ -141,7 +142,11 @@
            "value": "min(extruderValues('extruder_nr'))"
        },
        "adhesion_type": { "value": "'raft'" },
-        "bottom_thickness": { "value": "top_bottom_thickness" },
+        "bottom_thickness":
+        {
+            "minimum_value_warning": 0.3,
+            "value": "top_bottom_thickness"
+        },
        "bridge_enable_more_layers": { "value": true },
        "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" },
        "bridge_skin_density": { "value": 100 },
@ -575,7 +580,11 @@
            "minimum_value_warning": 0.3,
            "value": "4*layer_height"
        },
-        "top_thickness": { "value": "top_bottom_thickness * 1.5" },
+        "top_thickness":
+        {
+            "minimum_value_warning": 0.3,
+            "value": "top_bottom_thickness * 1.5"
+        },
        "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
        "travel_avoid_other_parts": { "value": false },
        "wall_0_inset": { "value": 0 },
--- a/resources/definitions/ultimaker_methodx.def.json
+++ b/resources/definitions/ultimaker_methodx.def.json
@ -69,6 +69,7 @@
        "supports_usb_connection": false,
        "variant_definition": "ultimaker_methodx",
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_methodxl.def.json
+++ b/resources/definitions/ultimaker_methodxl.def.json
@ -67,6 +67,7 @@
        "supports_network_connection": true,
        "supports_usb_connection": false,
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@ -50,7 +50,8 @@
        "supported_actions": [ "DiscoverUM3Action" ],
        "supports_material_export": true,
        "supports_usb_connection": false,
-        "variants_name": "Print core",
+        "variants_name": "Print Core",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@ -54,7 +54,8 @@
        "supports_material_export": true,
        "supports_network_connection": true,
        "supports_usb_connection": false,
-        "variants_name": "Print core",
+        "variants_name": "Print Core",
+        "variants_name_has_translation": true,
        "weight": -2
    },
    "overrides":
--- a/resources/definitions/ultimaker_s7.def.json
+++ b/resources/definitions/ultimaker_s7.def.json
@ -40,7 +40,8 @@
        "supports_material_export": true,
        "supports_network_connection": true,
        "supports_usb_connection": false,
-        "variants_name": "Print core",
+        "variants_name": "Print Core",
+        "variants_name_has_translation": true,
        "weight": -2
    },
    "overrides":
--- a/resources/definitions/ultimaker_sketch.def.json
+++ b/resources/definitions/ultimaker_sketch.def.json
@ -72,6 +72,7 @@
        "supports_network_connection": true,
        "supports_usb_connection": false,
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_sketch_large.def.json
+++ b/resources/definitions/ultimaker_sketch_large.def.json
@ -20,6 +20,7 @@
        "supports_network_connection": true,
        "supports_usb_connection": false,
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/ultimaker_sketch_sprint.def.json
+++ b/resources/definitions/ultimaker_sketch_sprint.def.json
@ -58,6 +58,7 @@
        ],
        "has_machine_quality": true,
        "has_materials": true,
+        "has_textured_buildplate": true,
        "has_variants": true,
        "machine_extruder_trains": { "0": "ultimaker_sketch_sprint_extruder" },
        "platform_offset": [
@ -73,6 +74,7 @@
        "supports_network_connection": true,
        "supports_usb_connection": false,
        "variants_name": "Extruder",
+        "variants_name_has_translation": true,
        "weight": -1
    },
    "overrides":
--- a/resources/definitions/uni_200.def.json
+++ b/resources/definitions/uni_200.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "Nail` Gimadeev (C)",
        "platform": "uni_200_platform.stl",
+        "has_textured_buildplate": true,
        "platform_texture": "uni.png",
        "quality_definition": "uni_base"
    },
--- a/resources/definitions/uni_250.def.json
+++ b/resources/definitions/uni_250.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "Nail` Gimadeev (C)",
        "platform": "uni_250_platform.stl",
+        "has_textured_buildplate": true,
        "platform_texture": "uni.png",
        "quality_definition": "uni_base"
    },
--- a/resources/definitions/uni_300.def.json
+++ b/resources/definitions/uni_300.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "Nail` Gimadeev (C)",
        "platform": "uni_300_platform.stl",
+        "has_textured_buildplate": true,
        "platform_texture": "uni.png",
        "quality_definition": "uni_base"
    },
--- a/resources/definitions/uni_mini.def.json
+++ b/resources/definitions/uni_mini.def.json
@ -7,6 +7,7 @@
        "visible": true,
        "author": "Nail` Gimadeev (C)",
        "platform": "uni_mini_platform.stl",
+        "has_textured_buildplate": true,
        "platform_texture": "uni.png",
        "quality_definition": "uni_base"
    },
--- a/resources/definitions/zyyx_pro_ii.def.json
+++ b/resources/definitions/zyyx_pro_ii.def.json
@ -1,82 +0,0 @@
-{
-    "version": 2,
-    "name": "ZYYX Pro II",
-    "inherits": "fdmprinter",
-    "metadata":
-    {
-        "visible": true,
-        "author": "ZYYX Labs AB",
-        "manufacturer": "ZYYX Labs AB",
-        "file_formats": "text/x-gcode",
-        "platform": "zyyx_pro_platform.stl",
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "machine": "zyyx_pro_ii",
-        "machine_extruder_trains": { "0": "zyyx_pro_ii_extruder" },
-        "machine_x3g_variant": "z",
-        "preferred_material": "zyyx_pla",
-        "preferred_quality_type": "normal",
-        "preferred_variant_name": "Carbon0.4",
-        "quality_definition": "zyyx_pro_ii",
-        "setting_version": 3,
-        "variants_name": "SwiftTool24"
-    },
-    "overrides":
-    {
-        "gantry_height": { "value": "10" },
-        "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" },
-        "machine_center_is_zero": { "default_value": true },
-        "machine_depth": { "default_value": 235 },
-        "machine_disallowed_areas":
-        {
-            "default_value": [
-                [
-                    [-58, 117.5],
-                    [-58, 108],
-                    [-50, 108],
-                    [-50, 117.5]
-                ],
-                [
-                    [119, 117.5],
-                    [119, 108],
-                    [140, 108],
-                    [140, 117.5]
-                ],
-                [
-                    [-58, -117.5],
-                    [-58, -108],
-                    [-50, -108],
-                    [-50, -117.5]
-                ],
-                [
-                    [119, -117.5],
-                    [119, -108],
-                    [140, -108],
-                    [140, -117.5]
-                ]
-            ]
-        },
-        "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" },
-        "machine_gcode_flavor": { "default_value": "Makerbot" },
-        "machine_head_with_fans_polygon":
-        {
-            "default_value": [
-                [-37, 50],
-                [25, 50],
-                [25, -40],
-                [-37, -40]
-            ]
-        },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 210 },
-        "machine_name": { "default_value": "ZYYX Pro II" },
-        "machine_start_gcode": { "default_value": ";start of ZYYX Pro II startcode\n M73 P0; enable build progress\n G21; set units to mm\n G90; set positioning to absolute\n G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z20 F3000\n G1 X-120 Y-110 Z10 F3000\n G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value\n M420 P10; set back fan speed 10 off 11-20 10-100%\n  M140 S10 T0; set 100% heater power\n M140 S99 T0; set chamber heater negative hysteresis 19 degrees\n M140 S110 T0; set chamber heater positive hysteresis 10 degrees\n M140 S{material_bed_temperature_layer_0} T0; set chamber temperature\n M104 S100 T0; set extruder temp 100 while heating\n M134 T0; wait for heated chamber temperature\n M420 P13; set fan speed 10 off 11-20 10-100%\n G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value\n ; Perform probing of build plate\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z5 F200\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0\n M131 A; store surface calibration point 1\n G1 X0 Y0 Z5 F200\n G1 X-182 Y0 Z5 F3000; move to 2nd probing point\n G161 Z F200\n M131 B; store surface calibration point 2\n G92 X-182 Y0 Z0 E0\n G1 X-182 Y0 Z5 F200\n G1 X0 Y0 Z5 F3000; move to home point\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0; set reference again\n G1 X0 Y0 Z5 F200; clear Z\n G1 X0 Y-228 Z5 F3000; move to 3rd calibration point\n G161 Z F200\n M131 AB; store surface calibration point 3\n M132 AB; activate auto leveling\n G92 X0 Y-228 Z0 E0\n G1 X0 Y-228 Z5 F200\n G162 X Y F3000\n G161 Z F200\n G92 X135 Y115 Z0 E0\n M132 Z; Recall stored home offset for Z axis\n G1 X135 Y115 Z5 F450; clear nozzle from hole\n G1 X0 Y115 Z5 F3000; clear nozzle from hole\n ; end of ZYYX pro build plate calibration\n M127; turn off fan\n M104 S{material_print_temperature_layer_0} T0\n M133 T0 ; stabilize extruder temperature\n ;SET_ZXPARAM\n ;SET_SUPPORT_BUMPMAP\n G92 E0 ; Set E to 0\n ; end of ZYYX Pro II start code" },
-        "machine_steps_per_mm_e": { "default_value": 415 },
-        "machine_steps_per_mm_x": { "default_value": 88.888889 },
-        "machine_steps_per_mm_y": { "default_value": 88.888889 },
-        "machine_steps_per_mm_z": { "default_value": 400 },
-        "machine_width": { "default_value": 285 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}
--- a/resources/extruders/zyyx_pro_ii_extruder.def.json
+++ b/resources/extruders/zyyx_pro_ii_extruder.def.json
@ -1,15 +0,0 @@
-{
-    "version": 2,
-    "name": "Extruder 1",
-    "inherits": "fdmextruder",
-    "metadata":
-    {
-        "machine": "zyyx_pro_ii",
-        "position": "0"
-    },
-    "overrides":
-    {
-        "extruder_nr": { "default_value": 0 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}
--- a/resources/i18n/cs_CZ/cura.po
+++ b/resources/i18n/cs_CZ/cura.po
@ -2840,6 +2840,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Y offset trysky"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Velikost trysky"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Velikost trysky"
--- a/resources/i18n/cs_CZ/fdmprinter.def.json.po
+++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: 2023-02-16 20:35+0100\n"
 "Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description"
 msgid "Extra material to prime after nozzle switching."
 msgstr "Materiál navíc pro extruzi po změně trysky."

+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
 msgstr "Primární pozice extruderu X"
@ -2493,6 +2497,10 @@ msgctxt "machine_nozzle_id label"
 msgid "Nozzle ID"
 msgstr "ID trysky"

+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr "Velikost trysky"
+
 msgctxt "switch_extruder_extra_prime_amount label"
 msgid "Nozzle Switch Extra Prime Amount"
 msgstr "Množství materiálu navíc pro změnu trysky"
@ -2801,6 +2809,10 @@ msgctxt "acceleration_print label"
 msgid "Print Acceleration"
 msgstr "Akcelerace tisku"

+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
 msgctxt "jerk_print label"
 msgid "Print Jerk"
 msgstr "Trh při tisku"
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@ -2677,6 +2677,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr ""

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr ""
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr ""
--- a/resources/i18n/de_DE/cura.po
+++ b/resources/i18n/de_DE/cura.po
@ -2756,6 +2756,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Y-Versatz Düse"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Düsengröße"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Düsengröße"
--- a/resources/i18n/de_DE/fdmprinter.def.json.po
+++ b/resources/i18n/de_DE/fdmprinter.def.json.po
--- a/resources/i18n/es_ES/cura.po
+++ b/resources/i18n/es_ES/cura.po
@ -2756,6 +2756,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Desplazamiento de la tobera sobre el eje Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Tamaño de la tobera"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Tamaño de la tobera"
--- a/resources/i18n/es_ES/fdmprinter.def.json.po
+++ b/resources/i18n/es_ES/fdmprinter.def.json.po
--- a/resources/i18n/fdmprinter.def.json.pot
+++ b/resources/i18n/fdmprinter.def.json.pot
@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@ -6000,3 +6000,15 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr ""

+
+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr ""
--- a/resources/i18n/fi_FI/cura.po
+++ b/resources/i18n/fi_FI/cura.po
@ -2815,6 +2815,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Suuttimen Y-siirtymä"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Suuttimen koko"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Suuttimen koko"
--- a/resources/i18n/fi_FI/fdmprinter.def.json.po
+++ b/resources/i18n/fi_FI/fdmprinter.def.json.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: 2022-07-15 11:17+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"
@ -1046,6 +1046,10 @@ msgctxt "switch_extruder_extra_prime_amount description"
 msgid "Extra material to prime after nozzle switching."
 msgstr ""

+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
 msgstr "Suulakkeen esitäytön X-sijainti"
@ -2488,6 +2492,10 @@ msgctxt "machine_nozzle_id label"
 msgid "Nozzle ID"
 msgstr "Suuttimen tunnus"

+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr "Suuttimen koko"
+
 msgctxt "switch_extruder_extra_prime_amount label"
 msgid "Nozzle Switch Extra Prime Amount"
 msgstr ""
@ -2796,6 +2804,10 @@ msgctxt "acceleration_print label"
 msgid "Print Acceleration"
 msgstr "Tulostuksen kiihtyvyys"

+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
 msgctxt "jerk_print label"
 msgid "Print Jerk"
 msgstr "Tulostuksen nykäisy"
--- a/resources/i18n/fr_FR/cura.po
+++ b/resources/i18n/fr_FR/cura.po
@ -2754,6 +2754,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Décalage buse Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Taille de la buse"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Taille de la buse"
--- a/resources/i18n/fr_FR/fdmprinter.def.json.po
+++ b/resources/i18n/fr_FR/fdmprinter.def.json.po
--- a/resources/i18n/hu_HU/cura.po
+++ b/resources/i18n/hu_HU/cura.po
@ -2825,6 +2825,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Fúvóka Y eltolás"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Fúvóka méret"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Fúvóka méret"
--- a/resources/i18n/hu_HU/fdmprinter.def.json.po
+++ b/resources/i18n/hu_HU/fdmprinter.def.json.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: 2020-03-24 09:43+0100\n"
 "Last-Translator: Nagy Attila <vokroot@gmail.com>\n"
 "Language-Team: AT-VLOG\n"
@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description"
 msgid "Extra material to prime after nozzle switching."
 msgstr "Egy extra anyagmennyiség, amivel több anyagot tol vissza a fejbe fúvókaváltás után."

+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
 msgstr "Extruder kezdő X helyzet"
@ -2495,6 +2499,10 @@ msgctxt "machine_nozzle_id label"
 msgid "Nozzle ID"
 msgstr "Fúvóka ID"

+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr "Fúvóka méret"
+
 msgctxt "switch_extruder_extra_prime_amount label"
 msgid "Nozzle Switch Extra Prime Amount"
 msgstr "Fúvókaváltási extra visszatolt anyag"
@ -2803,6 +2811,10 @@ msgctxt "acceleration_print label"
 msgid "Print Acceleration"
 msgstr "Nyomtatási gyorsulás"

+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
 msgctxt "jerk_print label"
 msgid "Print Jerk"
 msgstr "Nyomtatás löket"
--- a/resources/i18n/it_IT/cura.po
+++ b/resources/i18n/it_IT/cura.po
@ -2756,6 +2756,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Scostamento Y ugello"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Dimensione ugello"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Dimensione ugello"
--- a/resources/i18n/it_IT/fdmprinter.def.json.po
+++ b/resources/i18n/it_IT/fdmprinter.def.json.po
--- a/resources/i18n/ja_JP/cura.po
+++ b/resources/i18n/ja_JP/cura.po
@ -2764,6 +2764,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "ノズルオフセットY"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "ノズルサイズ"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "ノズルサイズ"
--- a/resources/i18n/ja_JP/fdmprinter.def.json.po
+++ b/resources/i18n/ja_JP/fdmprinter.def.json.po
--- a/resources/i18n/ko_KR/cura.po
+++ b/resources/i18n/ko_KR/cura.po
@ -2751,6 +2751,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "노즐 오프셋 Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "노즐 크기"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "노즐 크기"
--- a/resources/i18n/ko_KR/fdmprinter.def.json.po
+++ b/resources/i18n/ko_KR/fdmprinter.def.json.po
--- a/resources/i18n/nl_NL/cura.po
+++ b/resources/i18n/nl_NL/cura.po
@ -2754,6 +2754,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Nozzle-offset Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Maat nozzle"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Maat nozzle"
--- a/resources/i18n/nl_NL/fdmprinter.def.json.po
+++ b/resources/i18n/nl_NL/fdmprinter.def.json.po
--- a/resources/i18n/pl_PL/cura.po
+++ b/resources/i18n/pl_PL/cura.po
@ -2828,6 +2828,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Korekcja dyszy Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Rozmiar dyszy"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Rozmiar dyszy"
--- a/resources/i18n/pl_PL/fdmprinter.def.json.po
+++ b/resources/i18n/pl_PL/fdmprinter.def.json.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: 2019-11-15 15:34+0100\n"
 "Last-Translator: Mariusz Matłosz <matliks@gmail.com>\n"
 "Language-Team: Mariusz Matłosz <matliks@gmail.com>, reprapy.pl\n"
@ -1048,6 +1048,10 @@ msgctxt "switch_extruder_extra_prime_amount description"
 msgid "Extra material to prime after nozzle switching."
 msgstr "Ilość dodatkowego materiału do podania po zmianie dyszy."

+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
 msgstr "Pozycja X Czyszczenia Dyszy"
@ -2494,6 +2498,10 @@ msgctxt "machine_nozzle_id label"
 msgid "Nozzle ID"
 msgstr "ID Dyszy"

+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr "Rozmiar dyszy"
+
 msgctxt "switch_extruder_extra_prime_amount label"
 msgid "Nozzle Switch Extra Prime Amount"
 msgstr "Dodatkowa ekstruzja po zmianie dyszy"
@ -2802,6 +2810,10 @@ msgctxt "acceleration_print label"
 msgid "Print Acceleration"
 msgstr "Przyspieszenie Druku"

+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
 msgctxt "jerk_print label"
 msgid "Print Jerk"
 msgstr "Zryw Druku"
--- a/resources/i18n/pt_BR/cura.po
+++ b/resources/i18n/pt_BR/cura.po
@ -2841,6 +2841,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Deslocamento Y do Bico"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Tamanho do bico"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Tamanho do bico"
--- a/resources/i18n/pt_BR/fdmprinter.def.json.po
+++ b/resources/i18n/pt_BR/fdmprinter.def.json.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.7\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: 2024-10-29 03:52+0100\n"
 "Last-Translator: Cláudio Sampaio <patola@gmail.com>\n"
 "Language-Team: Cláudio Sampaio <patola@gmail.com>\n"
@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description"
 msgid "Extra material to prime after nozzle switching."
 msgstr "Material extra a avançar depois da troca de bico."

+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
 msgstr "Posição X da Purga do Extrusor"
@ -2497,6 +2501,10 @@ msgctxt "machine_nozzle_id label"
 msgid "Nozzle ID"
 msgstr "ID do Bico"

+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr "Tamanho do bico"
+
 msgctxt "switch_extruder_extra_prime_amount label"
 msgid "Nozzle Switch Extra Prime Amount"
 msgstr "Quantidade de Avanço Extra da Troca de Bico"
@ -2805,6 +2813,10 @@ msgctxt "acceleration_print label"
 msgid "Print Acceleration"
 msgstr "Aceleração da Impressão"

+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
 msgctxt "jerk_print label"
 msgid "Print Jerk"
 msgstr "Jerk da Impressão"
--- a/resources/i18n/pt_PT/cura.po
+++ b/resources/i18n/pt_PT/cura.po
@ -2757,6 +2757,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Desvio Y do Nozzle"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Tamanho do nozzle"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Tamanho do nozzle"
--- a/resources/i18n/pt_PT/fdmprinter.def.json.po
+++ b/resources/i18n/pt_PT/fdmprinter.def.json.po
--- a/resources/i18n/ru_RU/cura.po
+++ b/resources/i18n/ru_RU/cura.po
@ -2766,6 +2766,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Смещение сопла по оси Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Диаметр сопла"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Диаметр сопла"
--- a/resources/i18n/ru_RU/fdmprinter.def.json.po
+++ b/resources/i18n/ru_RU/fdmprinter.def.json.po
--- a/resources/i18n/tr_TR/cura.po
+++ b/resources/i18n/tr_TR/cura.po
@ -2756,6 +2756,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "Nozül Y ofseti"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "Nozzle boyutu"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "Nozzle boyutu"
--- a/resources/i18n/tr_TR/fdmprinter.def.json.po
+++ b/resources/i18n/tr_TR/fdmprinter.def.json.po
--- a/resources/i18n/zh_CN/cura.po
+++ b/resources/i18n/zh_CN/cura.po
@ -2751,6 +2751,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "喷嘴偏移 Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "喷嘴孔径"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "喷嘴孔径"
--- a/resources/i18n/zh_CN/fdmprinter.def.json.po
+++ b/resources/i18n/zh_CN/fdmprinter.def.json.po
--- a/resources/i18n/zh_TW/cura.po
+++ b/resources/i18n/zh_TW/cura.po
@ -2826,6 +2826,10 @@ msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr "噴頭偏移 Y"

+msgctxt "@label"
+msgid "Nozzle Size"
+msgstr "噴頭孔徑"
+
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr "噴頭孔徑"
--- a/resources/i18n/zh_TW/fdmprinter.def.json.po
+++ b/resources/i18n/zh_TW/fdmprinter.def.json.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 5.1\n"
 "Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-10-09 14:27+0000\n"
+"POT-Creation-Date: 2024-11-06 10:43+0000\n"
 "PO-Revision-Date: 2022-01-02 20:24+0800\n"
 "Last-Translator: Valen Chang  <carf17771@gmail.com>\n"
 "Language-Team: Valen Chang <carf17771@gmail.com>\n"
@ -1049,6 +1049,10 @@ msgctxt "switch_extruder_extra_prime_amount description"
 msgid "Extra material to prime after nozzle switching."
 msgstr "噴頭切換後額外裝填的線材量。"

+msgctxt "variant_name"
+msgid "Extruder"
+msgstr ""
+
 msgctxt "extruder_prime_pos_x label"
 msgid "Extruder Prime X Position"
 msgstr "擠出機 X 軸起始位置"
@ -2495,6 +2499,10 @@ msgctxt "machine_nozzle_id label"
 msgid "Nozzle ID"
 msgstr "噴頭 ID"

+msgctxt "variant_name"
+msgid "Nozzle Size"
+msgstr "噴頭孔徑"
+
 msgctxt "switch_extruder_extra_prime_amount label"
 msgid "Nozzle Switch Extra Prime Amount"
 msgstr "噴頭切換額外裝填量"
@ -2803,6 +2811,10 @@ msgctxt "acceleration_print label"
 msgid "Print Acceleration"
 msgstr "列印加速度"

+msgctxt "variant_name"
+msgid "Print Core"
+msgstr ""
+
 msgctxt "jerk_print label"
 msgid "Print Jerk"
 msgstr "列印加加速度"
--- a/resources/images/MakerbotSketchSprint.png
+++ b/resources/images/MakerbotSketchSprint.png
--- a/resources/meshes/ultimaker_sketch_sprint_platform.obj
+++ b/resources/meshes/ultimaker_sketch_sprint_platform.obj
--- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
@ -18,6 +18,12 @@ Item
        name: "cura"
    }

+    UM.I18nCatalog
+    {
+        id: catalog_fdmprinter
+        name: "fdmprinter.def.json"
+    }
+
    width: parent.width
    height: childrenRect.height

@ -281,7 +287,7 @@ Item

                UM.Label
                {
-                    text: Cura.MachineManager.activeDefinitionVariantsName
+                    text: catalog_fdmprinter.i18nc("variant_name", Cura.MachineManager.activeDefinitionVariantsName)
                    height: parent.height
                    width: selectors.textWidth
                }
--- a/resources/quality/ultimaker2/um2_normal.inst.cfg
+++ b/resources/quality/ultimaker2/um2_normal.inst.cfg
@ -11,4 +11,5 @@ type = quality
 weight = 0

 [values]
+layer_height = 0.1

--- a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
@ -32,7 +32,7 @@ skin_overlap = 20.0
 skirt_brim_minimal_length = 100.0
 speed_print = 25
 support_enable = False
-top_bottom_thickness = =layer_height * 2
+top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0
 top_thickness = =top_bottom_thickness
 wall_0_material_flow_layer_0 = 110
 wall_x_material_flow_layer_0 = 110
--- a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
@ -32,7 +32,7 @@ skin_overlap = 20.0
 skirt_brim_minimal_length = 100.0
 speed_print = 25
 support_enable = False
-top_bottom_thickness = =layer_height * 2
+top_bottom_thickness = =math.floor(layer_height * 2000)/1000.0
 top_thickness = =top_bottom_thickness
 wall_0_material_flow_layer_0 = 110
 wall_x_material_flow_layer_0 = 110
--- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg
@ -1,21 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Fast
-version = 4
-
-[metadata]
-material = generic_pla
-quality_type = fast
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-material_print_temperature_layer_0 = =material_print_temperature + 5
-retraction_hop = 0.2
-retraction_hop_enabled = True
-retraction_speed = 15
-speed_print = 20
-speed_travel = 80
-
--- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg
@ -1,21 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Fine
-version = 4
-
-[metadata]
-material = generic_pla
-quality_type = fine
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-material_print_temperature_layer_0 = =material_print_temperature + 5
-retraction_hop = 0.2
-retraction_hop_enabled = True
-retraction_speed = 15
-speed_print = 20
-speed_travel = 80
-
--- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg
@ -1,21 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Normal
-version = 4
-
-[metadata]
-material = generic_pla
-quality_type = normal
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-material_print_temperature_layer_0 = =material_print_temperature + 5
-retraction_hop = 0.2
-retraction_hop_enabled = True
-retraction_speed = 15
-speed_print = 20
-speed_travel = 80
-
--- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg
@ -1,42 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Fast
-version = 4
-
-[metadata]
-material = generic_pla
-quality_type = fast
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-adhesion_type = skirt
-brim_width = 7
-infill_overlap = -2
-infill_pattern = quarter_cubic
-layer_height = 0.3
-material_bed_temperature = 35
-material_flow = 420.0
-material_flow_layer_0 = 150.0
-material_print_temperature_layer_0 = 235
-retraction_amount = 1.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-retraction_speed = 20
-skin_overlap = 15
-skirt_line_count = 2
-speed_print = 40
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-top_bottom_thickness = =layer_height*3
-wall_thickness = =line_width *2
-
--- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg
@ -1,42 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Fine
-version = 4
-
-[metadata]
-material = generic_pla
-quality_type = fine
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-adhesion_type = skirt
-brim_width = 7
-infill_overlap = -2
-infill_pattern = quarter_cubic
-layer_height = 0.15
-material_bed_temperature = 35
-material_flow = 420.0
-material_flow_layer_0 = 150.0
-material_print_temperature_layer_0 = 235
-retraction_amount = 1.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-retraction_speed = 20
-skin_overlap = 15
-skirt_line_count = 2
-speed_print = 30
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-top_bottom_thickness = =layer_height*3
-wall_thickness = =line_width *2
-
--- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg
@ -1,42 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Normal
-version = 4
-
-[metadata]
-material = generic_pla
-quality_type = normal
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-adhesion_type = skirt
-brim_width = 7
-infill_overlap = -2
-infill_pattern = quarter_cubic
-layer_height = 0.2
-material_bed_temperature = 35
-material_flow = 420.0
-material_flow_layer_0 = 150.0
-material_print_temperature_layer_0 = 235
-retraction_amount = 1.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-retraction_speed = 20
-skin_overlap = 15
-skirt_line_count = 2
-speed_print = 40
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-top_bottom_thickness = =layer_height*3
-wall_thickness = =line_width *2
-
--- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg
@ -1,40 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Fast
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = fast
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = -2
-
-[values]
-adhesion_type = skirt
-brim_width = 7
-infill_overlap = -2
-infill_pattern = quarter_cubic
-layer_height = 0.3
-material_flow = 420.0
-material_flow_layer_0 = 150.0
-retraction_amount = 1.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-retraction_speed = 20
-skin_overlap = 15
-skirt_line_count = 2
-speed_print = 40
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-top_bottom_thickness = =layer_height*3
-wall_thickness = =line_width *2
-
--- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg
@ -1,40 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Fine
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = fine
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = -2
-
-[values]
-adhesion_type = skirt
-brim_width = 7
-infill_overlap = -2
-infill_pattern = quarter_cubic
-layer_height = 0.15
-material_flow = 420.0
-material_flow_layer_0 = 150.0
-retraction_amount = 1.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-retraction_speed = 20
-skin_overlap = 15
-skirt_line_count = 2
-speed_print = 30
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-top_bottom_thickness = =layer_height*3
-wall_thickness = =line_width *2
-
--- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg
@ -1,40 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Normal
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = normal
-setting_version = 24
-type = quality
-variant = Carbon0.4
-weight = -2
-
-[values]
-adhesion_type = skirt
-brim_width = 7
-infill_overlap = -2
-infill_pattern = quarter_cubic
-layer_height = 0.2
-material_flow = 420.0
-material_flow_layer_0 = 150.0
-retraction_amount = 1.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-retraction_speed = 20
-skin_overlap = 15
-skirt_line_count = 2
-speed_print = 40
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-top_bottom_thickness = =layer_height*3
-wall_thickness = =line_width *2
-
--- a/Show more
+++ b/Show more