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

Improvement: Add time until next prestige #1514

Merged
merged 92 commits into from
Apr 29, 2024

Conversation

CalMWolfs
Copy link
Collaborator

Dependencies

What

Adds a display showing time until next prestige and starts saving a lot more hoppity data to be used later on. Combines all of the open prs relating to the chocolate factory so that if people want a complete branch they can use this one.

Images

image

Changelog Improvements

  • Show an estimation of when you will prestige based on your chocolate/second. - CalMWolfs

Changelog Technical Details

  • Changes how some of the chocolate factory data is stored and accessed. - CalMWolfs

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryAPI.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 24, 2024
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 24, 2024
Copy link

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

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryBarnManager.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 24, 2024
Copy link

Conflicts have been resolved! 🎉

@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Apr 24, 2024
Copy link

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

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 28, 2024
# 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/ChocolateFactoryBarnManager.kt
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/features/event/ChocolateFactoryConfig.java
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 29, 2024
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 29, 2024
Copy link

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

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.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/ChocolateFactoryTimeTowerManager.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 29, 2024
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 merged commit a5a77b6 into hannibal002:beta Apr 29, 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 29, 2024
@CalMWolfs CalMWolfs deleted the choc-factory-all branch April 29, 2024 13:58
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.

3 participants