Skip to content

Commit

Permalink
Merge branch 'release' into delta
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreCat committed Sep 5, 2023
2 parents ca81b2c + e072d7c commit fb3ee3b
Show file tree
Hide file tree
Showing 20 changed files with 311 additions and 70 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "5.3.0",
"version": "5.4.0",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.22.10",
Expand Down
7 changes: 7 additions & 0 deletions website/common/locales/en/backgrounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,13 @@
"backgroundRockGardenText": "Rock Garden",
"backgroundRockGardenNotes": "Relax in a Rock Garden.",

"backgrounds092023": "SET 112: Released September 2023",
"backgroundMovingDayText": "Moving Day",
"backgroundMovingDayNotes": "Pack up for Moving Day.",
"backgroundCoveredBridgeInAutumnText": "Covered Bridge in Autumn",
"backgroundCoveredBridgeInAutumnNotes": "Traverse a Covered Bridge in Autumn.",
"backgroundBaobabForestText": "Baobab Forest",
"backgroundBaobabForestNotes": "Gaze in wonder at the Baobab Forest.",

"timeTravelBackgrounds": "Steampunk Backgrounds",
"backgroundAirshipText": "Airship",
Expand Down
6 changes: 6 additions & 0 deletions website/common/locales/en/gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,10 @@
"weaponArmoireFinelyCutGemNotes": "What a find! This stunning, precision-cut gem will be the prize of your collection. And it might contain some special magic, just waiting for you to tap into it. Increases Constitution by <%= con %>. Enchanted Armoire: Jeweler Set (Item 4 of 4).",
"weaponArmoirePaintbrushText": "Paintbrush",
"weaponArmoirePaintbrushNotes": "A jolt of pure inspiration rushes through you when you pick up this brush, allowing you to paint anything you can imagine. Increases Intelligence by <%= int %>. Enchanted Armoire: Painter Set (Item 3 of 4).",
"weaponArmoireMopText": "Mop",
"weaponArmoireMopNotes": "Step 1: Dunk the mop in a bucket of water and suds. Step 2: Drag the mop along the floor. Step 3: Pretend the end of the mop handle is a microphone and sing your heart out. Step 4: Repeat Steps 1-3 until floor is clean. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set Two (Item 2 of 3)",
"weaponArmoireCleaningClothText": "Cleaning Cloth",
"weaponArmoireCleaningClothNotes": "Take this tidying tool on your adventures and always be able to polish a pretty plaque or wipe a wooden windowsill. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set Two (Item 3 of 3)",

"armor": "armor",
"armorCapitalized": "Armor",
Expand Down Expand Up @@ -2707,6 +2711,8 @@
"shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",
"shieldArmoirePaintersPaletteText": "Painter's Palette",
"shieldArmoirePaintersPaletteNotes": "Paints in all colors of the rainbow are at your disposal. Is it magic that makes them so vivid when you use them, or is it your talent? Increases Strength by <%= str %>. Enchanted Armoire: Painter Set (Item 4 of 4).",
"shieldArmoireBucketText": "Bucket",
"shieldArmoireBucketNotes": "Though this bucket is helpful in holding a mixture of water and cleaning solution, you could also use it to collect, carry, and cart around just about anything that fits inside! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set 2 (Item 1 of 3)",

"back": "Back Accessory",
"backBase0Text": "No Back Accessory",
Expand Down
4 changes: 2 additions & 2 deletions website/common/locales/gl/gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
"armorRogue5Notes": "Permite a discreción a plena luz do día. Aumenta a Percepción de <%= per %>.",
"armorWizard1Text": "Túnica de Mago",
"armorWizard1Notes": "Vestimenta de mago típico. Aumenta a Intelixencia de <%= int %>.",
"armorWizard2Text": "Túnica de Bruxo",
"armorWizard2Text": "Túnica de maxia",
"armorWizard2Notes": "Roupa para un traballador marabilloso ambulante. Aumenta a Intelixencia de <%= int %>.",
"armorWizard3Text": "Túnica dos Misterios",
"armorWizard3Notes": "Denota iniciación a segredos da elite. Aumenta a Intelixencia de <%= int %>.",
Expand Down Expand Up @@ -494,7 +494,7 @@
"armorSpecialFallRogueNotes": "Vívido. Veludo. Vampírico. Aumenta a Percepción de <%= per %>. Edición Limitada de Outono de 2014.",
"armorSpecialFallWarriorText": "Bata de Laboratorio Científica",
"armorSpecialFallWarriorNotes": "Protéxete dos derrames de pocións misteriosas. Aumenta a Constitución de <%= con %>. Edición Limitada de Outono de 2014.",
"armorSpecialFallMageText": "Túnica de Bruxo Máxico",
"armorSpecialFallMageText": "Túnica de maxia máxica",
"armorSpecialFallMageNotes": "This robe has plenty of pockets to hold extra helpings of eye of newt and tongue of frog. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.",
"armorSpecialFallHealerText": "Equipo neboento",
"armorSpecialFallHealerNotes": "Carga na batalla vendad@ antes de estar ferid@! Aumenta a Constitución de <%= con %>. Edición Limitada de Outono de 2014.",
Expand Down
3 changes: 2 additions & 1 deletion website/common/locales/gl/subscriber.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,5 +227,6 @@
"mysterySet202304": "Lote de xogo de te xeitoso",
"mysterySet202305": "Lote de dragón acontecido",
"mysterySet202307": "Lote de kraken perigoso",
"mysterySet202308": "Lote de protagonista púrpura"
"mysterySet202308": "Lote de protagonista púrpura",
"mysterySet202309": "Lote de avelaíña do cometa colosal"
}
3 changes: 2 additions & 1 deletion website/common/locales/ko/faq.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,6 @@
"parties": "파티들",
"iosFaqAnswer14": "다른 플레이어들과 함께 Habitica를 경험하고 싶지만 다른 플레이어들을 모른다면 파티를 검색하는것을 추천합니다! 만약 당신이 이미 파티에 참여해 있는 다른 플레이어를 알고 있다면 당신의 @username을 공유하여 초대받을 수 있습니다. 또는 새 파티를 만들어 @username이나 이메일 주소를 이용하여 초대할 수 있습니다.\n\n파티를 만들거나 찾으려면 메뉴의 파티버튼을 클릭하여 원하는 항목을 선택하세요.",
"androidFaqAnswer14": "다른 플레이어들과 함께 Habitica를 경험하고 싶지만 다른 플레이어들을 모른다면 파티를 검색하는것을 추천합니다! 만약 당신이 이미 파티에 참여해 있는 다른 플레이어를 알고 있다면 당신의 @username을 공유하여 초대받을 수 있습니다. 또는 새 파티를 만들어 @username이나 이메일 주소를 이용하여 초대할 수 있습니다.\n\n파티를 만들거나 찾으려면 메뉴의 파티버튼을 클릭하여 원하는 항목을 선택하세요.",
"webFaqAnswer14": "다른 플레이어들과 함께 Habitica를 경험하고 싶지만 다른 플레이어들을 모른다면 파티를 검색하는것을 추천합니다! 만약 당신이 이미 파티에 참여해 있는 다른 플레이어를 알고 있다면 당신의 @username을 공유하여 초대받을 수 있습니다. 또는 새 파티를 만들어 @username이나 이메일 주소를 이용하여 초대할 수 있습니다.\n\n파티를 만들거나 찾으려면 메뉴의 파티버튼을 클릭하여 원하는 항목을 선택하세요."
"webFaqAnswer14": "다른 플레이어들과 함께 Habitica를 경험하고 싶지만 다른 플레이어들을 모른다면 파티를 검색하는것을 추천합니다! 만약 당신이 이미 파티에 참여해 있는 다른 플레이어를 알고 있다면 당신의 @username을 공유하여 초대받을 수 있습니다. 또는 새 파티를 만들어 @username이나 이메일 주소를 이용하여 초대할 수 있습니다.\n\n파티를 만들거나 찾으려면 메뉴의 파티버튼을 클릭하여 원하는 항목을 선택하세요.",
"iosFaqAnswer16": "파티 초대를"
}
Loading

0 comments on commit fb3ee3b

Please sign in to comment.