From 0a2eceaa73270f1bb8256fe6ee064475f18bb391 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 28 Mar 2022 16:26:37 -0500 Subject: [PATCH 1/3] fix(achievement): correct string for Birds and add to user schema --- website/common/locales/en/achievements.json | 2 +- website/server/models/user/schema.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json index 8e86fdf717..a8e4c796b5 100644 --- a/website/common/locales/en/achievements.json +++ b/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!" } diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 1525f4f434..d4371d180d 100644 --- a/website/server/models/user/schema.js +++ b/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, From af3aedc5d43acf40dbc2dad01a5556dc73b019bf Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 28 Mar 2022 16:26:49 -0500 Subject: [PATCH 2/3] 4.225.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d32f5e0da..30143cff7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.225.2", + "version": "4.225.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f26e135aaf..5d2c9f9a69 100644 --- a/package.json +++ b/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.16.12", From d44b2fe785e1a76284277f2f4b33ae5075f96c11 Mon Sep 17 00:00:00 2001 From: Basrara <46606963+Basrara@users.noreply.github.com> Date: Tue, 29 Mar 2022 18:30:16 +0200 Subject: [PATCH 3/3] Minor fixes (#13909) Updated "resetText2", "transaction_rebirth", and "transaction_reroll" to correct capitalization and eliminate a double space. --- website/common/locales/en/settings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json index 0438d09ce6..e582b2fa7e 100644 --- a/website/common/locales/en/settings.json +++ b/website/common/locales/en/settings.json @@ -56,7 +56,7 @@ "newUsername": "New Username", "dangerZone": "Danger Zone", "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.", - "resetText2": "You will lose all your levels, Gold, and Experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment except Subscriber Mystery Items and free commemorative items. You will be able to buy the deleted items back, including all limited edition equipment (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class, achievements and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.", + "resetText2": "You will lose all your levels, Gold, and Experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment except Subscriber Mystery Items and free commemorative items. You will be able to buy the deleted items back, including all limited edition equipment (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class, achievements and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.", "deleteLocalAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type your password into the text box below.", "deleteSocialAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type \"<%= magicWord %>\" into the text box below.", "API": "API", @@ -200,9 +200,9 @@ "transaction_create_challenge": "Created challenge", "transaction_create_guild": "Created guild", "transaction_change_class": "Changed class", - "transaction_rebirth": "Used orb of rebirth", + "transaction_rebirth": "Used Orb of Rebirth", "transaction_release_pets": "Released pets", "transaction_release_mounts": "Released mounts", - "transaction_reroll": "Used fortify potion", + "transaction_reroll": "Used Fortify Potion", "transaction_subscription_perks": "From subscription perk" }