Skip to content

Commit

Permalink
Merge branch 'hannibal002:beta' into flight-duration
Browse files Browse the repository at this point in the history
  • Loading branch information
j10a1n15 authored May 12, 2024
2 parents 3bb73a6 + 1a758de commit 5969daa
Show file tree
Hide file tree
Showing 388 changed files with 12,220 additions and 3,137 deletions.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Support
url: https://discord.gg/skyhanni-997079228510117908
about: "Please ask for support in #support on the SkyHanni Discord."
- name: Bug Report
url: https://discord.gg/skyhanni-997079228510117908
about: "If you wish to report a bug please open a post in #bug-reports on the SkyHanni Discord."
- name: Suggestion
url: https://discord.gg/skyhanni-997079228510117908
about: "If you wish to suggest something please open a post in #suggestions on the SkyHanni Discord."
1 change: 1 addition & 0 deletions .github/workflows/illegal-imports.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
# <directory without src/main/java prefix> <illegal import>

at/hannibal2/skyhanni/ scala.
at/hannibal2/skyhanni/ jline.
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.SlotClickEvent
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ gradle.properties

.devauth/*
!.devauth/config.toml

.env
5 changes: 1 addition & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,7 @@ folder for how to properly do this. You also may have to disable repo auto updat
### Discord IPC

DiscordIPC is a service that SkyHanni uses to send information from SkyBlock to Discord in Rich Presence. <br>
Specifically, we use [NetheriteMiner's Fork](https://github.com/NetheriteMiner/DiscordIPC) of a fork of a fork of a fork of
the [original](https://github.com/jagrosh/DiscordIPC).
For info on usage, look
at [DiscordRPCManager.kt](https://github.com/hannibal002/SkyHanni/blob/beta/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt)
For info on usage, look at [DiscordRPCManager.kt](https://github.com/hannibal002/SkyHanni/blob/beta/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt)

### Auto Updater

Expand Down
Loading

0 comments on commit 5969daa

Please sign in to comment.