diff --git a/Dockerfile-Production b/Dockerfile-Production index ba1c5be4d3..b372a1f4c0 100644 --- a/Dockerfile-Production +++ b/Dockerfile-Production @@ -17,7 +17,7 @@ RUN npm install -g gulp-cli mocha # Clone Habitica repo and install dependencies RUN mkdir -p /usr/src/habitrpg WORKDIR /usr/src/habitrpg -RUN git clone --branch v4.47.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN git clone --branch v4.48.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg RUN npm install RUN gulp build:prod --force diff --git a/package-lock.json b/package-lock.json index f15864a2a8..79394979c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.48.0", + "version": "4.48.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a6cb6e6e1b..6614f4534c 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.48.0", + "version": "4.48.1", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/website/client/assets/images/sprites/spritesmith-main-8.png b/website/client/assets/images/sprites/spritesmith-main-8.png index eed0935e0f..0bee06634d 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-8.png and b/website/client/assets/images/sprites/spritesmith-main-8.png differ diff --git a/website/common/locales/fr/gear.json b/website/common/locales/fr/gear.json index 07b6ca13d2..fed9227076 100644 --- a/website/common/locales/fr/gear.json +++ b/website/common/locales/fr/gear.json @@ -258,9 +258,9 @@ "weaponSpecialSpring2018MageNotes": "Cette fleur magique ne se flétrit jamais ! Augmente l'Intelligence de <%= int %> et la Perception de <%= per %>. Équipement en édition limitée du printemps 2018.", "weaponSpecialSpring2018HealerText": "Bâton de grenat", "weaponSpecialSpring2018HealerNotes": "Les pierres de ce bâton concentreront votre puissance lorsque vous lancerez des sorts de guérison ! Augmente l'intelligence de <%= int %>. Équipement en édition limitée du printemps 2018.", - "weaponSpecialSummer2018RogueText": "Fishing Rod", - "weaponSpecialSummer2018RogueNotes": "This lightweight, practically unbreakable rod and reel can be dual-wielded to maximize your DPS (Dragonfish Per Summer). Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.", - "weaponSpecialSummer2018WarriorText": "Betta Fish Spear", + "weaponSpecialSummer2018RogueText": "Canne à pêche", + "weaponSpecialSummer2018RogueNotes": "Cette canne à pêche, légère et pratiquement incassable, peut-être utilisée avec une autre canne à pêche pour optimiser votre DPS (poisson-Dragon Par Saison). Augmente la Force de <%= str %>. Équipement en édition limitée de l’été 2018.", + "weaponSpecialSummer2018WarriorText": "Harpon à Betta Splendens", "weaponSpecialSummer2018WarriorNotes": "Mighty enough for battle, elegant enough for ceremony, this exquisitely crafted spear shows you will protect your home surf no matter what! Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.", "weaponSpecialSummer2018MageText": "Lionfish Fin Rays", "weaponSpecialSummer2018MageNotes": "Underwater, magic based on fire, ice, or electricity can prove hazardous to the Mage wielding it. Conjuring poisonous spines, however, works brilliantly! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2018 Summer Gear.", diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json index 3bd4a8b7c1..72579effdd 100644 --- a/website/common/locales/pt_BR/gear.json +++ b/website/common/locales/pt_BR/gear.json @@ -258,7 +258,7 @@ "weaponSpecialSpring2018MageNotes": "Essa flor mágica nunca murcha! Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2018.", "weaponSpecialSpring2018HealerText": "Bastão de Granada", "weaponSpecialSpring2018HealerNotes": "As pedras deste cajado irão focar seu poder quando você lançar feitiços de cura! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2018.", - "weaponSpecialSummer2018RogueText": "Fishing Rod", + "weaponSpecialSummer2018RogueText": "Vara de Pescar", "weaponSpecialSummer2018RogueNotes": "This lightweight, practically unbreakable rod and reel can be dual-wielded to maximize your DPS (Dragonfish Per Summer). Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.", "weaponSpecialSummer2018WarriorText": "Betta Fish Spear", "weaponSpecialSummer2018WarriorNotes": "Mighty enough for battle, elegant enough for ceremony, this exquisitely crafted spear shows you will protect your home surf no matter what! Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.", diff --git a/website/common/locales/pt_BR/subscriber.json b/website/common/locales/pt_BR/subscriber.json index 87c4915693..dd7d15bc27 100644 --- a/website/common/locales/pt_BR/subscriber.json +++ b/website/common/locales/pt_BR/subscriber.json @@ -144,7 +144,7 @@ "mysterySet201803": "Conjunto Libélula Ousada", "mysterySet201804": "Conjunto do Esquilo Maneiro", "mysterySet201805": "Conjunto do Pavão Phenomenal", - "mysterySet201806": "Alluring Anglerfish Set", + "mysterySet201806": "Peixe-Pescador Atraente", "mysterySet301404": "Conjunto \"Revolução Industrial Padrão\"", "mysterySet301405": "Conjunto \"Acessórios Revolução Industrial\"", "mysterySet301703": "Conjunto \"Revolução Industrial Pavão\"", diff --git a/website/raw_sprites/spritesmith/gear/events/summer/broad_armor_special_summer2018Mage.png b/website/raw_sprites/spritesmith/gear/events/summer/broad_armor_special_summer2018Mage.png index 4a2c987b8f..401ffa7862 100644 Binary files a/website/raw_sprites/spritesmith/gear/events/summer/broad_armor_special_summer2018Mage.png and b/website/raw_sprites/spritesmith/gear/events/summer/broad_armor_special_summer2018Mage.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 34e0e9033d..7c2779650c 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'JUNE SUBSCRIBER ITEMS AND HABIT HISTORY CHANGES'; +const LAST_ANNOUNCEMENT_TITLE = 'USE CASE SPOTLIGHT AND GUILD SPOTLIGHT ON PARENTING AND FAMILY LIFE, PLUS NEW BEHIND THE SCENES POST!'; const worldDmg = { // @TODO bailey: false, }; @@ -30,26 +30,24 @@ api.getNews = {

${res.t('newStuff')}

+

6/22/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-

6/21/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-

June Subscriber Items Revealed!

-

The June Subscriber Item Set has been revealed: the Alluring Anglerfish Item Set! You only have until June 30 to receive the item set when you subscribe. If you're already an active subscriber, reload the site and then head to Inventory > Items to claim your gear!

+

We've got new posts on the blog all about ways to use Habitica to help with parenting and family-related matters! First, there's a Guild Spotlight that highlights the Guilds that can help you as you explore ways to use Habitica to smooth your home and family life. We've also posted a Use Case Spotlight featuring a number of great suggestions for using Habitica's task system to manage parenting and family-related tasks! These suggestions were submitted by Habiticans in the Use Case Spotlights Guild.

+
+
+
+
+
+
+

Plus, we're collecting user submissions for the next Use Case Spotlight! How do you use Habitica to build a routine to challenge your brain and keep your mind sharp? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!

+

There's also a new Behind the Scenes post on the Habitica blog about fun facts and goofy shenanigans from the Moderator Team and their behind-the-scenes chat channel. Check it out!

+
by Beffymaroo, the Habitica Staff, and the Moderator Team
-
-

Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe, the more Gems you can buy per month! There are other perks as well, such as longer access to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep Habitica running. Thank you very much for your support -- it means a lot to us.

-
by Beffymaroo
-

Habit History Changes

-

In a few days we're making a change to the way Habit history is stored in order to improve overall site performance and reduce errors and bugs for folks with lots of task activity.

-

If you view Habit history in a tool such as the Data Display Tool you will no longer be able to see timestamps showing when you clicked a Habit. You will still see how many times you clicked it in a given day.

-

So, if you are using your Habits for any tasks where the timestamps are critical, just a heads-up and a note to save your data elsewhere as timestamp data will be lost when the change goes live!

-

If you have developed a third-party tool or extension for Habitica, please check out these notes on GitHub so that you can update if needed.

-

Thanks for your understanding as we work to make Habitica better. <3

-
by Paglias
`, });