From b5dfcdd48283c974e08e3756b0cfc835869fd7b8 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 30 Mar 2020 12:00:41 +0200
Subject: [PATCH] Remove Nozzle Length and Filament Park Distance from the
 settings list

Implements CURA-7328.
---
 .../VersionUpgrade45to46.py                   |  3 ++-
 resources/definitions/fdmprinter.def.json     | 23 -------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py b/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
index 378e1fd5d7..03edbeaaec 100644
--- a/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
+++ b/plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
@@ -7,7 +7,8 @@ import io
 from UM.VersionUpgrade import VersionUpgrade
 
 _removed_settings = {
-    "machine_filament_park_distance"
+    "machine_filament_park_distance",
+    "machine_nozzle_head_distance"
 }
 
 class VersionUpgrade45to46(VersionUpgrade):
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index c144ed2fea..a5cc39e2c1 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -267,17 +267,6 @@
                     "settable_per_meshgroup": false,
                     "settable_globally": false
                 },
-                "machine_nozzle_head_distance":
-                {
-                    "label": "Nozzle Length",
-                    "description": "The height difference between the tip of the nozzle and the lowest part of the print head.",
-                    "unit": "mm",
-                    "default_value": 3,
-                    "type": "float",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "settable_per_meshgroup": false
-                },
                 "machine_nozzle_expansion_angle":
                 {
                     "label": "Nozzle Angle",
@@ -302,18 +291,6 @@
                     "settable_per_extruder": true,
                     "settable_per_meshgroup": false
                 },
-                "machine_filament_park_distance":
-                {
-                    "label": "Filament Park Distance",
-                    "description": "The distance from the tip of the nozzle where to park the filament when an extruder is no longer used.",
-                    "unit": "mm",
-                    "default_value": 16,
-                    "value": "machine_heat_zone_length",
-                    "type": "float",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "settable_per_meshgroup": false
-                },
                 "machine_nozzle_temp_enabled":
                 {
                     "label": "Enable Nozzle Temperature Control",