From 89b95b8998cf2c59e60ccc886e134e922030293b Mon Sep 17 00:00:00 2001
From: skriDude <56835828+skriDude@users.noreply.github.com>
Date: Mon, 4 Nov 2019 15:59:31 +0100
Subject: [PATCH] Changed "values" to strings

---
 resources/definitions/skriware_2.def.json | 257 +++++++++++-----------
 1 file changed, 130 insertions(+), 127 deletions(-)

diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json
index e3722cdacb..b3579c35ad 100644
--- a/resources/definitions/skriware_2.def.json
+++ b/resources/definitions/skriware_2.def.json
@@ -22,58 +22,58 @@
   },
   "overrides": {
     "jerk_print_layer_0": {
-      "value": 5
+      "value": "5"
     },
     "jerk_prime_tower": {
-      "value": 5
+      "value": "5"
     },
     "expand_skins_expand_distance": {
-      "value": 1.2
+      "value": "1.2"
     },
     "jerk_support_interface": {
-      "value": 5
+      "value": "5"
     },
     "jerk_travel_layer_0": {
-      "value": 5.0
+      "value": "5.0"
     },
     "wipe_retraction_prime_speed": {
-      "value": 30
+      "value": "30"
     },
     "material_standby_temperature": {
       "default_value": 195
     },
     "acceleration_support_bottom": {
-      "value": 250
+      "value": "250"
     },
     "raft_base_line_width": {
-      "value": 0.5
+      "value": "0.5"
     },
     "raft_speed": {
-      "value": 30.0
+      "value": "30.0"
     },
     "jerk_topbottom": {
-      "value": 5
+      "value": "5"
     },
     "ironing_inset": {
-      "value": 0.2
+      "value": "0.2"
     },
     "acceleration_wall": {
-      "value": 250
+      "value": "250"
     },
     "cross_infill_pocket_size": {
-      "value": 5.333333333333333
+      "value": "5.333333333333333"
     },
     "jerk_support_roof": {
-      "value": 5
+      "value": "5"
     },
     "acceleration_print": {
       "default_value": 250
     },
     "meshfix_maximum_travel_resolution": {
-      "value": 0.8
+      "value": "0.8"
     },
     "support_top_distance": {
-      "value": 0.22
+      "value": "0.22"
     },
     "acceleration_enabled": {
       "default_value": true
@@ -82,28 +82,28 @@
       "default_value": true
     },
     "jerk_layer_0": {
-      "value": 5
+      "value": "5"
     },
     "infill_line_distance": {
-      "value": 5.333333333333333
+      "value": "5.333333333333333"
     },
     "acceleration_ironing": {
       "default_value": 250
     },
     "material_print_temperature_layer_0": {
-      "value": 195
+      "value": "195"
     },
     "machine_extruder_start_pos_x": {
       "default_value": 0
     },
     "bridge_skin_speed_2": {
-      "value": 15
+      "value": "15"
     },
     "acceleration_travel": {
-      "value": 250
+      "value": "250"
     },
     "switch_extruder_retraction_speed": {
-      "value": 30
+      "value": "30"
     },
     "machine_extruder_cooling_fan_number": {
       "default_value": 0
@@ -111,74 +111,77 @@
     "jerk_print": {
       "default_value": 5
     },
+    "material_guid": {
+      "default_value": "0ff92885-617b-4144-a03c-9989872454bc"
+    },
     "raft_interface_acceleration": {
-      "value": 250
+      "value": "250"
     },
     "acceleration_support_interface": {
-      "value": 250
+      "value": "250"
     },
     "cool_fan_full_layer": {
-      "value": 1
+      "value": "1"
     },
     "skirt_brim_minimal_length": {
       "default_value": 50
     },
     "material_bed_temperature": {
-      "value": 50
+      "value": "50"
     },
     "speed_slowdown_layers": {
       "default_value": 1
     },
     "speed_travel": {
-      "value": 150
+      "value": "150"
     },
     "skin_overlap": {
-      "value": 15
+      "value": "15"
     },
     "acceleration_infill": {
-      "value": 250
+      "value": "250"
     },
     "support_roof_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "raft_base_jerk": {
-      "value": 5
+      "value": "5"
     },
     "retraction_retract_speed": {
-      "value": 30
+      "value": "30"
     },
     "infill_wipe_dist": {
-      "value": 0.1
+      "value": "0.1"
     },
     "jerk_wall_x": {
-      "value": 5
+      "value": "5"
     },
     "layer_height": {
       "default_value": 0.2
     },
     "bottom_skin_expand_distance": {
-      "value": 1.2000000000000002
+      "value": "1.2000000000000002"
     },
     "machine_start_gcode": {
-      "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 0}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15  ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management"
+      "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 X0 Y0;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM420 S1 Z0.9 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nG1 F2500 Y260\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15  ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E15\nG1 Z1.5\nM61 A\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management"
     },
     "travel_retract_before_outer_wall": {
       "default_value": true
     },
     "xy_offset_layer_0": {
-      "value": -0.16
+      "value": "-0.16"
     },
     "adhesion_type": {
       "default_value": "raft"
     },
     "min_skin_width_for_expansion": {
-      "value": 0.671279704941824
+      "value": "0.671279704941824"
     },
     "support_bottom_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "prime_tower_position_x": {
-      "value": 1
+      "value": "1"
     },
     "machine_depth": {
       "default_value": 260
@@ -196,22 +199,22 @@
       "default_value": false
     },
     "z_seam_x": {
-      "value": 115
+      "value": "115"
     },
     "support_xy_distance_overhang": {
-      "value": 0.5
+      "value": "0.5"
     },
     "support_tree_wall_thickness": {
-      "value": 0.4
+      "value": "0.4"
     },
     "acceleration_print_layer_0": {
-      "value": 250
+      "value": "250"
     },
     "support_xy_distance": {
       "default_value": 0.8
     },
     "support_roof_line_distance": {
-      "value": 0.5714285714285714
+      "value": "0.5714285714285714"
     },
     "jerk_enabled": {
       "default_value": true
@@ -223,7 +226,7 @@
       "default_value": true
     },
     "bottom_layers": {
-      "value": 3
+      "value": "3"
     },
     "multiple_mesh_overlap": {
       "default_value": 0
@@ -232,28 +235,28 @@
       "default_value": true
     },
     "acceleration_topbottom": {
-      "value": 250
+      "value": "250"
     },
     "jerk_wall": {
-      "value": 5
+      "value": "5"
     },
     "jerk_wall_0": {
-      "value": 5
+      "value": "5"
     },
     "skin_overlap_mm": {
-      "value": 0.06
+      "value": "0.06"
     },
     "retraction_min_travel": {
-      "value": 1
+      "value": "1"
     },
     "support_interface_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "material_diameter": {
       "default_value": 1.75
     },
     "speed_roofing": {
-      "value": 30.0
+      "value": "30.0"
     },
     "skin_outline_count": {
       "default_value": 0
@@ -265,10 +268,10 @@
       "value": "zigzag"
     },
     "top_skin_expand_distance": {
-      "value": 1.2000000000000002
+      "value": "1.2000000000000002"
     },
     "acceleration_travel_layer_0": {
-      "value": 250.0
+      "value": "250.0"
     },
     "prime_tower_min_volume": {
       "default_value": 4
@@ -277,28 +280,28 @@
       "default_value": 30
     },
     "skin_preshrink": {
-      "value": 1.2000000000000002
+      "value": "1.2000000000000002"
     },
     "material_bed_temperature_layer_0": {
-      "value": 50
+      "value": "50"
     },
     "support_tree_collision_resolution": {
-      "value": 0.2
+      "value": "0.2"
     },
     "machine_height": {
       "default_value": 210
     },
     "raft_acceleration": {
-      "value": 250
+      "value": "250"
     },
     "fill_outline_gaps": {
       "default_value": true
     },
     "wall_x_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "jerk_support_bottom": {
-      "value": 5
+      "value": "5"
     },
     "machine_end_gcode": {
       "default_value": "M59\nG92 E1\nG1 E-1 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107"
@@ -310,19 +313,19 @@
       "default_value": 0.005
     },
     "wall_0_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "material_adhesion_tendency": {
       "default_value": 0
     },
     "prime_tower_flow": {
-      "value": 99
+      "value": "99"
     },
     "prime_tower_position_y": {
-      "value": 1
+      "value": "1"
     },
     "support_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "machine_extruder_start_code": {
       "default_value": ""
@@ -337,79 +340,79 @@
       "default_value": 1.2
     },
     "support_infill_sparse_thickness": {
-      "value": 0.2
+      "value": "0.2"
     },
     "raft_surface_acceleration": {
-      "value": 250
+      "value": "250"
     },
     "machine_nozzle_offset_y": {
       "default_value": 0
     },
     "roofing_layer_count": {
-      "value": 1
+      "value": "1"
     },
     "skirt_brim_line_width": {
-      "value": 0.5
+      "value": "0.5"
     },
     "jerk_support": {
-      "value": 5
+      "value": "5"
     },
     "raft_surface_jerk": {
-      "value": 5
+      "value": "5"
     },
     "speed_equalize_flow_max": {
       "default_value": 40
     },
     "raft_surface_speed": {
-      "value": 30.0
+      "value": "30.0"
     },
     "jerk_travel": {
-      "value": 5
+      "value": "5"
     },
     "support_zag_skip_count": {
-      "value": 8
+      "value": "8"
     },
     "retraction_combing": {
       "default_value": "infill"
     },
     "raft_interface_line_spacing": {
-      "value": 0.4
+      "value": "0.4"
     },
     "layer_height_0": {
       "default_value": 0.2
     },
     "extruders_enabled_count": {
-      "value": 2
+      "value": "2"
     },
     "support_line_distance": {
-      "value": 1.3333333333333333
+      "value": "1.3333333333333333"
     },
     "support_roof_density": {
-      "value": 70
+      "value": "70"
     },
     "raft_base_line_spacing": {
-      "value": 0.8
+      "value": "0.8"
     },
     "machine_extruder_end_pos_y": {
       "default_value": 0
     },
     "acceleration_prime_tower": {
-      "value": 250
+      "value": "250"
     },
     "skin_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "support_z_distance": {
       "default_value": 0.22
     },
     "bottom_skin_preshrink": {
-      "value": 1.2000000000000002
+      "value": "1.2000000000000002"
     },
     "jerk_skirt_brim": {
-      "value": 5
+      "value": "5"
     },
     "z_seam_y": {
-      "value": 180
+      "value": "180"
     },
     "skirt_line_count": {
       "default_value": 2
@@ -418,76 +421,76 @@
       "default_value": 4
     },
     "infill_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "wipe_retraction_retract_speed": {
-      "value": 30
+      "value": "30"
     },
     "z_seam_corner": {
       "default_value": "z_seam_corner_weighted"
     },
     "support_roof_height": {
-      "value": 0.4
+      "value": "0.4"
     },
     "top_layers": {
-      "value": 4
+      "value": "4"
     },
     "support_infill_rate": {
-      "value": 30
+      "value": "30"
     },
     "raft_interface_speed": {
-      "value": 35
+      "value": "35"
     },
     "default_material_print_temperature": {
       "default_value": 195
     },
     "acceleration_layer_0": {
-      "value": 250
+      "value": "250"
     },
     "support_skip_zag_per_mm": {
       "default_value": 10
     },
     "material_initial_print_temperature": {
-      "value": 195
+      "value": "195"
     },
     "raft_interface_jerk": {
-      "value": 5
+      "value": "5"
     },
     "machine_width": {
       "default_value": 210
     },
     "wall_line_count": {
-      "value": 3
+      "value": "3"
     },
     "retraction_amount": {
       "default_value": 3
     },
     "infill_sparse_thickness": {
-      "value": 0.2
+      "value": "0.2"
     },
     "support_initial_layer_line_distance": {
-      "value": 1.3333333333333333
+      "value": "1.3333333333333333"
     },
     "jerk_support_infill": {
-      "value": 5
+      "value": "5"
     },
     "acceleration_roofing": {
-      "value": 250
+      "value": "250"
     },
     "retraction_extrusion_window": {
-      "value": 3
+      "value": "3"
     },
     "raft_interface_line_width": {
-      "value": 0.4
+      "value": "0.4"
     },
     "acceleration_support_roof": {
-      "value": 250
+      "value": "250"
     },
     "support_brim_line_count": {
-      "value": 16
+      "value": "16"
     },
     "layer_0_z_overlap": {
-      "value": 0.1
+      "value": "0.1"
     },
     "support_angle": {
       "default_value": 60
@@ -496,13 +499,13 @@
       "default_value": true
     },
     "raft_surface_thickness": {
-      "value": 0.2
+      "value": "0.2"
     },
     "cool_min_layer_time": {
       "default_value": 10
     },
     "gantry_height": {
-      "value": 210
+      "value": "210"
     },
     "raft_airgap": {
       "default_value": 0.2
@@ -511,16 +514,16 @@
       "default_value": 0
     },
     "acceleration_skirt_brim": {
-      "value": 250
+      "value": "250"
     },
     "skirt_brim_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "jerk_infill": {
-      "value": 5
+      "value": "5"
     },
     "roofing_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "extruder_nr": {
       "default_value": 0
@@ -538,10 +541,10 @@
       "default_value": ""
     },
     "speed_travel_layer_0": {
-      "value": 75.0
+      "value": "75.0"
     },
     "raft_base_acceleration": {
-      "value": 250
+      "value": "250"
     },
     "retraction_count_max": {
       "default_value": 40
@@ -550,7 +553,7 @@
       "default_value": 4
     },
     "acceleration_support": {
-      "value": 250
+      "value": "250"
     },
     "max_skin_angle_for_expansion": {
       "default_value": 50
@@ -562,19 +565,19 @@
       "default_value": 10
     },
     "acceleration_support_infill": {
-      "value": 250
+      "value": "250"
     },
     "machine_extruder_start_pos_abs": {
       "default_value": false
     },
     "retraction_prime_speed": {
-      "value": 30
+      "value": "30"
     },
     "raft_base_speed": {
-      "value": 35
+      "value": "35"
     },
     "acceleration_wall_0": {
-      "value": 250
+      "value": "250"
     },
     "xy_offset": {
       "default_value": -0.16
@@ -586,34 +589,34 @@
       "default_value": 1
     },
     "jerk_ironing": {
-      "value": 5
+      "value": "5"
     },
     "switch_extruder_prime_speed": {
-      "value": 30
+      "value": "30"
     },
     "raft_jerk": {
-      "value": 5
+      "value": "5"
     },
     "top_skin_preshrink": {
-      "value": 1.2000000000000002
+      "value": "1.2000000000000002"
     },
     "material_print_temperature": {
-      "value": 195
+      "value": "195"
     },
     "wall_material_flow": {
-      "value": 99
+      "value": "99"
     },
     "jerk_roofing": {
-      "value": 5
+      "value": "5"
     },
     "cool_fan_full_at_height": {
-      "value": 0
+      "value": "0"
     },
     "acceleration_wall_x": {
-      "value": 250
+      "value": "250"
     },
     "support_bottom_distance": {
-      "value": 0.23
+      "value": "0.23"
     },
     "cool_min_speed": {
       "default_value": 15
@@ -622,7 +625,7 @@
       "default_value": 50
     },
     "raft_interface_thickness": {
-      "value": 0.2
+      "value": "0.2"
     },
     "machine_extruder_end_pos_abs": {
       "default_value": false