Feature: Mineshaft Pity Display + OreMinedEvent #1655
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt # src/main/java/at/hannibal2/skyhanni/config/Storage.java # src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
This reverts commit 2ed9de7.
# Conflicts: # src/main/java/at/hannibal2/skyhanni/config/Storage.java
# Conflicts: # src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
# Conflicts: # src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
|
This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes. |
github-actions
bot
added
the
Merge Conflicts
# Conflicts: # src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
github-actions
bot
removed
the
Merge Conflicts
|
Conflicts have been resolved! 🎉 |
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
github-actions
bot
removed
the
Soon
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Adds a counter of your current pity counter for spawning a mineshaft. Also adds a OreMinedEvent that gets called when you mine a block using hypixel's custom mining system.
Images
Changelog New Features
Changelog Technical Details