From 7272ee7c36b8cd9ba22d0cdfbc31b6c429275686 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sat, 4 May 2019 22:04:15 +0200
Subject: [PATCH 1/2] add joiner, floorer, agricultural engine mechanic and
 parquet layer crafts

---
 data/deprecated.json                               |  8 ++++++++
 .../presets/craft/agricultural_engines.json        | 11 +++++++++++
 data/presets/presets/craft/floorer.json            | 11 +++++++++++
 data/presets/presets/craft/joiner.json             | 14 ++++++++++++++
 data/presets/presets/craft/parquet_layer.json      | 11 +++++++++++
 5 files changed, 55 insertions(+)
 create mode 100644 data/presets/presets/craft/agricultural_engines.json
 create mode 100644 data/presets/presets/craft/floorer.json
 create mode 100644 data/presets/presets/craft/joiner.json
 create mode 100644 data/presets/presets/craft/parquet_layer.json

diff --git a/data/deprecated.json b/data/deprecated.json
index 6ed662e75..031c886ae 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -212,6 +212,14 @@
       "old": {"craft": "glass"},
       "replace": {"craft": "glaziery"}
     },
+    {
+      "old": {"craft": "catering"},
+      "replace": {"craft": "caterer"}
+    },
+    {
+      "old": {"craft": "sculpter"},
+      "replace": {"craft": "sculptor"}
+    },
     {
       "old": {"crossing": "zebra"},
       "replace": {"crossing": "marked"}
diff --git a/data/presets/presets/craft/agricultural_engines.json b/data/presets/presets/craft/agricultural_engines.json
new file mode 100644
index 000000000..06a3c94ae
--- /dev/null
+++ b/data/presets/presets/craft/agricultural_engines.json
@@ -0,0 +1,11 @@
+{
+    "icon": "temaki-tools",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "craft": "agricultural_engines"
+    },
+    "name": "Argricultural Engines mechanic"
+}
diff --git a/data/presets/presets/craft/floorer.json b/data/presets/presets/craft/floorer.json
new file mode 100644
index 000000000..596523b8d
--- /dev/null
+++ b/data/presets/presets/craft/floorer.json
@@ -0,0 +1,11 @@
+{
+    "icon": "temaki-tools",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "craft": "floorer"
+    },
+    "name": "Floorer"
+}
diff --git a/data/presets/presets/craft/joiner.json b/data/presets/presets/craft/joiner.json
new file mode 100644
index 000000000..8d2d44bab
--- /dev/null
+++ b/data/presets/presets/craft/joiner.json
@@ -0,0 +1,14 @@
+{
+    "icon": "temaki-tools",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "craft": "joiner"
+    },
+    "terms": [
+        "furniture"
+    ],
+    "name": "Joiner"
+}
diff --git a/data/presets/presets/craft/parquet_layer.json b/data/presets/presets/craft/parquet_layer.json
new file mode 100644
index 000000000..9932b0cd6
--- /dev/null
+++ b/data/presets/presets/craft/parquet_layer.json
@@ -0,0 +1,11 @@
+{
+    "icon": "temaki-tools",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "craft": "parquet_layer"
+    },
+    "name": "Parquet Layer"
+}

From 3ab68e55d84c3fbe8b06b462c8b781449e3ce1c3 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sat, 4 May 2019 22:56:36 +0200
Subject: [PATCH 2/2] mechanic -> Mechanic

---
 data/presets/presets/craft/agricultural_engines.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/craft/agricultural_engines.json b/data/presets/presets/craft/agricultural_engines.json
index 06a3c94ae..b06944e4c 100644
--- a/data/presets/presets/craft/agricultural_engines.json
+++ b/data/presets/presets/craft/agricultural_engines.json
@@ -7,5 +7,5 @@
     "tags": {
         "craft": "agricultural_engines"
     },
-    "name": "Argricultural Engines mechanic"
+    "name": "Argricultural Engines Mechanic"
 }