restore some exclude materials

CURA-10709
Ultimaker · Jun 26, 2023 · f9faf21 · f9faf21
1 parent de27284
commit f9faf21
Show file tree

Hide file tree

Showing 10 changed files with 250 additions and 102 deletions.
diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json
@@ -9,10 +9,26 @@
         "manufacturer": "Kati Hal ARGE",
         "file_formats": "text/x-gcode",
         "platform": "alya_platform.3mf",
+        "exclude_materials": [
+            "dsm_arnitel2045",
+            "dsm_novamid1070",
+            "generic_abs",
+            "generic_cpe",
+            "generic_hips",
+            "generic_nylon",
+            "generic_pc",
+            "generic_petg",
+            "generic_pva",
+            "generic_tpu",
+            "innofill_innoflex60",
+            "verbatim_bvoh"
+        ],
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "machine_extruder_trains": { "0": "alya3dp_extruder_0" },
+        "machine_extruder_trains": {
+            "0": "alya3dp_extruder_0"
+        },
         "platform_offset": [
             -60,
             -45,

diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json
@@ -9,10 +9,26 @@
         "manufacturer": "Kati Hal ARGE",
         "file_formats": "text/x-gcode",
         "platform": "alya_nx_platform.3mf",
+        "exclude_materials": [
+            "dsm_arnitel2045_175",
+            "dsm_novamid1070_175",
+            "generic_abs_175",
+            "generic_cpe_175",
+            "generic_hips_175",
+            "generic_nylon_175",
+            "generic_pc_175",
+            "generic_petg_175",
+            "generic_pva_175",
+            "generic_tpu_175",
+            "innofill_innoflex60_175",
+            "verbatim_bvoh_175"
+        ],
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "machine_extruder_trains": { "0": "alya3dp_extruder_0" },
+        "machine_extruder_trains": {
+            "0": "alya3dp_extruder_0"
+        },
         "platform_offset": [
             -104,
             0,

diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json
@@ -4,19 +4,29 @@
     "inherits": "fdmprinter",
     "metadata":
     {
-        "visible": false,
-        "author": "3D-Nexus.com, cataclism, Wondro",
-        "manufacturer": "Artillery",
-        "file_formats": "text/x-gcode",
-        "first_start_actions": [ "MachineSettingsAction" ],
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "machine_extruder_trains": { "0": "artillery_base_extruder_0" },
-        "preferred_material": "generic_pla",
-        "preferred_quality_type": "standard",
-        "preferred_variant_name": "0.4mm Nozzle",
-        "variants_name": "Nozzle Size"
+      "visible": false,
+      "author": "3D-Nexus.com, cataclism, Wondro",
+      "manufacturer": "Artillery",
+      "file_formats": "text/x-gcode",
+      "exclude_materials": [
+        "dsm_arnitel2045_175",
+        "dsm_novamid1070_175",
+        "innofill_innoflex60_175",
+        "verbatim_bvoh_175"
+      ],
+      "first_start_actions": [
+        "MachineSettingsAction"
+      ],
+      "has_machine_quality": true,
+      "has_materials": true,
+      "has_variants": true,
+      "machine_extruder_trains": {
+        "0": "artillery_base_extruder_0"
+      },
+      "preferred_material": "generic_pla",
+      "preferred_quality_type": "standard",
+      "preferred_variant_name": "0.4mm Nozzle",
+      "variants_name": "Nozzle Size"
     },
     "overrides":
     {

diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json
@@ -4,20 +4,28 @@
     "inherits": "fdmprinter",
     "metadata":
     {
-        "visible": false,
-        "author": "ATMAT",
-        "manufacturer": "ATMAT sp. z o.o.",
-        "file_formats": "text/x-gcode",
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "machine_extruder_trains":
-        {
-            "0": "atmat_signal_pro_extruder_left",
-            "1": "atmat_signal_pro_extruder_right"
-        },
-        "preferred_material": "generic_pla_175",
-        "preferred_quality_type": "fast",
+      "visible": false,
+      "author": "ATMAT",
+      "manufacturer": "ATMAT sp. z o.o.",
+      "file_formats": "text/x-gcode",
+      "exclude_materials": [
+        "dsm_arnitel2045",
+        "dsm_novamid1070",
+        "generic_cpe",
+        "imade3d_petg",
+        "imade3d_pla",
+        "innofill_innoflex60",
+        "verbatim_bvoh"
+      ],
+      "has_machine_quality": true,
+      "has_materials": true,
+      "has_variants": true,
+      "machine_extruder_trains": {
+        "0": "atmat_signal_pro_extruder_left",
+        "1": "atmat_signal_pro_extruder_right"
+      },
+      "preferred_material": "generic_pla_175",
+      "preferred_quality_type": "fast",
         "preferred_variant_name": "V6 0.40mm",
         "supports_network_connection": false,
         "supports_usb_connection": false,

diff --git a/resources/definitions/fusion3.def.json b/resources/definitions/fusion3.def.json
@@ -4,18 +4,40 @@
     "inherits": "fdmprinter",
     "metadata":
     {
-        "visible": false,
-        "author": "Keith Varin",
-        "manufacturer": "Fusion3Design",
-        "file_formats": "text/x-gcode",
-        "first_start_actions": [ "MachineSettingsAction" ],
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "machine_extruder_trains": { "0": "fusion3_extruder_0" },
-        "preferred_material": "generic_abs",
-        "preferred_quality_type": "normal",
-        "preferred_variant_name": "0.4mm Nozzle",
-        "variants_name": "Nozzle Size"
+      "visible": false,
+      "author": "Keith Varin",
+      "manufacturer": "Fusion3Design",
+      "file_formats": "text/x-gcode",
+      "exclude_materials": [
+        "dsm_arnitel2045",
+        "dsm_novamid1070",
+        "Extrudr_GreenTECPro_Anthracite",
+        "Extrudr_GreenTECPro_Black",
+        "Extrudr_GreenTECPro_Blue",
+        "Extrudr_GreenTECPro_Nature",
+        "Extrudr_GreenTECPro_Red",
+        "Extrudr_GreenTECPro_Silver",
+        "Extrudr_GreenTECPro_White",
+        "generic_bvoh",
+        "generic_hips",
+        "generic_pva",
+        "imade3d_petg",
+        "imade3d_pla",
+        "innofill_innoflex60",
+        "verbatim_bvoh"
+      ],
+      "first_start_actions": [
+        "MachineSettingsAction"
+      ],
+      "has_machine_quality": true,
+      "has_materials": true,
+      "has_variants": true,
+      "machine_extruder_trains": {
+        "0": "fusion3_extruder_0"
+      },
+      "preferred_material": "generic_abs",
+      "preferred_quality_type": "normal",
+      "preferred_variant_name": "0.4mm Nozzle",
+      "variants_name": "Nozzle Size"
     }
 }
diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json
@@ -4,20 +4,35 @@
     "inherits": "fdmprinter",
     "metadata":
     {
-        "visible": true,
-        "author": "Kupido",
-        "manufacturer": "Kati Hal ARGE",
-        "file_formats": "text/x-gcode",
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": false,
-        "machine_extruder_trains": { "0": "kupido_extruder_0" },
-        "platform_offset": [
-            0,
-            0,
-            0
-        ],
-        "preferred_material": "generic_pla",
+      "visible": true,
+      "author": "Kupido",
+      "manufacturer": "Kati Hal ARGE",
+      "file_formats": "text/x-gcode",
+      "exclude_materials": [
+        "dsm_arnitel2045",
+        "dsm_novamid1070",
+        "generic_cpe",
+        "generic_hips",
+        "generic_nylon",
+        "generic_pc",
+        "generic_petg",
+        "generic_pva",
+        "generic_tpu",
+        "innofill_innoflex60",
+        "verbatim_bvoh"
+      ],
+      "has_machine_quality": true,
+      "has_materials": true,
+      "has_variants": false,
+      "machine_extruder_trains": {
+        "0": "kupido_extruder_0"
+      },
+      "platform_offset": [
+        0,
+        0,
+        0
+      ],
+      "preferred_material": "generic_pla",
         "supports_usb_connection": false
     },
     "overrides":

diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json
@@ -4,21 +4,37 @@
     "inherits": "fdmprinter",
     "metadata":
     {
-        "visible": true,
-        "author": "Karan and Vincent 20191104",
-        "manufacturer": "Leapfrog B.V.",
-        "file_formats": "text/x-gcode",
-        "platform": "leapfrog_bolt_pro_platform.3mf",
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "machine_extruder_trains":
-        {
-            "0": "leapfrog_bolt_pro_extruder_right",
-            "1": "leapfrog_bolt_pro_extruder_left"
-        },
-        "platform_offset": [
-            0,
+      "visible": true,
+      "author": "Karan and Vincent 20191104",
+      "manufacturer": "Leapfrog B.V.",
+      "file_formats": "text/x-gcode",
+      "platform": "leapfrog_bolt_pro_platform.3mf",
+      "exclude_materials": [
+        "generic_pla",
+        "generic_abs",
+        "generic_cpe",
+        "generic_hips",
+        "generic_nylon",
+        "generic_pc",
+        "generic_petg",
+        "generic_pva",
+        "generic_tpu",
+        "dsm_arnitel2045",
+        "dsm_novamid1070",
+        "imade3d_petg",
+        "imade3d_pla",
+        "innofill_innoflex60",
+        "verbatim_bvoh"
+      ],
+      "has_machine_quality": true,
+      "has_materials": true,
+      "has_variants": true,
+      "machine_extruder_trains": {
+        "0": "leapfrog_bolt_pro_extruder_right",
+        "1": "leapfrog_bolt_pro_extruder_left"
+      },
+      "platform_offset": [
+        0,
             0,
             -14
         ],

diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json
@@ -4,21 +4,37 @@
     "inherits": "fdmprinter",
     "metadata":
     {
-        "visible": true,
-        "author": "Tizyx",
-        "manufacturer": "Tizyx",
-        "file_formats": "text/x-gcode",
-        "platform": "tizyx_k25_platform.3mf",
-        "first_start_actions": [ "MachineSettingsAction" ],
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "machine_extruder_trains": { "0": "tizyx_evy_extruder_0" },
-        "platform_offset": [
-            0,
-            -4,
-            0
-        ],
+      "visible": true,
+      "author": "Tizyx",
+      "manufacturer": "Tizyx",
+      "file_formats": "text/x-gcode",
+      "platform": "tizyx_k25_platform.3mf",
+      "exclude_materials": [
+        "dsm_arnitel2045",
+        "dsm_novamid1070",
+        "generic_cpe",
+        "generic_hips",
+        "generic_nylon",
+        "generic_pc",
+        "generic_pva",
+        "generic_tpu",
+        "innofill_innoflex60",
+        "verbatim_bvoh"
+      ],
+      "first_start_actions": [
+        "MachineSettingsAction"
+      ],
+      "has_machine_quality": true,
+      "has_materials": true,
+      "has_variants": true,
+      "machine_extruder_trains": {
+        "0": "tizyx_evy_extruder_0"
+      },
+      "platform_offset": [
+        0,
+        -4,
+        0
+      ],
         "preferred_material": "tizyx_pla",
         "preferred_quality_type": "normal",
         "preferred_variant_name": "0.4mm",