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.

Sign up for GitHub

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

Jump to bottom

Feature: Show time tower usages and warn when none left #1506

Merged
merged 10 commits into from
Apr 29, 2024
Merged

Feature: Show time tower usages and warn when none left #1506

merged 10 commits into from
Apr 29, 2024

Commits on Apr 20, 2024

  1. show time tower usages and warn when none left

    @CalMWolfs
    CalMWolfs committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    994272c View commit details
    Browse the repository at this point in the history

  2. finish feature

    @CalMWolfs
    CalMWolfs committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    b86f08e View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. Merge branch 'refs/heads/beta' into time-tower

    @CalMWolfs
    CalMWolfs committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    6b56c51 View commit details
    Browse the repository at this point in the history

  2. fix highlighting on switched profile without time tower

    @CalMWolfs
    CalMWolfs committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    94676a1 View commit details
    Browse the repository at this point in the history

  3. fix not getting minutes or hours

    @CalMWolfs
    CalMWolfs committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    2822efe View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge branch 'refs/heads/beta' into time-tower

    @CalMWolfs
    CalMWolfs committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6de3429 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'refs/heads/beta' into time-tower 

    # 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
    @CalMWolfs
    CalMWolfs committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3041c53 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into time-tower 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryBarnManager.kt
    @CalMWolfs
    CalMWolfs committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    48f9d74 View commit details
    Browse the repository at this point in the history

  3. fix merge

    @CalMWolfs
    CalMWolfs committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    dc1d91d View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'refs/heads/beta' into time-tower 

    # 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
    @CalMWolfs
    CalMWolfs committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    36ead18 View commit details
    Browse the repository at this point in the history