Merge branch 'release' into develop

migrations/users/mystery-items.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201906';
-const MYSTERY_ITEMS = ['headAccessory_mystery_201906', 'armor_mystery_201906'];
+const MIGRATION_NAME = 'mystery_items_201907';
+const MYSTERY_ITEMS = ['head_mystery_201907', 'armor_mystery_201907', 'eyewear_mystery_201907'];
 import { model as User } from '../../website/server/models/user';
 import { model as UserNotification } from '../../website/server/models/userNotification';
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.104.2",
+  "version": "4.105.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^4.0.0",

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,78 +1,78 @@
 .promo_armoire_backgrounds_201907 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -313px -524px;
+  background-position: -776px 0px;
   width: 423px;
   height: 147px;
 }
 .promo_glass_watery_potions {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -854px 0px;
+  background-position: -776px -148px;
   width: 423px;
   height: 147px;
 }
-.promo_mystery_201906 {
+.promo_mystery_201907 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -854px -296px;
+  background-position: -776px -444px;
   width: 282px;
-  height: 147px;
+  height: 144px;
 }
 .promo_orcas {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -854px -444px;
+  background-position: -376px -286px;
   width: 219px;
   height: 147px;
 }
 .promo_seafoam {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -376px -337px;
+  background-position: -313px -473px;
   width: 425px;
   height: 148px;
 }
 .promo_seasonal_shop {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1074px -444px;
+  background-position: -596px -286px;
   width: 162px;
   height: 132px;
 }
 .promo_splashy_pals_bundle {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -854px -148px;
+  background-position: -776px -296px;
   width: 423px;
   height: 147px;
 }
 .promo_splashy_skins {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -337px;
+  background-position: 0px -286px;
   width: 375px;
   height: 186px;
 }
 .customize-option.promo_splashy_skins {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -25px -352px;
+  background-position: -25px -301px;
   width: 60px;
   height: 60px;
 }
 .promo_summer_splash_2019 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -445px 0px;
+  background-position: -367px 0px;
   width: 408px;
   height: 186px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1137px -296px;
+  background-position: -1059px -444px;
   width: 96px;
   height: 69px;
 }
 .scene_casting_spells {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -524px;
+  background-position: 0px -473px;
   width: 312px;
   height: 222px;
 }
-.scene_hat_guild {
+.scene_tools {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px 0px;
-  width: 444px;
-  height: 336px;
+  width: 366px;
+  height: 285px;
 }