From 0237904292887a2600b479ae7947c0cc8ccc1061 Mon Sep 17 00:00:00 2001
From: Mehmet Sutas <msutas@rigid3d.com>
Date: Mon, 17 Feb 2020 01:18:14 +0300
Subject: [PATCH] CI Fix

---
 resources/definitions/rigid3d.def.json               | 4 +---
 resources/definitions/rigid3d_3rdgen.def.json        | 4 +---
 resources/definitions/rigid3d_hobby.def.json         | 4 +---
 resources/definitions/rigid3d_mucit.def.json         | 4 +---
 resources/definitions/rigid3d_zero.def.json          | 4 +---
 resources/definitions/rigid3d_zero2.def.json         | 4 +---
 resources/extruders/rigid3d_base_extruder_0.def.json | 4 ++--
 7 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json
index 7fe145cd48..11863e6422 100644
--- a/resources/definitions/rigid3d.def.json
+++ b/resources/definitions/rigid3d.def.json
@@ -5,9 +5,7 @@
     "metadata": {
 		"visible": true,
 		"quality_definition": "rigid3d_base",	
-        "machine_extruder_trains":{
-            "0": "rigid3d_base_extruder_0"
-        },
+
 		"preferred_quality_type": "standard"		
     },
     "overrides": {
diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json
index d9b6b97335..e9b714cc3f 100644
--- a/resources/definitions/rigid3d_3rdgen.def.json
+++ b/resources/definitions/rigid3d_3rdgen.def.json
@@ -5,9 +5,7 @@
     "metadata": {
 		"visible": true,
 		"quality_definition": "rigid3d_base",
-        "machine_extruder_trains":{
-            "0": "rigid3d_base_extruder_0"
-        },		
+
 		"preferred_quality_type": "standard"		
     },
     "overrides": {
diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json
index b0c9b21c9f..54ed9888a6 100644
--- a/resources/definitions/rigid3d_hobby.def.json
+++ b/resources/definitions/rigid3d_hobby.def.json
@@ -6,9 +6,7 @@
 		"visible": true,
 		"quality_definition": "rigid3d_base",	
 		"preferred_quality_type": "standard",
-        "machine_extruder_trains":{
-            "0": "rigid3d_base_extruder_0"
-        },
+
         "preferred_material": "generic_pla_175",
         "exclude_materials": [
 			"chromatik_pla",
diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json
index c10ec7db06..7f012a3c8f 100644
--- a/resources/definitions/rigid3d_mucit.def.json
+++ b/resources/definitions/rigid3d_mucit.def.json
@@ -8,9 +8,7 @@
 		"preferred_quality_type": "standard",
 		"platform": "rigid3d_mucit_platform.stl",
         "platform_offset": [ 0, -19, 0],
-        "machine_extruder_trains":{
-            "0": "rigid3d_base_extruder_0"
-        },
+
         "preferred_material": "generic_pla_175",
         "exclude_materials": [
 			"chromatik_pla",
diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json
index 87e7e7f244..08309de6d4 100644
--- a/resources/definitions/rigid3d_zero.def.json
+++ b/resources/definitions/rigid3d_zero.def.json
@@ -6,9 +6,7 @@
 		"visible": true,
 		"quality_definition": "rigid3d_base",	
 		"preferred_quality_type": "standard",
-        "machine_extruder_trains":{
-            "0": "rigid3d_base_extruder_0"
-        },
+
         "preferred_material": "generic_pla_175",
         "exclude_materials": [
 			"chromatik_pla",
diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json
index ce9d50a5cb..ca42e1905e 100644
--- a/resources/definitions/rigid3d_zero2.def.json
+++ b/resources/definitions/rigid3d_zero2.def.json
@@ -6,9 +6,7 @@
 		"visible": true,
 		"quality_definition": "rigid3d_base",	
 		"preferred_quality_type": "standard",
-        "machine_extruder_trains":{
-            "0": "rigid3d_base_extruder_0"
-        },
+
 		"platform": "rigid3d_zero2_platform.stl"			
     },
     "overrides": {
diff --git a/resources/extruders/rigid3d_base_extruder_0.def.json b/resources/extruders/rigid3d_base_extruder_0.def.json
index 051ce2384d..fb3a271c13 100644
--- a/resources/extruders/rigid3d_base_extruder_0.def.json
+++ b/resources/extruders/rigid3d_base_extruder_0.def.json
@@ -3,12 +3,12 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "rigid3d_zero2",
+        "machine": "rigid3d_base",
         "position": "0"
     },
 
     "overrides": {
-        "extruder_nr": { "default_value": 0 },
+        "extruder_nr": { "default_value": "0" },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }