Merge branch '5.4'

# Conflicts:
#	conanfile.py

resources/definitions/alya3dp.def.json

@@ -10,57 +10,18 @@
         "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",
+            "dsm_arnitel2045",
+            "dsm_novamid1070",
             "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"
+            "innofill_innoflex60",
+            "verbatim_bvoh"
         ],
         "has_machine_quality": true,
         "has_materials": true,

resources/definitions/alyanx3dp.def.json

@@ -10,57 +10,18 @@
         "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"
+            "verbatim_bvoh_175"
         ],
         "has_machine_quality": true,
         "has_materials": true,

resources/definitions/artillery_base.def.json

@@ -9,51 +9,10 @@
         "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"
+            "verbatim_bvoh_175"
         ],
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,

resources/definitions/atmat_signal_pro_base.def.json

@@ -9,73 +9,13 @@
         "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",
+            "dsm_arnitel2045",
+            "dsm_novamid1070",
             "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"
+            "imade3d_petg",
+            "imade3d_pla",
+            "innofill_innoflex60",
+            "verbatim_bvoh"
         ],
         "has_machine_quality": true,
         "has_materials": true,

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,

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,

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,

resources/definitions/fusion3.def.json

@@ -9,144 +9,22 @@
         "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",
+            "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_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"
+            "imade3d_petg",
+            "imade3d_pla",
+            "innofill_innoflex60",
+            "verbatim_bvoh"
         ],
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,

resources/definitions/goofoo_e-one.def.json

@@ -2,25 +2,7 @@
     "version": 2,
     "name": "Goofoo E-one",
     "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"
-        ]
-    },
+    "metadata": { "visible": true },
     "overrides":
     {
         "machine_depth": { "default_value": 300 },

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"
     }
 }