main #21

Open
ChrisChrome wants to merge 45 commits from main into shard-test
Owner
No description provided.
Guh
Some checks failed
ptero-push / build (push) Has been cancelled
42487f22b6
Use djs 14.14.1 (Weird issue with entitlements?)
Some checks failed
ptero-push / build (push) Has been cancelled
928cb4b958
Add TERMS.md
Some checks are pending
ptero-push / build (push) Waiting to run
6b9438ed10
For discorf
Add PRIVACY.md
Some checks failed
ptero-push / build (push) Has been cancelled
c223eabc62
Discorf
G U H
Some checks are pending
ptero-push / build (push) Waiting to run
7a12ed05d3
guess it cant be a dm thing
Some checks are pending
ptero-push / build (push) Waiting to run
aac1420964
# Major Bug Fix
Some checks failed
ptero-push / build (push) Has been cancelled
98673be5c7
- "You had it set to 'W' for Wumbo, when you should've had it set to 'M' for mini."

Fixed a small issue involving capitalization.
TL;DR Fixed evtFilter for guild channels :)
uh
All checks were successful
ptero-push / build (push) Successful in 11s
70c30420fc
Backend Update
Some checks are pending
ptero-push / build (push) Waiting to run
845fead37a
- Send a message to the user who added the bot to a guild with support link
Fix
Some checks are pending
ptero-push / build (push) Waiting to run
662e0e775c
- Restart after 10 minutes of inactivity from weather.im
Update
Some checks are pending
ptero-push / build (push) Waiting to run
d48fe3085a
- Make NWRplay use new GWES icecast server!
Update
Some checks failed
ptero-push / build (push) Has been cancelled
aa8fe9498f
- Use cached URL for nwrstreams
Update data/events.json
Some checks failed
ptero-push / build (push) Has been cancelled
b10308ef36
Fixed Hurricane Warnings and Tropical Storm Warnings that Show at lowest level. Now set to High instead of Lowest
Update data/events.json
Some checks are pending
ptero-push / build (push) Waiting to run
f6acab4d20
NPW 3
Update data/events.json
Some checks failed
ptero-push / build (push) Has been cancelled
9afdd5626e
Updated WSW.
Some checks failed
ptero-push / build (push) Has been cancelled
73e42e2288
Fix that
Some checks are pending
ptero-push / build (push) Waiting to run
b5bf06a38d
Add discord error logs
Some checks are pending
ptero-push / build (push) Waiting to run
d653bc3e90
Possibly notify of bad perms?
Some checks are pending
ptero-push / build (push) Waiting to run
8b94e7e3f8
Bwuh
Some checks are pending
ptero-push / build (push) Waiting to run
d88188182c
bwuuuuh
Some checks are pending
ptero-push / build (push) Waiting to run
f763a95472
Add message to log channel about failed sends
Some checks are pending
ptero-push / build (push) Waiting to run
cbb1842100
Fix issue
Some checks are pending
ptero-push / build (push) Waiting to run
09f3fc957c
Damn, busy night lol
Some checks are pending
ptero-push / build (push) Waiting to run
00f97fd6e6
Make embed smaller
Some checks are pending
ptero-push / build (push) Waiting to run
96912d325a
Im dumb
Some checks are pending
ptero-push / build (push) Waiting to run
d491fda5c8
Smol fix
Some checks are pending
ptero-push / build (push) Waiting to run
9f31d18a6f
Add full sub info to permission errors
Some checks are pending
ptero-push / build (push) Waiting to run
0227979176
Notify guild owners and remove subs
Some checks are pending
ptero-push / build (push) Waiting to run
e952ec60e7
Add perm check to subscribe command
Some checks are pending
ptero-push / build (push) Waiting to run
4bb679cef8
Add bypass to deletion for main guild
Some checks failed
ptero-push / build (push) Has been cancelled
e02faaab18
Fix sat typo, mb
Some checks are pending
ptero-push / build (push) Waiting to run
79ae2f4c25
Attempt to not throw error when we cant DM a user!
Some checks are pending
ptero-push / build (push) Waiting to run
ded7a2373c
Whooooops
Some checks failed
ptero-push / build (push) Has been cancelled
770813b4a7
Update some logging stuff
Some checks are pending
ptero-push / build (push) Waiting to run
5b487125aa
Fix log?
Some checks are pending
ptero-push / build (push) Waiting to run
1a7c1735f4
hotfix
Some checks are pending
ptero-push / build (push) Waiting to run
1ae72ac979
Made the same mistake twice, dang
Some checks failed
ptero-push / build (push) Has been cancelled
a543386394
Nexlabs Outlooks
Some checks failed
ptero-push / build (push) Has been cancelled
c82ab68c1e
Update data/events.json
Some checks are pending
ptero-push / build (push) Waiting to run
cce9b12645
Flash Flood Warning Is Level 5
Update data/events.json
Some checks failed
ptero-push / build (push) Has been cancelled
664e00b7f4
updated some pri codes
Update data/wfos.json
Some checks failed
ptero-push / build (push) Has been cancelled
93ac9d14bf
Some checks failed
ptero-push / build (push) Has been cancelled
This pull request has changes conflicting with the target branch.
  • index.js
  • package.json
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin main:main
git switch main

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch shard-test
git merge --no-ff main
git switch main
git rebase shard-test
git switch shard-test
git merge --ff-only main
git switch main
git rebase shard-test
git switch shard-test
git merge --no-ff main
git switch shard-test
git merge --squash main
git switch shard-test
git merge --ff-only main
git switch shard-test
git merge main
git push origin shard-test
Sign in to join this conversation.
No description provided.