From dfe53e8b68a5f438b1d69a09fb8519d96ceef49c Mon Sep 17 00:00:00 2001 From: will yang Date: Tue, 12 Apr 2022 22:25:32 -0400 Subject: [PATCH 1/4] Hide Locked Background Year Tab --- website/client/src/components/creatorIntro.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/client/src/components/creatorIntro.vue b/website/client/src/components/creatorIntro.vue index 31c6f445a7..4a62932717 100644 --- a/website/client/src/components/creatorIntro.vue +++ b/website/client/src/components/creatorIntro.vue @@ -159,7 +159,7 @@
Date: Thu, 21 Apr 2022 16:22:36 -0500 Subject: [PATCH 2/4] fix(bgs): revert wording change and tokenize --- website/client/src/components/creatorIntro.vue | 2 +- website/common/locales/en/backgrounds.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/client/src/components/creatorIntro.vue b/website/client/src/components/creatorIntro.vue index 4a62932717..dd6b88421b 100644 --- a/website/client/src/components/creatorIntro.vue +++ b/website/client/src/components/creatorIntro.vue @@ -159,7 +159,7 @@
Date: Thu, 21 Apr 2022 17:39:54 -0400 Subject: [PATCH 3/4] Corrected spelling of Wotchimon and description of rage effect. (#13943) --- website/common/locales/en/questsContent.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 973cc2a36c..c969c30ef0 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -874,7 +874,7 @@ "questVirtualPetCompletion": "Some careful button pushing seems to have fulfilled the virtual pet’s mysterious needs, and finally it has quieted down and appears content.

Suddenly in a burst of confetti, the April Fool appears with a basket full of strange potions emitting soft beeps.

“What timing, April Fool,” @Beffymaroo says with a wry smile. “I suspect this large beeping fellow is an acquaintance of yours.”

“Uh, yes,” the Fool says, sheepishly. “So sorry about that, and thank you both for taking care of Wotchimon! Take these potions in the way of thanks, they can bring your Virtual pets back anytime you like!”

You’re not 100% sure you’re on board with all the beeping, but they’re sure cute so it’s worth a shot!", "questVirtualPetBoss": "Wotchimon", "questVirtualPetRageTitle": "The Beepening", - "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchiman will heal 30% of its remaining health!", + "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchimon will take away some of your party's pending damage!", "questVirtualPetRageEffect": "`Wotchimon uses Bothersome Beep!` Wotchimon sounds a bothersome beep, and its happiness bar suddenly disappears! Pending damage reduced.", "questVirtualPetDropVirtualPetPotion": "Virtual Pet Hatching Potion", "questVirtualPetUnlockText": "Unlocks Virtual Pet Hatching Potion for purchase in the Market" From 55c800cb4b840eb2d0319a8bd184df1b567b0b0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 12:53:12 -0400 Subject: [PATCH 4/4] build(deps): bump stripe from 8.217.0 to 8.219.0 (#13949) Bumps [stripe](https://github.com/stripe/stripe-node) from 8.217.0 to 8.219.0. - [Release notes](https://github.com/stripe/stripe-node/releases) - [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-node/compare/v8.217.0...v8.219.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 447988eb57..5f8e4c7225 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13777,9 +13777,9 @@ } }, "stripe": { - "version": "8.217.0", - "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.217.0.tgz", - "integrity": "sha512-CHWazNOrb1EBxTpepv5hCKMxOwF/oW3E4zRi8/LZIy5FC2y7A7NzcuE1aErYXLId3bKPe20HOmWKvjDRU2bXaA==", + "version": "8.219.0", + "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.219.0.tgz", + "integrity": "sha512-leQj9h2T4jhEz4Ta4irNTNgErPmXfF9h4nRYblTTrkTqldOmEWZQZIgXkNp1u6/UbOmMDRvxgh57UHyxwwfw0Q==", "requires": { "@types/node": ">=8.1.0", "qs": "^6.10.3" diff --git a/package.json b/package.json index 5bef9a8193..95f606601a 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "remove-markdown": "^0.3.0", "rimraf": "^3.0.2", "short-uuid": "^4.2.0", - "stripe": "^8.217.0", + "stripe": "^8.219.0", "superagent": "^7.1.2", "universal-analytics": "^0.5.3", "useragent": "^2.1.9",