Removed olson block as upgrade from UM2

Fixes CURA-1280

resources/machines/ultimaker2.json

@@ -11,10 +11,6 @@
 
     "inherits": "ultimaker.json",
 
-    "pages": [
-        "SelectUpgradedPartsUM2"
-    ],
-
     "machine_extruder_trains": [
         {
             "machine_nozzle_heat_up_speed": {

resources/machines/ultimaker2_olsson.json

@@ -1,21 +0,0 @@
-{
-    "id": "ultimaker2_olsson_base",
-    "version": 1,
-    "name": "Ultimaker 2 with Olsson Block",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2backplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2.json",
-
-    "overrides": {
-        "machine_show_variants": { "default": true },
-        "machine_nozzle_head_distance": { "default": 5 },
-        "machine_nozzle_expansion_angle": { "default": 45 },
-        "machine_height": { "default": 203 },
-        "machine_heat_zone_length": { "default": 20 },
-        "gantry_height": { "default": 52 }
-    }
-}

resources/machines/ultimaker2_olsson_025.json

@@ -1,22 +0,0 @@
-{
-    "id": "ultimaker2_olsson",
-    "version": 1,
-    "name": "Ultimaker 2 with Olsson Block",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2backplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2_olsson.json",
-
-    "variant": "0.25 mm",
-
-    "overrides": {
-        "machine_nozzle_size": { "default": 0.25 },
-        "machine_nozzle_tip_outer_diameter": { "default": 0.8 },
-
-        "coasting_volume": { "default": 0.1 },
-        "coasting_min_volume": { "default": 0.17 }
-    }
-}

resources/machines/ultimaker2_olsson_040.json

@@ -1,19 +0,0 @@
-{
-    "id": "ultimaker2_olsson",
-    "version": 1,
-    "name": "Ultimaker 2 with Olsson Block",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2backplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2_olsson.json",
-
-    "variant": "0.4 mm",
-
-    "overrides": {
-        "machine_nozzle_size": { "default": 0.40 },
-        "machine_nozzle_tip_outer_diameter": { "default": 1.05 }
-    }
-}

resources/machines/ultimaker2_olsson_060.json

@@ -1,20 +0,0 @@
-{
-    "id": "ultimaker2_olsson",
-    "version": 1,
-    "name": "Ultimaker 2 with Olsson Block",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2backplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2_olsson.json",
-
-    "variant": "0.6 mm",
-
-    "overrides": {
-        "machine_nozzle_size": { "default": 0.60 },
-        "machine_nozzle_tip_outer_diameter": { "default": 1.25 },
-        "coasting_volume": { "default": 1.36 }
-    }
-}

resources/machines/ultimaker2_olsson_080.json

@@ -1,20 +0,0 @@
-{
-    "id": "ultimaker2_olsson",
-    "version": 1,
-    "name": "Ultimaker 2 with Olsson Block",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2backplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2_olsson.json",
-
-    "variant": "0.8 mm",
-
-    "overrides": {
-        "machine_nozzle_size": { "default": 0.80 },
-        "machine_nozzle_tip_outer_diameter": { "default": 1.35 },
-        "coasting_volume": { "default": 3.22 }
-    }
-}

resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile

@@ -1,23 +0,0 @@
-[general]
-version = 1
-name = Normal Quality
-machine_type = ultimaker2_olsson
-machine_variant = 0.25 mm
-weight = -2
-
-[settings]
-line_width = 0.22
-layer_height = 0.06
-layer_height_0 = 0.15
-wall_thickness = 0.88
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-infill_overlap = 0.022
-retraction_amount = 6
-retraction_extrusion_window = 6
-speed_infill = 30
-speed_wall_0 = 20
-speed_wall_x = 25
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15

resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile

@@ -1,22 +0,0 @@
-[general]
-version = 1
-name = Fast Print
-machine_type = ultimaker2_olsson
-machine_variant = 0.4 mm
-weight = -1
-
-[settings]
-line_width = 0.35
-layer_height = 0.15
-layer_height_0 = 0.26
-wall_thickness = 0.7
-top_bottom_thickness = 0.6
-infill_sparse_density = 18
-infill_overlap = 0.035
-retraction_amount = 5.5
-retraction_extrusion_window = 6
-speed_wall_0 = 40
-speed_wall_x = 50
-speed_travel = 150
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15

resources/profiles/ultimaker2_olsson/0.4_high.curaprofile

@@ -1,22 +0,0 @@
-[general]
-version = 1
-name = High Quality
-machine_type = ultimaker2_olsson
-machine_variant = 0.4 mm
-weight = -3
-
-[settings]
-line_width = 0.35
-layer_height = 0.06
-layer_height_0 = 0.26
-wall_thickness = 1.05
-top_bottom_thickness = 0.84
-infill_sparse_density = 22
-infill_overlap = 0.035
-retraction_amount = 5.5
-retraction_extrusion_window = 6
-speed_infill = 50
-speed_wall_x = 40
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15

resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile

@@ -1,21 +0,0 @@
-[general]
-version = 1
-name = Normal Quality
-machine_type = ultimaker2_olsson
-machine_variant = 0.4 mm
-weight = -2
-
-[settings]
-line_width = 0.35
-layer_height = 0.1
-layer_height_0 = 0.26
-wall_thickness = 1.05
-top_bottom_thickness = 0.8
-infill_overlap = 0.035
-retraction_amount = 5.5
-retraction_extrusion_window = 6
-speed_infill = 50
-speed_wall_x = 40
-speed_topbottom = 20
-speed_layer_0 = 25
-cool_min_layer_time_fan_speed_max = 15