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: warning when upgrade avaliavble #1642

Merged
merged 19 commits into from
May 2, 2024
Merged

Feature: warning when upgrade avaliavble #1642

merged 19 commits into from
May 2, 2024

Commits on May 2, 2024

  1. Improvement: Show stars on time tower and coach jackrabbit

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d83752e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into rework-chocolate-factory-upgrades

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7c417bc View commit details
    Browse the repository at this point in the history

  3. fix bug

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1c9ec06 View commit details
    Browse the repository at this point in the history

  4. more fixes

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

  5. uhh

    @catgirlseraid
    catgirlseraid committed May 2, 2024
    Configuration menu
    Copy the full SHA
    762eb6e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'refs/heads/rework-chocolate-factory-upgrades' into soun… 

    …donupgrade
    @catgirlseraid
    catgirlseraid committed May 2, 2024
    Configuration menu
    Copy the full SHA
    cf79b9f View commit details
    Browse the repository at this point in the history

  7. make other thing work maybe

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9839a24 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'refs/heads/rework-chocolate-factory-upgrades' into soun… 

    …donupgrade
    @catgirlseraid
    catgirlseraid committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2432b18 View commit details
    Browse the repository at this point in the history

  9. uhh i forgor what this pr is tbh give me a sec

    @catgirlseraid
    catgirlseraid committed May 2, 2024
    Configuration menu
    Copy the full SHA
    be8c06b View commit details
    Browse the repository at this point in the history

  10. added more stuff i think

    @catgirlseraid
    catgirlseraid committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3d26678 View commit details
    Browse the repository at this point in the history

  11. make double

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0178bd1 View commit details
    Browse the repository at this point in the history

  12. fix 2 small bugs

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8ac89fa View commit details
    Browse the repository at this point in the history

  13. Merge branch 'refs/heads/beta' into rework-chocolate-factory-upgrades

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4bb67a4 View commit details
    Browse the repository at this point in the history

  14. split into another file

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f8baf59 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'refs/heads/rework-chocolate-factory-upgrades' into fork… 

    …/soundonupgrade

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e09ab09 View commit details
    Browse the repository at this point in the history

  16. fix merge

    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7274dbc View commit details
    Browse the repository at this point in the history

  17. Merge branch 'refs/heads/beta' into fork/soundonupgrade 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
#	src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
    @CalMWolfs
    CalMWolfs committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2891b3e View commit details
    Browse the repository at this point in the history

  18. Merge branch 'beta' into fork/soundonupgrade

    @hannibal002
    hannibal002 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    05a2d35 View commit details
    Browse the repository at this point in the history

  19. code cleanup

    @hannibal002
    hannibal002 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bfc7c89 View commit details
    Browse the repository at this point in the history