From cd58703dca8d206b8cf8a43459a79c1bfb133f15 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 21 Jun 2023 11:37:08 +0200 Subject: [PATCH 1/8] Remove exclude materials from 3rd party printers With the changes from https://github.com/Ultimaker/Cura/pull/15692 logic regarding the exclude materials printer setting changed. It has never worked properly before. Now that it works properly again a ton of materials were excluded that were never intended to be excluded. As we can never be sure if an exclude material was intended or not we decided to be pretty agressive in removing exclude materials. This way the behavior is closed to the behavior prior to the exclude material fix. There was one case were we decide to leave an exclude material in. If a printer has a material diameter of `175` *and* the material would specifically specify the `175` substring (e.g. `dsm_arnitel2045_175`). When this is the case we were pretty certain it was intended to exclude this material. CURA-10599 --- resources/definitions/alya3dp.def.json | 53 ------ resources/definitions/alyanx3dp.def.json | 53 ------ resources/definitions/artillery_base.def.json | 47 ----- .../atmat_signal_pro_base.def.json | 69 -------- resources/definitions/creality_base.def.json | 53 +----- resources/definitions/elegoo_base.def.json | 17 +- .../definitions/flyingbear_base.def.json | 83 +-------- resources/definitions/fusion3.def.json | 140 --------------- resources/definitions/goofoo_e-one.def.json | 17 +- resources/definitions/goofoo_far.def.json | 6 - resources/definitions/goofoo_open.def.json | 12 -- resources/definitions/goofoo_small.def.json | 14 -- resources/definitions/goofoo_t-one.def.json | 15 -- resources/definitions/hms434.def.json | 85 ++------- .../imade3d_jellybox_root.def.json | 48 +----- resources/definitions/kingroon_base.def.json | 113 ++---------- resources/definitions/kupido.def.json | 51 ------ .../definitions/leapfrog_bolt_pro.def.json | 54 ------ resources/definitions/mingda_base.def.json | 49 +----- resources/definitions/sovol_base.def.json | 53 +----- resources/definitions/tizyx_evy.def.json | 45 ----- resources/definitions/tizyx_evy_dual.def.json | 36 ---- resources/definitions/tizyx_k25.def.json | 52 ------ .../definitions/trimaker_cosmosII.def.json | 82 +-------- .../definitions/trimaker_nebula.def.json | 82 +-------- resources/definitions/uni_base.def.json | 62 +------ resources/definitions/weedo_base.def.json | 161 ++---------------- resources/definitions/weedo_x40.def.json | 136 +-------------- .../xyzprinting_da_vinci_jr_1p0a_pro.def.json | 32 ---- resources/definitions/zav_base.def.json | 70 +------- 30 files changed, 94 insertions(+), 1696 deletions(-) diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 636a020184..3eacad0640 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -9,59 +9,6 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla", - "tizyx_pla", - "tizyx_abs", - "tizyx_pla_bois" - ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 2572e9db95..0a44471df1 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -9,59 +9,6 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla", - "tizyx_pla", - "tizyx_abs", - "tizyx_pla_bois" - ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index d12587e383..970ab208a5 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -8,53 +8,6 @@ "author": "3D-Nexus.com, cataclism, Wondro", "manufacturer": "Artillery", "file_formats": "text/x-gcode", - "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 6f64fab01b..b4cb7dc090 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -8,75 +8,6 @@ "author": "ATMAT", "manufacturer": "ATMAT sp. z o.o.", "file_formats": "text/x-gcode", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "emotiontech_asax", - "emotiontech_hips", - "fiberlogy_hd_pla", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "generic_cpe_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index e5f5baf0db..b960e2a1b6 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -9,55 +9,10 @@ "manufacturer": "Creality3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index d41ebfe462..b0a0717c59 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -9,26 +9,13 @@ "file_formats": "text/x-gcode", "platform": "elegoo_platform.3mf", "exclude_materials": [ - "generic_nylon_175", "generic_nylon", - "generic_hips_175", "generic_hips", - "generic_gffcpe", - "generic_bvoh_175", - "generic_ccfpe", - "generic_cffcpe", - "generic_cpe_plus", - "generic_cpe_175", + "generic_bvoh", "generic_cpe", - "generic_tpu", - "generic_pp", "generic_pc", - "generic_pc_175", - "generic_pvc", "generic_pva", - "generic_pva_175", - "generic_pvc_175", - "generic_pp" + "generic_pvc" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index c256ae61f8..70ae7e8f96 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -9,83 +9,12 @@ "manufacturer": "Flying Bear", "file_formats": "text/x-gcode", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/fusion3.def.json b/resources/definitions/fusion3.def.json index 30c5b6ce93..ccf8360804 100644 --- a/resources/definitions/fusion3.def.json +++ b/resources/definitions/fusion3.def.json @@ -8,146 +8,6 @@ "author": "Keith Varin", "manufacturer": "Fusion3Design", "file_formats": "text/x-gcode", - "exclude_materials": [ - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_bam", - "generic_bvoh_175", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_hips_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petgcarbone_ultra", - "volumic_petg_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json index 39d8a9c74a..c962aceaa5 100644 --- a/resources/definitions/goofoo_e-one.def.json +++ b/resources/definitions/goofoo_e-one.def.json @@ -4,22 +4,7 @@ "inherits": "goofoo_open", "metadata": { - "visible": true, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs", - "goofoo_pva", - "goofoo_hips", - "goofoo_pva" - ] + "visible": true }, "overrides": { diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json index 385b767c80..70e51f6138 100644 --- a/resources/definitions/goofoo_far.def.json +++ b/resources/definitions/goofoo_far.def.json @@ -5,12 +5,6 @@ "metadata": { "visible": false, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a" - ], "quality_definition": "goofoo_far" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_open.def.json b/resources/definitions/goofoo_open.def.json index 5a1c707024..663a14cd01 100644 --- a/resources/definitions/goofoo_open.def.json +++ b/resources/definitions/goofoo_open.def.json @@ -5,18 +5,6 @@ "metadata": { "visible": false, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs" - ], "quality_definition": "goofoo_open" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_small.def.json b/resources/definitions/goofoo_small.def.json index edbcd4f667..b6fda1e2a5 100644 --- a/resources/definitions/goofoo_small.def.json +++ b/resources/definitions/goofoo_small.def.json @@ -5,20 +5,6 @@ "metadata": { "visible": false, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs", - "goofoo_pva", - "goofoo_hips" - ], "quality_definition": "goofoo_small" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json index 4117603a2b..621af6a407 100644 --- a/resources/definitions/goofoo_t-one.def.json +++ b/resources/definitions/goofoo_t-one.def.json @@ -5,21 +5,6 @@ "metadata": { "visible": true, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs", - "goofoo_pva", - "goofoo_hips", - "goofoo_pva" - ], "machine_extruder_trains": { "0": "goofoo_tone_1st", diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 633ad2007e..5250df5d73 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -10,79 +10,20 @@ "file_formats": "text/x-gcode", "platform": "hms_platform.obj", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "emotiontech_absx", - "emotiontech_bvoh", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", + "dsm_arnitel2045", + "dsm_novamid1070", "generic_abs", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "zyyx_pro_flex", - "zyyx_pro_pla" + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pva", + "generic_tpu", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index 83db4c29a2..0120c3076f 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -9,58 +9,18 @@ "manufacturer": "Imade3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "filo3d_pla", - "generic_abs_175", + "dsm_arnitel2045", + "dsm_novamid1070", "generic_abs", - "generic_bam", - "generic_cpe_175", - "generic_cpe_plus", "generic_cpe", - "generic_hips_175", "generic_hips", - "generic_nylon_175", "generic_nylon", - "generic_pc_175", "generic_pc", "generic_petg", - "generic_petg_175", "generic_pla", - "generic_pla_175", - "generic_pp", - "generic_pva_175", "generic_pva", - "generic_tough_pla", - "generic_tpu", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla_bois", - "tizyx_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "innofill_innoflex60", + "verbatim_bvoh" ] }, "overrides": diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index 2530ae87b4..7b318018f7 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -9,108 +9,17 @@ "manufacturer": "Kingroon", "file_formats": "text/x-gcode", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_copa", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PLA_PRO_White", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_pla_olive", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_pva_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_white_pla", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "leapfrog_pva_natural", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_tpe", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "tizyx_abs", - "verbatim_bvoh_175", - "Vertex_Delta_TPU", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "volumic_support_ultra", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_pva", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 3a202653c4..f5d8cb0017 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -8,57 +8,6 @@ "author": "Kupido", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_bam", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla", - "tizyx_pla", - "tizyx_abs", - "tizyx_pla_bois" - ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index a5b0a53345..4bd12c7948 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -9,60 +9,6 @@ "manufacturer": "Leapfrog B.V.", "file_formats": "text/x-gcode", "platform": "leapfrog_bolt_pro_platform.3mf", - "exclude_materials": [ - "generic_pla_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", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pva", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 6da76584f3..23dcf21f48 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -9,51 +9,10 @@ "manufacturer": "Mingda", "file_formats": "text/x-gcode", "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/sovol_base.def.json b/resources/definitions/sovol_base.def.json index 71dc460a9f..5c474fb700 100644 --- a/resources/definitions/sovol_base.def.json +++ b/resources/definitions/sovol_base.def.json @@ -9,55 +9,10 @@ "manufacturer": "Sovol 3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index fc2eadc2fb..3050be9dfc 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -9,51 +9,6 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_bam", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 1ea1095af5..0464f92af7 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -9,42 +9,6 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_pva_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index cc301ab54e..f150dc46d6 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -9,58 +9,6 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pla", - "generic_pla_175", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json index 475eb4e371..c16d8397ab 100644 --- a/resources/definitions/trimaker_cosmosII.def.json +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -10,89 +10,21 @@ "file_formats": "text/x-gcode", "platform": "trimaker_cosmosII_platform.stl", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", "generic_hips", - "generic_hips_175", "generic_nylon", - "generic_nylon_175", "generic_pc", - "generic_pc_175", "generic_petg", - "generic_petg_175", "generic_pla", - "generic_pla_175", - "generic_pp", "generic_pva", - "generic_pva_175", - "generic_tough_pla", "generic_tpu", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index c380f34a9a..4e17fe9f84 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -10,89 +10,21 @@ "file_formats": "text/x-gcode", "platform": "trimaker_nebula_platform.stl", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", "generic_hips", - "generic_hips_175", "generic_nylon", - "generic_nylon_175", "generic_pc", - "generic_pc_175", "generic_petg", - "generic_petg_175", "generic_pla", - "generic_pla_175", - "generic_pp", "generic_pva", - "generic_pva_175", - "generic_tough_pla", "generic_tpu", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 1b3dbc104d..c6405d213c 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -9,62 +9,12 @@ "manufacturer": "Uni 3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 305f4f081b..0a43dae8cc 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -9,154 +9,19 @@ "manufacturer": "WEEDO", "file_formats": "text/x-gcode", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" + "Extrudr_GreenTECPro_Anthracite", + "Extrudr_GreenTECPro_Black", + "Extrudr_GreenTECPro_Blue", + "Extrudr_GreenTECPro_Nature", + "Extrudr_GreenTECPro_Red", + "Extrudr_GreenTECPro_Silver", + "Extrudr_GreenTECPro_White", + "verbatim_bvoh", + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60" ], "has_machine_quality": false, "has_materials": true, diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index 043bae3cb0..acf99f1802 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -10,135 +10,13 @@ "file_formats": "text/x-gcode", "platform": "weedo_x40.3mf", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "generic_nylon_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "zyyx_pro_flex", - "zyyx_pro_pla" + "generic_pc", + "generic_nylon", + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json index 164c0eb579..c3b4edd4db 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json @@ -8,38 +8,6 @@ "author": "XYZprinting Software", "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "exclude_materials": [ - "generic_hips", - "generic_petg", - "generic_bam", - "ultimaker_bam", - "generic_pva", - "ultimaker_pva", - "generic_tough_pla", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "generic_cffcpe", - "generic_cffpa", - "generic_gffcpe", - "generic_gffpa", - "structur3d_dap100silicone", - "ultimaker_petg_blue", - "ultimaker_petg_grey", - "ultimaker_petg_black", - "ultimaker_petg_green", - "ultimaker_petg_white", - "ultimaker_petg_orange", - "ultimaker_petg_silver", - "ultimaker_petg_yellow", - "ultimaker_petg_transparent", - "ultimaker_petg_red_translucent", - "ultimaker_petg_blue_translucent", - "ultimaker_petg_green_translucent", - "ultimaker_petg_yellow_fluorescent", - "ultimaker_petg_red" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 2c9516aecf..03178f5eb9 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -9,71 +9,11 @@ "manufacturer": "Zav Co., Ltd.", "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, From 38a684fe0545a470e61594c8d39fbff180cce81e Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 21 Jun 2023 09:38:32 +0000 Subject: [PATCH 2/8] Applied printer-linter format --- resources/definitions/goofoo_e-one.def.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json index c962aceaa5..00ac99ab00 100644 --- a/resources/definitions/goofoo_e-one.def.json +++ b/resources/definitions/goofoo_e-one.def.json @@ -2,10 +2,7 @@ "version": 2, "name": "Goofoo E-one", "inherits": "goofoo_open", - "metadata": - { - "visible": true - }, + "metadata": { "visible": true }, "overrides": { "machine_depth": { "default_value": 300 }, From e5b60dcaed621853af2740d24028451551620ed8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 22 Jun 2023 15:10:49 +0200 Subject: [PATCH 3/8] Restore exclude materials to some extent again These machines were 1.75 machines, so they should include those in their exclude list (and not include 2.85 variants) CURA-10709 --- resources/definitions/alya3dp.def.json | 43 +++++ resources/definitions/alyanx3dp.def.json | 43 +++++ resources/definitions/artillery_base.def.json | 34 ++++ .../atmat_signal_pro_base.def.json | 52 ++++++ resources/definitions/creality_base.def.json | 36 +++- resources/definitions/elegoo_base.def.json | 14 +- .../definitions/flyingbear_base.def.json | 66 ++++++- resources/definitions/fusion3.def.json | 134 +++++++++++++++ resources/definitions/goofoo_far.def.json | 6 + resources/definitions/goofoo_open.def.json | 12 ++ resources/definitions/goofoo_small.def.json | 14 ++ resources/definitions/goofoo_t-one.def.json | 15 ++ resources/definitions/hms434.def.json | 86 ++++++++-- .../imade3d_jellybox_root.def.json | 53 ++++-- resources/definitions/kingroon_base.def.json | 113 ++++++++++-- resources/definitions/kupido.def.json | 41 +++++ .../definitions/leapfrog_bolt_pro.def.json | 54 ++++++ resources/definitions/mingda_base.def.json | 36 +++- resources/definitions/sovol_base.def.json | 36 +++- resources/definitions/tizyx_evy.def.json | 36 ++++ resources/definitions/tizyx_evy_dual.def.json | 35 ++++ resources/definitions/tizyx_k25.def.json | 39 +++++ .../definitions/trimaker_cosmosII.def.json | 82 +++++++-- .../definitions/trimaker_nebula.def.json | 82 +++++++-- resources/definitions/uni_base.def.json | 62 ++++++- resources/definitions/weedo_base.def.json | 161 ++++++++++++++++-- resources/definitions/weedo_x40.def.json | 138 ++++++++++++++- .../xyzprinting_da_vinci_jr_1p0a_pro.def.json | 3 + resources/definitions/zav_base.def.json | 70 +++++++- 29 files changed, 1472 insertions(+), 124 deletions(-) diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 3eacad0640..603d7e7386 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -9,6 +9,49 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_cpe_175", + "generic_cpe_plus", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu_175", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla", + "tizyx_pla", + "tizyx_abs", + "tizyx_pla_bois" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 0a44471df1..9616db8073 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -9,6 +9,49 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_cpe_175", + "generic_cpe_plus", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu_175", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla", + "tizyx_pla", + "tizyx_abs", + "tizyx_pla_bois" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index 970ab208a5..c842b461c6 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -8,6 +8,40 @@ "author": "3D-Nexus.com, cataclism, Wondro", "manufacturer": "Artillery", "file_formats": "text/x-gcode", + "exclude_materials": [ + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index b4cb7dc090..efe747a4d4 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -8,6 +8,58 @@ "author": "ATMAT", "manufacturer": "ATMAT sp. z o.o.", "file_formats": "text/x-gcode", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "emotiontech_asax", + "emotiontech_hips", + "fiberlogy_hd_pla", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_cpe_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index b960e2a1b6..dbeb7adcb4 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -9,10 +9,38 @@ "manufacturer": "Creality3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "innofill_innoflex60", - "verbatim_bvoh" + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index b0a0717c59..397526c95a 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -9,13 +9,13 @@ "file_formats": "text/x-gcode", "platform": "elegoo_platform.3mf", "exclude_materials": [ - "generic_nylon", - "generic_hips", - "generic_bvoh", - "generic_cpe", - "generic_pc", - "generic_pva", - "generic_pvc" + "generic_nylon_175", + "generic_hips_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_pc_175", + "generic_pva_175", + "generic_pvc_175" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 70ae7e8f96..6f66ee0b09 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -9,12 +9,66 @@ "manufacturer": "Flying Bear", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60", - "verbatim_bvoh" + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/fusion3.def.json b/resources/definitions/fusion3.def.json index ccf8360804..b031ff700f 100644 --- a/resources/definitions/fusion3.def.json +++ b/resources/definitions/fusion3.def.json @@ -8,6 +8,140 @@ "author": "Keith Varin", "manufacturer": "Fusion3Design", "file_formats": "text/x-gcode", + "exclude_materials": [ + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_bvoh_175", + "generic_hips_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petgcarbone_ultra", + "volumic_petg_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json index 70e51f6138..385b767c80 100644 --- a/resources/definitions/goofoo_far.def.json +++ b/resources/definitions/goofoo_far.def.json @@ -5,6 +5,12 @@ "metadata": { "visible": false, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a" + ], "quality_definition": "goofoo_far" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_open.def.json b/resources/definitions/goofoo_open.def.json index 663a14cd01..5a1c707024 100644 --- a/resources/definitions/goofoo_open.def.json +++ b/resources/definitions/goofoo_open.def.json @@ -5,6 +5,18 @@ "metadata": { "visible": false, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs" + ], "quality_definition": "goofoo_open" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_small.def.json b/resources/definitions/goofoo_small.def.json index b6fda1e2a5..edbcd4f667 100644 --- a/resources/definitions/goofoo_small.def.json +++ b/resources/definitions/goofoo_small.def.json @@ -5,6 +5,20 @@ "metadata": { "visible": false, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs", + "goofoo_pva", + "goofoo_hips" + ], "quality_definition": "goofoo_small" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json index 621af6a407..4117603a2b 100644 --- a/resources/definitions/goofoo_t-one.def.json +++ b/resources/definitions/goofoo_t-one.def.json @@ -5,6 +5,21 @@ "metadata": { "visible": true, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs", + "goofoo_pva", + "goofoo_hips", + "goofoo_pva" + ], "machine_extruder_trains": { "0": "goofoo_tone_1st", diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 5250df5d73..ec3c3e66a2 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -10,20 +10,78 @@ "file_formats": "text/x-gcode", "platform": "hms_platform.obj", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "generic_abs", - "generic_cpe", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pva", - "generic_tpu", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60", - "verbatim_bvoh" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "emotiontech_absx", + "emotiontech_bvoh", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index 0120c3076f..56da8396dc 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -9,18 +9,47 @@ "manufacturer": "Imade3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "generic_abs", - "generic_cpe", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pva", - "innofill_innoflex60", - "verbatim_bvoh" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "filo3d_pla", + "generic_abs_175", + "generic_cpe_175", + "generic_cpe_plus", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pla_175", + "generic_pva_175", + "generic_tough_pla", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla_bois", + "tizyx_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ] }, "overrides": diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index 7b318018f7..2530ae87b4 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -9,17 +9,108 @@ "manufacturer": "Kingroon", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "generic_cpe", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_pva", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60", - "verbatim_bvoh" + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_copa", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eSUN_PLA_PRO_White", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_pla_olive", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_pva_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_white_pla", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "leapfrog_pva_natural", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_tpe", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "tizyx_abs", + "verbatim_bvoh_175", + "Vertex_Delta_TPU", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "volumic_support_ultra", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index f5d8cb0017..57ef3a6106 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -8,6 +8,47 @@ "author": "Kupido", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_cpe_175", + "generic_cpe_plus", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla", + "tizyx_pla", + "tizyx_abs", + "tizyx_pla_bois" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index 4bd12c7948..a5b0a53345 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -9,6 +9,60 @@ "manufacturer": "Leapfrog B.V.", "file_formats": "text/x-gcode", "platform": "leapfrog_bolt_pro_platform.3mf", + "exclude_materials": [ + "generic_pla_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", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla", + "tizyx_flex", + "tizyx_petg", + "tizyx_pva", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 23dcf21f48..2d5310a4c6 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -9,10 +9,38 @@ "manufacturer": "Mingda", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "innofill_innoflex60", - "verbatim_bvoh" + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/sovol_base.def.json b/resources/definitions/sovol_base.def.json index 5c474fb700..48c89bc0c4 100644 --- a/resources/definitions/sovol_base.def.json +++ b/resources/definitions/sovol_base.def.json @@ -9,10 +9,38 @@ "manufacturer": "Sovol 3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "innofill_innoflex60", - "verbatim_bvoh" + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 3050be9dfc..3d86941cbf 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -9,6 +9,42 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 0464f92af7..2295e86d26 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -9,6 +9,41 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_pva_175", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index f150dc46d6..57395c44e0 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -9,6 +9,45 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pla_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json index c16d8397ab..3eaeb0d8b8 100644 --- a/resources/definitions/trimaker_cosmosII.def.json +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -10,21 +10,73 @@ "file_formats": "text/x-gcode", "platform": "trimaker_cosmosII_platform.stl", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "generic_abs", - "generic_cpe", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pva", - "generic_tpu", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60", - "verbatim_bvoh" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pla_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index 4e17fe9f84..bd85dc5d48 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -10,21 +10,73 @@ "file_formats": "text/x-gcode", "platform": "trimaker_nebula_platform.stl", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "generic_abs", - "generic_cpe", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pva", - "generic_tpu", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60", - "verbatim_bvoh" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pla_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index c6405d213c..1b3dbc104d 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -9,12 +9,62 @@ "manufacturer": "Uni 3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60", - "verbatim_bvoh" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 0a43dae8cc..305f4f081b 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -9,19 +9,154 @@ "manufacturer": "WEEDO", "file_formats": "text/x-gcode", "exclude_materials": [ - "Extrudr_GreenTECPro_Anthracite", - "Extrudr_GreenTECPro_Black", - "Extrudr_GreenTECPro_Blue", - "Extrudr_GreenTECPro_Nature", - "Extrudr_GreenTECPro_Red", - "Extrudr_GreenTECPro_Silver", - "Extrudr_GreenTECPro_White", - "verbatim_bvoh", - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60" + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "has_machine_quality": false, "has_materials": true, diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index acf99f1802..c5fbf1adc8 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -9,14 +9,136 @@ "manufacturer": "Weedo", "file_formats": "text/x-gcode", "platform": "weedo_x40.3mf", - "exclude_materials": [ - "generic_pc", - "generic_nylon", - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60" + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "generic_nylon_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json index c3b4edd4db..a621623013 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json @@ -8,6 +8,9 @@ "author": "XYZprinting Software", "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", + "exclude_materials": [ + "structur3d_dap100silicone" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 03178f5eb9..2c9516aecf 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -9,11 +9,71 @@ "manufacturer": "Zav Co., Ltd.", "file_formats": "text/x-gcode", "exclude_materials": [ - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, From f590f4b02d096aabbd670c6c339deaedfa896b47 Mon Sep 17 00:00:00 2001 From: nallath Date: Thu, 22 Jun 2023 13:12:49 +0000 Subject: [PATCH 4/8] Applied printer-linter format --- resources/definitions/weedo_x40.def.json | 2 +- .../definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index c5fbf1adc8..043bae3cb0 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -9,7 +9,7 @@ "manufacturer": "Weedo", "file_formats": "text/x-gcode", "platform": "weedo_x40.3mf", - "exclude_materials": [ + "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", "bestfilament_abs_skyblue", diff --git a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json index a621623013..0a5f35cffe 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json @@ -8,9 +8,7 @@ "author": "XYZprinting Software", "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "exclude_materials": [ - "structur3d_dap100silicone" - ], + "exclude_materials": [ "structur3d_dap100silicone" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, From 00db0b2f7123402d7457732094b3f722da742aa5 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Jun 2023 16:33:20 +0200 Subject: [PATCH 5/8] Revert "Applied printer-linter format" This reverts commit f590f4b02d096aabbd670c6c339deaedfa896b47. --- resources/definitions/weedo_x40.def.json | 2 +- .../definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index 043bae3cb0..c5fbf1adc8 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -9,7 +9,7 @@ "manufacturer": "Weedo", "file_formats": "text/x-gcode", "platform": "weedo_x40.3mf", - "exclude_materials": [ + "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", "bestfilament_abs_skyblue", diff --git a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json index 0a5f35cffe..a621623013 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json @@ -8,7 +8,9 @@ "author": "XYZprinting Software", "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "exclude_materials": [ "structur3d_dap100silicone" ], + "exclude_materials": [ + "structur3d_dap100silicone" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, From de272845cb3cc7ea7f742480ed22a83317a7a22b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Jun 2023 16:33:20 +0200 Subject: [PATCH 6/8] Revert "Restore exclude materials to some extent again" This reverts commit e5b60dcaed621853af2740d24028451551620ed8. --- resources/definitions/alya3dp.def.json | 43 ----- resources/definitions/alyanx3dp.def.json | 43 ----- resources/definitions/artillery_base.def.json | 34 ---- .../atmat_signal_pro_base.def.json | 52 ------ resources/definitions/creality_base.def.json | 36 +--- resources/definitions/elegoo_base.def.json | 14 +- .../definitions/flyingbear_base.def.json | 66 +------ resources/definitions/fusion3.def.json | 134 --------------- resources/definitions/goofoo_far.def.json | 6 - resources/definitions/goofoo_open.def.json | 12 -- resources/definitions/goofoo_small.def.json | 14 -- resources/definitions/goofoo_t-one.def.json | 15 -- resources/definitions/hms434.def.json | 86 ++-------- .../imade3d_jellybox_root.def.json | 53 ++---- resources/definitions/kingroon_base.def.json | 113 ++---------- resources/definitions/kupido.def.json | 41 ----- .../definitions/leapfrog_bolt_pro.def.json | 54 ------ resources/definitions/mingda_base.def.json | 36 +--- resources/definitions/sovol_base.def.json | 36 +--- resources/definitions/tizyx_evy.def.json | 36 ---- resources/definitions/tizyx_evy_dual.def.json | 35 ---- resources/definitions/tizyx_k25.def.json | 39 ----- .../definitions/trimaker_cosmosII.def.json | 82 ++------- .../definitions/trimaker_nebula.def.json | 82 ++------- resources/definitions/uni_base.def.json | 62 +------ resources/definitions/weedo_base.def.json | 161 ++---------------- resources/definitions/weedo_x40.def.json | 138 +-------------- .../xyzprinting_da_vinci_jr_1p0a_pro.def.json | 3 - resources/definitions/zav_base.def.json | 70 +------- 29 files changed, 124 insertions(+), 1472 deletions(-) diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 603d7e7386..3eacad0640 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -9,49 +9,6 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla", - "tizyx_pla", - "tizyx_abs", - "tizyx_pla_bois" - ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 9616db8073..0a44471df1 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -9,49 +9,6 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla", - "tizyx_pla", - "tizyx_abs", - "tizyx_pla_bois" - ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index c842b461c6..970ab208a5 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -8,40 +8,6 @@ "author": "3D-Nexus.com, cataclism, Wondro", "manufacturer": "Artillery", "file_formats": "text/x-gcode", - "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index efe747a4d4..b4cb7dc090 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -8,58 +8,6 @@ "author": "ATMAT", "manufacturer": "ATMAT sp. z o.o.", "file_formats": "text/x-gcode", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "emotiontech_asax", - "emotiontech_hips", - "fiberlogy_hd_pla", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index dbeb7adcb4..b960e2a1b6 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -9,38 +9,10 @@ "manufacturer": "Creality3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index 397526c95a..b0a0717c59 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -9,13 +9,13 @@ "file_formats": "text/x-gcode", "platform": "elegoo_platform.3mf", "exclude_materials": [ - "generic_nylon_175", - "generic_hips_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_pc_175", - "generic_pva_175", - "generic_pvc_175" + "generic_nylon", + "generic_hips", + "generic_bvoh", + "generic_cpe", + "generic_pc", + "generic_pva", + "generic_pvc" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 6f66ee0b09..70ae7e8f96 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -9,66 +9,12 @@ "manufacturer": "Flying Bear", "file_formats": "text/x-gcode", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/fusion3.def.json b/resources/definitions/fusion3.def.json index b031ff700f..ccf8360804 100644 --- a/resources/definitions/fusion3.def.json +++ b/resources/definitions/fusion3.def.json @@ -8,140 +8,6 @@ "author": "Keith Varin", "manufacturer": "Fusion3Design", "file_formats": "text/x-gcode", - "exclude_materials": [ - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_bvoh_175", - "generic_hips_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petgcarbone_ultra", - "volumic_petg_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json index 385b767c80..70e51f6138 100644 --- a/resources/definitions/goofoo_far.def.json +++ b/resources/definitions/goofoo_far.def.json @@ -5,12 +5,6 @@ "metadata": { "visible": false, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a" - ], "quality_definition": "goofoo_far" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_open.def.json b/resources/definitions/goofoo_open.def.json index 5a1c707024..663a14cd01 100644 --- a/resources/definitions/goofoo_open.def.json +++ b/resources/definitions/goofoo_open.def.json @@ -5,18 +5,6 @@ "metadata": { "visible": false, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs" - ], "quality_definition": "goofoo_open" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_small.def.json b/resources/definitions/goofoo_small.def.json index edbcd4f667..b6fda1e2a5 100644 --- a/resources/definitions/goofoo_small.def.json +++ b/resources/definitions/goofoo_small.def.json @@ -5,20 +5,6 @@ "metadata": { "visible": false, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs", - "goofoo_pva", - "goofoo_hips" - ], "quality_definition": "goofoo_small" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json index 4117603a2b..621af6a407 100644 --- a/resources/definitions/goofoo_t-one.def.json +++ b/resources/definitions/goofoo_t-one.def.json @@ -5,21 +5,6 @@ "metadata": { "visible": true, - "exclude_materials": [ - "goofoo_bronze_pla", - "goofoo_peek", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_pa", - "goofoo_asa", - "goofoo_abs", - "goofoo_pva", - "goofoo_hips", - "goofoo_pva" - ], "machine_extruder_trains": { "0": "goofoo_tone_1st", diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index ec3c3e66a2..5250df5d73 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -10,78 +10,20 @@ "file_formats": "text/x-gcode", "platform": "hms_platform.obj", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "emotiontech_absx", - "emotiontech_bvoh", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pva", + "generic_tpu", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index 56da8396dc..0120c3076f 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -9,47 +9,18 @@ "manufacturer": "Imade3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "filo3d_pla", - "generic_abs_175", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pla_175", - "generic_pva_175", - "generic_tough_pla", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla_bois", - "tizyx_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pva", + "innofill_innoflex60", + "verbatim_bvoh" ] }, "overrides": diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index 2530ae87b4..7b318018f7 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -9,108 +9,17 @@ "manufacturer": "Kingroon", "file_formats": "text/x-gcode", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_copa", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PLA_PRO_White", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_pla_olive", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_pva_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_white_pla", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "leapfrog_pva_natural", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_tpe", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "tizyx_abs", - "verbatim_bvoh_175", - "Vertex_Delta_TPU", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "volumic_support_ultra", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_pva", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 57ef3a6106..f5d8cb0017 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -8,47 +8,6 @@ "author": "Kupido", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "generic_cpe_plus", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla", - "tizyx_pla", - "tizyx_abs", - "tizyx_pla_bois" - ], "has_machine_quality": true, "has_materials": true, "has_variants": false, diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index a5b0a53345..4bd12c7948 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -9,60 +9,6 @@ "manufacturer": "Leapfrog B.V.", "file_formats": "text/x-gcode", "platform": "leapfrog_bolt_pro_platform.3mf", - "exclude_materials": [ - "generic_pla_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", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "tizyx_abs", - "tizyx_pla", - "tizyx_flex", - "tizyx_petg", - "tizyx_pva", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 2d5310a4c6..23dcf21f48 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -9,38 +9,10 @@ "manufacturer": "Mingda", "file_formats": "text/x-gcode", "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/sovol_base.def.json b/resources/definitions/sovol_base.def.json index 48c89bc0c4..5c474fb700 100644 --- a/resources/definitions/sovol_base.def.json +++ b/resources/definitions/sovol_base.def.json @@ -9,38 +9,10 @@ "manufacturer": "Sovol 3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_pla", - "tizyx_pla_bois", - "verbatim_bvoh_175", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 3d86941cbf..3050be9dfc 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -9,42 +9,6 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 2295e86d26..0464f92af7 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -9,41 +9,6 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_pva_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 57395c44e0..f150dc46d6 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -9,45 +9,6 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pla_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "innofill_innoflex60_175", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json index 3eaeb0d8b8..c16d8397ab 100644 --- a/resources/definitions/trimaker_cosmosII.def.json +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -10,73 +10,21 @@ "file_formats": "text/x-gcode", "platform": "trimaker_cosmosII_platform.stl", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pla_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pva", + "generic_tpu", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index bd85dc5d48..4e17fe9f84 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -10,73 +10,21 @@ "file_formats": "text/x-gcode", "platform": "trimaker_nebula_platform.stl", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pla_175", - "generic_pva_175", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pva", + "generic_tpu", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 1b3dbc104d..c6405d213c 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -9,62 +9,12 @@ "manufacturer": "Uni 3D", "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 305f4f081b..0a43dae8cc 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -9,154 +9,19 @@ "manufacturer": "WEEDO", "file_formats": "text/x-gcode", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" + "Extrudr_GreenTECPro_Anthracite", + "Extrudr_GreenTECPro_Black", + "Extrudr_GreenTECPro_Blue", + "Extrudr_GreenTECPro_Nature", + "Extrudr_GreenTECPro_Red", + "Extrudr_GreenTECPro_Silver", + "Extrudr_GreenTECPro_White", + "verbatim_bvoh", + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60" ], "has_machine_quality": false, "has_materials": true, diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index c5fbf1adc8..acf99f1802 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -9,136 +9,14 @@ "manufacturer": "Weedo", "file_formats": "text/x-gcode", "platform": "weedo_x40.3mf", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "generic_nylon_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "zyyx_pro_flex", - "zyyx_pro_pla" + "exclude_materials": [ + "generic_pc", + "generic_nylon", + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60" ], "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json index a621623013..c3b4edd4db 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json @@ -8,9 +8,6 @@ "author": "XYZprinting Software", "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "exclude_materials": [ - "structur3d_dap100silicone" - ], "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 2c9516aecf..03178f5eb9 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -9,71 +9,11 @@ "manufacturer": "Zav Co., Ltd.", "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60" ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, From f9faf215e61d4378ef2b4b4016c4a5841409489e Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Jun 2023 16:52:48 +0200 Subject: [PATCH 7/8] restore some exclude materials CURA-10709 --- resources/definitions/alya3dp.def.json | 18 ++++++- resources/definitions/alyanx3dp.def.json | 18 ++++++- resources/definitions/artillery_base.def.json | 36 +++++++++----- .../atmat_signal_pro_base.def.json | 36 ++++++++------ resources/definitions/fusion3.def.json | 48 ++++++++++++++----- resources/definitions/kupido.def.json | 43 +++++++++++------ .../definitions/leapfrog_bolt_pro.def.json | 46 ++++++++++++------ resources/definitions/tizyx_evy.def.json | 46 ++++++++++++------ resources/definitions/tizyx_evy_dual.def.json | 42 ++++++++++------ resources/definitions/tizyx_k25.def.json | 19 +++++++- 10 files changed, 250 insertions(+), 102 deletions(-) diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 3eacad0640..c39db43cbe 100644 --- 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 index 0a44471df1..6607ddb04b 100644 --- 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 index 970ab208a5..af50593f12 100644 --- 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 index b4cb7dc090..9a0d0c37f7 100644 --- 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 index ccf8360804..b3f7b8dac6 100644 --- 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" } } \ No newline at end of file diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index f5d8cb0017..5468d5c818 100644 --- 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 index 4bd12c7948..f7dfad2d4c 100644 --- 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 index 3050be9dfc..b76b780388 100644 --- 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", diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 0464f92af7..3aec7ba12a 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -4,21 +4,33 @@ "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_dual_extruder_0", - "1": "tizyx_evy_dual_extruder_1" - }, - "platform_offset": [ + "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", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "first_start_actions": [ + "MachineSettingsAction" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "tizyx_evy_dual_extruder_0", + "1": "tizyx_evy_dual_extruder_1" + }, + "platform_offset": [ 0, -4, 0 diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index f150dc46d6..58c6777f49 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -9,10 +9,27 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pva", + "generic_tpu", + "innofill_innoflex60", + "verbatim_bvoh" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "machine_extruder_trains": { "0": "tizyx_k25_extruder_0" }, + "machine_extruder_trains": { + "0": "tizyx_k25_extruder_0" + }, "platform_offset": [ 0, -4, From 7bdb5dfa508f32fba538996db0f60d3772b8ce18 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Mon, 26 Jun 2023 14:54:29 +0000 Subject: [PATCH 8/8] Applied printer-linter format --- resources/definitions/alya3dp.def.json | 4 +- resources/definitions/alyanx3dp.def.json | 4 +- resources/definitions/artillery_base.def.json | 42 ++++++------ .../atmat_signal_pro_base.def.json | 45 ++++++------- resources/definitions/fusion3.def.json | 66 +++++++++---------- resources/definitions/kupido.def.json | 56 ++++++++-------- .../definitions/leapfrog_bolt_pro.def.json | 63 +++++++++--------- resources/definitions/tizyx_evy.def.json | 58 ++++++++-------- resources/definitions/tizyx_evy_dual.def.json | 53 ++++++++------- resources/definitions/tizyx_k25.def.json | 4 +- 10 files changed, 188 insertions(+), 207 deletions(-) diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index c39db43cbe..2fbb62a794 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -26,9 +26,7 @@ "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 index 6607ddb04b..eecc96738f 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -26,9 +26,7 @@ "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 index af50593f12..d9e71e4333 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -4,29 +4,25 @@ "inherits": "fdmprinter", "metadata": { - "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" + "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 index 9a0d0c37f7..7d14fa6576 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -4,28 +4,29 @@ "inherits": "fdmprinter", "metadata": { - "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", + "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 index b3f7b8dac6..44f76431e0 100644 --- a/resources/definitions/fusion3.def.json +++ b/resources/definitions/fusion3.def.json @@ -4,40 +4,36 @@ "inherits": "fdmprinter", "metadata": { - "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" + "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" } } \ No newline at end of file diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 5468d5c818..dbe57bb95a 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -4,35 +4,33 @@ "inherits": "fdmprinter", "metadata": { - "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", + "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 index f7dfad2d4c..c880eef16c 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -4,37 +4,38 @@ "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", - "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, + "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 index b76b780388..41b2b982be 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -4,37 +4,33 @@ "inherits": "fdmprinter", "metadata": { - "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 - ], + "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", diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 3aec7ba12a..22046a16ff 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -4,33 +4,32 @@ "inherits": "fdmprinter", "metadata": { - "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", - "innofill_innoflex60", - "verbatim_bvoh" - ], - "first_start_actions": [ - "MachineSettingsAction" - ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "tizyx_evy_dual_extruder_0", - "1": "tizyx_evy_dual_extruder_1" - }, - "platform_offset": [ + "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", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "tizyx_evy_dual_extruder_0", + "1": "tizyx_evy_dual_extruder_1" + }, + "platform_offset": [ 0, -4, 0 diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 58c6777f49..60005e8712 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -27,9 +27,7 @@ "has_machine_quality": true, "has_materials": true, "has_variants": true, - "machine_extruder_trains": { - "0": "tizyx_k25_extruder_0" - }, + "machine_extruder_trains": { "0": "tizyx_k25_extruder_0" }, "platform_offset": [ 0, -4,