Fix merge

This commit is contained in:
thepaperpilot 2024-10-18 08:49:17 -05:00
parent 88abd53faf
commit c93418bfec
4 changed files with 1949 additions and 4581 deletions

6523
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -16,8 +16,8 @@
playing incremental games is taking priority over other things in your life, or
manipulating your sleep schedule, it may be prudent to seek help.
</p>
<h4>Resources:</h4>
<p>
<h4>Resources:</h4>
<span>
<a style="display: inline" href="https://www.samhsa.gov/" target="_blank">
SAMHSA

View file

@ -3,7 +3,7 @@
"title": "Profectus",
"description": "A project made in Profectus",
"id": "321",
"id": "",
"author": "",
"discordName": "",
"discordLink": "",

View file

@ -143,7 +143,8 @@ globalBus.on("setupVue", () =>
<div style="column-count: 2">
{keys.map(hotkey => (
<div>
<Hotkey hotkey={hotkey as GenericHotkey} /> {unref(}
<Hotkey hotkey={hotkey as GenericHotkey} />{" "}
{unref(hotkey?.description)}
</div>
))}
</div>