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

Backend: Enum in GardenCropMilestoneDisplay #1535

Merged
merged 29 commits into from
May 6, 2024
Merged

Backend: Enum in GardenCropMilestoneDisplay #1535

merged 29 commits into from
May 6, 2024

Commits on Feb 24, 2024

  1. Add overflow crop milestones

    @qtlunya
    qtlunya committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    afeb540 View commit details
    Browse the repository at this point in the history

  2. Changes from HiZe 

    https://github.com/superhize/SkyHanni/tree/overflow_milestones
    @superhize @qtlunya
    superhize authored and qtlunya committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    67e28b9 View commit details
    Browse the repository at this point in the history

  3. Fix

    @qtlunya
    qtlunya committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    872c380 View commit details
    Browse the repository at this point in the history

  4. Remove test command

    @qtlunya
    qtlunya committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8b83202 View commit details
    Browse the repository at this point in the history

  5. Address review comments

    @qtlunya
    qtlunya committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ff67996 View commit details
    Browse the repository at this point in the history

  6. Cleanup

    @qtlunya
    qtlunya committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    31e9efc View commit details
    Browse the repository at this point in the history

  7. Forgot to commit these 

    Co-authored-by: HiZe <superhize@hotmail.com>
    @qtlunya @superhize
    qtlunya and superhize committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    fe2cb65 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. No more property 

    Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
    @qtlunya @CalMWolfs
    qtlunya and CalMWolfs authored Feb 25, 2024
    Configuration menu
    Copy the full SHA
    41d9810 View commit details
    Browse the repository at this point in the history

  2. Fix access

    @qtlunya
    qtlunya committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    8a54410 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. I don't know what this is doing here

    @qtlunya
    qtlunya committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    19e9cd9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/beta' into overflow-milestones

    @qtlunya
    qtlunya committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    e27db1e View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'beta' into fork/overflow-milestones 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
    @hannibal002
    hannibal002 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    ffe6e70 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Address some review comments

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

  2. Fix build error

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

  3. Address review comments - Part 2

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

  4. Merge remote-tracking branch 'origin/beta' into overflow-milestones

    @qtlunya
    qtlunya committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    2f79362 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'beta' into fork/overflow-milestones 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
    @hannibal002
    hannibal002 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3b1593e View commit details
    Browse the repository at this point in the history

  2. fix merge conflicts

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

  3. move CropMilestonesOverflowConfig into own class

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

  4. code cleanup

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

  5. progressDisplay is now renderable

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

  6. code cleanup

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

  7. Merge branch 'fork/overflow-milestones' into crop-milestone-display-r… 

    …enderable
    @hannibal002
    hannibal002 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    f248899 View commit details
    Browse the repository at this point in the history

  8. mushroomCowPerkDisplay is now renderable

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

  9. use buildList for horizontalContainer

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

  10. use enum rather than ordinals in GardenCropMilestoneDisplay

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

  11. now for MushroomTextEntry as well

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

Commits on May 4, 2024

  1. Merge branch 'beta' into use-enum-rather-than-ordinals 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesOverflowConfig.java
#	src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
#	src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt
#	src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt
#	src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
#	src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryTooltipOverflow.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
#	src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
    @hannibal002
    hannibal002 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    47fb43e View commit details
    Browse the repository at this point in the history

  2. fix

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