Merge branch 'release' into develop

website/common/script/content/appearance/backgrounds.js

@@ -969,6 +969,20 @@ const backgrounds = {
       notes: t('backgroundTeaPartyNotes'),
     },
   },
+  backgrounds032020: {
+    among_giant_flowers: {
+      text: t('backgroundAmongGiantFlowersText'),
+      notes: t('backgroundAmongGiantFlowersNotes'),
+    },
+    butterfly_garden: {
+      text: t('backgroundButterflyGardenText'),
+      notes: t('backgroundButterflyGardenNotes'),
+    },
+    succulent_garden: {
+      text: t('backgroundSucculentGardenText'),
+      notes: t('backgroundSucculentGardenNotes'),
+    },
+  },
   timeTravelBackgrounds: {
     airship: {
       text: t('backgroundAirshipText'),

website/common/script/content/gear/sets/armoire.js

@@ -534,6 +534,15 @@ const armor = {
     set: 'matchMaker',
     canOwn: ownsItem('armor_armoire_matchMakersApron'),
   },
+  baseballUniform: {
+    text: t('armorArmoireBaseballUniformText'),
+    notes: t('armorArmoireBaseballUniformNotes', { attrs: 10 }),
+    value: 100,
+    con: 10,
+    str: 10,
+    set: 'baseball',
+    canOwn: ownsItem('armor_armoire_baseballUniform'),
+  },
 };
 
 const body = {
@@ -1089,6 +1098,15 @@ const head = {
     set: 'matchMaker',
     canOwn: ownsItem('head_armoire_matchMakersBeret'),
   },
+  baseballCap: {
+    text: t('headArmoireBaseballCapText'),
+    notes: t('headArmoireBaseballCapNotes', { attrs: 8 }),
+    value: 100,
+    con: 8,
+    str: 8,
+    set: 'baseball',
+    canOwn: ownsItem('head_armoire_baseballCap'),
+  },
 };
 
 const shield = {
@@ -1392,6 +1410,14 @@ const shield = {
     set: 'matchMaker',
     canOwn: ownsItem('shield_armoire_perfectMatch'),
   },
+  baseballGlove: {
+    text: t('shieldArmoireBaseballGloveText'),
+    notes: t('shieldArmoireBaseballGloveNotes', { str: 9 }),
+    value: 100,
+    str: 9,
+    set: 'baseball',
+    canOwn: ownsItem('shield_armoire_baseballGlove'),
+  },
 };
 
 const headAccessory = {
@@ -1863,6 +1889,14 @@ const weapon = {
     set: 'matchMaker',
     canOwn: ownsItem('weapon_armoire_livelyMatch'),
   },
+  baseballBat: {
+    text: t('weaponArmoireBaseballBatText'),
+    notes: t('weaponArmoireBaseballBatNotes', { con: 9 }),
+    value: 100,
+    con: 9,
+    set: 'baseball',
+    canOwn: ownsItem('weapon_armoire_baseballBat'),
+  },
 };
 
 export {

website/common/script/content/index.js

@@ -164,12 +164,14 @@ api.timeTravelStable = {
     'MantisShrimp-Base': t('mantisShrimp'),
     'Phoenix-Base': t('phoenix'),
     'MagicalBee-Base': t('magicalBee'),
+    'Hippogriff-Hopeful': t('hopefulHippogriffPet'),
   },
   mounts: {
     'Mammoth-Base': t('mammoth'),
     'MantisShrimp-Base': t('mantisShrimp'),
     'Phoenix-Base': t('phoenix'),
     'MagicalBee-Base': t('magicalBee'),
+    'Hippogriff-Hopeful': t('hopefulHippogriffMount'),
   },
 };