Merge branch '5.9' into CURA-12262_flatten_slice_info

cura/BuildVolume.py

@@ -252,19 +252,23 @@ class BuildVolume(SceneNode):
         if not self.getMeshData() or not self.isVisible():
             return True
 
+        theme = self._application.getTheme()
         if not self._shader:
             self._shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "default.shader"))
             self._grid_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "grid.shader"))
-            theme = self._application.getTheme()
-            self._grid_shader.setUniformValue("u_plateColor", Color(*theme.getColor("buildplate").getRgb()))
             self._grid_shader.setUniformValue("u_gridColor0", Color(*theme.getColor("buildplate_grid").getRgb()))
             self._grid_shader.setUniformValue("u_gridColor1", Color(*theme.getColor("buildplate_grid_minor").getRgb()))
 
+        plate_color = Color(*theme.getColor("buildplate").getRgb())
+        if self._global_container_stack.getMetaDataEntry("has_textured_buildplate", False):
+            plate_color.setA(0.5)
+        self._grid_shader.setUniformValue("u_plateColor", plate_color)
+
         renderer.queueNode(self, mode = RenderBatch.RenderMode.Lines)
         renderer.queueNode(self, mesh = self._origin_mesh, backface_cull = True)
-        renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True)
+        renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True, transparent = True, sort = -10)
         if self._disallowed_area_mesh:
-            renderer.queueNode(self, mesh = self._disallowed_area_mesh, shader = self._shader, transparent = True, backface_cull = True, sort = -9)
+            renderer.queueNode(self, mesh = self._disallowed_area_mesh, shader = self._shader, transparent = True, backface_cull = True, sort = -5)
 
         if self._error_mesh:
             renderer.queueNode(self, mesh=self._error_mesh, shader=self._shader, transparent=True,

plugins/SimulationView/layers3d.shader

@@ -360,8 +360,8 @@ geometry41core =
             ((v_prev_line_type[0] != 1) && (v_line_type[0] == 1)) ||
             ((v_prev_line_type[0] != 4) && (v_line_type[0] == 4))
             )) {
-            float w = size_x;
-            float h = size_y;
+            float w = max(0.05, size_x);
+            float h = max(0.05, size_y);
 
             myEmitVertex(v_vertex[0] + vec3( w,  h,  w), u_starts_color, normalize(vec3( 1.0,  1.0,  1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w,  h,  w, 0.0))); // Front-top-left
             myEmitVertex(v_vertex[0] + vec3(-w,  h,  w), u_starts_color, normalize(vec3(-1.0,  1.0,  1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w,  h,  w, 0.0))); // Front-top-right

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",

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",

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",

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":
         {

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":
     {
@@ -8981,7 +8983,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",
@@ -9008,7 +9010,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",

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"
     },

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"
     },

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"
     },

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,

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",

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",

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"
     },

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",

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"
     },

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",

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"
     },

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",

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"
     },

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",

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,

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"
     },

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"
     },

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"
     },

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",

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":
     {

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",

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"
     },

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":
     {

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":
     {

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":
     {

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":

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":

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":

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":

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":

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":

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":

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":

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":

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":

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":

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"
     },

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"
     },

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"
     },

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"
     },

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"

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"

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 ""

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"

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"

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 ""

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"

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"

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"

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"

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"

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"

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 "ノズルサイズ"

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 "노즐 크기"

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"

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"

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"

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"

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"

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"

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 "Диаметр сопла"

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"

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 "喷嘴孔径"

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 "噴頭孔徑"

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 "列印加加速度"

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
                 }

resources/shaders/grid.shader

@@ -45,6 +45,7 @@ fragment =
         float majorLine = min(majorGrid.x, majorGrid.y);
 
         gl_FragColor = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0));
+        gl_FragColor.a = u_plateColor.a;
     }
 
 vertex41core =
@@ -88,6 +89,7 @@ fragment41core =
         float majorLine = min(majorGrid.x, majorGrid.y);
 
         frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0));
+        frag_color.a = u_plateColor.a;
     }
 
 [defaults]