From f15445b1a3f2de6d5e191341059d3c707b628230 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 17 May 2016 17:26:01 +0200
Subject: [PATCH] Translate definition for Ultimaker

The preferred variant/profile/material has moved to the metadata.

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

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
new file mode 100644
index 0000000000..60e4dbbf40
--- /dev/null
+++ b/resources/definitions/ultimaker.def.json
@@ -0,0 +1,14 @@
+{
+    "id": "ultimaker_base",
+    "version": 2,
+    "visible": false,
+    "name": "Ultimaker",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker",
+        "preferred_profile": "Normal Quality",
+        "preferred_nozzle": "0.4 mm",
+        "preferred_material": "PLA"
+    }
+}
diff --git a/resources/machines/ultimaker.json b/resources/machines/ultimaker.json
deleted file mode 100644
index a7a9cd3994..0000000000
--- a/resources/machines/ultimaker.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "ultimaker_base",
-    "version": 1,
-    "visible": false,
-    "name": "Ultimaker",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "inherits": "fdmprinter.json",
-
-    "machine_preferences": {
-        "prefered_profile": "Normal Quality",
-        "prefered_variant": "0.4 mm",
-        "prefered_material": "PLA"
-    }
-}