Move file types to machine metadata

Much better place than machine settings...

Contributes to issue CURA-611.

resources/machines/RigidBot.json

@@ -5,7 +5,7 @@
     "manufacturer": "Other",
     "author": "RBC",
     "platform": "rigidbot_platform.stl",
-
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -32,9 +32,6 @@
         },
         "machine_end_gcode": {
             "default": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },
 

resources/machines/RigidBotBig.json

@@ -5,7 +5,7 @@
     "manufacturer": "Other",
     "author": "RBC",
     "platform": "rigidbotbig_platform.stl",
-	
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -30,9 +30,6 @@
         },
         "machine_end_gcode": {
             "default": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },
 

resources/machines/bq_hephestos.json

@@ -5,6 +5,7 @@
     "manufacturer": "Other",
     "author": "BQ",
     "platform": "bq_hephestos_platform.stl",
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -34,9 +35,6 @@
         },
         "machine_platform_offset": {
             "default": [0, -82, 0]
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode"
         }
     },
     "overrides": {

resources/machines/bq_hephestos_2.json

@@ -5,6 +5,7 @@
     "manufacturer": "Other",
     "author": "BQ",
     "platform": "bq_hephestos_2_platform.stl",
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -34,9 +35,6 @@
         },
         "machine_platform_offset": {
             "default": [6, 1320, 0]
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },
     "overrides": {

resources/machines/bq_hephestos_xl.json

@@ -5,6 +5,7 @@
     "manufacturer": "Other",
     "author": "BQ",
     "platform": "bq_hephestos_platform.stl",
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -34,9 +35,6 @@
         },
         "machine_platform_offset": {
             "default": [0, -82, 0]
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },
     "overrides": {

resources/machines/bq_witbox.json

@@ -5,6 +5,7 @@
     "manufacturer": "Other",
     "author": "BQ",
     "platform": "bq_witbox_platform.stl",
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -34,9 +35,6 @@
         },
         "machine_platform_offset": {
             "default": [0, -145, -38]
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },
     "overrides": {

resources/machines/bq_witbox_2.json

@@ -5,6 +5,7 @@
     "manufacturer": "Other",
     "author": "BQ",
     "platform": "bq_witbox_platform.stl",
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -34,9 +35,6 @@
         },
         "machine_platform_offset": {
             "default": [0, -145, -38]
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },
     "overrides": {

resources/machines/dual_extrusion_printer.json

@@ -2,7 +2,7 @@
     "version": 1,
     "id": "dual_extrusion",
     "name": "Dual Extrusion Base File",
-
+    "file_formats": "text/x-gcode;application/sla;prs.wavefront-obj;application/octet-stream",
     "inherits": "fdmprinter.json",
 
     "visible": false,

resources/machines/fdmprinter.json

@@ -5,6 +5,7 @@
     "name": "FDM Printer Base Description",
     "author": "Ultimaker B.V.",
     "manufacturer": "Ultimaker",
+    "file_formats": "text/x-gcode;application/sla;prs.wavefront-obj;application/octet-stream",
 
     "add_pages": [],
 
@@ -175,12 +176,6 @@
             "description": "The height difference between the tip of the nozzle and the gantry system (X and Y axes).",
             "default": 99999999999,
             "global_only": true
-        },
-        "machine_file_formats": {
-            "description": "The file formats that this printer is able to read.",
-            "type": "string",
-            "default": "text/x-gcode;application/sla;prs.wavefront-obj;application/octet-stream",
-            "global_only": true
         }
     },
     "categories": {

resources/machines/grr_neo.json

@@ -6,7 +6,7 @@
     "author": "Other",
     "icon": "icon_ultimaker.png",
     "platform": "grr_neo_platform.stl",
-
+    "file_formats": "text/x-gcode",
     "inherits": "fdmprinter.json",
     "visible": "true",
 
@@ -30,9 +30,6 @@
         },
         "machine_end_gcode": {
             "default": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
-        },
-        "machine_file_formats": {
-            "default": "text/x-gcode",
         }
     },