diff --git a/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py b/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py index b1932bcb9c..b0293c5904 100644 --- a/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py +++ b/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py @@ -19,7 +19,7 @@ class VariantDatabaseHandler(DatabaseMetadataContainerController): "definition": "text", "version": "text", "setting_version": "text", - "bot_extruder_id": "text", + "reference_extruder_id": "text", }, )) self._container_type = InstanceContainer diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 912457e0bd..1087ef0b16 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -144,7 +144,7 @@ class MakerbotWriter(MeshWriter): meta = dict() - meta["bot_type"] = global_stack.definition.getMetaDataEntry("bot_machine_id") + meta["bot_type"] = global_stack.definition.getMetaDataEntry("reference_machine_id") bounds: Optional[AxisAlignedBox] = None for node in nodes: @@ -186,7 +186,7 @@ class MakerbotWriter(MeshWriter): meta["uuid"] = print_information.slice_uuid - materials = [extruder.material.getMetaData().get("bot_material_id") for extruder in extruders] + materials = [extruder.material.getMetaData().get("reference_material_id") for extruder in extruders] meta["material"] = materials[0] meta["materials"] = materials @@ -198,7 +198,7 @@ class MakerbotWriter(MeshWriter): meta["model_counts"] = [{"count": 1, "name": node.getName()} for node in nodes] - tool_types = [extruder.variant.getMetaDataEntry("bot_extruder_id") for extruder in extruders] + tool_types = [extruder.variant.getMetaDataEntry("reference_extruder_id") for extruder in extruders] meta["tool_type"] = tool_types[0] meta["tool_types"] = tool_types diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index bf0cef923f..6292d3c5d2 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -9,7 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_platform.stl", - "bot_machine_id": "lava_f", + "reference_machine_id": "lava_f", "exclude_materials": [ "dsm_", "Essentium_", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 3cf50e5b8c..7409c18590 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -9,7 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_xl_platform.stl", - "bot_machine_id": "magma_10", + "reference_machine_id": "magma_10", "has_machine_materials": true, "has_machine_quality": true, "has_materials": true, diff --git a/resources/variants/ultimaker_methodx_1C.inst.cfg b/resources/variants/ultimaker_methodx_1C.inst.cfg index 4a5f41c057..cf32997d67 100644 --- a/resources/variants/ultimaker_methodx_1C.inst.cfg +++ b/resources/variants/ultimaker_methodx_1C.inst.cfg @@ -4,7 +4,7 @@ name = 1C version = 4 [metadata] -bot_extruder_id = mk14_c +reference_extruder_id = mk14_c hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodx_1XA.inst.cfg b/resources/variants/ultimaker_methodx_1XA.inst.cfg index dc0149928f..5ccf8d3635 100644 --- a/resources/variants/ultimaker_methodx_1XA.inst.cfg +++ b/resources/variants/ultimaker_methodx_1XA.inst.cfg @@ -4,7 +4,7 @@ name = 1XA version = 4 [metadata] -bot_extruder_id = mk14_hot +reference_extruder_id = mk14_hot hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodx_2XA.inst.cfg b/resources/variants/ultimaker_methodx_2XA.inst.cfg index ef1eb62a48..073e101ef7 100644 --- a/resources/variants/ultimaker_methodx_2XA.inst.cfg +++ b/resources/variants/ultimaker_methodx_2XA.inst.cfg @@ -4,7 +4,7 @@ name = 2XA version = 4 [metadata] -bot_extruder_id = mk14_hot_s +reference_extruder_id = mk14_hot_s hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodx_LABS.inst.cfg b/resources/variants/ultimaker_methodx_LABS.inst.cfg index bf6d495e90..96a4987923 100644 --- a/resources/variants/ultimaker_methodx_LABS.inst.cfg +++ b/resources/variants/ultimaker_methodx_LABS.inst.cfg @@ -4,7 +4,7 @@ name = LABS version = 4 [metadata] -bot_extruder_id = mk14_e +reference_extruder_id = mk14_e hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodxl_1C.inst.cfg b/resources/variants/ultimaker_methodxl_1C.inst.cfg index 1bed86aa6e..ac715e5df2 100644 --- a/resources/variants/ultimaker_methodxl_1C.inst.cfg +++ b/resources/variants/ultimaker_methodxl_1C.inst.cfg @@ -4,7 +4,7 @@ name = 1C version = 4 [metadata] -bot_extruder_id = mk14_c +reference_extruder_id = mk14_c hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodxl_1XA.inst.cfg b/resources/variants/ultimaker_methodxl_1XA.inst.cfg index ce303347f8..a0d3bf9669 100644 --- a/resources/variants/ultimaker_methodxl_1XA.inst.cfg +++ b/resources/variants/ultimaker_methodxl_1XA.inst.cfg @@ -4,7 +4,7 @@ name = 1XA version = 4 [metadata] -bot_extruder_id = mk14_hot +reference_extruder_id = mk14_hot hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodxl_2XA.inst.cfg b/resources/variants/ultimaker_methodxl_2XA.inst.cfg index 8ab9108e71..8e45222a7b 100644 --- a/resources/variants/ultimaker_methodxl_2XA.inst.cfg +++ b/resources/variants/ultimaker_methodxl_2XA.inst.cfg @@ -4,7 +4,7 @@ name = 2XA version = 4 [metadata] -bot_extruder_id = mk14_hot_s +reference_extruder_id = mk14_hot_s hardware_type = nozzle setting_version = 22 type = variant diff --git a/resources/variants/ultimaker_methodxl_LABS.inst.cfg b/resources/variants/ultimaker_methodxl_LABS.inst.cfg index 4ec3edcc33..551567cf8c 100644 --- a/resources/variants/ultimaker_methodxl_LABS.inst.cfg +++ b/resources/variants/ultimaker_methodxl_LABS.inst.cfg @@ -4,7 +4,7 @@ name = LABS version = 4 [metadata] -bot_extruder_id = mk14_e +reference_extruder_id = mk14_e hardware_type = nozzle setting_version = 22 type = variant