Merge branch 'release' into develop

2018-02-12 22:08:03 +00:00
parent 6a67cbba65 b7b8faedd6
commit 1e23395c8c
122 changed files with 1396 additions and 1393 deletions
@@ -6,15 +6,15 @@ const featuredItems = {
    },
    {
      type: 'hatchingPotions',
-      path: 'hatchingPotions.CottonCandyBlue',
+      path: 'hatchingPotions.CottonCandyPink',
    },
    {
      type: 'hatchingPotions',
-      path: 'hatchingPotions.Golden',
+      path: 'hatchingPotions.Cupid',
    },
    {
      type: 'card',
-      path: 'cardTypes.greeting',
+      path: 'cardTypes.valentine',
    },
  ],
  quests: [
@@ -28,7 +28,7 @@ const featuredItems = {
    },
    {
      type: 'quests',
-      path: 'quests.penguin',
+      path: 'quests.badger',
    },
    {
      type: 'quests',