Skip to content

Commit

Permalink
Merge branch 'release/2.22.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Feb 18, 2024
2 parents e6bfe47 + 401e3cd commit 54fc5d9
Show file tree
Hide file tree
Showing 22 changed files with 733 additions and 537 deletions.
4 changes: 2 additions & 2 deletions 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,5 +1,5 @@
{
"version": "2.21.0",
"version": "2.22.0",
"name": "harmless_key",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Harmless Key",
Expand Down
4 changes: 4 additions & 0 deletions src/components/compendium/Monster.vue
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,10 @@
</template>
</div>
</div>

<div v-if="monster.environment?.length" class="mt-3">
<strong>Environment:</strong> {{ monster.environment.join(", ").capitalizeEach() }}
</div>
<q-resize-observer @resize="setSize" />
</div>
<hk-loader v-else name="monster" />
Expand Down
Loading

0 comments on commit 54fc5d9

Please sign in to comment.