Skip to content
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
merged 56 commits into from
Apr 23, 2024

Conversation

CalMWolfs
Copy link
Collaborator

Dependencies

What

Shows a summary of your hoppity rabbit collection.

Images

image
image

Changelog New Features

  • Added Hoppity rabbit collection stats summary. - CalMWolfs

@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Apr 18, 2024
@CalMWolfs CalMWolfs added this to the Version 0.25 milestone Apr 18, 2024
@hannibal002 hannibal002 added the Waiting on Dependency PR waiting for a dependency pr to be merged label Apr 18, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 19, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@hannibal002 hannibal002 removed the Waiting on Dependency PR waiting for a dependency pr to be merged label Apr 19, 2024
Copy link
Owner

@hannibal002 hannibal002 left a 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
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 19, 2024
@hannibal002 hannibal002 merged commit 4ab1988 into hannibal002:beta Apr 23, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Apr 23, 2024
@CalMWolfs CalMWolfs deleted the hoppety-collection-stats branch April 23, 2024 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants