From de272845cb3cc7ea7f742480ed22a83317a7a22b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Jun 2023 16:33:20 +0200 Subject: [PATCH] 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,