From 4947dfffb8e27e8c70c6f14f9c10cb6649557f03 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 18 May 2016 09:52:54 +0200
Subject: [PATCH] Translate definition for Ultimaker 2 Extended+

It remains to be seen what we do with the variants of this machine and consequently the visibility of this machine.

Contributes to issue CURA-1278.
---
 .../ultimaker2_extended_plus.def.json         | 30 +++++++++++++++++++
 .../machines/ultimaker2_extended_plus.json    | 19 ------------
 2 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 resources/definitions/ultimaker2_extended_plus.def.json
 delete mode 100644 resources/machines/ultimaker2_extended_plus.json

diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json
new file mode 100644
index 0000000000..5283209745
--- /dev/null
+++ b/resources/definitions/ultimaker2_extended_plus.def.json
@@ -0,0 +1,30 @@
+{
+    "id": "ultimaker2_extended_plus_base",
+    "version": 2,
+    "name": "Ultimaker 2 Extended+",
+    "inherits": "ultimaker2plus",
+    "visible": false,
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker",
+        "category": "Ultimaker",
+        "file_formats": "text/x-gcode",
+        "platform": "ultimaker2_platform.obj",
+        "platform_texture": "Ultimaker2ExtendedPlusbackplate.png"
+    },
+
+    "overrides": {
+        "machine_height": {
+            "default_value": 313
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_nozzle_head_distance": {
+            "default_value": 5
+        },
+        "machine_nozzle_expansion_angle": {
+            "default_value": 45
+        }
+    }
+}
diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json
deleted file mode 100644
index 318361a894..0000000000
--- a/resources/machines/ultimaker2_extended_plus.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "id": "ultimaker2_extended_plus_base",
-    "version": 1, 
-    "name": "Ultimaker 2 Extended+",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2plus.json",
-
-    "machine_settings": {
-        "machine_height": { "default": 313 },
-        "machine_show_variants": { "default": true },
-        "machine_nozzle_head_distance": { "default": 5 },
-        "machine_nozzle_expansion_angle": { "default": 45 }
-    }
-}