Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2020-02-01 06:27:22 -06:00
commit 68aeda44d4
8 changed files with 7 additions and 7 deletions

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "habitica", "name": "habitica",
"version": "4.131.0", "version": "4.131.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View file

@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.131.0", "version": "4.131.1",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@babel/core": "^7.8.3", "@babel/core": "^7.8.3",

View file

@ -922,31 +922,31 @@
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
.body_mystery_022020 { .body_mystery_202002 {
background-image: url('~@/assets/images/sprites/spritesmith-main-9.png'); background-image: url('~@/assets/images/sprites/spritesmith-main-9.png');
background-position: -460px -727px; background-position: -460px -727px;
width: 114px; width: 114px;
height: 90px; height: 90px;
} }
.shop_body_mystery_022020 { .shop_body_mystery_202002 {
background-image: url('~@/assets/images/sprites/spritesmith-main-9.png'); background-image: url('~@/assets/images/sprites/spritesmith-main-9.png');
background-position: -690px -1273px; background-position: -690px -1273px;
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
.shop_set_mystery_022020 { .shop_set_mystery_202002 {
background-image: url('~@/assets/images/sprites/spritesmith-main-9.png'); background-image: url('~@/assets/images/sprites/spritesmith-main-9.png');
background-position: -621px -1273px; background-position: -621px -1273px;
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
.shop_weapon_mystery_022020 { .shop_weapon_mystery_202002 {
background-image: url('~@/assets/images/sprites/spritesmith-main-9.png'); background-image: url('~@/assets/images/sprites/spritesmith-main-9.png');
background-position: -276px -1273px; background-position: -276px -1273px;
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
.weapon_mystery_022020 { .weapon_mystery_202002 {
background-image: url('~@/assets/images/sprites/spritesmith-main-9.png'); background-image: url('~@/assets/images/sprites/spritesmith-main-9.png');
background-position: -469px 0px; background-position: -469px 0px;
width: 114px; width: 114px;