diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 0c2e09cbd9..ed1256e1e8 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -8,8 +8,8 @@ "author": "UltiMaker", "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", - "bot_id": "lava_f", "platform": "ultimaker_method_platform.stl", + "bot_id": "lava_f", "exclude_materials": [ "dsm_", "Essentium_", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 80a3287209..96a4728cbb 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -8,8 +8,8 @@ "author": "UltiMaker", "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", - "bot_id": "magma_10", "platform": "ultimaker_method_xl_platform.stl", + "bot_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 579e1534de..42a45fe3f9 100644 --- a/resources/variants/ultimaker_methodx_1C.inst.cfg +++ b/resources/variants/ultimaker_methodx_1C.inst.cfg @@ -4,10 +4,10 @@ name = 1C version = 4 [metadata] +bot_id = mk14_c hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_c [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_methodx_1XA.inst.cfg b/resources/variants/ultimaker_methodx_1XA.inst.cfg index 2189328aea..05871055ac 100644 --- a/resources/variants/ultimaker_methodx_1XA.inst.cfg +++ b/resources/variants/ultimaker_methodx_1XA.inst.cfg @@ -4,10 +4,10 @@ name = 1XA version = 4 [metadata] +bot_id = mk14_hot hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_hot [values] machine_nozzle_id = 1XA diff --git a/resources/variants/ultimaker_methodx_2XA.inst.cfg b/resources/variants/ultimaker_methodx_2XA.inst.cfg index b5b2882179..fc9ccec85c 100644 --- a/resources/variants/ultimaker_methodx_2XA.inst.cfg +++ b/resources/variants/ultimaker_methodx_2XA.inst.cfg @@ -4,10 +4,10 @@ name = 2XA version = 4 [metadata] +bot_id = mk14_hot_s hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_hot_s [values] machine_nozzle_id = 2XA diff --git a/resources/variants/ultimaker_methodx_LABS.inst.cfg b/resources/variants/ultimaker_methodx_LABS.inst.cfg index 316d114a59..37e1ad8802 100644 --- a/resources/variants/ultimaker_methodx_LABS.inst.cfg +++ b/resources/variants/ultimaker_methodx_LABS.inst.cfg @@ -4,10 +4,10 @@ name = LABS version = 4 [metadata] +bot_id = mk14_e hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_e [values] machine_nozzle_id = LABS diff --git a/resources/variants/ultimaker_methodxl_1C.inst.cfg b/resources/variants/ultimaker_methodxl_1C.inst.cfg index 110aa9c964..ba0f8d1d19 100644 --- a/resources/variants/ultimaker_methodxl_1C.inst.cfg +++ b/resources/variants/ultimaker_methodxl_1C.inst.cfg @@ -4,10 +4,10 @@ name = 1C version = 4 [metadata] +bot_id = mk14_c hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_c [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_methodxl_1XA.inst.cfg b/resources/variants/ultimaker_methodxl_1XA.inst.cfg index 024c224fe3..1f1d60cde3 100644 --- a/resources/variants/ultimaker_methodxl_1XA.inst.cfg +++ b/resources/variants/ultimaker_methodxl_1XA.inst.cfg @@ -4,10 +4,10 @@ name = 1XA version = 4 [metadata] +bot_id = mk14_hot hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_hot [values] machine_nozzle_id = 1XA diff --git a/resources/variants/ultimaker_methodxl_2XA.inst.cfg b/resources/variants/ultimaker_methodxl_2XA.inst.cfg index dba05e0af9..c462e2ed6f 100644 --- a/resources/variants/ultimaker_methodxl_2XA.inst.cfg +++ b/resources/variants/ultimaker_methodxl_2XA.inst.cfg @@ -4,10 +4,10 @@ name = 2XA version = 4 [metadata] +bot_id = mk14_hot_s hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_hot_s [values] machine_nozzle_id = 2XA diff --git a/resources/variants/ultimaker_methodxl_LABS.inst.cfg b/resources/variants/ultimaker_methodxl_LABS.inst.cfg index 0b2a06b3ec..160361cd75 100644 --- a/resources/variants/ultimaker_methodxl_LABS.inst.cfg +++ b/resources/variants/ultimaker_methodxl_LABS.inst.cfg @@ -4,11 +4,12 @@ name = LABS version = 4 [metadata] +bot_id = mk14_e hardware_type = nozzle setting_version = 22 type = variant -bot_id = mk14_e [values] machine_nozzle_id = LABS machine_nozzle_size = 0.4 +