Merge branch 'develop' into api-v3

common/script/content/gear/sets/mystery.js

@@ -109,6 +109,12 @@ let armor = {
     mystery: '201603',
     value: 0,
   },
+  201604: {
+    text: t('armorMystery201604Text'),
+    notes: t('armorMystery201604Notes'),
+    mystery: '201604',
+    value: 0,
+  },
   301404: {
     text: t('armorMystery301404Text'),
     notes: t('armorMystery301404Notes'),
@@ -292,6 +298,12 @@ let head = {
     mystery: '201603',
     value: 0,
   },
+  201604: {
+    text: t('headMystery201604Text'),
+    notes: t('headMystery201604Notes'),
+    mystery: '201604',
+    value: 0,
+  },
   301404: {
     text: t('headMystery301404Text'),
     notes: t('headMystery301404Notes'),

common/script/content/index.js

@@ -506,7 +506,15 @@ api.premiumHatchingPotions = {
     canBuy: (function() {
       return false;
     })
-  }
+  },
+  Floral: {
+    value: 2,
+    text: t('hatchingPotionFloral'),
+    limited: true,
+    canBuy: (function() {
+      return true;
+    }),
+  },
 };
 
 _.each(api.dropHatchingPotions, function(pot, key) {
@@ -2564,11 +2572,11 @@ api.quests = {
       items: [
         {
           type: 'pets',
-          key: 'Bumblebee-Base',
+          key: 'MagicalBee-Base',
           text: t('questBewilderDropBumblebeePet')
         }, {
           type: 'mounts',
-          key: 'Bumblebee-Base',
+          key: 'MagicalBee-Base',
           text: t('questBewilderDropBumblebeeMount')
         }, {
           type: 'food',

common/script/content/mystery-sets.js

@@ -106,6 +106,10 @@ let mysterySets = {
     start: '2016-03-24',
     end: '2016-04-02',
   },
+  201604: {
+    start: '2016-04-25',
+    end: '2016-05-02',
+  },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',