4.191.0

chore(sprites): compile
feat(content): Armoire and Backgrounds 2021-05
2026-05-24 11:49:12 -05:00 · 2021-05-04 16:20:50 -05:00 · 2021-05-04 16:20:41 -05:00 · 2021-05-04 16:20:33 -05:00 · 2021-04-30 09:35:45 -05:00 · 2021-04-30 09:35:36 -05:00
338 changed files with 35824 additions and 33852 deletions
@@ -0,0 +1,108 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20210216_pet_group_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Dragon-Base']
+      && pets['Dragon-CottonCandyBlue']
+      && pets['Dragon-CottonCandyPink']
+      && pets['Dragon-Desert']
+      && pets['Dragon-Golden']
+      && pets['Dragon-Red']
+      && pets['Dragon-Shade']
+      && pets['Dragon-Skeleton']
+      && pets['Dragon-White']
+      && pets['Dragon-Zombie']
+      && pets['FlyingPig-Base']
+      && pets['FlyingPig-CottonCandyBlue']
+      && pets['FlyingPig-CottonCandyPink']
+      && pets['FlyingPig-Desert']
+      && pets['FlyingPig-Golden']
+      && pets['FlyingPig-Red']
+      && pets['FlyingPig-Shade']
+      && pets['FlyingPig-Skeleton']
+      && pets['FlyingPig-White']
+      && pets['FlyingPig-Zombie']
+      && pets['Gryphon-Base']
+      && pets['Gryphon-CottonCandyBlue']
+      && pets['Gryphon-CottonCandyPink']
+      && pets['Gryphon-Desert']
+      && pets['Gryphon-Golden']
+      && pets['Gryphon-Red']
+      && pets['Gryphon-Shade']
+      && pets['Gryphon-Skeleton']
+      && pets['Gryphon-White']
+      && pets['Gryphon-Zombie']
+      && pets['SeaSerpent-Base']
+      && pets['SeaSerpent-CottonCandyBlue']
+      && pets['SeaSerpent-CottonCandyPink']
+      && pets['SeaSerpent-Desert']
+      && pets['SeaSerpent-Golden']
+      && pets['SeaSerpent-Red']
+      && pets['SeaSerpent-Shade']
+      && pets['SeaSerpent-Skeleton']
+      && pets['SeaSerpent-White']
+      && pets['SeaSerpent-Zombie']
+      && pets['Unicorn-Base']
+      && pets['Unicorn-CottonCandyBlue']
+      && pets['Unicorn-CottonCandyPink']
+      && pets['Unicorn-Desert']
+      && pets['Unicorn-Golden']
+      && pets['Unicorn-Red']
+      && pets['Unicorn-Shade']
+      && pets['Unicorn-Skeleton']
+      && pets['Unicorn-White']
+      && pets['Unicorn-Zombie']) {
+        set['achievements.legendaryBestiary'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2021-02-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
@@ -18,7 +18,7 @@ function setUpServer () {
 setUpServer();

 // Replace this with your migration
-const processUsers = require('./archive/2021/20210129_habit_birthday').default;
+const processUsers = require().default;

 processUsers()
  .then(() => {
@@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid';

 import { model as User } from '../../website/server/models/user';

-const MIGRATION_NAME = '20200314_pi_day';
+const MIGRATION_NAME = '20210314_pi_day';

 const progressCount = 1000;
 let count = 0;
@@ -54,7 +54,7 @@ async function updateUser (user) {
 export default async function processUsers () {
  const query = {
    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2020-02-15') },
+    'auth.timestamps.loggedin': { $gt: new Date('2021-02-15') },
  };

  const fields = {
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.179.1",
+  "version": "4.191.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -2925,6 +2925,11 @@
      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
      "optional": true
    },
+    "bootstrap": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz",
+      "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw=="
+    },
    "boxen": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.179.1",
+  "version": "4.191.0",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.12.10",
@@ -17,6 +17,7 @@
    "apple-auth": "^1.0.7",
    "bcrypt": "^5.0.0",
    "body-parser": "^1.18.3",
+    "bootstrap": "^4.6.0",
    "compression": "^1.7.4",
    "cookie-session": "^1.4.0",
    "coupon-code": "^0.4.5",
@@ -535,24 +535,12 @@ describe('PUT /tasks/:id', () => {
      });

      expect(savedMonthly.nextDue.length).to.eql(6);
-      expect(moment(savedMonthly.nextDue[0]).toDate()).to.eql(
-        moment(date2).add(1, 'months').startOf('day').toDate(),
-      );
-      expect(moment(savedMonthly.nextDue[1]).toDate()).to.eql(
-        moment(date2).add(2, 'months').startOf('day').toDate(),
-      );
-      expect(moment(savedMonthly.nextDue[2]).toDate()).to.eql(
-        moment(date2).add(3, 'months').startOf('day').toDate(),
-      );
-      expect(moment(savedMonthly.nextDue[3]).toDate()).to.eql(
-        moment(date2).add(4, 'months').startOf('day').toDate(),
-      );
-      expect(moment(savedMonthly.nextDue[4]).toDate()).to.eql(
-        moment(date2).add(5, 'months').startOf('day').toDate(),
-      );
-      expect(moment(savedMonthly.nextDue[5]).toDate()).to.eql(
-        moment(date2).add(6, 'months').startOf('day').toDate(),
-      );
+      expect(moment(savedMonthly.nextDue[0]).isSame(moment(date2).add(1, 'months').startOf('day')));
+      expect(moment(savedMonthly.nextDue[1]).isSame(moment(date2).add(2, 'months').startOf('day')));
+      expect(moment(savedMonthly.nextDue[2]).isSame(moment(date2).add(3, 'months').startOf('day')));
+      expect(moment(savedMonthly.nextDue[3]).isSame(moment(date2).add(4, 'months').startOf('day')));
+      expect(moment(savedMonthly.nextDue[4]).isSame(moment(date2).add(5, 'months').startOf('day')));
+      expect(moment(savedMonthly.nextDue[5]).isSame(moment(date2).add(6, 'months').startOf('day')));
    });
  });

@@ -70,6 +70,7 @@ describe('POST /user/buy/:key', () => {
  it('buys a special spell', async () => {
    const key = 'spookySparkles';
    const item = content.special[key];
+    const stub = sinon.stub(item, 'canOwn').returns(true);

    await user.update({ 'stats.gp': 250 });
    const res = await user.post(`/user/buy/${key}`);
@@ -82,6 +83,8 @@ describe('POST /user/buy/:key', () => {
    expect(res.message).to.equal(t('messageBought', {
      itemText: item.text(),
    }));
+
+    stub.restore();
  });

  it('allows for bulk purchases', async () => {
@@ -1,6 +1,5 @@
 import moment from 'moment';
 import {
-  hasActiveOnboarding,
  hasCompletedOnboarding,
  onOnboardingComplete,
  checkOnboardingStatus,
@@ -17,19 +16,6 @@ describe('onboarding', () => {
    user.auth.timestamps.created = moment('2019-12-20').toDate();
  });

-  describe('hasActiveOnboarding', () => {
-    // The value of BEGIN DATE is available in common/script/libs/onboarding
-
-    it('returns true if the account is created after BEGIN_DATE', () => {
-      expect(hasActiveOnboarding(user)).to.eql(true);
-    });
-
-    it('returns false if the account is created before BEGIN_DATE', () => {
-      user.auth.timestamps.created = moment('2019-12-01').toDate();
-      expect(hasActiveOnboarding(user)).to.eql(false);
-    });
-  });
-
  describe('hasCompletedOnboarding', () => {
    it('returns false if no achievement has been awarded', () => {
      const result = hasCompletedOnboarding(user);
@@ -169,7 +169,6 @@ describe('shared.ops.hatch', () => {

      it('awards Back to Basics achievement', () => {
        user.items.pets = {
-          'Wolf-Base': 5,
          'TigerCub-Base': 5,
          'PandaCub-Base': 10,
          'LionCub-Base': 5,
@@ -180,14 +179,13 @@ describe('shared.ops.hatch', () => {
          'BearCub-Base': 5,
        };
        user.items.eggs = { Wolf: 1 };
-        user.items.hatchingPotions = { Spooky: 1 };
-        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Spooky' } });
+        user.items.hatchingPotions = { Base: 1 };
+        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Base' } });
        expect(user.achievements.backToBasics).to.eql(true);
      });

      it('awards Dust Devil achievement', () => {
        user.items.pets = {
-          'Wolf-Desert': 5,
          'TigerCub-Desert': 5,
          'PandaCub-Desert': 10,
          'LionCub-Desert': 5,
@@ -198,8 +196,8 @@ describe('shared.ops.hatch', () => {
          'BearCub-Desert': 5,
        };
        user.items.eggs = { Wolf: 1 };
-        user.items.hatchingPotions = { Spooky: 1 };
-        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Spooky' } });
+        user.items.hatchingPotions = { Desert: 1 };
+        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Desert' } });
        expect(user.achievements.dustDevil).to.eql(true);
      });

@@ -10094,6 +10094,12 @@
          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "optional": true
+        },
        "fast-deep-equal": {
          "version": "3.1.3",
          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -10196,6 +10202,55 @@
            "has-flag": "^3.0.0"
          }
        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.2.0",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
+          "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+              "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+              "optional": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            },
+            "has-flag": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+              "optional": true
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "optional": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
        "wrap-ansi": {
          "version": "6.2.0",
          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -25542,76 +25597,6 @@
        }
      }
    },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.1.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
-      "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
    "vue-mugen-scroll": {
      "version": "0.2.6",
      "resolved": "https://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.6.tgz",
@@ -28,7 +28,7 @@
    "axios": "^0.21.1",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
-    "bootstrap": "^4.5.3",
+    "bootstrap": "^4.6.0",
    "bootstrap-vue": "^2.21.2",
    "chai": "^4.1.2",
    "core-js": "^3.8.3",
@@ -544,6 +544,6 @@ export default {
 <style src="@/assets/css/sprites/spritesmith-main-27.css"></style>
 <style src="@/assets/css/sprites/spritesmith-main-28.css"></style>
 <style src="@/assets/css/sprites/spritesmith-main-29.css"></style>
-<!-- <style src="@/assets/css/sprites/spritesmith-main-30.css"></style> -->
+<style src="@/assets/css/sprites/spritesmith-main-30.css"></style>
 <style src="@/assets/css/sprites.css"></style>
 <style src="smartbanner.js/dist/smartbanner.min.css"></style>
@@ -1,396 +1,420 @@
-.quest_TEMPLATE_FOR_MISSING_IMAGE {
+.npc_matt {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -502px -1519px;
-  width: 221px;
-  height: 39px;
+  background-position: -1517px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_fall {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1375px -1315px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_habitoween {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -341px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_nye {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -537px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_spring {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -733px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_summer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -929px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_thanksgiving {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1125px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.npc_matt_winter {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1321px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.background_dysheartener {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px 0px;
+  width: 306px;
+  height: 202px;
+}
+.banner_flair_dysheartener {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1963px -444px;
+  width: 69px;
+  height: 18px;
+}
+.phobia_dysheartener {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1187px -880px;
+  width: 201px;
+  height: 195px;
+}
+.quest_alligator {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1627px -1079px;
+  width: 201px;
+  height: 213px;
+}
+.quest_amber {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -307px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_armadillo {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -527px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_atom1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -665px -1315px;
+  width: 250px;
+  height: 150px;
+}
+.quest_atom2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1167px -1315px;
+  width: 207px;
+  height: 138px;
+}
+.quest_atom3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -747px -440px;
+  width: 216px;
+  height: 180px;
+}
+.quest_axolotl {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -435px;
+  width: 219px;
+  height: 219px;
+}
+.quest_badger {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -220px -435px;
+  width: 219px;
+  height: 219px;
+}
+.quest_basilist {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1844px 0px;
+  width: 189px;
+  height: 141px;
+}
+.quest_beetle {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1627px -1293px;
+  width: 204px;
+  height: 201px;
+}
+.quest_blackPearl {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1627px 0px;
+  width: 216px;
+  height: 216px;
+}
+.quest_bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -440px -435px;
+  width: 219px;
+  height: 219px;
+}
+.quest_bunny {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -967px -660px;
+  width: 210px;
+  height: 186px;
+}
+.quest_butterfly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -747px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_cheetah {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -747px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_cow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -1535px;
+  width: 174px;
+  height: 213px;
+}
+.quest_dilatory {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -220px -655px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dilatoryDistress1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1627px -868px;
+  width: 210px;
+  height: 210px;
+}
+.quest_dilatoryDistress2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1844px -142px;
+  width: 150px;
+  height: 150px;
 }
 .quest_dilatoryDistress3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px 0px;
+  background-position: -440px -655px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dilatory_derby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_dolphin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px 0px;
+  background-position: -660px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_dustbunnies {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -232px;
+  background-position: -967px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_egg {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -362px;
+  background-position: -175px -1535px;
  width: 165px;
  height: 207px;
 }
 .quest_evilsanta {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -1023px;
+  background-position: -1844px -444px;
  width: 118px;
  height: 131px;
 }
 .quest_evilsanta2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -232px;
+  background-position: -967px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_falcon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -232px;
+  background-position: -967px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_ferret {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px 0px;
+  background-position: 0px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_fluorite {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -220px;
+  background-position: -220px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_frog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1540px 0px;
+  background-position: -220px -1315px;
  width: 221px;
  height: 213px;
 }
 .quest_ghost_stag {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -452px;
+  background-position: -440px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -452px;
+  background-position: -660px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1519px;
+  background-position: -916px -1315px;
  width: 250px;
  height: 150px;
 }
 .quest_goldenknight3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px 0px;
+  background-position: 0px -203px;
  width: 219px;
  height: 231px;
 }
 .quest_gryphon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -443px -1332px;
+  background-position: -527px -220px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -452px;
+  background-position: -880px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -452px;
+  background-position: -1187px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1332px;
+  background-position: -1407px -1100px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px 0px;
+  background-position: -1187px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -220px;
+  background-position: -1187px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -440px;
+  background-position: -1187px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -1332px;
+  background-position: -307px -220px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -672px;
+  background-position: 0px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -672px;
+  background-position: -220px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -672px;
+  background-position: -440px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -570px;
+  background-position: -1844px -293px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -672px;
+  background-position: -660px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -672px;
+  background-position: -880px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px 0px;
+  background-position: -1100px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1540px -214px;
+  background-position: -1627px -217px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -220px;
+  background-position: -1407px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -440px;
+  background-position: -1407px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -660px;
+  background-position: -1407px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -892px;
+  background-position: -1407px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -892px;
+  background-position: -1407px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1540px -431px;
+  background-position: -1627px -434px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -1332px;
+  background-position: -442px -1315px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -892px;
+  background-position: 0px -1315px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1540px -648px;
+  background-position: -1627px -651px;
  width: 216px;
  height: 216px;
 }
-.quest_penguin {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -178px;
-  width: 190px;
-  height: 183px;
-}
-.quest_pterodactyl {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -892px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rat {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -892px;
-  width: 219px;
-  height: 219px;
-}
-.quest_robot {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -892px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rock {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1540px -865px;
-  width: 216px;
-  height: 216px;
-}
-.quest_rooster {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1528px -1332px;
-  width: 213px;
-  height: 174px;
-}
-.quest_ruby {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sabretooth {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_seaserpent {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -440px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sheep {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -660px;
-  width: 219px;
-  height: 219px;
-}
-.quest_silver {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -880px;
-  width: 219px;
-  height: 219px;
-}
-.quest_slime {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sloth {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_snail {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -1112px;
-  width: 219px;
-  height: 213px;
-}
-.quest_snake {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -877px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_spider {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -251px -1519px;
-  width: 250px;
-  height: 150px;
-}
-.quest_squirrel {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -721px;
-  width: 150px;
-  height: 150px;
-}
-.quest_stoikalmCalamity2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_taskwoodsTerror1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -872px;
-  width: 150px;
-  height: 150px;
-}
-.quest_taskwoodsTerror2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1540px -1082px;
-  width: 216px;
-  height: 216px;
-}
-.quest_taskwoodsTerror3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_treeling {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1094px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_trex {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px 0px;
-  width: 204px;
-  height: 177px;
-}
-.quest_trex_undead {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1311px -1332px;
-  width: 216px;
-  height: 177px;
-}
@@ -0,0 +1,636 @@
+.Pet-Wolf-AutumnLeaf {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-BirchBark {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-BlackPearl {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Celestial {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Cupid {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Dessert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ember {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fairy {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Floral {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Frost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ghost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-IcySnow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-PolkaDot {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Rainbow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoseQuartz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ruby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-SandSculpture {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StainedGlass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Turquoise {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Vampire {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veggie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Windup {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -492px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -574px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -656px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -656px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -656px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -656px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -656px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -656px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -82px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -164px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -246px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Amber {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -328px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -397px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Aurora {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -466px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_AutumnLeaf {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -535px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -604px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_BirchBark {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_BlackPearl {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Celestial {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -552px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -738px -621px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -69px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -138px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -207px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -276px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -345px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -414px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -483px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -552px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -621px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_PolkaDot {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -690px -700px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ruby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_SandSculpture {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -552px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -621px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -807px -690px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: 0px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -69px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StainedGlass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -138px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -207px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -276px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -345px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Turquoise {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -414px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Vampire {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -483px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -552px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -621px -769px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-30.png');
+  background-position: -690px -769px;
+  width: 68px;
+  height: 68px;
+}
@@ -212,8 +212,10 @@ export default {
      currentEvent: 'worldState.data.currentEvent',
    }),
    eventName () {
-      if (!this.currentEvent || !this.currentEvent.event || this.currentEvent.season === 'normal') return null;
-      return this.currentEvent.event.replace('NoPromo', '');
+      if (
+        !this.currentEvent || !this.currentEvent.event || !this.currentEvent.gear
+      ) return null;
+      return this.currentEvent.event;
    },
  },
  methods: {
@@ -81,7 +81,7 @@
        <span
          v-if="member.items.currentPet"
          class="current-pet"
-          :class="'Pet-' + member.items.currentPet"
+          :class="petClass"
        ></span>
      </template>
    </div>
@@ -121,9 +121,15 @@
  .offset-kangaroo {
    margin-top: 24px;
  }
+
+  .invert {
+    filter: invert(100%);
+  }
 </style>

 <script>
+import some from 'lodash/some';
+import moment from 'moment';
 import { mapState } from '@/libs/store';

 import ClassBadge from '@/components/members/classBadge';
@@ -174,6 +180,7 @@ export default {
  computed: {
    ...mapState({
      flatGear: 'content.gear.flat',
+      currentEventList: 'worldState.data.currentEventList',
    }),
    hasClass () {
      return this.$store.getters['members:hasClass'](this.member);
@@ -233,6 +240,15 @@ export default {

      return null;
    },
+    petClass () {
+      if (some(
+        this.currentEventList,
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'invert',
+      )) {
+        return `Pet-${this.member.items.currentPet} invert`;
+      }
+      return `Pet-${this.member.items.currentPet}`;
+    },
  },
  methods: {
    getGearClass (gearType) {
@@ -114,10 +114,7 @@
 <script>
 import { mapState, mapActions } from '@/libs/store';
 import * as quests from '@/../../common/script/content/quests';
-import {
-  hasCompletedOnboarding,
-  hasActiveOnboarding,
-} from '@/../../common/script/libs/onboarding';
+import { hasCompletedOnboarding } from '@/../../common/script/libs/onboarding';
 import notificationsIcon from '@/assets/svg/notifications.svg';
 import MenuDropdown from '../ui/customMenuDropdown';
 import MessageCount from './messageCount';
@@ -300,7 +297,7 @@ export default {
      return this.$store.getters['members:hasClass'](this.user);
    },
    showOnboardingGuide () {
-      return hasActiveOnboarding(this.user) && !hasCompletedOnboarding(this.user);
+      return !hasCompletedOnboarding(this.user);
    },
  },
  mounted () {
@@ -103,9 +103,15 @@
      transform: scale(1.2);
    }
  }
+
+  .invert {
+    filter: invert(100%);
+  }
 </style>

 <script>
+import some from 'lodash/some';
+import moment from 'moment';
 import { v4 as uuid } from 'uuid';
 import { mapState } from '@/libs/store';
 import {
@@ -141,6 +147,7 @@ export default {
  computed: {
    ...mapState({
      userItems: 'user.data.items',
+      currentEventList: 'worldState.data.currentEventList',
    }),
    potionClass () {
      return `Pet_HatchingPotion_${this.item.potionKey}`;
@@ -160,6 +167,13 @@ export default {
      return isAllowedToFeed(this.item, this.userItems);
    },
    getPetItemClass () {
+      if (this.isOwned() && some(
+        this.currentEventList,
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'invert',
+      )) {
+        return `Pet Pet-${this.item.key} ${this.item.eggKey} invert`;
+      }
+
      if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {
        return `Pet Pet-${this.item.key} ${this.item.eggKey}`;
      }
@@ -115,6 +115,7 @@ import { toNextLevel } from '@/../../common/script/statHelpers';
 import { shouldDo } from '@/../../common/script/cron';
 import { onOnboardingComplete } from '@/../../common/script/libs/onboarding';
 import { mapState } from '@/libs/store';
+import { MAX_LEVEL_HARD_CAP } from '@/../../common/script/constants';
 import notifications from '@/mixins/notifications';
 import guide from '@/mixins/guide';

@@ -386,6 +387,22 @@ const NOTIFICATIONS = {
      achievement: 'redLetterDay',
    },
  },
+  ACHIEVEMENT_LEGENDARY_BESTIARY: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementLegendaryBestiary')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'legendaryBestiary',
+    },
+  },
+  ACHIEVEMENT_SEASONAL_SPECIALIST: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementSeasonalSpecialist')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'seasonalSpecialist',
+    },
+  },
 };

 export default {
@@ -448,7 +465,7 @@ export default {
      'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA', 'ACHIEVEMENT_BARE_NECESSITIES',
      'ACHIEVEMENT_FRESHWATER_FRIENDS', 'ACHIEVEMENT_GOOD_AS_GOLD', 'ACHIEVEMENT_ALL_THAT_GLITTERS',
      'ACHIEVEMENT_BONE_COLLECTOR', 'ACHIEVEMENT_SKELETON_CREW', 'ACHIEVEMENT_SEEING_RED',
-      'ACHIEVEMENT_RED_LETTER_DAY',
+      'ACHIEVEMENT_RED_LETTER_DAY', 'ACHIEVEMENT_LEGENDARY_BESTIARY', 'ACHIEVEMENT_SEASONAL_SPECIALIST',
    ].forEach(type => {
      handledNotifications[type] = true;
    });
@@ -643,7 +660,7 @@ export default {
        const lvlUps = afterLvl - beforeLvl;
        let exp = afterExp - beforeExp;

-        if (lvlUps > 0) {
+        if (lvlUps > 0 || afterLvl >= MAX_LEVEL_HARD_CAP) {
          let level = Math.trunc(beforeLvl);
          exp += toNextLevel(level);

@@ -869,6 +886,8 @@ export default {
          case 'ACHIEVEMENT_SKELETON_CREW':
          case 'ACHIEVEMENT_SEEING_RED':
          case 'ACHIEVEMENT_RED_LETTER_DAY':
+          case 'ACHIEVEMENT_LEGENDARY_BESTIARY':
+          case 'ACHIEVEMENT_SEASONAL_SPECIALIST':
          case 'GENERIC_ACHIEVEMENT':
            this.showNotificationWithModal(notification);
            break;
@@ -114,6 +114,7 @@

 <script>
 import clone from 'lodash/clone';
+import { MAX_LEVEL_HARD_CAP } from '@/../../common/script/constants';
 import { mapState } from '@/libs/store';

 export default {
@@ -151,6 +152,10 @@ export default {
        return;
      }

+      if (this.restoreValues.stats.lvl > MAX_LEVEL_HARD_CAP) {
+        this.restoreValues.stats.lvl = MAX_LEVEL_HARD_CAP;
+      }
+
      const userChangedLevel = this.restoreValues.stats.lvl !== this.user.stats.lvl;
      const userDidNotChangeExp = this.restoreValues.stats.exp === this.user.stats.exp;
      if (userChangedLevel && userDidNotChangeExp) this.restoreValues.stats.exp = 0;
@@ -161,16 +161,10 @@
        </button>
      </div>
    </div>
-    <div
+    <countdown-banner
      v-if="item.event && item.owned == null"
-      class="limitedTime"
-    >
-      <span
-        class="svg-icon inline icon-16 clock-icon"
-        v-html="icons.clock"
-      ></span>
-      <span class="limitedString">{{ limitedString }}</span>
-    </div>
+      :endDate = "endDate"
+    />
    <div
      v-if="item.key === 'rebirth_orb' && item.value > 0 && user.stats.lvl >= 100"
      class="free-rebirth d-flex align-items-center"
@@ -324,27 +318,6 @@
      opacity: 0.55;
    }

-    .limitedTime {
-      height: 32px;
-      background-color: $purple-300;
-      width: calc(100% + 30px);
-      margin: 0 -15px; // the modal content has its own padding
-
-      font-size: 12px;
-      line-height: 1.33;
-      text-align: center;
-      color: $white;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .limitedString {
-        height: 16px;
-        margin-left: 8px;
-      }
-    }
-
    .attributesGrid {
      margin-top: 8px;
      border-radius: 2px;
@@ -399,6 +372,7 @@ import svgWhiteClock from '@/assets/svg/clock-white.svg';

 import BalanceInfo from './balanceInfo.vue';
 import PinBadge from '@/components/ui/pinBadge';
+import CountdownBanner from './countdownBanner';
 import currencyMixin from './_currencyMixin';
 import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
@@ -432,6 +406,7 @@ export default {
    Item,
    Avatar,
    PinBadge,
+    CountdownBanner,
  },
  mixins: [buyMixin, currencyMixin, notifications, numberInvalid, spellsMixin],
  props: {
@@ -462,6 +437,7 @@ export default {

      selectedAmountToBuy: 1,
      isPinned: false,
+      endDate: seasonalShopConfig.dateRange.end,
    };
  },
  computed: {
@@ -494,9 +470,6 @@ export default {
      }
      return this.item.notes;
    },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
    gemsLeft () {
      if (!this.user.purchased.plan) return 0;
      return planGemLimits.convCap
@@ -0,0 +1,105 @@
+<template>
+  <div
+    class="limitedTime"
+    :class="availabilityClass"
+  >
+    <span
+      class="svg-icon inline icon-16"
+      v-html="availabilityClass === 'expired' ? icons.clockWhite : icons.clock"
+    ></span>
+    <span class="limitedString"> {{ limitedString }} </span>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
+
+  .limitedTime {
+    height: 32px;
+    width: calc(100% + 30px);
+    margin: 0 -15px; // the modal content has its own padding
+
+    font-size: 12px;
+    line-height: 1.33;
+    text-align: center;
+    color: $white;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .limitedString {
+      height: 16px;
+      margin-left: 8px;
+    }
+  }
+
+  .available {
+    background-color: $purple-300;
+  }
+  .expired {
+    background-color: $gray-200;
+  }
+</style>
+
+<script>
+import moment from 'moment';
+import svgClock from '@/assets/svg/clock.svg';
+import clockWhite from '@/assets/svg/clock-white.svg';
+
+export default {
+  props: {
+    endDate: {
+      type: Object, // moment
+    },
+  },
+  data () {
+    return {
+      icons: Object.freeze({
+        clock: svgClock,
+        clockWhite,
+      }),
+      timer: '',
+      limitedString: '',
+      availabilityClass: 'available',
+    };
+  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 1000);
+  },
+  methods: {
+    countdownString () {
+      const diffDuration = moment.duration(moment(this.endDate).diff(moment()));
+
+      if (moment(this.endDate).isBefore()) {
+        this.limitedString = this.$t('noLongerAvailable');
+        this.availabilityClass = 'expired';
+        this.cancelAutoUpdate();
+      } else if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else if (diffDuration.asMinutes() > 2) {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
+  },
+};
+</script>
@@ -48,6 +48,12 @@ export default {
  },
  mixins: [pinUtils],
  props: ['hideLocked', 'hidePinned', 'searchBy', 'sortBy', 'category'],
+  data () {
+    return {
+      timer: '',
+      limitedString: '',
+    };
+  },
  computed: {
    ...mapState({
      content: 'content',
@@ -60,9 +66,6 @@ export default {
      return planGemLimits.convCap
        + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
    },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
    sortedMarketItems () {
      let result = _map(this.category.items, e => ({
        ...e,
@@ -103,10 +106,43 @@ export default {
      return result;
    },
  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 1000);
+  },
  methods: {
    itemSelected (item) {
      this.$root.$emit('buyModal::showItem', item);
    },
+    countdownString () {
+      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
+
+      if (diffDuration.asSeconds() <= 0) {
+        this.limitedString = this.$t('noLongerAvailable');
+      } else if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else if (diffDuration.asMinutes() > 2) {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
  },
 };
 </script>
@@ -84,16 +84,10 @@
    >
      <questDialogDrops :item="item" />
    </div>
-    <div
+    <countdown-banner
      v-if="item.event"
-      class="limitedTime"
-    >
-      <span
-        class="svg-icon inline icon-16 clock-icon"
-        v-html="icons.clock"
-      ></span>
-      <span class="limitedString">{{ limitedString }}</span>
-    </div>
+      :endDate="endDate"
+    />
    <div
      slot="modal-footer"
      class="clearfix"
@@ -208,27 +202,6 @@
      display: block;
    }

-    .limitedTime {
-      height: 32px;
-      background-color: $purple-300;
-      width: calc(100% + 30px);
-      margin: 0 -15px; // the modal content has its own padding
-
-      font-size: 12px;
-      line-height: 1.33;
-      text-align: center;
-      color: $white;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .limitedString {
-        height: 16px;
-        margin-left: 8px;
-      }
-    }
-
    .notEnough {
      pointer-events: none;
      opacity: 0.55;
@@ -268,7 +241,6 @@
 </style>

 <script>
-import moment from 'moment';
 import { mapState } from '@/libs/store';
 import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';

@@ -285,6 +257,7 @@ import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
 import numberInvalid from '@/mixins/numberInvalid';
 import PinBadge from '@/components/ui/pinBadge';
+import CountdownBanner from '../countdownBanner';

 import questDialogDrops from './questDialogDrops';
 import questDialogContent from './questDialogContent';
@@ -295,6 +268,7 @@ export default {
    PinBadge,
    questDialogDrops,
    questDialogContent,
+    CountdownBanner,
  },
  mixins: [buyMixin, currencyMixin, notifications, numberInvalid],
  props: {
@@ -321,6 +295,7 @@ export default {

      isPinned: false,
      selectedAmountToBuy: 1,
+      endDate: seasonalShopConfig.dateRange.end,
    };
  },
  computed: {
@@ -344,9 +319,6 @@ export default {
      if (this.priceType === 'hourglasses') return this.icons.hourglass;
      return this.icons.gem;
    },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
  },
  watch: {
    item: function itemChanged () {
@@ -36,7 +36,7 @@
        </dd>
      </div>
    </div>
-    <div v-if="quest.event && popoverVersion">
+    <div v-if="quest.event">
      {{ limitedString }}
    </div>
  </div>
@@ -131,10 +131,6 @@ export default {
    quest: {
      type: Object,
    },
-    popoverVersion: {
-      type: Boolean,
-      default: false,
-    },
  },
  data () {
    return {
@@ -143,6 +139,8 @@ export default {
        starHalf: svgStarHalf,
        starEmpty: svgStarEmpty,
      }),
+      timer: '',
+      limitedString: '',
    };
  },
  computed: {
@@ -153,9 +151,10 @@ export default {

      return 1;
    },
-    limitedString () {
-      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
+  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 1000);
  },
  methods: {
    stars () {
@@ -182,6 +181,35 @@ export default {
      }
      return collect.text;
    },
+    countdownString () {
+      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
+
+      if (diffDuration.asSeconds() <= 0) {
+        this.limitedString = this.$t('noLongerAvailable');
+      } else if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else if (diffDuration.asMinutes() > 2) {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
  },
 };
 </script>
@@ -107,7 +107,7 @@
          </div>
        </div>
        <div
-          v-if="item.event"
+          v-if="item.event && item.purchaseType !== 'quests'"
          :class="item.purchaseType === 'gear' ? 'mt-4' : 'mt-2'"
        >
          {{ limitedString }}
@@ -291,16 +291,18 @@ export default {
    },
  },
  data () {
-    return Object.freeze({
+    return {
      itemId: uuid(),
-      icons: {
+      icons: Object.freeze({
        gems: svgGem,
        gold: svgGold,
        lock: svgLock,
        hourglasses: svgHourglasses,
        clock: svgClock,
-      },
-    });
+      }),
+      timer: '',
+      limitedString: '',
+    };
  },
  computed: {
    showNotes () {
@@ -314,10 +316,10 @@ export default {
      }
      return 'gold';
    },
-    limitedString () {
-      return this.item.owned === false ? ''
-        : this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
-    },
+  },
+  mounted () {
+    this.countdownString();
+    this.timer = setInterval(this.countdownString, 1000);
  },
  methods: {
    click () {
@@ -338,6 +340,35 @@ export default {
        locked: this.item.locked,
      };
    },
+    countdownString () {
+      const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
+
+      if (diffDuration.asSeconds() <= 0) {
+        this.limitedString = this.$t('noLongerAvailable');
+      } else if (diffDuration.days() > 0) {
+        this.limitedString = this.$t('limitedAvailabilityDays', {
+          days: diffDuration.days(),
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else if (diffDuration.asMinutes() > 2) {
+        this.limitedString = this.$t('limitedAvailabilityHours', {
+          hours: diffDuration.hours(),
+          minutes: diffDuration.minutes(),
+        });
+      } else {
+        this.limitedString = this.$t('limitedAvailabilityMinutes', {
+          minutes: diffDuration.minutes(),
+          seconds: diffDuration.seconds(),
+        });
+      }
+    },
+    cancelAutoUpdate () {
+      clearInterval(this.timer);
+    },
+  },
+  beforeDestroy () {
+    this.cancelAutoUpdate();
  },
 };
 </script>
@@ -7,52 +7,52 @@
    "faqQuestion1": "Kako da namjestim svoje zadatke?",
    "iosFaqAnswer1": "Dobre navike (one sa +) zadaci su koje možete raditi mnogo puta dnevno, poput jedenja povrća. Loše navike (one koje imaju -) zadaci su koje trebate izbjegavati, poput grickanja noktiju. Navike sa + i - imaju dobar i loš izbor, poput korištenja stepenica u odnosu na lift. Dobre navike daju iskustvo i zlatnike. Loše navike oduzimaju zdravlje.\n\nDnevni zadaci su zadaci koje morate obavljati svakodnevno, poput pranja zubi ili provjere e-pošte. Dnevne zadatke možete prilagoditi dodirom da biste uredili. Ako preskočite rok za dnevni zadatak koji treba dospjeti, vaš će se avatar oštetiti preko noći. Pazite da ne dodate previše dnevnih listova odjednom!\n\nZa-uraditi su vaša lista obaveza. Dovršavanjem obaveza dobijate zlatnike i iskustvo. Nikada ne gubite zdravlje zbog za-uraditi obaveza. Moguće je dodati i krajnji datum kroz uređivanje na dodir.",
    "androidFaqAnswer1": "Dobre navike (one sa +) zadaci su koje možete raditi mnogo puta dnevno, poput jedenja povrća. Loše navike (one koje imaju -) zadaci su koje trebate izbjegavati, poput grickanja noktiju. Navike sa + i - imaju dobar i loš izbor, poput korištenja stepenica u odnosu na lift. Dobre navike daju iskustvo i zlatnike. Loše navike oduzimaju zdravlje.\n\nDnevni zadaci su zadaci koje morate obavljati svakodnevno, poput pranja zubi ili provjere e-pošte. Dnevne zadatke možete prilagoditi dodirom da biste uredili. Ako preskočite rok za dnevni zadatak koji treba dospjeti, vaš će se avatar oštetiti preko noći. Pazite da ne dodate previše dnevnih listova odjednom!\n\nZa-uraditi su vaša lista obaveza. Dovršavanjem obaveza dobijate zlatnike i iskustvo. Nikada ne gubite zdravlje zbog za-uraditi obaveza. Moguće je dodati i krajnji datum kroz uređivanje na dodir.",
-    "webFaqAnswer1": "* Good Habits (the ones with a :heavy_plus_sign:) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a :heavy_minus_sign:) are tasks that you should avoid, like biting nails. Habits with a :heavy_plus_sign: and a :heavy_minus_sign: have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n* Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n* To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.",
-    "faqQuestion2": "What are some sample tasks?",
-    "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
-    "androidFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
-    "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
-    "faqQuestion3": "Why do my tasks change color?",
-    "iosFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it's a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.",
-    "androidFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it's a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.",
-    "webFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it’s a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.",
-    "faqQuestion4": "Why did my avatar lose health, and how do I regain it?",
-    "iosFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.",
-    "androidFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards tab on the Tasks page. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.",
-    "webFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you click a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your party and one of your party mates did not complete all their Dailies, the Boss will attack you. The main way to heal is to gain a level, which restores all your Health. You can also buy a Health Potion with Gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. Other Healers can heal you as well if you are in a Party with them. Learn more by clicking \"Party\" in the navigation bar.",
-    "faqQuestion5": "How do I play Habitica with my friends?",
-    "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to Menu > Party and click \"Create New Party\" if you don't already have a Party. Then tap on the Members list, and tap Invite in the upper right-hand corner to invite your friends by entering their User ID (a string of numbers and letters that they can find under Settings > Account Details on the app, and Settings > API on the website). On the website, you can also invite friends via email, which we will add to the app in a future update.\n\nOn the website, you and your friends can also join Guilds, which are public chat rooms. Guilds will be added to the app in a future update!",
-    "androidFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to the [website](https://habitica.com/) to create one if you don't already have a Party. You can also join guilds together (Social > Guilds). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many guilds as you'd like, but only one party.\n\n For more detailed info, check out the wiki pages on [Parties](http://habitica.wikia.com/wiki/Party) and [Guilds](http://habitica.wikia.com/wiki/Guilds).",
-    "webFaqAnswer5": "The best way is to invite them to a Party with you by clicking \"Party\" in the navigation bar! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join Guilds together (click on \"Guilds\" in the navigation bar). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many Guilds as you'd like, but only one Party. For more detailed info, check out the wiki pages on [Parties](http://habitica.wikia.com/wiki/Party) and [Guilds](http://habitica.wikia.com/wiki/Guilds).",
-    "faqQuestion6": "How do I get a Pet or Mount?",
-    "iosFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Menu > Items.\n\n To hatch a Pet, you'll need an egg and a hatching potion. Tap on the egg to determine the species you want to hatch, and select \"Hatch Egg.\" Then choose a hatching potion to determine its color! Go to Menu > Pets to equip your new Pet to your avatar by clicking on it. \n\n You can also grow your Pets into Mounts by feeding them under Menu > Pets. Tap on a Pet, and then select \"Feed Pet\"! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Menu > Mounts and tap on it to equip it to your avatar.\n\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
-    "androidFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Menu > Items.\n\n To hatch a Pet, you'll need an egg and a hatching potion. Tap on the egg to determine the species you want to hatch, and select \"Hatch with potion.\" Then choose a hatching potion to determine its color! To equip your new Pet, go to Menu > Stable > Pets, select a species, click on the desired Pet, and select \"Use\"(Your avatar doesn't update to reflect the change). \n\n You can also grow your Pets into Mounts by feeding them under Menu > Stable [ > Pets ]. Tap on a Pet, and then select \"Feed\"! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). To equip your Mount, go to Menu > Stable > Mounts, select a species, click on the desired Mount, and select \"Use\"(Your avatar doesn't update to reflect the change).\n\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
-    "webFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored under Inventory > Items. To hatch a Pet, you'll need an egg and a hatching potion. Once you have both an egg and a potion, go to Inventory > Stable to hatch your pet by clicking on its image. Once you've hatched a pet, you can equip it by clicking on it. You can also grow your Pets into Mounts by feeding them under Inventory > Stable. Drag a piece of food from the action bar at the bottom of the screen and drop it on a pet to feed it! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). Once you have a Mount, click on it to equip it to your avatar. You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
-    "faqQuestion7": "How do I become a Warrior, Mage, Rogue, or Healer?",
-    "iosFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Decide Later” and choose later under Menu > Choose Class.",
-    "androidFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Opt Out” and choose later under Menu > Choose Class.",
-    "webFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most Gold and find the most item drops, and they can help their party do the same. Finally, Healers can heal themselves and their party members. If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click \"Opt Out\" and re-enable it later under Settings.",
-    "faqQuestion8": "What is the blue Stat bar that appears in the Header after level 10?",
-    "iosFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Use Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-    "androidFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-    "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-    "faqQuestion9": "How do I fight monsters and go on Quests?",
-    "iosFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
-    "androidFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
-    "webFaqAnswer9": "First, you need to join or start a Party by clicking \"Party\" in the navigation bar. Although you can battle monsters alone, we recommend playing in a group, because this will make quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating! Next, you need a Quest Scroll, which are stored under Inventory > Quests. There are four ways to get a scroll:\n * When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n * At level 15, you get a Quest-line, i.e., three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively.\n * You can buy Quests from the Quests Shop (Shops > Quests) for Gold and Gems.\n * When you check in to Habitica a certain number of times, you'll be rewarded with Quest Scrolls. You earn a Scroll during your 1st, 7th, 22nd, and 40th check-ins.\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading may be required to see the Boss's Health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
-    "faqQuestion10": "What are Gems, and how do I get them?",
-    "iosFaqAnswer10": "Gems are purchased with real money by tapping on the Gem icon in the header. When people buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Social > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
-    "androidFaqAnswer10": "Gems are purchased with real money by tapping on the Gem icon in the header. When people buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Social > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
-    "webFaqAnswer10": "Gems are purchased with real money, although [subscribers](https://habitica.com/user/settings/subscription) can purchase them with Gold. When people subscribe or buy Gems, they are helping us to keep the site running. We're very grateful for their support! In addition to buying Gems directly or becoming a subscriber, there are two other ways players can gain Gems:\n* Win a Challenge that has been set up by another player. Go to Challenges > Discover Challenges to join some.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica). Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the site without them!",
-    "faqQuestion11": "How do I report a bug or request a feature?",
-    "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > About > Report a Bug and Menu > About > Send Feedback! We'll do everything we can to assist you.",
-    "androidFaqAnswer11": "You can report a bug, request a feature, or send feedback under About > Report a Bug and About > Send us Feedback! We'll do everything we can to assist you.",
-    "webFaqAnswer11": "To report a bug, go to [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and read the points above the chat box. If you're unable to log in to Habitica, send your login details (not your password!) to [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Don't worry, we'll get you fixed up soon! Feature requests are collected on Trello. Go to [Help > Request a Feature](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) and follow the instructions. Ta-da!",
-    "faqQuestion12": "How do I battle a World Boss?",
-    "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
-    "androidFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
-    "webFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual. You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party. A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change. You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
-    "iosFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
-    "androidFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
-    "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help."
+    "webFaqAnswer1": "* Dobre navike (one sa :heavy_plus_sign:) su zadaci koje možete raditi više puta dnevno, poput jedenja povrća. Loše navike (one sa :heavy_minus_sign:) zadaci su kojih biste trebali izbjegavati, poput grickanja noktiju. Navike sa :heavy_plus_sign: i :heavy_minus_sign: imaju dobar i loš izbor, poput korištenja stepenica umjesto lifta. Nagrada za dobre navike su iskustvo i zlatnici. Loše navike oduzimaju zdravlje.\n* Dnevni zadaci su zadaci koje morate obavljati svakodnevno, poput pranja zubi ili provjere e-pošte. Zadatak možete prilagoditi klikom na olovku da biste je uredili. Ako preskočite rok za završetak, vaš će se avatar oštetiti preko noći. Pazite da ne dodate previše dnevnih listova odjednom!\n* Za-uraditi su vaša lista obaveza. Dovršavanjem za-uraditi dobijate zlatnike i iskustvo. Nikada ne gubite zdravlje zbog za-uraditi. Možete ih uređivati klikom na ikonu olovke za uređivanje.",
+    "faqQuestion2": "Koji su neki primjeri zadataka?",
+    "iosFaqAnswer2": "Wiki ima četiri liste primjera zadataka koje treba koristiti kao inspiraciju:\n<br><br>\n * [Primjeri navika](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Primjeri dnevnih zadataka](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Primjeri za-uraditi](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Primjeri prilagođenih nagrada](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
+    "androidFaqAnswer2": "Wiki ima četiri liste primjera zadataka koje treba koristiti kao inspiraciju:\n<br><br>\n * [Primjeri navika](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Primjeri dnevnik zadataka](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Primjeri za-uraditi](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Primjeri prilagođenih nagrada](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
+    "webFaqAnswer2": "Wiki ima četiri liste primjera zadataka koje treba koristiti kao inspiraciju:\n * [Primjeri navika](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Primjeri dnevnih zadataka](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Primjeri za-uraditi](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Primjeri prilagođenih nagrada](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
+    "faqQuestion3": "Zašto moji zadaci mijenjaju boju?",
+    "iosFaqAnswer3": "Vaši zadaci mijenjaju boju na osnovu toga koliko ih trenutno izvršavate! Svaki novi zadatak započinje kao neutralno žuto. Češće izvodite dnevne zadatke ili pozitivne navike i oni se kreću prema plavoj boji. Propuštajući dnevni zadatak ili se prepuđtajući se lošoj navici zadatak će se kretati ka crvenoj boji. Što je zadatak crveniji, to će vam više nagrada dati, ali ako je to svakodnevna ili loša navika, to će vam više naštetiti! Ovo vas pomaže motivisati da dovršite zadatke koji vam stvaraju probleme.",
+    "androidFaqAnswer3": "Vaši zadaci mijenjaju boju na osnovu toga koliko ih trenutno izvršavate! Svaki novi zadatak započinje kao neutralno žuto. Češće izvođenje dnevnih zadataka ili pozitivneih navika zadatke pomijera prema plavoj boji. Propuštajući dnevni zadatak ili se prepuštajući se lošoj navici zadatak se kreće prema crvenoj boji. Što je zadatak crveniji, to će vam više nagrada dati, ali ako je to svakodnevna ili loša navika, to će vam više naštetiti! Ovo vas pomaže motivisati da dovršite zadatke koji vam stvaraju probleme.",
+    "webFaqAnswer3": "Vaši zadaci mijenjaju boju na osnovu toga koliko ih trenutno izvršavate! Svaki novi zadatak započinje kao neutralno žuto. Češće izvodite dnevne zadatke ili pozitivne navike i oni se kreću prema plavoj boji. Propuštajući dnevni zadatak ili se prepuštajući lošoj navici zadatak se kreće prema crvenoj boji. Što je zadatak crveniji, to će vam više nagrada dati, ali ako je to svakodnevna ili loša navika, to će vam više naštetiti! Ovo vas pomaže motivisati da dovršite zadatke koji vam stvaraju probleme.",
+    "faqQuestion4": "Zašto je moj avatar izgubio zdravlje i kako da ga povratim?",
+    "iosFaqAnswer4": "Postoji nekoliko stvari zbog kojih možete pretrpjeti štetu. Prvo, ako ste ostavili dnevne zadatke nekompletne preko noći i niste ih označili na ekranu koji se pojavio sljedećeg jutra, ti nedovršeni dnevni zadaci će vas oštetiti. Drugo, ako ste imali lošu naviku, to će vas oštetiti. Konačno, ako vodite bitku za šefove sa svojom strankom, a jedan od partijskih drugova nije ispunio sve svoje dnevne zadatke, šef će vas napasti.\n\nGlavni način ozdravljenja je postizanje nivoa koji vam vraća sve zdravlje. Također možete kupiti zdravstveni napitak sa zlatnicima iz kolone Nagrade. Uz to, na nivou 10 ili višem, možete odabrati da postanete iscjelitelj, a zatim ćete naučiti iscjeliteljske vještine. Ako ste u partiji sa iscjeliteljem, oni mogu i vas izliječiti.",
+    "androidFaqAnswer4": "Postoji nekoliko stvari zbog kojih možete pretrpjeti štetu. Prvo, ako ste ostavili dnevne zadatke nekompletne preko noći i niste ih označili na ekranu koji se pojavio sljedećeg jutra, ti nedovršeni dnevni zadaci će vas oštetiti. Drugo, ako ste imali lošu naviku, to će vas oštetiti. Konačno, ako vodite bitku za šefove sa svojom partijom, a jedan od partijskih drugova nije ispunio sve svoje dnevne listove, šef će vas napasti.\n\nGlavni način ozdravljenja je postizanje nivoa koji vam vraća sve zdravlje. Zdravstveni napitak sa zlatnicima možete kupiti i na kartici Nagrade na stranici Zadaci. Uz to, na nivou 10 ili višem, možete odabrati da postanete iscjelitelj, a zatim ćete naučiti iscjeliteljske vještine. Ako ste u partiji sa iscjeliteljem, oni mogu i vas izliječiti.",
+    "webFaqAnswer4": "Postoji nekoliko stvari zbog kojih možete pretrpjeti štetu. Prvo, ako ste ostavili dnevne zadatke nekompletne preko noći i niste ih označili na ekranu koji se pojavio sljedećeg jutra, ti nedovršeni dnevni zadaci će vas oštetiti. Drugo, ako ste imali lošu naviku, to će vas oštetiti. Konačno, ako vodite bitku za šefove sa svojom partijom, a jedan od partijskih drugova nije ispunio sve svoje dnevne listove, šef će vas napasti. Glavni način izlječenja je postizanje nivoa koji vam vraća sve zdravlje. Također možete kupiti Zdravstveni napitak sa zlatnicima iz kolone Nagrade. Uz to, na nivou 10 ili višem, možete odabrati da postanete iscjelitelj, a zatim ćete naučiti iscjeliteljske vještine. I drugi iscjelitelji mogu vas izliječiti ako ste s njima u partiji. Saznajte više klikom na \"Partija\" na navigacijskoj traci.",
+    "faqQuestion5": "Kako da igram Habiticu sa svojim prijateljima?",
+    "iosFaqAnswer5": "Najbolji način je pozvati ih u partiju s vama! Partije mogu imati zadatke, boriti se protiv čudovišta i bacati vještine kako bi podržavali jedni druge.\n\nAko želite pokrenuti vlastitu Partiju, idite na Izornik > [Partija] (https://habitica.com/party) i dodirnite \"Napravi novu partiu\". Zatim se pomaknite prema dolje i dodirnite \"Pozovite člana\" da biste pozvali svoje prijatelje unošenjem njihovog @ korisničkog imena. Ako se želite pridružiti tuđoj partiji, samo im dajte svoje @ korisničko ime i oni će vas moći pozvati!\n\nVi i vaši prijatelji također se možete pridružiti esnafima, koji su javne čet sobe koje okupljaju ljude na osnovu zajedničkih interesa! Puno je korisnih i zabavnih zajednica, svakako ih provjerite.\n\nAko se osjećate konkurentnije, vi i vaši prijatelji možete stvoriti izazove ili se pridružiti njima kako biste preuzeli niz zadataka. Dostupne su sve vrste izazova koji pokrivaju širok spektar interesa i ciljeva. Neki javni izazovi dodijelit će čak i nagrade u  obliku dragulja ako ste izabrani za pobjednika.",
+    "androidFaqAnswer5": "Najbolji način je pozvati ih u partiju s vama! Partije mogu ići u zadatke, boriti se protiv čudovišta i bacati vještine kako bi podržavali jedni druge. Idite na [website] (https://habitica.com/) da biste je napravilli ako je već nemate. Također se možete pridružiti esnafima (Zajednica > Esnafi). Esnafi su čet sobe koje se fokusiraju na zajednički interes ili traženje zajedničkog cilja, a mogu biti javne ili privatne. Možete se učlaniti u koliko god želite esnafa, ali samo u jednu partiju.\n\nZa detaljnije informacije pogledajte wiki stranice na [Partija] (http://habitica.fandom.com/wiki/Party) i [Esnafi] (http://habitica.fandom.com/wiki/Guilds).",
+    "webFaqAnswer5": "Najbolji način je pozvati ih u partiju s vama klikom na \"Partija\" na navigacijskoj traci! Partije mogu ići u zadatke, boriti se protiv čudovišta i bacati vještine kako bi podržavali jedni druge. Također se možete udružiti u esnafe (kliknite \"Esnafi\" na navigacijskoj traci). Esnafi su čet sobe koje se fokusiraju na zajednički interes ili traženje zajedničkog cilja, a mogu biti javni ili privatni. Možete se učlaniti u koliko god želite esnafa, ali samo u jednu stranku. Za detaljnije informacije pogledajte wiki stranice na [Partija] (http://habitica.wikia.com/wiki/Party) i [Esnafi] (http://habitica.wikia.com/wiki/Guilds).",
+    "faqQuestion6": "Kako mogu dobiti ljubimca ili jahalicu?",
+    "iosFaqAnswer6": "Svaki put kad izvršite zadatak, imat ćete slučajnu priliku dobiti jaje, napitak za izlijeganje ili parče hrane za ljubimce. Bit će pohranjeni u Izbornik > Artikli.\n\nDa biste izlegli ljubimca, trebat će vam jaje i napitak za izlijeganje. Dodirnite jaje da odredite vrstu koju želite izleći i odaberite \"Izlijegnite jaje\". Zatim odaberite napitak za izlijeganje kako biste odredili njegovu boju! Idite na Izbornik > Ljubimci i kliknite svog novog ljubimca da biste ga dodali na svoj Avatar.\n\nTakođer možete uzgajati svoje ljubimce da postanu jahalice tako što ćete ih hraniti u Izbornik > Ljubimci. Dodirnite kućnog ljubimca i odaberite \"Nahrani ljubimca\"! Morat ćete hraniti kućnog ljubimca mnogo puta prije nego što postane jahalica, ali ako uspijete otkriti njegovu omiljenu hranu, on će brže rasti. Koristite pokušaje i greške ili [pogledajte trikove za hranjene] (http://habitica.fandom.com/wiki/Food#Food_Preferences). Kada imate jahalicu, idite na Izbornik > Jahalice i dodirnite ga da biste ga dodali na svoj Avatar.\n\nJaja za ljubimce možete dobiti i ispunjavanjem određenih zadataka tokom potraga za ljubimcima (da biste saznali više o potragama, pogledajte [Kako se borim protiv čudovišta i idem u zadatke] (https://habitica.com/static/faq/9)).",
+    "androidFaqAnswer6": "Svaki put kad izvršite zadatak, imat ćete slučajnu priliku dobiti jaje, napitak za izlijeganje ili parče hrane za kućne ljubimce. Bit će pohranjeni u Izbornik > Artikli.\n\nDa biste izlegli ljubimca, trebat će vam jaje i napitak za izlijeganje. Dodirnite jaje da odredite vrstu koju želite izleći i odaberite \"Izlijeganje s napitkom\". Zatim odaberite napitak za izlijeganje kako biste odredili njegovu boju! Da biste opremili svog novog ljubimca, idite na Izbornik > Štala> Ljubimci, odaberite vrstu, kliknite željenog kućnog ljubimca i odaberite \"Koristi\" (Vaš Avatar se ne ažurira da reflektuje promjenu).\n\nTakođer možete uzgajati svoje ljubimce da postanu jahalice tako što ćete ih hraniti u Izbornik > Štala [> Ljubimci]. Dodirnite ljubimca, a zatim odaberite \"Nahrani\"! Morat ćete hraniti kućnog ljubimca mnogo puta prije nego što postane jahalica, ali ako uspijete otkriti njegovu omiljenu hranu, on će brže rasti. Koristite pokušaje i greške ili [pogledajte trikove za hranjenje] (http://habitica.fandom.com/wiki/Food#Food_Preferences). Da biste opremili svoju jahalicu, idite na Izbornik > Štala > Jahalice, odaberite vrstu, kliknite željenu jahallicu i odaberite \"Koristi\" (Vaš Avatar se ne ažurira da reflektuje promjenu).\n\nJaja možete dobiti i ispunjavanjem određenih zadataka u potragama za ljubimcima. (Pogledajte dolje da biste saznali više o misijama.)",
+    "webFaqAnswer6": "Svaki put kada izvršite zadatak, imat ćete slučajnu priliku dobiti jaje, napitak za izlijeganje ili parče hrane za ljubimce. Bit će pohranjeni u odjeljku Inventar > Predmeti. Da biste izlegli ljubimca, trebat će vam jaje i napitak za izlijeganje. Nakon što dobijete i jaje i napitak za izlijeganje, idite na Inventar > Štala i kliknite sliku da biste izlegli svog ljubimca. Nakon što izležete ljubimca, možete ga opremiti klikom na njega. Također možete uzgajati svoje ljubimce da postanu jahalice tako što ćete ih hraniti pod Inventar > Štala. Povucite parče hrane za ljubimce s radne trake na dnu zaslona i spustite ga na ljubimca da ga nahranite! Morat ćete hraniti ljubimca mnogo puta prije nego što postane jahalica, ali ako uspijete otkriti njegovu omiljenu hranu, on će brže rasti. Koristite pokušaje i greške ili [pogledajte trikove hranjena] (http://habitica.fandom.com/wiki/Food#Food_Preferences). Kada imate jahalicu, kliknite na njeu da je opremite za svoj Avatar. Jaja možete dobiti i ispunjavanjem određenih zadataka u potragama za ljubimcima. (Pogledajte dolje da biste saznali više o misijama.)",
+    "faqQuestion7": "Kako mogu postati ratnik, mudrac, baraba ili iscjelitelj?",
+    "iosFaqAnswer7": "Na nivou 10 možete odabrati da postanete ratnik, mudrac, baraba ili iscjelitelj. (Svi igrači počinju kao ratnici.) Svaki razred ima različite mogućnosti opreme, različite vještine koje mogu steći nakon nivoa 11 i različite prednosti. Ratnici mogu lahko oštetiti šefove, izdržati veću štetu od njihovih zadataka i pomoći da ojačaju svoju partiju. Mudraci također mogu lahko oštetiti šefove, kao i brzo se vratiti u normalu i vratiti mudrost za svoju partiju. Barabe zarađuju najviše zlatnika i pronalaze najviše predmeta, a mogu pomoći svojoj partiji da urade isto. Konačno, iscjelitelji mogu izliječiti sebe i svoje članove partije.\n\nAko ne želite odmah odabrati razred - na primjer, ako još uvijek radite na kupnji sve opreme vašeg trenutnog razreda - možete dodirnuti „Otkaži“ i odabrati kasnije otvaranjem izbornika, tapkajući ikonu Postavke , a zatim dodirnite „Omogući sistem razreda“.",
+    "androidFaqAnswer7": "Na nivou 10, možete odabrati da postanete ratnik, mudrac, baraba ili iscjelitelj. (Svi igrači po počinju kao ratnici.) Svaki razred ima različite opcije opreme, različite vještine koje mogu steći nakon nivoa 11 i različite prednosti. Ratnici mogu lahko oštetiti šefove, izdržati veću štetu od njihovih zadataka i pomoći da njihova partija postane tvrđa. Mudraci također mogu lahko oštetiti šefove, kao i brzo se vratiti u normalu i vratiti mudrost za svoju partiju. Barabe zarađuju najviše zlatnika i pronalaze najviše predmeta, a mogu pomoći svojoj partiji da učini isto. Konačno, iscjelitelji mogu izliječiti sebe i svoje članove partije.\n\nAko ne želite odmah odabrati razred - na primjer, ako još uvijek radite na kupovini sve opreme vašeg trenutnog razreda - možete dodirnuti „Odjavi se“ i odabrati kasnije otvaranjem izbornika, tapkajući ikona postavki, a zatim dodirnite „Omogući sistem razreda“.",
+    "webFaqAnswer7": "Na nivou 10, možete odabrati da postanete ratnik, mudrac, baraba ili iscjelitelj. (Svi igrači počinju kao ratnici.) Svaki razred ima različite opcije opreme, različite vještine koje mogu steći nakon nivoa 11 i različite prednosti. Ratnici mogu lahko oštetiti šefove, izdržati veću štetu od njihovih zadataka i pomoći da njihova partija postane tvrđa. Mudraci također mogu lahko oštetiti šefove, kao i brzo se vratiti u normalu i vratiti mudrost za svoju partiju. Barabe zarade najviše zlatnika i pronađu najviše predmeta, a mogu pomoći svojoj partiji da učini isto. Konačno, iscjelitelji mogu izliječiti sebe i članove svoje partije. Ako ne želite odmah odabrati razred - na primjer, ako još uvijek radite na kupnji sve opreme vašeg trenutnog razreda - možete kliknuti \"Isključi\" i ponovo ga omogućiti kasnije u Postavkama.",
+    "faqQuestion8": "Šta predstavlja plava statusna traka koja se pojavljuje u zaglavlju nakon 10. nivoa?",
+    "iosFaqAnswer8": "Plava traka koja se pojavila kada ste dosegli nivo 10 i odabrali razred je vaša traka mudroti. Kako nastavljate s višim nivoom, otključat ćete posebne vještine koje mudrost koštaju korištenja. Svaki razred ima različite vještine, koje se pojavljuju nakon nivoa 11 u izbornik > Koristi vještine. Za razliku od vaše zdravstvene trake, vaša traka mudrosti se ne resetira kada položite nivo. Umjesto toga, mudrost se stječe kada ispunite dobre navike, dnevne zadatke i za-uraditi, a gubi se kad se prepustite lošim navikama. Također ćete preko noći povratiti malo mudrosti - što više dnevnih zadataka završite, to ćete više dobiti mudrosti.",
+    "androidFaqAnswer8": "Plava traka koja se pojavila kada ste dosegli nivo 10 i odabrali razred je vaša traka mudrosti. Kako nastavljate s povišenjem nivoa, otključat ćete posebne vještine koje mudroat koštaju korištenja. Svaki razred ima različite vještine, koje se pojavljuju nakon nivoa 11 u izbornik > Vještine. Za razliku od vaše zdravstvene trake, vaša traka mudroti se ne resetira kada pređene na novi nivo. Umjesto toga, mudrost se stječe kada ispunite dobre navike, dnevne zadatke i za-uraditi, a gubi se kad se prepustite lošim navikama. Također ćete preko noći povratiti malo mudroti - što više dnevnih zadataka završite, to ćete više dobiti.",
+    "webFaqAnswer8": "Plava traka koja se pojavila kada ste dosegli nivo 10 i odabrali razred je vaša traka mudroti. Kako nastavljate s višim nivoom, otključat ćete posebne vještine koje mudrost koštaju korištenja. Svaki razred ima različite vještine, koje se pojavljuju nakon nivoa 11 na traci akcija na dnu ekrana. Za razliku od vaše trake zdravlja, vaša se traka mudrosti ne resetira kada pređete na viši nivo. Umjesto toga, mudrost se stječe kada ispunite dobre navike, dnevne zadatke i za-uraditi, a gubi se kad se prepuštate lošim navikama. Također ćete preko noći povratiti malo mudrosti - što više dnevnih zadataka završite, to ćete više dobiti.",
+    "faqQuestion9": "Kako se mogu boriti protiv čudovišta i odlaziti u potrage?",
+    "iosFaqAnswer9": "Prvo, morate se pridružiti ili pokrenuti partiju (pogledajte [Kako igrati Habiticu sa svojim prijateljima] (https://habitica.com/static/faq/5)). Iako se protiv čudovišta možete boriti sami, preporučujemo igranje u grupi, jer će ovo znatno olakšati zadatke. Osim toga, imati mog prijatelja koji će vas bodriti dok izvršavate svoje zadatke vrlo je motivirajuće!\n\n Dalje potrebni su vam svici potraga koji se čuvaju u Izbornik > Artikli. Postoje tri načina za dobivanje svitka:\n\n - Na nivou 15 dobivate potrage liniju, poznatu kao tri povezane misije. Više potraga linija otključava se na nivoima 30, 40 i 60, respektivno.\n - Kad pozovete ljude u svoju partiju, bit ćete nagrađeni pomicanjem sa osnovne liste svitka!\n - Misije možete kupiti u prodavnici za potrage za zlatnike i dragulje.\n\nDa biste se borili protiv šefa ili sakupljali predmete za potragu za sakupljanjem, jednostavno normalno izvršite zadatke i tokom noći će se računati da će oštetiti. (Možda će biti potrebno ponovno punjenje povlačenjem zaslona da biste vidjeli kako se šefova ljestvica zdravlja spušta.) Ako se borite protiv šefa i propustili ste bilo koji dnevni zadatak, šef će oštetiti vašu partiju istovremeno kada i vi oštetite šefa.\n\nNakon 11. nivoa mudraci i ratnici stječu vještine koje im omogućavaju da nanesu dodatnu štetu šefu, tako da su ovo izvrsne klase koje možete odabrati na 10. nivou ako želite biti težak napadač.",
+    "androidFaqAnswer9": "Prvo, morate se pridružiti ili osnovati partiju (vidi gore). Iako se protiv čudovišta možete boriti sami, preporučujemo igranje u grupi, jer će to znatno olakšati zadatke. Osim toga, imati mog prijatelja koji će vas bodriti dok izvršavate svoje zadatke vrlo je motivirajuće!\n\nDalje, potrebni su vam svitci potraga koji se čuvaju u Izborik > Artikli. Postoje tri načina za dobivanje svitka:\n\n - Na nivou 15 dobivate liniju zadataka, poznatu kao tri povezane misije. Više potraga linija otključava se na nivoima 30, 40 i 60, respektivno.\n - Kad pozovete ljude u svoju partiju, bit ćete nagrađeni pomicanjem sa osnovne liste svitka!\n - Misije možete kupiti u prodavnici potraga za zlatnike i dragulje.\n\nDa biste se borili protiv šefa ili sakupljali predmete za potragu za sakupljanjem, jednostavno normalno izvršite zadatke i tokom noći će se računati da će oštetiti. (Možda će biti potrebno ponovno punjenje povlačenjem zaslona da biste vidjeli kako se šefova ljestvica zdravlja spušta.) Ako se borite protiv šefa i propustili ste bilo koji dnevni zadatak, šef će oštetiti vašu partiju istovremeno kada i vi oštetite šefa.\n\nNakon 11. nivoa mudraci i ratnici stječu vještine koje im omogućavaju da nanesu dodatnu štetu šefu, tako da su ovo izvrsne klase koje možete odabrati na 10. nivou ako želite biti težak napadač.",
+    "webFaqAnswer9": "Prvo, morate se pridružiti ili pokrenuti stranku klikom na \"Stranka\" na navigacijskoj traci. Iako se protiv čudovišta možete boriti sami, preporučujemo igranje u grupi jer će to znatno olakšati zadatke. Osim toga, imati mog prijatelja koji će vas bodriti dok izvršavate svoje zadatke vrlo je motivirajuće! Dalje, potrebni su vam svitci potraga koji su pohranjeni u odjeljku Inventar > Potrage. Postoje četiri načina za dobivanje svitka:\n * Kad pozovete ljude u svoju partiju, bit ćete nagrađeni pomicanjem sa osnovne liste svitka!\n * Na nivou 15 dobivate liniju zadatka, tj. Tri povezana zadatka. Više potraga linija otključava se na nivoima 30, 40 i 60, respektivno.\n * Misije možete kupiti u prodavnici potraga (trgovina > misije) za zlatnike i dragulje.\n * Kada se prijavite na Habiticu određeni broj puta, bit ćete nagrađeni svitcima iz potraga. Svitak zaradite za vrijeme 1., 7., 22. i 40. prijave.\n Da biste se borili protiv šefa ili sakupljali predmete za potragu za sakupljanjem, jednostavno normalno izvršite zadatke i tokom noći će se računati da će oštetiti. (Možda će biti potrebno ponovno punjenje kako bi se vidjelo kako se šefova ljestvica šefa spušta.) Ako se borite sa šefom i propustili ste bilo koji dnevni zadatak, šef će oštetiti vašu partiju istovremeno kada i vi oštetite šefa. Nakon 11. nivoa mudraci i ratnici stječu vještine koje im omogućavaju da nanesu dodatnu štetu šefu, tako da su ovo izvrsne klase koje možete odabrati na 10. nivou ako želite biti težak napadač.",
+    "faqQuestion10": "Šta su dragulji i kako ih mogu dobiti?",
+    "iosFaqAnswer10": "Dragulji se kupuju stvarnim novcem u Izbornik > Kupovina dragulja. Kada kupujete dragulje, pomažete nam da i dalje održavamo Habiticu. Vrlo smo zahvalni na svakoj podršci!\n\nPored direktne kupovine dragulja, postoje još tri načina na koja igrači mogu dobiti dragulje:\n\n* Osvojite izazov koji je postavio drugi igrač. Idite na Izbornik > Izazovi da biste se pridružili nekim.\n* Pretplatite se i otključajte mogućnost kupovine određenog broja dragulja mjesečno.\n* Dajte svoje vještine projektu Habitica. Pogledajte ovu wiki stranicu za više detalja: [Doprinosi Habitici] (http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\nImajte na umu da predmeti kupljeni putem dragulja ne nude nikakve statusne prednosti, pa igrači i dalje mogu koristiti aplikaciju bez njih!",
+    "androidFaqAnswer10": "Dragulji se kupuju stvarnim novcem u Izbornik > Kupovina dragulja. Kada kupujete dragulje, pomažete nam da i dalje održavamo Habiticu. Vrlo smo zahvalni na svakoj podršci!\n\n Pored direktne kupovine dragulja, postoje još tri načina na koja igrači mogu dobiti dragulje:\n\n * Osvojite izazov koji je postavio drugi igrač. Idite na Izbornik > Izazovi da biste se pridružili nekim.\n * Pretplatite se i otključajte mogućnost kupovine određenog broja dragulja mjesečno.\n * Dajte svoje vještine projektu Habitica. Pogledajte ovu wiki stranicu za više detalja: [Doprinosi Habitici] (http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Imajte na umu da predmeti kupljeni putem dragulja ne nude nikakve statusne prednosti, pa igrači i dalje mogu koristiti aplikaciju bez njih!",
+    "webFaqAnswer10": "Dragulji se kupuju stvarnim novcem, iako ih [pretplatnici] (https://habitica.com/user/settings/subscription) mogu kupiti zlatnicima. Kad se ljudi pretplate ili kupe dragulje, pomažu nam da stranica i dalje radi. Vrlo smo zahvalni na njihovoj podršci! Pored direktne kupovine dragulja ili pretplate, postoje još dva načina na koje igrači mogu dobiti dragulje:\n* Osvojite izazov koji je postavio drugi igrač. Idite na Izazovi > Otkrijte izazove da biste se pridružili nekim.\n* Dajte svoje vještine projektu Habitica. Pogledajte ovu wiki stranicu za više detalja: [Doprinosi Habitici] (http://habitica.fandom.com/wiki/Contributing_to_Habitica). Imajte na umu da predmeti kupljeni putem draguljima ne nude nikakve statusne prednosti, pa igrači i dalje mogu koristiti stranicu bez njih!",
+    "faqQuestion11": "Kako mogu prijaviti grešku, ili zatražiti novu mogućnost?",
+    "iosFaqAnswer11": "Ako mislite da ste naišli na grešku, idite na Izbornik > Podrška > Zatraži pomoć da biste potražili brze ispravke, poznate probleme ili prijavili grešku. Učinit ćemo sve što možemo da vam pomognemo.\n\nDa biste poslali povratne informacije ili zatražili funkciju, možete pristupiti našem obrascu za povratne informacije iz Izbornik > Podrška > Pošalji povratne informacije. Ako imamo bilo kakvih pitanja, obratit ćemo vam se za više informacija!",
+    "androidFaqAnswer11": "Ako mislite da ste naišli na grešku, idite na Izbornik > Pomoć i česta pitanja > Zatražite pomoć da biste potražili brze ispravke, poznate probleme ili nam prijavili grešku. Učinit ćemo sve što možemo da vam pomognemo.\n\nDa biste poslali povratne informacije ili zatražili funkciju, možete pristupiti našem obrascu za povratne informacije iz Izbornik > Pomoć i ČPP > Pošalji povratne informacije. Ako imamo bilo kakvih pitanja, obratit ćemo vam se za više informacija!",
+    "webFaqAnswer11": "Da biste prijavili grešku, idite na [Pomoć> Prijavi grešku] (https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) i pročitajte tačke iznad okvira za čat. Ako se ne možete prijaviti na Habitica, pošaljite svoje podatke za prijavu (a ne lozinku!) Na [<% = techAssistanceEmail%>] (<% = wikiTechAssistanceEmail%>). Ne brinite, uskoro ćemo to srediti! Zahtjevi za nove funkcionalnosti prikupljaju se putem Google obrasca. Idite na [Pomoć > Zatraži značajku] (https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) i slijedite upute. Ta-da!",
+    "faqQuestion12": "Kako se mogu boriti protiv svjetskog šefa?",
+    "iosFaqAnswer12": "Svjetski šefovi su posebna čudovišta koja se pojavljuju u aščinici. Svi aktivni korisnici automatski se bore protiv šefa, a njihovi zadaci i vještine će oštetiti šefa kao i obično.\n\nTakođe možete istovremeno biti u normalnoj potrazi. Vaši zadaci i vještine računat će se i na svjetskog šefa i na potragu za šefom/kolekcijom u vašoj partiji.\n\nSvjetski šef nikada ni na koji način neće povrijediti vas ili vaš račun. Umjesto toga, ima Rage Bar koji se puni kada korisnici preskoče dnevne zadatke. Ako se njegova traka za bijes napuni, napast će jednog od neigrača na sajtu i njihova će se slika promijeniti.\n\nMožete pročitati više o [prošlim svjetskim šefovima] (http://habitica.fandom.com/wiki/World_Bosses) na wikiju.",
+    "androidFaqAnswer12": "Svjetski šefovi su posebna čudovišta koja se pojavljuju u aščinici. Svi aktivni korisnici automatski se bore protiv šefa, a njihovi zadaci i vještine će oštetiti šefa kao i obično.\n\nTakođe možete istovremeno biti u normalnoj potrazi. Vaši zadaci i vještine računat će se i na svjetskog šefa i na potragu za šefom/kolekcijom u vašoj partiji.\n\nSvjetski šef nikada ni na koji način neće povrijediti vas ili vaš račun. Umjesto toga, ima Rage Bar koji se puni kada korisnici preskoče dnevne zadatke. Ako se njegova traka za bijes napuni, napast će jednog od neigrača na sajtu i njihova će se slika promijeniti.\n\nMožete pročitati više o [prošlim svjetskim šefovima] (http://habitica.fandom.com/wiki/World_Bosses) na wikiju.",
+    "webFaqAnswer12": "Svjetski šefovi su posebna čudovišta koja se pojavljuju u aščinici. Svi aktivni korisnici automatski se bore protiv šefa, a njihovi zadaci i vještine će oštetiti šefa kao i obično. Takođe možete istovremeno biti u normalnoj potrazi. Vaši zadaci i vještine računat će se i na svjetskog šefa i na potragu za šefom/kolekcijom u vašoj partiji. Svjetski šef nikada ni na koji način neće povrijediti vas ili vaš račun. Umjesto toga, ima Rage Bar koji se puni kada korisnici preskoče dnevne zadatke. Ako se njegova traka za bijes napuni, napast će jednog od neigrača na sajtu i njihova će se slika promijeniti. Možete pročitati više o [prošlim svjetskim šefovima] (http://habitica.fandom.com/wiki/World_Bosses) na wikiju.",
+    "iosFaqStillNeedHelp": "Ako imate pitanje koje nije navedeno na ovom popisu ili pod [Wiki ČPP](http://habitica.wikia.com/wiki/FAQ), dođi i pitaj u aščinici pod Izbornik > Krčma! Rado ćemo pomoći.",
+    "androidFaqStillNeedHelp": "Ako imate pitanje koje nije navedeno na ovom popisu ili pod [Wiki ČPP](http://habitica.wikia.com/wiki/FAQ), dođi i pitaj u aščinici pod Izbornik > Krčma! Rado ćemo pomoći.",
+    "webFaqStillNeedHelp": "Ako imate pitanje koje nije navedeno na ovom popisu ili pod [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), dođi i pitaj u [Habitica esnafu za pomoć](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Rado ćemo pomoći."
 }
@@ -1,13 +1,13 @@
 {
-    "npc": "NPC",
-    "npcAchievementName": "<%= key %> NPC",
-    "npcAchievementText": "Backed the Kickstarter project at the maximum level!",
-    "welcomeTo": "Welcome to",
-    "welcomeBack": "Welcome back!",
-    "justin": "Justin",
-    "justinIntroMessage1": "Hello there! You must be new here. My name is <strong>Justin</strong>, and I'll be your guide in Habitica.",
-    "justinIntroMessage3": "Great! Now, what are you interested in working on throughout this journey?",
-    "justinIntroMessageUsername": "Before we begin, let’s figure out what to call you. Below you’ll find a display name and username I’ve generated for you. After you’ve picked a display name and username, we’ll get started by creating an avatar!",
+    "npc": "NIL",
+    "npcAchievementName": "<%= key %> NIL",
+    "npcAchievementText": "Podržao/la je Kickstarter projekt maksimalno!",
+    "welcomeTo": "Dobrodošli u",
+    "welcomeBack": "Dobrodošli nazad!",
+    "justin": "Džemal",
+    "justinIntroMessage1": "Zdravo! Sigurno ste novi ovdje. Moje ime je <strong>Džemal</strong> i bit ću vam vodič na Habitici.",
+    "justinIntroMessage3": "Super! Sada, za šta ste zainteresovani da radite tokom ovog putovanja?",
+    "justinIntroMessageUsername": "Prije nego što započnemo, hajde da vidimo kako vas možemo nazvati. Ispod ćete pronaći ime za prikaz i korisničko ime koje sam napravio za vas. Nakon što odaberete ime za prikaz i korisničko ime, započet ćemo sa stvaranjem avatara!",
    "justinIntroMessageAppearance": "So how would you like to look? Don’t worry, you can change this later.",
    "introTour": "Here we are! I've filled out some Tasks for you based on your interests, so you can get started right away. Click a Task to edit or add new Tasks to fit your routine!",
    "prev": "Prev",
@@ -11,7 +11,7 @@
    "veteranWolf": "Vuk veteran",
    "etherealLion": "Eterični lav",
    "magicMounts": "Čarobni napitci jahalica",
-    "questMounts": "Jahalice iz akcija",
+    "questMounts": "Jahalice iz misija",
    "mountsTamed": "Pripitomljene jahalice",
    "noActiveMount": "Nema aktivne jahalice",
    "activeMount": "Aktivna jahalica",
@@ -42,7 +42,7 @@
    "noFoodAvailable": "Nemate hrane za ljubimce.",
    "food": "Hrana za ljubimce i sedla",
    "quickInventory": "Brzi inventar",
-    "haveHatchablePet": "Imate <% = potion %> napitak za izlijeganje i <% = egg %> jaje za izlijeganje ovog ljubimca! <b>Kliknite</b> da biste se izlegli!",
+    "haveHatchablePet": "Imate <%= potion %> napitak za izlijeganje i <%= egg %> jaja za izlijeganje ovog ljubimca! <b>Kliknite</b> da biste se izlegli!",
    "hatchingPotion": "napitak za izlijeganje",
    "magicHatchingPotions": "Magični napitci za izlijeganje",
    "hatchingPotions": "Napitci za izlijeganje",
@@ -50,12 +50,64 @@
    "eggs": "Jaja",
    "egg": "<%= eggType %> jaje",
    "potion": "<%= potionType %> napitak",
-    "gryphatrice": "Gryphatrice",
+    "gryphatrice": "Grifetris",
    "invisibleAether": "Nevidljivi eter",
-    "royalPurpleJackalope": "Kraljevski ljubičasti Jackalope",
-    "hopefulHippogriffMount": "Hopeful Hippogriff",
-    "hopefulHippogriffPet": "Hopeful Hippogriff",
+    "royalPurpleJackalope": "Kraljevska ljubičasta džakalopa",
+    "hopefulHippogriffMount": "Nadajući hipogrif",
+    "hopefulHippogriffPet": "Nadajući hipogrif",
    "magicalBee": "Magična pčela",
    "phoenix": "Feniks",
-    "royalPurpleGryphon": "Kraljevski Ljubičasti Grifon"
+    "royalPurpleGryphon": "Kraljevski Ljubičasti Grifon",
+    "mountNotOwned": "Niste vlasnik ove jahalice.",
+    "petNotOwned": "Niste vlasnik ovog ljubimca.",
+    "hatchedPetHowToUse": "Posjetite [Štalu](<%= stableUrl %>) da nahranite i opremite vašeg novog ljubimca!",
+    "hatchedPetGeneric": "Izlegli ste novog ljubimca!",
+    "hatchedPet": "Izlegli ste novo <%= potion %> <%= egg %>!",
+    "triadBingoAchievement": "Zaslužili ste postignuće \"Trostrugi bingo\" jer ste pronašli sve ljubimce, pripitomili sve jahalice i ponovo pronašli sve ljubimce!",
+    "triadBingoText2": " i oslobođena puna štala ukupno <%= count %> puta",
+    "triadBingoText": "Pronađeno je svih 90 ljubimaca, svih 90 jahalica i PONOVO pronađeno svih 90 ljubimaca (KAKO STE TO RADILI!)",
+    "invalidAmount": "Neispravna količina hrane, mora biti cijeli pozitivan broj",
+    "tooMuchFood": "Pokušavate nahraniti ljubimca s previše hrane, radnja je otkazana",
+    "notEnoughFood": "Nemate dovoljno hrane",
+    "notEnoughPetsMounts": "Niste prikupili dovoljno ljubimaca i jahalica",
+    "notEnoughMounts": "Niste prikupili dovoljno jahalica",
+    "notEnoughPets": "Niste prikupili dovoljno ljubimaca",
+    "clickOnPotionToHatch": "Kliknite napitak za izlijeganje da biste ga iskoristili na <% = eggName%> i izlegnite novog ljubimca!",
+    "hatchDialogText": "Izlijte svoj napitak za izlijeganje <%= potionName %> na jaje <%= eggName %> i ono će se izleći u <%= petName %>.",
+    "clickOnEggToHatch": "Kliknite na jaje da koristite vaš <%= potionName %> napitak za izlijeganje i izlegnite novog ljubimca!",
+    "dragThisPotion": "Povucite <%= potionName %> do jajeta i izlegnite novog ljubimca!",
+    "clickOnPetToFeed": "Kliknite na ljubimca da ga nahranite sa <%= foodName %> i gledajte kako raste!",
+    "dragThisFood": "Povucite <%= foodName %> do ljubimca i gledajte kako raste!",
+    "foodTitle": "Hrana za ljubimce",
+    "hatch": "Izleći!",
+    "sortByHatchable": "Izlegljiv",
+    "sortByColor": "Boja",
+    "standard": "Standard",
+    "filterByWacky": "Otkačeno",
+    "filterByQuest": "Potraga",
+    "filterByMagicPotion": "Čarobni napitak",
+    "filterByStandard": "Standard",
+    "petLikeToEatText": "Ljubimci će rasti bez obzira čime ih hranite, ali oni će rasti brže ako ih hranite onom hranom za ljubimce koja im se najviše sviđa. Eksperimentišite da biste saznali obrazac ili pogledajte odgovore ovdje: <br/> <a href=\"http://habitica.fandom.com/wiki/Food_Preferences\" target=\"_blank\">http://habitica.fandom.com/wiki/Food_Preferences</a>",
+    "petLikeToEat": "Šta moj ljubimac voli jesti?",
+    "welcomeStableText": "Dobrodošli u štalu! Ja sam Matt, majstor zvijeri. Svaki put kad izvršite zadatak, imat ćete slučajnu priliku da dobijete jaje ili napitak za izlijeganje da izlegnete ljubimce. Kada izležete ljubimca, on će se pojaviti ovdje! Kliknite sliku ljubimca da biste ga dodali u svoj avatar. Nahranite ih hranom za ljubimce koju nađete i oni će izrasti u izdržljive jahalice.",
+    "welcomeStable": "Dobrodošli u štalu!",
+    "mountsReleased": "Jahalice oslobođene",
+    "mountsAndPetsReleased": "Jahalice i ljubimci oslobođeni",
+    "petsReleased": "Ljubimci oslobođeni.",
+    "releaseBothSuccess": "Oslobođeni su vaši standardni ljubimci i jahalice!",
+    "releaseBothConfirm": "Jeste li sigurni da želite osloboditi svoje standardne ljubimce i jahalice?",
+    "releaseMountsSuccess": "Oslobođene su vaše standardne jahalice!",
+    "releaseMountsConfirm": "Jeste li sigurni da želite osloboditi svoje standardne jahalice?",
+    "releasePetsSuccess": "Oslobođeni su vaši standardni ljubimci!",
+    "releasePetsConfirm": "Jeste li sigurni da želite otpustiti vaše standardne ljubimce?",
+    "keyToBothDesc": "Oslobodite sve standardne ljubimce i jahalice kako biste ih mogli ponovo sakupljati. (To ne utječe na ljubimce/jahalice iz misija i rijetke ljubimce/jahalice.)",
+    "keyToBoth": "Glavni ključ za uzgajivače",
+    "keyToMountsDesc": "Otpustite sve standardne jahalice da biste ih mogli ponovo sakupljati. (To ne utječe na jahalice iz misija i rijetke jahalice.)",
+    "keyToMounts": "Ključ za uzgajivače jahalica",
+    "keyToPetsDesc": "Oslobodite sve standardne ljubimce kako biste ih mogli ponovo sakupljati. (To ne utječe na ljubimce iz misija i rijetke ljubimce.)",
+    "keyToPets": "Ključ za uzgajivače ljubimaca",
+    "mountName": "<%= potion(locale) %> <%= mount(locale) %>",
+    "petName": "<%= potion(locale) %> <%= egg(locale) %>",
+    "raisedPet": "Odhranili ste <%= pet %>!",
+    "feedPet": "Hrana <%= text %> za vašeg <%= name %>?"
 }
@@ -1,75 +1,89 @@
 {
-    "quests": "Quests",
-    "quest": "quest",
-    "petQuests": "Pet and Mount Quests",
-    "unlockableQuests": "Unlockable Quests",
-    "goldQuests": "Masterclasser Quest Lines",
-    "questDetails": "Quest Details",
-    "questDetailsTitle": "Quest Details",
-    "questDescription": "Quests allow players to focus on long-term, in-game goals with the members of their party.",
-    "invitations": "Invitations",
-    "completed": "Completed!",
-    "rewardsAllParticipants": "Rewards for all Quest Participants",
-    "rewardsQuestOwner": "Additional Rewards for Quest Owner",
-    "inviteParty": "Invite Party to Quest",
-    "questInvitation": "Quest Invitation:",
+    "quests": "Misije",
+    "quest": "misija",
+    "petQuests": "Potrage za ljubimcima i jahalicama",
+    "unlockableQuests": "Misije koje se mogu otključati",
+    "goldQuests": "Nizovi majstorskih misija",
+    "questDetails": "Detalji misije",
+    "questDetailsTitle": "Detalji misije",
+    "questDescription": "Misije omogućavaju igračima da se usredotoče na dugoročne ciljeve u igri sa članovima svoje partije.",
+    "invitations": "Pozivnice",
+    "completed": "Završeno!",
+    "rewardsAllParticipants": "Nagrade za sve učesnike misije",
+    "rewardsQuestOwner": "Dodatne nagrade za vlasnika misije",
+    "inviteParty": "Pozovite partiju u misiju",
+    "questInvitation": "Pozvinice misije: ",
    "questInvitationInfo": "Invitation for the Quest <%= quest %>",
-    "invitedToQuest": "You were invited to the Quest <span class=\"notification-bold-blue\"><%= quest %></span>",
-    "askLater": "Ask Later",
-    "buyQuest": "Buy Quest",
-    "accepted": "Accepted",
-    "declined": "Declined",
-    "rejected": "Rejected",
-    "pending": "Pending",
-    "questCollection": "+ <%= val %> quest item(s) found",
+    "invitedToQuest": "Bili ste pozvani da se pridružite potrazi <span class=\"notification-bold-blue\"><%= quest %></span>",
+    "askLater": "Pitaj kasnije",
+    "buyQuest": "Kupi misiju",
+    "accepted": "Prihvaćeno",
+    "declined": "Odbijeno",
+    "rejected": "Odbijeno",
+    "pending": "Na čekanju",
+    "questCollection": "+ <%= val %> stavki pronađeno u misiji",
    "questDamage": "+ <%= val %> damage to boss",
-    "begin": "Begin",
-    "bossHP": "Boss HP",
-    "bossStrength": "Boss Strength",
-    "rage": "Rage",
-    "collect": "Collect",
-    "collected": "Collected",
-    "abort": "Abort",
-    "leaveQuest": "Leave Quest",
-    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
-    "mustComplete": "You must first complete <%= quest %>.",
-    "mustLvlQuest": "You must be level <%= level %> to buy this quest!",
-    "unlockByQuesting": "To unlock this quest, complete <%= title %>.",
-    "questConfirm": "Are you sure? Only <%= questmembers %> of your <%= totalmembers %> party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.",
-    "sureCancel": "Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.",
-    "sureAbort": "Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.",
-    "doubleSureAbort": "Are you double sure? Make sure they won't hate you forever!",
-    "bossRageTitle": "Rage",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
-    "startAQuest": "START A QUEST",
-    "startQuest": "Start Quest",
-    "questInvitationDoesNotExist": "No quest invitation has been sent out yet.",
-    "questInviteNotFound": "No quest invitation found.",
-    "guildQuestsNotSupported": "Guilds cannot be invited on quests.",
-    "questNotOwned": "You don't own that quest scroll.",
-    "questNotGoldPurchasable": "Quest \"<%= key %>\" is not a Gold-purchasable quest.",
-    "questNotGemPurchasable": "Quest \"<%= key %>\" is not a Gem-purchasable quest.",
-    "questAlreadyUnderway": "Your party is already on a quest. Try again when the current quest has ended.",
-    "questAlreadyAccepted": "You already accepted the quest invitation.",
-    "noActiveQuestToLeave": "No active quest to leave",
-    "questLeaderCannotLeaveQuest": "Quest leader cannot leave quest",
-    "notPartOfQuest": "You are not part of the quest",
-    "youAreNotOnQuest": "You're not on a quest",
-    "noActiveQuestToAbort": "There is no active quest to abort.",
-    "onlyLeaderAbortQuest": "Only the group or quest leader can abort a quest.",
-    "questAlreadyRejected": "You already rejected the quest invitation.",
-    "cantCancelActiveQuest": "You can not cancel an active quest, use the abort functionality.",
-    "onlyLeaderCancelQuest": "Only the group or quest leader can cancel the quest.",
-    "questNotPending": "There is no quest to start.",
-    "questOrGroupLeaderOnlyStartQuest": "Only the quest leader or group leader can force start the quest",
-    "loginIncentiveQuest": "To unlock this quest, check in to Habitica on <%= count %> different days!",
-    "loginReward": "<%= count %> Check-ins",
-    "questBundles": "Discounted Quest Bundles",
-    "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!",
-    "pendingDamage": "<%= damage %> pending damage",
-    "pendingDamageLabel": "pending damage",
-    "bossHealth": "<%= currentHealth %> / <%= maxHealth %> Health",
-    "rageAttack": "Rage Attack:",
-    "bossRage": "<%= currentRage %> / <%= maxRage %> Rage",
-    "rageStrikes": "Rage Strikes"
+    "begin": "Početak",
+    "bossHP": "Šefovo zdravlje",
+    "bossStrength": "Šefova snaga",
+    "rage": "Bijes",
+    "collect": "Sakupiti",
+    "collected": "Sakupljeno",
+    "abort": "Otkaži",
+    "leaveQuest": "Napusti misiju",
+    "sureLeave": "Jeste li sigurni da želite napustiti aktivnu potragu? Sav vaš napredak u potrazi bit će izgubljen.",
+    "mustComplete": "Prvo morate završiti <%= quest %>.",
+    "mustLvlQuest": "Morate biti na nivou <%= level %> da biste kupili ovu misiju!",
+    "unlockByQuesting": "Da otključate ovu misiju, završite <%= title %>.",
+    "questConfirm": "Jeste li sigurni? Samo <%= questmembers %> od ukupno <% = totalmembers%> članova partije pridružili su se ovoj potrazi! Misije počinju automatski kada se svi igrači pridruže pozivu ili ga odbiju.",
+    "sureCancel": "Jeste li sigurni da želite otkazati ovu potragu? Sva prihvaćanja poziva bit će izgubljena. Vlasnik zadatka zadržat će svitak misije.",
+    "sureAbort": "Jeste li sigurni da želite prekinuti ovu misiju? To će prekinuti za sve u vašoj partiji i sav napredak će biti izgubljen. Svitak misije vratit će se vlasniku zadatka.",
+    "doubleSureAbort": "Jeste li zaista sigurni? Pazite da vas zauvijek ne zamrzite!",
+    "bossRageTitle": "Bijes",
+    "bossRageDescription": "Kad se ova traka napuni, šef će izvesti poseban napad!",
+    "startAQuest": "ZAPOČNI MISIJU",
+    "startQuest": "Započni misiju",
+    "questInvitationDoesNotExist": "Još nije poslana nijedna pozivnica.",
+    "questInviteNotFound": "Nije pronađena nijedna pozivnica.",
+    "guildQuestsNotSupported": "Esnafi se ne mogu pozivati u misije.",
+    "questNotOwned": "Vi ne posjedujete taj svitak misije.",
+    "questNotGoldPurchasable": "Misiju \"<%= key %>\" nije moguće kupiti zlatnicima.",
+    "questNotGemPurchasable": "Misiju \"<%= key %>\" nije moguće kupiti draguljima.",
+    "questAlreadyUnderway": "Vaša partija je već u potrazi. Pokušajte ponovo kada završi trenutna potraga.",
+    "questAlreadyAccepted": "Već ste prihvatili pozivnicu za potragu.",
+    "noActiveQuestToLeave": "Nema aktivne potrage koju možete napustiti",
+    "questLeaderCannotLeaveQuest": "Vođa potrage ne može napustiti potragu",
+    "notPartOfQuest": "Niste dio potrage",
+    "youAreNotOnQuest": "Niste u potrazi",
+    "noActiveQuestToAbort": "Ne postoji aktivna potraga za prekinuti.",
+    "onlyLeaderAbortQuest": "Samo vođa grupe ili misije može prekinuti od misiju.",
+    "questAlreadyRejected": "Već ste odbili poziv za potragu.",
+    "cantCancelActiveQuest": "Ne možete otkazati aktivnu potragu, koristite funkciju prekida.",
+    "onlyLeaderCancelQuest": "Samo vođa grupe ili misije može otkazati misiju.",
+    "questNotPending": "Ne postoji potraga koja se može početi.",
+    "questOrGroupLeaderOnlyStartQuest": "Samo vođa potrage ili vođa grupe može prisilno započeti potragu",
+    "loginIncentiveQuest": "Da biste otključali ovu potragu, prijavite se na Habiticu <%= count%>  dana zaredom!",
+    "loginReward": "<%= count %> prijava",
+    "questBundles": "Paketi misija na popustu",
+    "noQuestToStart": "Ne možete pronaći potragu koja se može početi? Pokušajte provjeriti prodavnicu misija na pijaci za nove ponude!",
+    "pendingDamage": "<%= damage %> štete čekanju",
+    "pendingDamageLabel": "šteta na čekanju",
+    "bossHealth": "<%= currentHealth %> / <%= maxHealth %> Zadravlje",
+    "rageAttack": "Napad bijesa:",
+    "bossRage": "<%= currentRage %> / <%= maxRage %> Bijes",
+    "rageStrikes": "Udar bijesa",
+    "tavernBossTired": "<%= bossName %> pokušava osloboditi <%= rageName %> ali je suviše umoran/na.",
+    "chatQuestCancelled": "<%= username %> je odustao od partijske potrage <%= questName %>.",
+    "chatQuestAborted": "<%= username %> prekinuo partijsku potragu <%= questName %>.",
+    "chatItemQuestFinish": "Svi predmeti pronađeni! Partija je dobila njihove nagrade.",
+    "chatFindItems": "<%= username %> pronašao/la <%= items %>.",
+    "chatBossDefeated": "Porazili ste <%= bossName%>! Članovi partije koji su učestvovali u misiji dobijaju nagrade za pobjedu.",
+    "chatBossDontAttack": "<%= username %> napada <%= bossName %> za <%= userDamage %> štete. <%= bossName %> ne napada, jer poštuje činjenicu da postoje neke greške nakon održavanja i ne želi nikoga povrijediti nepravedno. Uskoro će nastaviti sa svojim divljanjem!",
+    "chatBossDamage": "<%= username %> napada <%= bossName %> s <%= userDamage %> štete. <%= bossName %> napada partiju s <%= bossDamage %> štete.",
+    "chatQuestStarted": "Vaša portraga, <%= questName %>, je počela.",
+    "questAlreadyStartedFriendly": "Potraga je već započela, ali uvijek možete uhvatiti sljedeću!",
+    "questAlreadyStarted": "Potraga je već započela.",
+    "bossDamage": "Oštetili ste šefa!",
+    "questInvitationNotificationInfo": "Pozvani ste da se pridružite potrazi",
+    "hatchingPotionQuests": "Čarobni napitci za izlijeganje iz misija"
 }
@@ -431,5 +431,11 @@
    "backgroundFlyingOverTropicalIslandsNotes": "Άσε τη θέα να σου κόψει την ανάσα όσο Πετάς πάνω από Τροπικά Νησιά.",
    "backgroundFlyingOverTropicalIslandsText": "Πετώντας πάνω από Τροπικά Νησιά",
    "backgroundBlossomingDesertNotes": "Δες  μια σπάνια υπεράνθηση στην Ανθισμένη Έρημο.",
-    "backgroundBlossomingDesertText": "Ανθισμένη Έρημος"
+    "backgroundBlossomingDesertText": "Ανθισμένη Έρημος",
+    "backgroundBirchForestNotes": "Φλέρταρε σε ένα ήρεμο Δάσος Σημύδων.",
+    "backgroundBirchForestText": "Δάσος Σημύδων",
+    "backgroundAmidAncientRuinsNotes": "Στάσου ευλαβικά για το μυστηριώδες παρελθόν Ανάμεσα σε Αρχαία Ερείπια.",
+    "backgroundAmidAncientRuinsText": "Ανάμεσα σε Αρχαία Ερείπια",
+    "backgroundGiantDandelionsText": "Γιγαντιαίες Πικραλίδες",
+    "backgroundGiantDandelionsNotes": "Χασομέρησε ανάμεσα σε Γιγαντιαίες Πικραλίδες."
 }
@@ -8,5 +8,7 @@
    "clearBrowserData": "Διαγραφή Δεδομένων Προγράμματος Περιήγησης",
    "chores": "Μικροδουλειές",
    "termsAndAgreement": "Πατώντας το κουμπί από κάτω, υποδεικνύετε πως έχετε διαβάσει και συμφωνείτε με τους <a href='/static/terms'> Όρους Λειτουργίας</a> και <a href='/static/privacy'>Πολιτική Απορρήτου</a>.",
-    "FAQ": "Συχνές Ερωτήσεις"
+    "FAQ": "Συχνές Ερωτήσεις",
+    "forgotPassword": "Ξέχασες τον Κωδικό σου;",
+    "companyDonate": "Δωρεά"
 }
@@ -1,8 +1,10 @@
 {
-    "noItemsAvailableForType": "Δεν έχεις <%= type %>",
+    "noItemsAvailableForType": "Δεν έχεις <%= type %>.",
    "foodItemType": "Ζωοτροφή",
    "eggsItemType": "Αυγά",
    "hatchingPotionsItemType": "Φίλτρα εκκόλαψης",
    "specialItemType": "Ξεχωριστά αντικείμενα",
-    "lockedItem": "Κλειδωμένα αντικείμενα"
+    "lockedItem": "Κλειδωμένα αντικείμενα",
+    "allItems": "Όλα τα Αντικείμενα",
+    "petAndMount": "Κατοικίδιο και Θηρίο"
 }
@@ -30,7 +30,7 @@
    "worldBossDescription": "Περιγραφή του Παγκόσμιου Εχθρού",
    "welcomeMarketMobile": "Welcome to the Market! Buy hard-to-find eggs and potions! Come see what we have to offer.",
    "howManyToSell": "How many would you like to sell?",
-    "yourBalance": "Your balance",
+    "yourBalance": "Ο χρυσός σου:",
    "sell": "Sell",
    "buyNow": "Buy Now",
    "sortByNumber": "Number",
@@ -1,5 +1,7 @@
 {
    "activePet": "Ενεργό Κατοικίδιο",
    "pets": "Κατοικίδια",
-    "stable": "Στάβλος"
+    "stable": "Στάβλος",
+    "petsFound": "Κατοικίδια που έχουν Βρεθεί",
+    "noActivePet": "Κανένα Ενεργό Κατοικίδιο"
 }
@@ -102,5 +102,11 @@
  "achievementSeeingRedModalText": "You collected all the Red Pets!",
  "achievementRedLetterDay": "Red Letter Day",
  "achievementRedLetterDayText": "Has tamed all Red Mounts.",
-  "achievementRedLetterDayModalText": "You tamed all the Red Mounts!"
+  "achievementRedLetterDayModalText": "You tamed all the Red Mounts!",
+  "achievementLegendaryBestiary": "Legendary Bestiary",
+  "achievementLegendaryBestiaryText": "Has hatched all standard colors of mythical pets: Dragon, Flying Pig, Gryphon, Sea Serpent, and Unicorn!",
+  "achievementLegendaryBestiaryModalText": "You collected all the mythical pets!",
+  "achievementSeasonalSpecialist": "Seasonal Specialist",
+  "achievementSeasonalSpecialistText": "Has completed all the Spring and Winter seasonal quests: Egg Hunt, Trapper Santa, and Find the Cub!",
+  "achievementSeasonalSpecialistModalText": "You completed all the seasonal quests!"
 }
@@ -659,6 +659,38 @@
  "backgroundWintryCastleText": "Wintry Castle",
  "backgroundWintryCastleNotes": "Witness a Wintry Castle through the chilly mists.",

+  "backgrounds022021": "SET 81: Released February 2021",
+  "backgroundFlyingOverGlacierText": "Flying Over a Glacier",
+  "backgroundFlyingOverGlacierNotes": "Witness frozen majesty by Flying Over a Glacier.",
+  "backgroundHeartShapedBubblesText": "Heart-Shaped Bubbles",
+  "backgroundHeartShapedBubblesNotes": "Float cheerfully among Heart-Shaped Bubbles.",
+  "backgroundThroneRoomText": "Throne Room",
+  "backgroundThroneRoomNotes": "Grant an audience in your luxurious Throne Room.",
+
+  "backgrounds032021": "SET 82: Released March 2021",
+  "backgroundInTheArmoryText": "In the Armory",
+  "backgroundInTheArmoryNotes": "Gear up In the Armory.",
+  "backgroundSplashInAPuddleText": "Splashing in a Puddle",
+  "backgroundSplashInAPuddleNotes": "Enjoy the sequel to the storm by Splashing in a Puddle.",
+  "backgroundSpringThawText": "Spring Thaw",
+  "backgroundSpringThawNotes": "Watch winter yield to the Spring Thaw.",
+
+  "backgrounds042021": "SET 83: Released April 2021",
+  "backgroundAmongCattailsText": "Among Cattails",
+  "backgroundAmongCattailsNotes": "Admire wetland wildlife Among Cattails.",
+  "backgroundCottageConstructionText": "Cottage Under Construction",
+  "backgroundCottageConstructionNotes": "Help out with, or at least supervise, a Cottage Under Construction.",
+  "backgroundElegantGardenText": "Elegant Garden",
+  "backgroundElegantGardenNotes": "Walk the well-manicured paths of an Elegant Garden.",
+
+  "backgrounds052021": "SET 84: Released May 2021",
+  "backgroundAfternoonPicnicText": "Afternoon Picnic",
+  "backgroundAfternoonPicnicNotes": "Enjoy an Afternoon Picnic alone or with your pet.",
+  "backgroundDragonsLairText": "Dragon's Lair",
+  "backgroundDragonsLairNotes": "Try not to disturb the occupant of the Dragon's Lair.",
+  "backgroundWindmillsText": "Windmills",
+  "backgroundWindmillsNotes": "Saddle up and go tilting at Windmills.",
+
  "timeTravelBackgrounds": "Steampunk Backgrounds",
  "backgroundAirshipText": "Airship",
  "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
@@ -302,6 +302,7 @@
  "hatchingPotionAutumnLeaf": "Autumn Leaf",
  "hatchingPotionBlackPearl": "Black Pearl",
  "hatchingPotionStainedGlass": "Stained Glass",
+  "hatchingPotionPolkaDot": "Polka Dot",

  "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
  "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",
@@ -27,7 +27,7 @@
  "webFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you click a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your party and one of your party mates did not complete all their Dailies, the Boss will attack you. The main way to heal is to gain a level, which restores all your Health. You can also buy a Health Potion with Gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. Other Healers can heal you as well if you are in a Party with them. Learn more by clicking \"Party\" in the navigation bar.",

  "faqQuestion5": "How do I play Habitica with my friends?",
-  "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on Quests, battle monsters, and cast skills to support each other.\n\nIf you want to start your own Party, go to Menu > [Party](https://habitica.com/party) and tap \"Create New Party\". Then scroll down and tap \"Invite a Member\" to invite your friends by entering their @username. If you want to join someone else’s Party, just give them your @username and they can invite you!\n\nYou and your friends can also join Guilds, which are public chat rooms that bring people together based on shared interests! There are a lot of helpful and fun communities, be sure to check them out.\n\nIf you’re feeling more competitive, you and your friends can create or join Challenges to take on a set of tasks. There are all sorts public of Challenges available that span a wide array of interests and goals. Some public Challenges will even award Gem prizes if you’re selected as the winner.",
+  "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on Quests, battle monsters, and cast skills to support each other.\n\nIf you want to start your own Party, go to Menu > [Party](https://habitica.com/party) and tap \"Create New Party\". Then scroll down and tap \"Invite a Member\" to invite your friends by entering their @username. If you want to join someone else’s Party, just give them your @username and they can invite you!\n\nYou and your friends can also join Guilds, which are public chat rooms that bring people together based on shared interests! There are a lot of helpful and fun communities, be sure to check them out.\n\nIf you’re feeling more competitive, you and your friends can create or join Challenges to take on a set of tasks. There are all sorts of public Challenges available that span a wide array of interests and goals. Some public Challenges will even award Gem prizes if you’re selected as the winner.",
  "androidFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to the [website](https://habitica.com/) to create one if you don't already have a Party. You can also join guilds together (Social > Guilds). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many guilds as you'd like, but only one party.\n\n For more detailed info, check out the wiki pages on [Parties](http://habitica.fandom.com/wiki/Party) and [Guilds](http://habitica.fandom.com/wiki/Guilds).",
  "webFaqAnswer5": "The best way is to invite them to a Party with you by clicking \"Party\" in the navigation bar! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join Guilds together (click on \"Guilds\" in the navigation bar). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many Guilds as you'd like, but only one Party. For more detailed info, check out the wiki pages on [Parties](http://habitica.fandom.com/wiki/Party) and [Guilds](http://habitica.fandom.com/wiki/Guilds).",

@@ -389,6 +389,15 @@
  "headSpecialNye2020Text": "Extravagant Party Hat",
  "headSpecialNye2020Notes": "You've received an Extravagant Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",

+  "weaponSpecialSpring2021RogueText": "Twin Flower Bloom",
+  "weaponSpecialSpring2021RogueNotes": "You know what's better than dual-wielding flowers? QUADRUPLE wielding flowers! Increases Strength by <%= str %>. Limited Edition 2021 Spring Gear.",
+  "weaponSpecialSpring2021WarriorText": "Hammer of the Sun",
+  "weaponSpecialSpring2021WarriorNotes": "Harness the power of the sun against your enemies, and let the sunstone bring you luck! Increases Strength by <%= str %>. Limited Edition 2021 Spring Gear.",
+  "weaponSpecialSpring2021MageText": "Swan Plume",
+  "weaponSpecialSpring2021MageNotes": "Throw, beat, treadle, rest! Swish this magnificent feather in time to conduct the music of your magic. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2021 Spring Gear.",
+  "weaponSpecialSpring2021HealerText": "Willow Branch",
+  "weaponSpecialSpring2021HealerNotes": "The bark and leaves of this fresh cutting are known for their ability to relieve pain. Or you can plant it and watch it grow! Increases Intelligence by <%= int %>. Limited Edition 2021 Spring Gear.",
+
  "weaponMystery201411Text": "Pitchfork of Feasting",
  "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
  "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -405,6 +414,10 @@
  "weaponMystery201911Notes": "The crystal ball atop this staff can show you the future, but beware! Using such dangerous knowledge can change a person in unexpected ways. Confers no benefit. November 2019 Subscriber Item.",
  "weaponMystery202002Text": "Stylish Sweetheart Parasol",
  "weaponMystery202002Notes": "An accessory that lends you an air of mystery and romance. Sun protection is a bonus! Confers no benefit. February 2020 Subscriber Item.",
+  "weaponMystery202102Text": "Charming Wand",
+  "weaponMystery202102Notes": "The glowing pink gem in this wand holds the power to spread joy and friendship far and wide! Confers no benefit. February 2021 Subscriber Item.",
+  "weaponMystery202104Text": "Thorny Thistle Staff",
+  "weaponMystery202104Notes": "Your enemies had better look out- you've got powerful and prickly defenses! Confers no benefit. April 2021 Subscriber Item.",
  "weaponMystery301404Text": "Steampunk Cane",
  "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",

@@ -534,6 +547,8 @@
  "weaponArmoireEveningTeaNotes": "This panacea will help you relax so those big tasks don't look so threatening. Increases Intelligence by <%= int %>. Enchanted Armoire: Dressing Gown Set (Item 3 of 3).",
  "weaponArmoireBlueMoonSaiText": "Dark Lunar Sai",
  "weaponArmoireBlueMoonSaiNotes": "This sai is a traditional weapon, imbued with the powers of the dark side of the moon. Increases Strength by <%= str %>. Enchanted Armoire: Blue Moon Rogue Set (item 1 of 4).",
+  "weaponArmoireJadeGlaiveText": "Jade Glaive",
+  "weaponArmoireJadeGlaiveNotes": "The reach of this glaive will keep you far from your enemies! Also, you can knock things off high shelves. Increases Strength by <%= str %>. Enchanted Armoire: Jade Warrior Set (Item 3 of 3).",

  "armor": "armor",
  "armorCapitalized": "Armor",
@@ -904,6 +919,15 @@
  "armorSpecialWinter2021HealerText": "Arctic Parka",
  "armorSpecialWinter2021HealerNotes": "Defy the chill winds with the best protection available north of the Circle! Increases Constitution by <%= con %>. Limited Edition 2020-2021 Winter Gear.",

+  "armorSpecialSpring2021RogueText": "Twin Flower Stem",
+  "armorSpecialSpring2021RogueNotes": "No one will see you waiting in amBUSH with this cunning armor; you look like a plant from every angle. Increases Perception by <%= per %>. Limited Edition 2021 Spring Gear.",
+  "armorSpecialSpring2021WarriorText": "Armor of the Sun",
+  "armorSpecialSpring2021WarriorNotes": "Be careful you don't dazzle yourself as this sunstone armor catches the light! Increases Constitution by <%= con %>. Limited Edition 2021 Spring Gear.",
+  "armorSpecialSpring2021MageText": "White Swan's Splendor",
+  "armorSpecialSpring2021MageNotes": "Your transformation is complete! Take to the sky, or to the lake, and sing for joy! Increases Intelligence by <%= int %>. Limited Edition 2021 Spring Gear.",
+  "armorSpecialSpring2021HealerText": "Willow Bark Coat",
+  "armorSpecialSpring2021HealerNotes": "This armor helps you bend instead of break when buffeted by wind or weapon. Increases Constitution by <%= con %>. Limited Edition 2021 Spring Gear.",
+
  "armorMystery201402Text": "Messenger Robes",
  "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
  "armorMystery201403Text": "Forest Walker Armor",
@@ -998,6 +1022,12 @@
  "armorMystery202007Notes": "Swim, flip, dive, and race with this handsome and powerful tail! Confers no benefit. July 2020 Subscriber Item.",
  "armorMystery202101Text": "Snazzy Snow Leopard Suit",
  "armorMystery202101Notes": "Wrap yourself in warm fur and nearly endless tail floof! Confers no benefit. January 2021 Subscriber Item.",
+  "armorMystery202102Text": "Charming Dress",
+  "armorMystery202102Notes": "Sail across the universe in fine style in this buoyantly bright dress. Confers no benefit. February 2021 Subscriber Item.",
+  "armorMystery202103Text": "Blossom Viewing Robes",
+  "armorMystery202103Notes": "These soft and breezy robes are perfect for a tea party beneath the showy spring trees. Confers no benefit. March 2021 Subscriber Item.",
+  "armorMystery202104Text": "Downy Thistle Armor",
+  "armorMystery202104Notes": "Soft on the inside, spiky on the outside, stylish everywhere! Confers no benefit. April 2021 Subscriber Item.",
  "armorMystery301404Text": "Steampunk Suit",
  "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
  "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1147,6 +1177,12 @@
  "armorArmoireDressingGownNotes": "Relax in style with this beautiful traditional dressing gown. Increases Constitution by <%= con %>. Enchanted Armoire: Dressing Gown Set (Item 1 of 3).",
  "armorArmoireBlueMoonShozokuText": "Blue Moon Armor",
  "armorArmoireBlueMoonShozokuNotes": "A strange serenity surrounds the wearer of this armor. Increases Constitution by <%= con %>. Enchanted Armoire: Blue Moon Rogue Set (item 4 of 4).",
+  "armorArmoireSoftPinkSuitText": "Soft Pink Suit",
+  "armorArmoireSoftPinkSuitNotes": "Pink is a soothing color. Slip into this loungewear set for a bit of peace during the daily grind! Increases Perception by <%= per %>. Enchanted Armoire: Pink Loungewear Set (item 2 of 3).",
+  "armorArmoireJadeArmorText": "Jade Armor",
+  "armorArmoireJadeArmorNotes": "This jade armor is both beautiful and functional. Protect yourself, and know that you look fabulous! Increases Perception by <%= per %>. Enchanted Armoire: Jade Warrior Set (Item 2 of 3).",
+  "armorArmoireClownsMotleyText": "Clown's Motley",
+  "armorArmoireClownsMotleyNotes": "The clothes fit beautifully, but filling these shoes is no small feat. Increases Strength by <%= str %>. Enchanted Armoire: Clown Set (Item 1 of 5).",

  "headgear": "helm",
  "headgearCapitalized": "Headgear",
@@ -1516,6 +1552,15 @@
  "headSpecialWinter2021HealerText": "Arctic Exploration Headgear",
  "headSpecialWinter2021HealerNotes": "A surprising amount of heat escapes through the head! Not if you're wearing this thick hood and goggles, though. There'll be no icicles on YOUR eyelashes! Increases Intelligence by <%= int %>. Limited Edition 2020-2021 Winter Gear.",

+  "headSpecialSpring2021RogueText": "Twin Flower Hat",
+  "headSpecialSpring2021RogueNotes": "Let's keep the flowery language to a minimum: this hat will help you blend in with the spring flowers! Increases Perception by <%= per %>. Limited Edition 2021 Spring Gear.",
+  "headSpecialSpring2021WarriorText": "Helm of the Sun",
+  "headSpecialSpring2021WarriorNotes": "Don't fear! The sunstone in this helm will help you bring to light those deepest, darkest red to-dos. Increases Strength by <%= str %>. Limited Edition 2021 Spring Gear.",
+  "headSpecialSpring2021MageText": "Cygnet Circlet",
+  "headSpecialSpring2021MageNotes": "Set this airy crown upon your brow, and the birds of the water will come attend to you. To what quest will you call them? Increases Perception by <%= per %>. Limited Edition 2021 Spring Gear.",
+  "headSpecialSpring2021HealerText": "Salix Wreath",
+  "headSpecialSpring2021HealerNotes": "Weep not, friends! A Healer is here to soothe your suffering! Increases Intelligence by <%= int %>. Limited Edition 2021 Spring Gear.",
+
  "headSpecialGaymerxText": "Rainbow Warrior Helm",
  "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",

@@ -1633,6 +1678,8 @@
  "headMystery202012Notes": "This imposing mask features piercing eyes that will blind foes like the glare of sunlight on fresh snow. Confers no benefit. December 2020 Subscriber Item.",
  "headMystery202101Text": "Snazzy Snow Leopard Helm",
  "headMystery202101Notes": "The icy blue eyes on this feline helm will freeze even the most intimidating task on your list. Confers no benefit. January 2021 Subscriber Item.",
+  "headMystery202103Text": "Blossom Viewing Circlet",
+  "headMystery202103Notes": "Greet spring in style in this circlet woven from the first blooming branches. Confers no benefit. March 2021 Subscriber Item.",
  "headMystery301404Text": "Fancy Top Hat",
  "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
  "headMystery301405Text": "Basic Top Hat",
@@ -1780,6 +1827,12 @@
  "headArmoireNightcapNotes": "Your new nightcap even has a nice bouncy pompom! Increases Perception by <%= per %>. Enchanted Armoire: Dressing Gown Set (Item 2 of 3).",
  "headArmoireBlueMoonHelmText": "Blue Moon Helm",
  "headArmoireBlueMoonHelmNotes": "This helm offers an astonishing amount of luck to its wearer, and exceptional events follow its use. Increases Intelligence by <%= int %>. Enchanted Armoire: Blue Moon Rogue Set (item 3 of 4).",
+  "headArmoirePinkFloppyHatText": "Pink Floppy Hat",
+  "headArmoirePinkFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a perfect pink color. Increases Intelligence by <%= int %>. Enchanted Armoire: Pink Loungewear Set (item 1 of 3).",
+  "headArmoireJadeHelmText": "Jade Helm",
+  "headArmoireJadeHelmNotes": "Some say jade decreases fear and anxiety. With this beautiful helm, you definitely have no cause to worry! Increases Constitution by <%= con %>. Enchanted Armoire: Jade Warrior Set (Item 1 of 3).",
+  "headArmoireClownsWigText": "Clown's Wig",
+  "headArmoireClownsWigNotes": "No bad tasks can bite you now! You'll taste funny. Increases Constitution by <%= con %>. Enchanted Armoire: Clown Set (Item 3 of 5).",

  "offhand": "off-hand item",
  "offhandCapitalized": "Off-Hand Item",
@@ -1987,6 +2040,11 @@
  "shieldSpecialWinter2021HealerText": "Arctic Armguards",
  "shieldSpecialWinter2021HealerNotes": "These mighty mitts stop weapons cold. Increases Constitution by <%= con %>. Limited Edition 2020-2021 Winter Gear.",

+  "shieldSpecialSpring2021WarriorText": "Shield of the Sun",
+  "shieldSpecialSpring2021WarriorNotes": "The beauty in this roughly-shaped sunstone will shine even in the deepest caves and darkest dungeons. Hold it high! Increases Constitution by <%= con %>. Limited Edition 2021 Spring Gear.",
+  "shieldSpecialSpring2021HealerText": "Salicylic Shield",
+  "shieldSpecialSpring2021HealerNotes": "A leafy green bundle that heralds shelter and compassion. Increases Constitution by <%= con %>. Limited Edition 2021 Spring Gear.",
+
  "shieldMystery201601Text": "Resolution Slayer",
  "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
  "shieldMystery201701Text": "Time-Freezer Shield",
@@ -2093,7 +2151,31 @@
  "shieldArmoireDarkAutumnFlameText": "Dark Autumn Flame",
  "shieldArmoireDarkAutumnFlameNotes": "These mesmerizing flames dance with lively but foreboding energy even in autumn's chilliest nights. Increases Constitution by <%= con %>. Enchanted Armoire: Autumn Enchanter Set (Item 4 of 4).",
  "shieldArmoireBlueMoonSaiText": "Light Lunar Sai",
-  "shieldArmoireBlueMoonSaiNotes": "This sai is a traditional weapon, imbued with the powers of the light side of the moon. Increases Perception by <%= per %>. Enchanted Armoire: Blue Moon Rogue Set (item 3 of 4).",
+  "shieldArmoireBlueMoonSaiNotes": "This sai is a traditional weapon, imbued with the powers of the light side of the moon. Increases Perception by <%= per %>. Enchanted Armoire: Blue Moon Rogue Set (item 2 of 4).",
+  "shieldArmoireSoftPinkPillowText": "Soft Pink Pillow",
+  "shieldArmoireSoftPinkPillowNotes": "The sensible warrior packs a pillow for any expedition. Soften life's blows... even while you nap. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Pink Loungewear Set (item 3 of 3).",
+  "shieldArmoireClownsBalloonsText": "Clown's Balloons",
+  "shieldArmoireClownsBalloonsNotes": "Be careful: replacing these balloons would be a bit expensive... because of the inflation! Increases Perception by <%= per %>. Enchanted Armoire: Clown Set (Item 4 of 5).",
+  "shieldArmoireStrawberryFoodText": "Strawberry",
+  "shieldArmoireStrawberryFoodNotes": "A delicious fresh strawberry to feed to your pets! Do you know which pets like strawberries best? Increases Strength by <%= str %>. Enchanted Armoire: Pet Food Set (Item 1 of 10).",
+  "shieldArmoireRottenMeatFoodText": "Rotten Meat",
+  "shieldArmoireRottenMeatFoodNotes": "Hold your nose! This rotten meat might be disgusting to you, but it's perfect for some of your pets! Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 2 of 10).",
+  "shieldArmoirePotatoFoodText": "Potato",
+  "shieldArmoirePotatoFoodNotes": "Potatoes are a staple of many diets, but some pets would like to live on potatoes alone... Increases Perception by <%= per %>. Enchanted Armoire: Pet Food Set (Item 3 of 10).",
+  "shieldArmoirePinkCottonCandyFoodText": "Pink Cotton Candy",
+  "shieldArmoirePinkCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 4 of 10).",
+  "shieldArmoireMilkFoodText": "Milk",
+  "shieldArmoireMilkFoodNotes": "There are many sayings about the health benefits of milk, but the pets who favor it just love its creamy taste. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Pet Food Set (Item 10 of 10)",
+  "shieldArmoireMeatFoodText": "Meat",
+  "shieldArmoireMeatFoodNotes": "Sometimes a bit of protein is what you need to grow up big and strong. Some of your pets are more eager for it than others! Increases Strength by <%= str %>. Enchanted Armoire: Pet Food Set (Item 5 of 10).",
+  "shieldArmoireHoneyFoodText": "Honey",
+  "shieldArmoireHoneyFoodNotes": "Watch out for sticky paws once you've fed your pets this honey! Some pets crave this natural sweetness; can you guess who? Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Pet Food Set (Item 6 of 10).",
+  "shieldArmoireFishFoodText": "Fish",
+  "shieldArmoireFishFoodNotes": "This fish will help your pets have good bones! But you'll have to guess which of your pets like it the most. Increases Perception by <%= per %>. Enchanted Armoire: Pet Food Set (Item 7 of 10).",
+  "shieldArmoireChocolateFoodText": "Chocolate",
+  "shieldArmoireChocolateFoodNotes": "Everybody likes a little chocolate, but some of your pets are keener than others... Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 8 of 10).",
+  "shieldArmoireBlueCottonCandyFoodText": "Blue Cotton Candy",
+  "shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 9).",

  "back": "Back Accessory",
  "backCapitalized": "Back Accessory",
@@ -2151,6 +2233,8 @@
  "backMystery202010Notes": "You are the night! So fly as silently as a midnight cloud with these swift purple wings. Confers no benefit. October 2020 Subscriber Item.",
  "backMystery202012Text": "Frostfire Wings",
  "backMystery202012Notes": "The snowy feathers of these wings will grant you the speed of a wintry gale. Confers no benefit. December 2020 Subscriber Item.",
+  "backMystery202105Text": "Nebula Dragon Wings",
+  "backMystery202105Notes": "Glide through the starry sky and place yourself among the constellations! Confers no benefit. May 2021 Subscriber Item.",

  "backSpecialWonderconRedText": "Mighty Cape",
  "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -2237,6 +2321,8 @@
  "bodyArmoireCozyScarfNotes": "This fine scarf will keep you warm as you go about your wintry business. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Lamplighter's Set (Item 4 of 4).",
  "bodyArmoireLifeguardWhistleText": "Lifeguard Whistle",
  "bodyArmoireLifeguardWhistleNotes": "Call that misbehaving habit to order! It should know the rules! Increases Intelligence by <%= int %>. Enchanted Armoire: Lifeguard Set (Item 3 of 3).",
+  "bodyArmoireClownsBowtieText": "Clown's Bow-Tie",
+  "bodyArmoireClownsBowtieNotes": "A nice bow-tie is no joking matter, even for a clown. Increases Strength, Intelligence, Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Clown Set (Item 5 of 5).",

  "headAccessory": "head accessory",
  "headAccessoryCapitalized": "Head Accessory",
@@ -2341,6 +2427,10 @@
  "headAccessoryMystery202005Notes": "With such mighty horns, what creature dares challenge you? Confers no benefit. May 2020 Subscriber Item.",
  "headAccessoryMystery202009Text": "Marvelous Moth Antennae",
  "headAccessoryMystery202009Notes": "These feathery appendages will help you find your way even in the dark of night. Confers no benefit. September 2020 Subscriber Item.",
+  "headAccessoryMystery202102Text": "Charming Tiara",
+  "headAccessoryMystery202102Notes": "Magnify your empathy and caring to new heights with this ornate golden tiara. Confers no benefit. February 2021 Subscriber Item.",
+  "headAccessoryMystery202105Text": "Nebula Dragon Horns",
+  "headAccessoryMystery202105Notes": "Don these iridescent horns and summon the magic of starlight. Confers no benefit. May 2021 Subscriber Item.",
  "headAccessoryMystery301405Text": "Headwear Goggles",
  "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",

@@ -2427,6 +2517,8 @@
  "eyewearArmoirePlagueDoctorMaskNotes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Plague Doctor Set (Item 2 of 3).",
  "eyewearArmoireGoofyGlassesText": "Goofy Glasses",
  "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+  "eyewearArmoireClownsNoseText": "Clown's Nose",
+  "eyewearArmoireClownsNoseNotes": "This accessory will make sure everyone 'nose' you're a clown! Increases Intelligence by <%= int %>. Enchanted Armoire: Clown Set (Item 2 of 5).",

  "twoHandedItem": "Two-handed item."
 }
--- a/Show More
+++ b/Show More