Merge branch 'release' into develop

package-lock.json

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

package.json

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

website/common/locales/en/achievements.json

@@ -128,6 +128,6 @@
   "achievementZodiacZookeeperText": "Has hatched all the zodiac pets: Rat, Cow, Bunny, Snake, Horse, Sheep, Monkey, Rooster, Wolf, Tiger, Flying Pig, and Dragon!",
   "achievementZodiacZookeeperModalText": "You collected all the zodiac pets!",
   "achievementBirdsOfAFeather": "Birds of a Feather",
-  "achievementBirdsOfAFeatherText": "Has hatched all the flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, and Falcon.",
+  "achievementBirdsOfAFeatherText": "Has hatched all the flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, Falcon, Peacock, and Rooster.",
   "achievementBirdsOfAFeatherModalText":"You collected all the flying pets!"
 }

website/server/models/user/schema.js

@@ -148,6 +148,7 @@ export default new Schema({
     shadyCustomer: Boolean,
     shadeOfItAll: Boolean,
     zodiacZookeeper: Boolean,
+    birdsOfAFeather: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,