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: Show time tower usages and warn when none left #1506

Merged
merged 10 commits into from
Apr 29, 2024

Conversation

CalMWolfs
Copy link
Collaborator

@CalMWolfs CalMWolfs commented Apr 21, 2024

What

Shows the status of your time tower (only if you have it unlocked) and notifies you when you get another charge or if all of your charges are full.

Images

image
image

Changelog New Features

  • Added time tower status to the chocolate factory stats. - CalMWolfs
    • Also can notify you when you get a new charge or your charges are full.

@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Apr 21, 2024
@CalMWolfs CalMWolfs added this to the Version 0.25 milestone Apr 21, 2024
@CalMWolfs CalMWolfs requested a review from hannibal002 April 21, 2024 00:00
@CalMWolfs CalMWolfs marked this pull request as draft April 21, 2024 23:07
@hannibal002 hannibal002 removed the Soon This Pull Request will be merged within the next couple of betas label Apr 22, 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 23, 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/ChocolateFactoryAPI.kt
#	src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryStats.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 marked this pull request as ready for review April 24, 2024 13:35
@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Apr 24, 2024
@hannibal002
Copy link
Owner

cant test this yet

@CalMWolfs CalMWolfs modified the milestones: Version 0.26, Version 0.25 Apr 25, 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
@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 8fe9472 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 time-tower branch April 29, 2024 12:47
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