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

resources/definitions/flsun_qq.def.json

@@ -0,0 +1,46 @@
+{
+    "version": 2,
+    "name": "FLSUN QQ",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "manufacturer": "FLSUN",
+        "author": "Daniel Green",
+        "file_formats": "text/x-gcode",
+        "machine_extruder_trains": {
+            "0": "flsun_qq_extruder"
+        }
+    },
+    "overrides": {
+        "machine_extruder_count": {
+            "default_value": 1
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_width": {
+            "default_value": 240
+        },
+        "machine_height": {
+            "default_value": 285
+        },
+        "machine_depth": {
+            "default_value": 240
+        },
+        "machine_center_is_zero": {
+            "default_value": true
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
+        },
+        "machine_shape": {
+            "default_value": "elliptic"
+        }
+    }
+}

resources/extruders/flsun_qq_extruder.def.json

@@ -0,0 +1,15 @@
+{
+    "id": "flsun_qq_extruder",
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "flsun_qq",
+        "position": "0"
+    },
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}