Merge branch 'master' of https://github.com/Firedrops/Cura into Firedrops-master

4 files changed, 50 insertions, 0 deletions

diff --git a/resources/definitions/ideagen3D_sapphire_plus.def.json b/resources/definitions/ideagen3D_sapphire_plus.def.json
new file mode 100644
index 0000000000..e854d1d556
--- /dev/null
+++ b/resources/definitions/ideagen3D_sapphire_plus.def.json
@@ -0,0 +1,35 @@
+{
+    "version": 2,
+    "name": "ideagen3D Sapphire Plus",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "ideagen3D",
+        "manufacturer": "ideagen3D",
+        "file_formats": "text/x-gcode",
+        "platform": "ideagen3D_sapphire_plus.3mf",
+        "platform_texture": "ideagen3D.png",
+        "has_materials": true,
+        "has_machine_quality": false,
+        "machine_extruder_trains": { "0": "ideagen3D_sapphire_plus_0" }
+    },
+    "overrides":
+    {
+        "machine_name": { "default_value": "ideagen3D Sapphire Plus" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_width": { "default_value": 300 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 350 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-20, -10],
+                [-20, 10],
+                [10, -10],
+                [10, 10]
+            ]
+        },
+        "machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach inital layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach inital layer temperature\n\nG28 ;Home\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" },
+        "machine_end_gcode": { "default_value": ";End GCode by ideagen3D\n\nM104 S0 ;Set nozzle temperature to 0\nM140 S0 ;Set Bed temperature to 0\n\nG92 E1 ;Prepare to retract filament\nG1 E-1 F300 ;Retract filament\nG28 X0 Y0 ;Home X and Y\nM84 ;Disable Steppers" },
+        "gantry_height": { "value": 350 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/ideagen3D_sapphire_plus_0.def.json b/resources/extruders/ideagen3D_sapphire_plus_0.def.json
new file mode 100644
index 0000000000..ab14b131b6
--- /dev/null
+++ b/resources/extruders/ideagen3D_sapphire_plus_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ideagen3D_sapphire_plus",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
\ No newline at end of file
diff --git a/resources/images/ideagen3D.png b/resources/images/ideagen3D.png
new file mode 100644
index 0000000000..c02c18b047
--- /dev/null
+++ b/resources/images/ideagen3D.png
diff --git a/resources/meshes/ideagen3D_sapphire_plus.3mf b/resources/meshes/ideagen3D_sapphire_plus.3mf
new file mode 100644
index 0000000000..3b5c41a3f3
--- /dev/null
+++ b/resources/meshes/ideagen3D_sapphire_plus.3mf