From 1cfc6e3e240945838ccfb0b94e91397dfb4e52e3 Mon Sep 17 00:00:00 2001
From: Michael Rice <michael@riceclan.org>
Date: Sun, 23 Oct 2016 22:08:06 -0500
Subject: [PATCH] Fixed "Settlers / Bustling Village" group as it was backward
 (#84)

causing it not to match cards.json.  Also copied the updates
from 7355c8f6 into the other three card_groups.json, as new
entries needing translation.
---
 card_db/de/card_groups.json    | 42 ++++++++++++++++++++++++++++++++++
 card_db/en_us/card_groups.json |  8 +++----
 card_db/fr/card_groups.json    | 42 ++++++++++++++++++++++++++++++++++
 card_db/it/card_groups.json    | 42 ++++++++++++++++++++++++++++++++++
 4 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/card_db/de/card_groups.json b/card_db/de/card_groups.json
index 462cb78..05a945a 100644
--- a/card_db/de/card_groups.json
+++ b/card_db/de/card_groups.json
@@ -48,5 +48,47 @@
             "Mercenary"
         ],
         "new_name": "Urchin \/ Mercenary"
+    },
+    "Catapult \/ Rocks" : {
+        "subcards": [
+            "Catapult",
+            "Rocks"
+        ],
+        "new_name": "Catapult \/ Rocks"
+    },
+    "Encampment \/ Plunder": {
+        "subcards": [
+            "Encampment",
+            "Plunder"
+        ],
+        "new_name": "Encampment \/ Plunder"
+    },
+    "Gladiator \/ Fortune": {
+        "subcards": [
+            "Gladiator",
+            "Fortune"
+        ],
+        "new_name": "Gladiator \/ Fortune"
+    },
+    "Patrician \/ Emporium": {
+        "subcards": [
+            "Patrician",
+            "Emporium"
+        ],
+        "new_name": "Patrician \/ Emporium"
+    },
+    "Settlers \/ Bustling Village": {
+        "subcards": [
+            "Settlers",
+            "Bustling Village"
+        ],
+        "new_name": "Settlers \/ Bustling Village"
+    },
+    "Sauna \/ Avanto": {
+        "subcards": [
+            "Sauna",
+            "Avanto"
+        ],
+        "new_name": "Sauna \/ Avanto"
     }
 }
diff --git a/card_db/en_us/card_groups.json b/card_db/en_us/card_groups.json
index 792342e..a8ac871 100644
--- a/card_db/en_us/card_groups.json
+++ b/card_db/en_us/card_groups.json
@@ -77,12 +77,12 @@
         ],
         "new_name": "Patrician \/ Emporium"
     },
-    "Bustling Village \/ Settlers": {
+    "Settlers \/ Bustling Village": {
         "subcards": [
-            "Bustling Village",
-            "Settlers"
+            "Settlers",
+            "Bustling Village"
         ],
-        "new_name": "Bustling Village \/ Settlers"
+        "new_name": "Settlers \/ Bustling Village"
     },
     "Sauna \/ Avanto": {
         "subcards": [
diff --git a/card_db/fr/card_groups.json b/card_db/fr/card_groups.json
index 462cb78..a8ac871 100644
--- a/card_db/fr/card_groups.json
+++ b/card_db/fr/card_groups.json
@@ -48,5 +48,47 @@
             "Mercenary"
         ],
         "new_name": "Urchin \/ Mercenary"
+    },
+    "Catapult \/ Rocks": {
+        "subcards": [
+            "Catapult",
+            "Rocks"
+        ],
+        "new_name": "Catapult \/ Rocks"
+    },
+    "Encampment \/ Plunder": {
+        "subcards": [
+            "Encampment",
+            "Plunder"
+        ],
+        "new_name": "Encampment \/ Plunder"
+    },
+    "Gladiator \/ Fortune": {
+        "subcards": [
+            "Gladiator",
+            "Fortune"
+        ],
+        "new_name": "Gladiator \/ Fortune"
+    },
+    "Patrician \/ Emporium": {
+        "subcards": [
+            "Patrician",
+            "Emporium"
+        ],
+        "new_name": "Patrician \/ Emporium"
+    },
+    "Settlers \/ Bustling Village": {
+        "subcards": [
+            "Settlers",
+            "Bustling Village"
+        ],
+        "new_name": "Settlers \/ Bustling Village"
+    },
+    "Sauna \/ Avanto": {
+        "subcards": [
+            "Sauna",
+            "Avanto"
+        ],
+        "new_name": "Sauna \/ Avanto"
     }
 }
diff --git a/card_db/it/card_groups.json b/card_db/it/card_groups.json
index 462cb78..a8ac871 100644
--- a/card_db/it/card_groups.json
+++ b/card_db/it/card_groups.json
@@ -48,5 +48,47 @@
             "Mercenary"
         ],
         "new_name": "Urchin \/ Mercenary"
+    },
+    "Catapult \/ Rocks": {
+        "subcards": [
+            "Catapult",
+            "Rocks"
+        ],
+        "new_name": "Catapult \/ Rocks"
+    },
+    "Encampment \/ Plunder": {
+        "subcards": [
+            "Encampment",
+            "Plunder"
+        ],
+        "new_name": "Encampment \/ Plunder"
+    },
+    "Gladiator \/ Fortune": {
+        "subcards": [
+            "Gladiator",
+            "Fortune"
+        ],
+        "new_name": "Gladiator \/ Fortune"
+    },
+    "Patrician \/ Emporium": {
+        "subcards": [
+            "Patrician",
+            "Emporium"
+        ],
+        "new_name": "Patrician \/ Emporium"
+    },
+    "Settlers \/ Bustling Village": {
+        "subcards": [
+            "Settlers",
+            "Bustling Village"
+        ],
+        "new_name": "Settlers \/ Bustling Village"
+    },
+    "Sauna \/ Avanto": {
+        "subcards": [
+            "Sauna",
+            "Avanto"
+        ],
+        "new_name": "Sauna \/ Avanto"
     }
 }