Browse Source

Merge remote-tracking branch 'origin/main' into CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99

# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
Jelle Spijker 1 year ago
parent
commit
4185fbb88a

+ 30 - 33
.github/ISSUE_TEMPLATE/bugreport.yaml

@@ -5,17 +5,17 @@ body:
 - type: markdown
 - type: markdown
   attributes:
   attributes:
     value: |
     value: |
-      **Thank you for using Cura and wanting to report a bug.**
+      **Thank you for using Cura and wanting to report a bug. 🙏**
       
       
-      Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. 
+      Before filing, [please check if the issue already exists](https://github.com/Ultimaker/Cura/issues?q=is%3Aissue) by using the search bar on the issues page. 
       If it does, comment there. Even if it's closed, we can reopen it based on your comment. 
       If it does, comment there. Even if it's closed, we can reopen it based on your comment. 
       
       
-      Also, please note the application version in the title of the issue "For example (5.3.1) Cannot connect to 3rd-party printer". Please do not write things like **Request** or **BUG** in the title, this is what labels are for.
+      Please include the cura version in the title of the issue. For example, *"[5.4.0] Support Brim is missing in this model"*. 
 - type: input
 - type: input
   attributes:
   attributes:
-    label: Application Version
+    label: Cura Version
     description: The version of Cura this issue occurs with.
     description: The version of Cura this issue occurs with.
-    placeholder: 5.3.0
+    placeholder: 5.4.0
   validations:
   validations:
     required: true
     required: true
 - type: input
 - type: input
@@ -28,14 +28,14 @@ body:
 - type: input
 - type: input
   attributes:
   attributes:
     label: Printer
     label: Printer
-    description: Which printer was selected in Cura?
-    placeholder: Ultimaker S7    
+    description: Which printer was selected in Cura? It also helps to mention if you made any firmware modifications to your printer. 
+    placeholder: Ultimaker S7 / Creality CR-10 with Klipper     
   validations:
   validations:
     required: true
     required: true
 - type: textarea
 - type: textarea
   attributes:
   attributes:
     label: Reproduction steps
     label: Reproduction steps
-    description: Tell us what you did!
+    description: Share what you did, so we can reproduce it
     placeholder: |
     placeholder: |
       1. Something you did
       1. Something you did
       2. Something you did next
       2. Something you did next
@@ -44,42 +44,39 @@ body:
 - type: textarea
 - type: textarea
   attributes:
   attributes:
     label: Actual results
     label: Actual results
-    description: What happens after the above steps have been followed.
+    description: What happens after the above steps have been followed?
   validations:
   validations:
     required: true
     required: true
 - type: textarea
 - type: textarea
   attributes:
   attributes:
     label: Expected results
     label: Expected results
-    description: What should happen after the above steps have been followed.
+    description: What should happen after the above steps have been followed?
   validations:
   validations:
     required: true
     required: true
 - type: markdown
 - type: markdown
   attributes:
   attributes:
     value: |
     value: |
-      Please be sure to add the following files:
-        * To save a project file go to File -> Save project. 
-          Please make sure to .zip your project file. 
-          For big files, you may need to use [WeTransfer](https://wetransfer.com/) or similar file-sharing sites. 
-          G-code files are not project files!
-          Before you share, please think to yourself. Is this a model that can be shared?
-        * **Screenshots** of showing the problem, perhaps before/after images.
-        * A **log file** for crashes and similar issues.
-          You can find your log file here:
-          Windows: `%APPDATA%\cura\<Cura version>\cura.log` or usually `C:\Users\\<your username>\AppData\Roaming\cura\<Cura version>\cura.log`
-          MacOS: `$USER/Library/Application Support/cura/<Cura version>/cura.log`
-          Ubuntu/Linux: `$USER/.local/share/cura/<Cura version>/cura.log` 
-          
-          If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder 
-- type: checkboxes
-  attributes:
-    label: Checklist of files to include
-    options:
-      - label: Log file
-      - label: Project file
+      ### Please add the following files when they are related to...
+        * 🔵 **The quality of your print**   
+          Please add **a Project File**. It contains the printer and settings we need for troubleshooting.    
+          To save a project file go to File -> Save project. 
+          Please make sure to .zip your project file. For big files, you may need to use [WeTransfer](https://wetransfer.com/) or similar file-sharing sites. 
+          G-code files are not project files! Before you share, please think to yourself. Is this a model that can be shared?
+          ![Alt Text](https://user-images.githubusercontent.com/40423138/240616958-5a9751f2-bd34-4808-9752-6fde2e27516e.gif)
+       * 🔵 **Using and interacting with Cura** 
+           Please add **screenshots** showing the issue. 
+           Before and after, and arrows can help here. 
+       * 🔵 **Unexpected crashes and behavior**
+           Please add **a log file** with information on what your Cura is doing.  
+           You can find your log file here:
+           Windows: `%APPDATA%\cura\<Cura version>\cura.log`
+           MacOS: `$USER/Library/Application Support/cura/<Cura version>/cura.log`
+           Ubuntu/Linux: `$USER/.local/share/cura/<Cura version>/cura.log` 
+           If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder 
+
 - type: textarea
 - type: textarea
   attributes:
   attributes:
-    label: Additional information & file uploads  
-    description: You can add these files and additional information that is relevant to the issue in the comments below.
+    label: Add your .zip and screenshots here ⬇️ 
+    description: You can add the zip file and additional information that is relevant to the issue in the comments below.
   validations:
   validations:
     required: true
     required: true
-

+ 7 - 0
.github/workflows/update-translation.yml

@@ -17,6 +17,13 @@ on:
             - 'conandata.yml'
             - 'conandata.yml'
             - 'GitVersion.yml'
             - 'GitVersion.yml'
             - '*.jinja'
             - '*.jinja'
+        branches:
+          - '[1-9].[0-9]'
+          - '[1-9].[0-9][0-9]'
+        tags:
+          - '[1-9].[0-9].[0-9]*'
+          - '[1-9].[0-9].[0-9]'
+          - '[1-9].[0-9][0-9].[0-9]*'
 
 
 jobs:
 jobs:
     update-translations:
     update-translations:

+ 4 - 43
resources/definitions/alya3dp.def.json

@@ -10,57 +10,18 @@
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "platform": "alya_platform.3mf",
         "platform": "alya_platform.3mf",
         "exclude_materials": [
         "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",
-            "generic_abs_175",
-            "generic_bam",
             "generic_cpe",
             "generic_cpe",
-            "generic_cpe_175",
-            "generic_cpe_plus",
             "generic_hips",
             "generic_hips",
-            "generic_hips_175",
             "generic_nylon",
             "generic_nylon",
-            "generic_nylon_175",
             "generic_pc",
             "generic_pc",
-            "generic_pc_175",
             "generic_petg",
             "generic_petg",
-            "generic_petg_175",
-            "generic_pp",
             "generic_pva",
             "generic_pva",
-            "generic_pva_175",
-            "generic_tough_pla",
             "generic_tpu",
             "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_machine_quality": true,
         "has_materials": true,
         "has_materials": true,

+ 1 - 40
resources/definitions/alyanx3dp.def.json

@@ -10,57 +10,18 @@
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "platform": "alya_nx_platform.3mf",
         "platform": "alya_nx_platform.3mf",
         "exclude_materials": [
         "exclude_materials": [
-            "chromatik_pla",
             "dsm_arnitel2045_175",
             "dsm_arnitel2045_175",
             "dsm_novamid1070_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_abs_175",
-            "generic_bam",
-            "generic_cpe",
             "generic_cpe_175",
             "generic_cpe_175",
-            "generic_cpe_plus",
-            "generic_hips",
             "generic_hips_175",
             "generic_hips_175",
-            "generic_nylon",
             "generic_nylon_175",
             "generic_nylon_175",
-            "generic_pc",
             "generic_pc_175",
             "generic_pc_175",
-            "generic_petg",
             "generic_petg_175",
             "generic_petg_175",
-            "generic_pp",
-            "generic_pva",
             "generic_pva_175",
             "generic_pva_175",
-            "generic_tough_pla",
-            "generic_tpu",
             "generic_tpu_175",
             "generic_tpu_175",
-            "imade3d_petg_green",
-            "imade3d_petg_pink",
-            "imade3d_pla_green",
-            "imade3d_pla_pink",
             "innofill_innoflex60_175",
             "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_machine_quality": true,
         "has_materials": true,
         "has_materials": true,

+ 1 - 42
resources/definitions/artillery_base.def.json

@@ -9,51 +9,10 @@
         "manufacturer": "Artillery",
         "manufacturer": "Artillery",
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "exclude_materials": [
         "exclude_materials": [
-            "Vertex_Delta_ABS",
-            "Vertex_Delta_PET",
-            "Vertex_Delta_PLA",
-            "Vertex_Delta_TPU",
-            "chromatik_pla",
             "dsm_arnitel2045_175",
             "dsm_arnitel2045_175",
             "dsm_novamid1070_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",
             "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" ],
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_machine_quality": true,

+ 6 - 66
resources/definitions/atmat_signal_pro_base.def.json

@@ -9,73 +9,13 @@
         "manufacturer": "ATMAT sp. z o.o.",
         "manufacturer": "ATMAT sp. z o.o.",
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "exclude_materials": [
         "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",
-            "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_machine_quality": true,
         "has_materials": true,
         "has_materials": true,

+ 4 - 49
resources/definitions/creality_base.def.json

@@ -9,55 +9,10 @@
         "manufacturer": "Creality3D",
         "manufacturer": "Creality3D",
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "exclude_materials": [
         "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" ],
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_machine_quality": true,

+ 2 - 15
resources/definitions/elegoo_base.def.json

@@ -9,26 +9,13 @@
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "platform": "elegoo_platform.3mf",
         "platform": "elegoo_platform.3mf",
         "exclude_materials": [
         "exclude_materials": [
-            "generic_nylon_175",
             "generic_nylon",
             "generic_nylon",
-            "generic_hips_175",
             "generic_hips",
             "generic_hips",
-            "generic_gffcpe",
-            "generic_bvoh_175",
-            "generic_ccfpe",
-            "generic_cffcpe",
-            "generic_cpe_plus",
-            "generic_cpe_175",
+            "generic_bvoh",
             "generic_cpe",
             "generic_cpe",
-            "generic_tpu",
-            "generic_pp",
             "generic_pc",
             "generic_pc",
-            "generic_pc_175",
-            "generic_pvc",
             "generic_pva",
             "generic_pva",
-            "generic_pva_175",
-            "generic_pvc_175",
-            "generic_pp"
+            "generic_pvc"
         ],
         ],
         "has_machine_quality": true,
         "has_machine_quality": true,
         "has_materials": true,
         "has_materials": true,

+ 6 - 77
resources/definitions/flyingbear_base.def.json

@@ -9,83 +9,12 @@
         "manufacturer": "Flying Bear",
         "manufacturer": "Flying Bear",
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "exclude_materials": [
         "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" ],
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_machine_quality": true,

+ 14 - 136
resources/definitions/fusion3.def.json

@@ -9,144 +9,22 @@
         "manufacturer": "Fusion3Design",
         "manufacturer": "Fusion3Design",
         "file_formats": "text/x-gcode",
         "file_formats": "text/x-gcode",
         "exclude_materials": [
         "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",
-            "generic_hips_175",
-            "generic_pp",
             "generic_pva",
             "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" ],
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_machine_quality": true,

Some files were not shown because too many files changed in this diff