Travis build: 1130

src/domdiv/card_db/cz/sets_cz.json

@@ -138,12 +138,21 @@
     },
     "menagerie": {
         "set_name": "Menagerie",
+<<<<<<< Updated upstream
         "text_icon": "*",
         "set_text": ""
     },
     "menagerie extras": {
         "set_name": "Menagerie Extras",
         "text_icon": "*",
+=======
+        "text_icon": "M",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "text_icon": "M",
+>>>>>>> Stashed changes
         "set_text": ""
     }
 }

src/domdiv/card_db/de/sets_de.json

@@ -138,12 +138,21 @@
     },
     "menagerie": {
         "set_name": "Menagerie",
+<<<<<<< Updated upstream
         "text_icon": "*",
         "set_text": ""
     },
     "menagerie extras": {
         "set_name": "Menagerie Extras",
         "text_icon": "*",
+=======
+        "text_icon": "M",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "text_icon": "M",
+>>>>>>> Stashed changes
         "set_text": ""
     }
 }

src/domdiv/card_db/en_us/sets_en_us.json

@@ -105,6 +105,16 @@
         "short_name": "Intrigue",
         "text_icon": "I2"
     },
+    "menagerie": {
+        "set_name": "Menagerie",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return.",
+        "text_icon": "M"
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "set_text": "",
+        "text_icon": "M"
+    },
     "nocturne": {
         "set_name": "Nocturne",
         "set_text": "You've always been a night person; lately you've even considered becoming a vampire. There are a lot of advantages: you don't age; you don't have to see yourself in mirrors anymore; if someone asks you to do something, you can just turn into a bat, and then say, sorry, I'm a bat. There are probably some downsides though. You always think of the statue in the town square that came to life and now works as the tavern barmaid. The pedestal came to life too, so she has to hop around. The village blacksmith turns into a wolf whenever there's a full moon; when there's a crescent moon, he turns into a chihuahua. That's how this stuff goes sometimes. Still, when you breathe in the night air, you feel ready for anything.\n<i>Dominion: Nocturne</i>, the 11th expansion to <i>Dominion</i>, has 500 cards, with 33 new Kingdom cards. There are Night cards, which are played after the Buy phase; Heirlooms that replace starting Coppers; Fate and Doom cards that give out Boons and Hexes; and a variety of extra cards that other cards can provide.",

src/domdiv/card_db/en_us/types_en_us.json

@@ -35,7 +35,13 @@
     "Traveller": "Traveller",
     "Treasure": "Treasure",
     "Victory": "Victory",
+<<<<<<< Updated upstream
     "Zombie": "Zombie",
     "Way": "Way",
     "Ways": "Ways"
+=======
+    "Way": "Way",
+    "Ways": "Ways",
+    "Zombie": "Zombie"
+>>>>>>> Stashed changes
 }

src/domdiv/card_db/fr/sets_fr.json

@@ -138,12 +138,21 @@
     },
     "menagerie": {
         "set_name": "Menagerie",
+<<<<<<< Updated upstream
         "text_icon": "*",
         "set_text": ""
     },
     "menagerie extras": {
         "set_name": "Menagerie Extras",
         "text_icon": "*",
+=======
+        "text_icon": "M",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "text_icon": "M",
+>>>>>>> Stashed changes
         "set_text": ""
     }
 }

src/domdiv/card_db/it/sets_it.json

@@ -138,12 +138,21 @@
     },
     "menagerie": {
         "set_name": "Menagerie",
+<<<<<<< Updated upstream
         "text_icon": "*",
         "set_text": ""
     },
     "menagerie extras": {
         "set_name": "Menagerie Extras",
         "text_icon": "*",
+=======
+        "text_icon": "M",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "text_icon": "M",
+>>>>>>> Stashed changes
         "set_text": ""
     }
 }

src/domdiv/card_db/nl_du/sets_nl_du.json

@@ -138,12 +138,21 @@
     },
     "menagerie": {
         "set_name": "Menagerie",
+<<<<<<< Updated upstream
         "text_icon": "*",
         "set_text": ""
     },
     "menagerie extras": {
         "set_name": "Menagerie Extras",
         "text_icon": "*",
+=======
+        "text_icon": "M",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "text_icon": "M",
+>>>>>>> Stashed changes
         "set_text": ""
     }
 }

src/domdiv/card_db/xx/sets_xx.json

@@ -138,12 +138,21 @@
     },
     "menagerie": {
         "set_name": "Menagerie",
+<<<<<<< Updated upstream
         "text_icon": "*",
         "set_text": ""
     },
     "menagerie extras": {
         "set_name": "Menagerie Extras",
         "text_icon": "*",
+=======
+        "text_icon": "M",
+        "set_text": "Dominion, that’s what you’re trying to achieve. This time with animals! They each have a lesson to teach, whether it’s how to spit really far, or what kind of grass tastes the best. It’s a lot to keep track of, but you’re like an elephant: you remember everything. And you’re afraid of mice. You’ve taken up riding. Horses are intimidating; they say you can lead a horse to water, but you haven’t managed it. So you’re working your way up, starting with dogs. So far so good; the dog hasn’t bucked you off yet. Your menagerie got off to a poor start, with just a goat, two rats, and the advisor who suggested starting a menagerie. You couldn’t get that fox you wanted, but it was probably bad anyway. Now you’ve got some camels, which are just as useless for sewing as you’d been warned, and a turtle that can hold its breath for longer than anyone can stay interested. Soon the animal kingdom will be yours.\nThis is the 13th expansion to <i>Dominion</i>. It has 400 cards, with 30 new Kingdom cards. There are Horses that save a draw for later, Exile mats that cards can be sent to and rescued from, and Ways that give Actions another option. Events return."
+    },
+    "menagerie extras": {
+        "set_name": "Menagerie Extras",
+        "text_icon": "M",
+>>>>>>> Stashed changes
         "set_text": ""
     }
 }