Definitions corrections

resources/definitions/stream20pro_mk2.def.json

@@ -11,7 +11,7 @@
         "platform": "STREAM20PRO_platform.STL",
         "has_materials": true,
         "has_machine_quality": true,
-        "machine_extruder_trains":{"0": "stream20_30_extruder"}
+        "machine_extruder_trains":{"0": "stream20_extruder"}
     },
 
     "overrides": {

resources/definitions/stream30pro_mk2.def.json

@@ -11,7 +11,7 @@
         "platform": "STREAM30PRO_platform.STL",
         "has_materials": true,
         "has_machine_quality": true,
-        "machine_extruder_trains":{"0": "stream20_30_extruder"}
+        "machine_extruder_trains":{"0": "stream30_extruder"}
     },
 
     "overrides": {

resources/extruders/stream20_extruder.def.json

@@ -0,0 +1,21 @@
+{
+    "version": 2,
+    "name": "Extrudeur STREAM20MK2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "stream20pro_mk2",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
+    }
+}

resources/extruders/stream20dual_0.def.json

@@ -1,10 +1,9 @@
 {
-    "id": "STREAM20_dual_extruder_0",
     "version": 2,
     "name": "Extrudeur gauche",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "VOLUMIC STREAM20DUAL MK2",
+        "machine": "stream20dual_mk2",
         "position": "0"
     },
 

resources/extruders/stream20dual_1.def.json

@@ -1,10 +1,9 @@
 {
-    "id": "STREAM20_dual_extruder_1",
     "version": 2,
     "name": "Extrudeur droit",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "VOLUMIC STREAM20DUAL MK2",
+        "machine": "stream20dual_mk2",
         "position": "1"
     },
 

resources/extruders/stream30_extruder.def.json

@@ -0,0 +1,21 @@
+{
+    "version": 2,
+    "name": "Extrudeur STREAM30MK2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "stream30pro_mk2",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
+    }
+}

resources/extruders/stream30dual_0.def.json

@@ -1,10 +1,9 @@
 {
-    "id": "STREAM30_dual_extruder_0",
     "version": 2,
     "name": "Extrudeur gauche",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "VOLUMIC STREAM30DUAL MK2",
+        "machine": "stream30dual_mk2",
         "position": "0"
     },
 

resources/extruders/stream30dual_1.def.json

@@ -1,10 +1,9 @@
 {
-    "id": "STREAM30_dual_extruder_1",
     "version": 2,
     "name": "Extrudeur droit",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "VOLUMIC STREAM30DUAL MK2",
+        "machine": "stream30dual_mk2",
         "position": "1"
     },
 

resources/extruders/stream30ultra_extruder.def.json

@@ -3,7 +3,7 @@
     "name": "Extruder",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "stream30ultrasc",
+        "machine": "stream30ultra",
         "position": "0"
     },
 

resources/materials/volumic_abs_ultra.xml.fdm_material

@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial version="1.3" xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura">
+  <metadata>
+    <name>
+      <brand>Volumic</brand>
+      <material>ABS</material>
+      <color>Generic</color>
+      <label>ABS Ultra</label>
+    </name>
+    <GUID>6cc2db78-1538-43c8-964a-24a4f33119ce</GUID>
+    <description>L'ABS professionnel qui ne warp pas ! Bien plus facile à imprimer que l'ABS standard, peut de warping, une matière de très haute qualité et un excellent rendu.</description>
+    <version>2</version>
+    <adhesion_info>Plateau laqué</adhesion_info>
+    <compatible>True</compatible>
+    <color_code>#00ff00</color_code>
+  </metadata>
+  <properties>
+    <density>1.05</density>
+    <diameter>1.75</diameter>
+  </properties>
+  <settings>
+    <setting key="retraction speed">30.0</setting>
+    <setting key="print cooling">30.0</setting>
+    <setting key="retraction amount">1.2</setting>
+    <setting key="standby temperature">175.0</setting>
+    <setting key="adhesion tendency">0</setting>
+    <setting key="heated bed temperature">75.0</setting>
+    <setting key="print temperature">235.0</setting>
+    <setting key="material flow">96</setting>
+  </settings>
+</fdmmaterial>