thepaperpilot/Profectus
1
0
Fork 0
forked from profectus/Profectus
Code Pull requests Activity Actions

Fix merge

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6517
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
src/components/modals/AddictionWarning.vue
View file

@ -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>
<p>
<h4>Resources:</h4> <h4>Resources:</h4>
<p>
<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

2
src/data/projInfo.json
View file

@ -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": "",

3
src/features/hotkey.tsx
View file

@ -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>