Squashed commit of the following:

commit 96187e21580e10ba3006895c0a0613cb1fa66c4d
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:52:29 2020 +0200

    Update setting_version of recently merged profiles

    None of these had any settings that needed to be deleted or updated. I'm updating them so that they load properly in Cura 4.7.

    Contributes to issue CURA-7403.

commit 80bea3caa14139c189fc10c6874867d104df2fd7
Merge: 174b58374 037eb9a89
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:41:31 2020 +0200

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

commit 037eb9a898e8625497a0f44e31746155c8523662
Merge: 109b5cf8e 772fd650a
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 19:36:01 2020 +0200

    Merge pull request #2 from Ultimaker/master

    Resync with Ultimaker

commit 109b5cf8e3311283f60ffb73dc165974cf619faa
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit cdea1a7d598e39c3beebd4386b6326503051a160
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:28:18 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit bc8422d4ee95a5d20b5f8364711965b036b28eed
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 00:14:38 2020 +0200

    plateform image renamed.

commit e0d95c12558f7da8dcbc1aab966e92a1d67bdebb
Merge: a069ed5f9 b1e95d7a8
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 00:03:57 2020 +0200

    Merge pull request #1 from Ultimaker/master

    Resync with ultimaker

commit a069ed5f946b0a9d9830d8ba39c89e7cbe1ffdb2
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576802ea9c116b4901a79ae17b96ade99
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 21:03:02 2020 +0200

    Try to fix errors comming from the CI

commit ec4cbe6809ba80f84a065a2d875f591110c751ff
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

commit 8a6468943a79a6f72078ded187722706c85871a5
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 18:17:13 2020 +0200

    Adding Anycubic Predator printer

commit e4491b30bdc9e9642737d6851c8f7571be368798
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Tue Apr 21 18:51:29 2020 +0200

    Adding the mesh for the FLSUN QQ-S thanks to Eddy Emck

resources/definitions/flsun_qq_s.def.json

@@ -4,8 +4,9 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
-        "author": "Cataldo URSO",
+        "author": "Cataldo URSO & Eddy Emck ",
         "manufacturer": "FLSUN",
+        "platform": "FLSUN-QQ-S.stl",
         "file_formats": "text/x-gcode",
         "has_materials": true,
         "preferred_quality_type": "draft",

resources/definitions/predator.def.json

@@ -0,0 +1,72 @@
+{
+    "version": 2,
+    "name": "Anycubic Predator",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "ksihota",
+        "manufacturer": "Anycubic",
+        "file_formats": "text/x-gcode",
+        "platform": "predator_platform.stl",
+        "platform_texture": "anycubic_predator.png",
+        "supports_usb_connection": true,
+        "visible": true,
+        "platform_offset": [0, 0, 0],
+        "has_materials": true,
+        "has_variants": false,
+        "has_machine_materials": false,
+        "has_variant_materials": false,
+        "has_machine_quality": true,
+        "quality_definition": "predator",
+        "preferred_quality_type": "normal",
+        "machine_extruder_trains":
+        {
+            "0": "predator_extruder_0"
+        }
+    },
+
+    "overrides": {
+        "machine_start_gcode":
+        {
+            "default_value": "G21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nG28 ;Home \nG1 Z15.0 F1000;short move \nG92 E0 ;zero the extruded length \nG1 F200 E3 ;extrude 3mm of feed stock adjust so I don't have to remove any filament \nG92 E0 ;zero the extruded length again \nG1 F4000 ;move to bed \n;Put printing message on LCD screen \nM117 Printing... \n;G5; this is in order to resume on Power failure (only works on SD prints)"
+        },
+        "machine_end_gcode":
+        {
+            "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off \nG91 ;relative positioning \nG92 E0 ;zero the extruded length \nG1 E-2 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure \nG92 E0 ;zero the extruded length \n;M107 ;fan off \nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more \n;G1 X0.0 Y0.0 Z455.0 F4500 \nG28 ;Home all axes (max endstops) \nG90 ;absolute positioning \n;M109 S60 ; wait for extruder temp to drop to 60 \n;M84 ;steppers off \n;M81 ;turn off printer"
+        },
+        "gantry_height": {
+            "value": 455
+        },
+        "machine_width": { "default_value": 370 },
+        "machine_depth": { "default_value": 370 },
+        "machine_height": { "default_value": 455 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_nozzle_size": {
+            "default_value": 0.4,
+            "minimum_value": 0.15,
+            "maximum_value": 0.80
+        },
+        "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
+        "material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_max_feedrate_x": { "default_value": 150 },
+        "machine_max_feedrate_y": { "default_value": 150 },
+        "machine_max_feedrate_z": { "default_value": 150 },
+        "machine_max_feedrate_e": { "default_value": 50 },
+        "machine_max_acceleration_x": { "default_value": 800 },
+        "machine_max_acceleration_y": { "default_value": 800 },
+        "machine_max_acceleration_z": { "default_value": 800 },
+        "machine_max_acceleration_e": { "default_value": 10000 },
+        "machine_acceleration": { "default_value": 3000 },
+        "machine_max_jerk_xy": { "default_value": 20 },
+        "machine_max_jerk_z": { "default_value": 20 },
+        "machine_max_jerk_e": { "default_value": 5},
+        "retraction_amount": { "default_value": 4 },
+        "retraction_speed": { "default_value": 50 },
+        "retraction_hop_enabled": { "default_value": false },
+        "retract_at_layer_change": { "default_value": true },
+        "coasting_enable": { "default_value": true }
+    }
+}

resources/extruders/predator_extruder_0.def.json

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

resources/quality/anycubic_predator/predator_coarse.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Coarse
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = coarse
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.4
+layer_height_0 = 0.45

resources/quality/anycubic_predator/predator_draft.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Draft
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.30
+layer_height_0 = 0.35

resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Extra Coarse
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = Xcoarse
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.5
+layer_height_0 = 0.55

resources/quality/anycubic_predator/predator_extra_fine.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Extra Fine
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = Xfine
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.05
+layer_height_0 = 0.10

resources/quality/anycubic_predator/predator_fine.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fine
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = fine
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.1
+layer_height_0 = 0.15

resources/quality/anycubic_predator/predator_normal.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Normal
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.2
+layer_height_0 = 0.25

resources/quality/beamup_s/beamup_s_coarse.inst.cfg

@@ -4,7 +4,7 @@ name = BeamUp S Coarse
 definition = beamup_s
 
 [metadata]
-setting_version = 10
+setting_version = 13
 type = quality
 quality_type = coarse
 weight = -3

resources/quality/beamup_s/beamup_s_draft.inst.cfg

@@ -4,7 +4,7 @@ name = BeamUp S Draft
 definition = beamup_s
 
 [metadata]
-setting_version = 10
+setting_version = 13
 type = quality
 quality_type = draft
 weight = -2

resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg

@@ -4,7 +4,7 @@ name = BeamUp S Extra Fine
 definition = beamup_s
 
 [metadata]
-setting_version = 10
+setting_version = 13
 type = quality
 quality_type = high
 weight = 1

resources/quality/beamup_s/beamup_s_fine.inst.cfg

@@ -4,7 +4,7 @@ name = BeamUp S Fine
 definition = beamup_s
 
 [metadata]
-setting_version = 10
+setting_version = 13
 type = quality
 quality_type = normal
 weight = 0

resources/quality/beamup_s/beamup_s_normal.inst.cfg

@@ -4,7 +4,7 @@ name = BeamUp S Normal
 definition = beamup_s
 
 [metadata]
-setting_version = 10
+setting_version = 13
 type = quality
 quality_type = fast
 weight = -1

resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg

@@ -4,7 +4,7 @@ definition = alyanx3dp
 name = Normal
 
 [metadata]
-setting_version = 6
+setting_version = 13
 type = quality
 quality_type = alyanx_normal
 weight = 2

resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg

@@ -4,7 +4,7 @@ name = Fine
 definition = makeblock_mcreate
 
 [metadata]
-setting_version = 6
+setting_version = 13
 type = quality
 quality_type = normal
 weight = 0

resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg

@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_abs

resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg

@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_abs

resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg

@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_abs

resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg

@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_abs

resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg

@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_abs

resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg

@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_abs

resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg

@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_nylon

resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg

@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_nylon

resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg

@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_nylon

resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg

@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_nylon

resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg

@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_nylon

resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg

@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_nylon

resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg

@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_petg

resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg

@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_petg

resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg

@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_petg

resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg

@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_petg

resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg

@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_petg

resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg

@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_petg

resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg

@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_pla

resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg

@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_pla

resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg

@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_pla

resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg

@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_pla

resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg

@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_pla

resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg

@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_pla

resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg

@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 weight = -6

resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg

@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 weight = -2

resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg

@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 weight = -4

resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg

@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 weight = -3

resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg

@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 weight = -1

resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg

@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 weight = 0

resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg

@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_tpu

resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg

@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_tpu

resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg

@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_tpu

resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg

@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_tpu

resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg

@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_tpu

resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg

@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_tpu