-
-
Notifications
You must be signed in to change notification settings - Fork 195
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature: Hoppety rabbit collection stats #1482
Merged
hannibal002
merged 56 commits into
hannibal002:beta
from
CalMWolfs:hoppety-collection-stats
Apr 23, 2024
Merged
Feature: Hoppety rabbit collection stats #1482
hannibal002
merged 56 commits into
hannibal002:beta
from
CalMWolfs:hoppety-collection-stats
Apr 23, 2024
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
Co-authored-by: Thunderblade73 <[email protected]>
CalMWolfs
added
the
Soon
This Pull Request will be merged within the next couple of betas
label
Apr 18, 2024
hannibal002
added
the
Waiting on Dependency PR
waiting for a dependency pr to be merged
label
Apr 18, 2024
github-actions
bot
added
the
Merge Conflicts
There are open merge conflicts with the beta branch.
label
Apr 19, 2024
This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes. |
hannibal002
removed
the
Waiting on Dependency PR
waiting for a dependency pr to be merged
label
Apr 19, 2024
hannibal002
requested changes
Apr 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merge conflicts
# Conflicts: # src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt # src/main/java/at/hannibal2/skyhanni/config/features/event/ChocolateFactoryConfig.java # src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryAPI.kt # src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryStats.kt # src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggType.kt # src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggsManager.kt # src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggsShared.kt
Conflicts have been resolved! 🎉 |
github-actions
bot
removed
the
Merge Conflicts
There are open merge conflicts with the beta branch.
label
Apr 19, 2024
hannibal002
approved these changes
Apr 23, 2024
github-actions
bot
removed
the
Soon
This Pull Request will be merged within the next couple of betas
label
Apr 23, 2024
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.
Dependencies
What
Shows a summary of your hoppity rabbit collection.
Images
Changelog New Features