Fix merge
This commit is contained in:
parent
88abd53faf
commit
c93418bfec
4 changed files with 1949 additions and 4581 deletions
6523
package-lock.json
generated
6523
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -16,8 +16,8 @@
|
||||||
playing incremental games is taking priority over other things in your life, or
|
playing incremental games is taking priority over other things in your life, or
|
||||||
manipulating your sleep schedule, it may be prudent to seek help.
|
manipulating your sleep schedule, it may be prudent to seek help.
|
||||||
</p>
|
</p>
|
||||||
|
<h4>Resources:</h4>
|
||||||
<p>
|
<p>
|
||||||
<h4>Resources:</h4>
|
|
||||||
<span>
|
<span>
|
||||||
<a style="display: inline" href="https://www.samhsa.gov/" target="_blank">
|
<a style="display: inline" href="https://www.samhsa.gov/" target="_blank">
|
||||||
SAMHSA
|
SAMHSA
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
"title": "Profectus",
|
"title": "Profectus",
|
||||||
"description": "A project made in Profectus",
|
"description": "A project made in Profectus",
|
||||||
"id": "321",
|
"id": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"discordName": "",
|
"discordName": "",
|
||||||
"discordLink": "",
|
"discordLink": "",
|
||||||
|
|
|
@ -143,7 +143,8 @@ globalBus.on("setupVue", () =>
|
||||||
<div style="column-count: 2">
|
<div style="column-count: 2">
|
||||||
{keys.map(hotkey => (
|
{keys.map(hotkey => (
|
||||||
<div>
|
<div>
|
||||||
<Hotkey hotkey={hotkey as GenericHotkey} /> {unref(}
|
<Hotkey hotkey={hotkey as GenericHotkey} />{" "}
|
||||||
|
{unref(hotkey?.description)}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue