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: Custom Scoreboard Lines #1709

Closed
wants to merge 422 commits into from
Closed

Feature: Custom Scoreboard Lines #1709

wants to merge 422 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 24, 2024

  1. fixed buttons

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

  2. improved performance by like 10x

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

  3. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeOverlay.kt
    @ItsEmpa
    ItsEmpa committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    918706b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into gui-before-draw

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

  5. fixed issues

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

  6. Update src/main/java/at/hannibal2/skyhanni/features/inventory/wardrob… 

    …e/WardrobeOverlay.kt
    @j10a1n15
    j10a1n15 authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    b3ec38d View commit details
    Browse the repository at this point in the history

  7. Update src/main/java/at/hannibal2/skyhanni/features/inventory/wardrob… 

    …e/WardrobeOverlay.kt
    @j10a1n15
    j10a1n15 authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d541bf9 View commit details
    Browse the repository at this point in the history

  8. Update src/main/java/at/hannibal2/skyhanni/features/inventory/wardrob… 

    …e/WardrobeOverlay.kt
    @j10a1n15
    j10a1n15 authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    1329a58 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #35 from ItsEmpa/wardrobe-overlay-addon 

    more wardrobe pr
    @j10a1n15
    j10a1n15 authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    08d9971 View commit details
    Browse the repository at this point in the history

  10. fixed button size

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

  11. Merge branch 'beta' into tool/graph

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

  12. fix ConfigManager

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

Commits on Apr 25, 2024

  1. fix

    @Thunderblade73
    Thunderblade73 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    bc2f69b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fork/outlined-scoreboard' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    966d6e3 View commit details
    Browse the repository at this point in the history

  3. small cleanup

    @j10a1n15
    j10a1n15 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    75eb727 View commit details
    Browse the repository at this point in the history

  4. fixed indexOutOfBoundsException

    @Thunderblade73
    Thunderblade73 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c63bbc0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta' into tool/graph

    @Thunderblade73
    Thunderblade73 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    385668f View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. fixed button size

    @j10a1n15 @ItsEmpa
    j10a1n15 authored and ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    50b9ae1 View commit details
    Browse the repository at this point in the history

  2. a

    @VixidDev @ItsEmpa
    VixidDev authored and ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    f9a4cc2 View commit details
    Browse the repository at this point in the history

  3. Fix the entire scoreboard being covered in the outline color

    @VixidDev @ItsEmpa
    VixidDev authored and ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    41e3125 View commit details
    Browse the repository at this point in the history

  4. fix alignment when outline

    @j10a1n15 @ItsEmpa
    j10a1n15 authored and ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    0efd209 View commit details
    Browse the repository at this point in the history

  5. too many things to count at this point

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9154ed2 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeOverlay.kt
#	src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    2af7ba3 View commit details
    Browse the repository at this point in the history

  7. renamed to custom wardrobe

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e276eca View commit details
    Browse the repository at this point in the history

  8. move wardrobe price logic to wardrobeapi

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b23b73d View commit details
    Browse the repository at this point in the history

  9. fix estimated wardrobe price tooltip appearing in custom wardrobe

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    bd2050f View commit details
    Browse the repository at this point in the history

  10. fix not setting no current slot and added support for storing locked … 

    …slots
    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4450eba View commit details
    Browse the repository at this point in the history

  11. Merge pull request #36 from ItsEmpa/wardrobe-overlay-addon 

    wardrobe stuff
    @j10a1n15
    j10a1n15 authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    23e8b4a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/wardrobe-overlay' of https://github.com/j10a1n1… 

    …5/SkyHanni into feature/wardrobe-overlay
    @j10a1n15
    j10a1n15 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d077422 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    38c11d1 View commit details
    Browse the repository at this point in the history

  14. fix hover size

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ede0cc5 View commit details
    Browse the repository at this point in the history

  15. only create new renderables when absolutely necessary

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    354e506 View commit details
    Browse the repository at this point in the history

  16. where second layer

    @j10a1n15
    j10a1n15 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a0be0dd View commit details
    Browse the repository at this point in the history

  17. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e2d6be2 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #37 from ItsEmpa/wardrobe-overlay-addon 

    more wardrob
    @j10a1n15
    j10a1n15 authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7dea50f View commit details
    Browse the repository at this point in the history

  19. see through blocks toggle

    @Thunderblade73
    Thunderblade73 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    5a5c5f1 View commit details
    Browse the repository at this point in the history

  20. move to category, fix still showing when temp disabled

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a663f03 View commit details
    Browse the repository at this point in the history

  21. added back and close buttons

    @j10a1n15
    j10a1n15 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3f5161d View commit details
    Browse the repository at this point in the history

  22. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d9b6d44 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'beta' into gui-before-draw

    @Thunderblade73
    Thunderblade73 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1614811 View commit details
    Browse the repository at this point in the history

  24. fix bug

    @Thunderblade73
    Thunderblade73 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    92057f8 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'fork/gui-before-draw' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e24ca2d View commit details
    Browse the repository at this point in the history

  26. a

    @ItsEmpa
    ItsEmpa committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c61aa73 View commit details
    Browse the repository at this point in the history

  27. added depth Layer

    @Thunderblade73
    Thunderblade73 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8a98af4 View commit details
    Browse the repository at this point in the history

  28. I learned how to write

    @Thunderblade73
    Thunderblade73 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    86155a7 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #39 from Thunderblade73/pr/wardrobe-overlay 

    Renderable cleanup
    @j10a1n15
    j10a1n15 authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    0ab3da0 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #38 from ItsEmpa/wardrobe-overlay-addon 

    g
    @j10a1n15
    j10a1n15 authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    2adcc3c View commit details
    Browse the repository at this point in the history

  31. shouldAllowLink updated

    @Thunderblade73
    Thunderblade73 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    81ecabd View commit details
    Browse the repository at this point in the history

  32. Merge branch 'fork/gui-before-draw' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    81e66b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch 'beta' into chunked

    @j10a1n15
    j10a1n15 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    1509e40 View commit details
    Browse the repository at this point in the history

  2. removed dupe code

    @j10a1n15
    j10a1n15 committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    0c0bb9b View commit details
    Browse the repository at this point in the history

  3. use reset here

    @j10a1n15
    j10a1n15 committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    d5833fc View commit details
    Browse the repository at this point in the history

  4. added price tooltips hover thingy

    @j10a1n15
    j10a1n15 committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    95f48e6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    c78e97e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    53e953b View commit details
    Browse the repository at this point in the history

  7. removed mixin, made player renderer work without mixin, and fixed sec… 

    …ond skin layer not being shown
    @ItsEmpa
    ItsEmpa committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    525d1bf View commit details
    Browse the repository at this point in the history

  8. Merge pull request #40 from ItsEmpa/wardrobe-overlay-addon 

    wardobe pr :3
    @j10a1n15
    j10a1n15 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    bf7ce73 View commit details
    Browse the repository at this point in the history

  9. thunder vertical container fix

    @ItsEmpa
    ItsEmpa committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    8b9635e View commit details
    Browse the repository at this point in the history

  10. switch from tables to vertical containers, add favoriting in a per-sl… 

    …ot button instead of select toggle, and cleanup
    @ItsEmpa
    ItsEmpa committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    558c356 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #41 from ItsEmpa/wardrobe-overlay-addon

    @j10a1n15
    j10a1n15 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    930c864 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. things :3

    @ItsEmpa
    ItsEmpa committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    5495122 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #42 from ItsEmpa/wardrobe-overlay-addon 

    me when i the the when the
    @j10a1n15
    j10a1n15 authored Apr 28, 2024
    Configuration menu
    Copy the full SHA
    96ed2b9 View commit details
    Browse the repository at this point in the history

  3. removed player cache

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    9e7b880 View commit details
    Browse the repository at this point in the history

  4. fixed players having no armor on first load

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    9a9c28c View commit details
    Browse the repository at this point in the history

  5. small cleanup

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    4e169bf View commit details
    Browse the repository at this point in the history

  6. so smart

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    d79dc48 View commit details
    Browse the repository at this point in the history

  7. addAll() exists

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    7dc5a79 View commit details
    Browse the repository at this point in the history

  8. renamed loop vars

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    c3990df View commit details
    Browse the repository at this point in the history

  9. renamed some more vars

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    08e008a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored Apr 28, 2024
    Configuration menu
    Copy the full SHA
    4f02bc3 View commit details
    Browse the repository at this point in the history

  11. fixed slot buttons alignment

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    addf3e0 View commit details
    Browse the repository at this point in the history

  12. fixed typo in config

    @j10a1n15
    j10a1n15 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    9f305c1 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. b

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1f4b407 View commit details
    Browse the repository at this point in the history

  2. b

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    b388c3b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1977826 View commit details
    Browse the repository at this point in the history

  4. fix sometimes storing items from other menus

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    0cbe652 View commit details
    Browse the repository at this point in the history

  5. aaaa

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

  6. item fix

    @Thunderblade73
    Thunderblade73 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f064612 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #43 from Thunderblade73/pr/wardrobe-overlay 

    Item fix
    @j10a1n15
    j10a1n15 authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1847cd2 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    d791975 View commit details
    Browse the repository at this point in the history

  9. removed useless update()

    @j10a1n15
    j10a1n15 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    d659be5 View commit details
    Browse the repository at this point in the history

  10. improve player renderable bounding and make every slot a single rende… 

    …rable
    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5e05e1a View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    ed4298a View commit details
    Browse the repository at this point in the history

  12. itemstack sizes

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    8969685 View commit details
    Browse the repository at this point in the history

  13. delete thing

    @ItsEmpa
    ItsEmpa committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    597f1c9 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #44 from ItsEmpa/wardrobe-overlay-addon 

    wardbobe
    @j10a1n15
    j10a1n15 authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    18b5c18 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. fix maybe?

    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7b47f1c View commit details
    Browse the repository at this point in the history

  2. make everything inside very few renderables!!! 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    53a5a0e View commit details
    Browse the repository at this point in the history

  3. dont allow wardrobe loc edit in guieditormanager

    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    cbc1890 View commit details
    Browse the repository at this point in the history

  4. add a billion config options 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    2299c67 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    b36f789 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #45 from ItsEmpa/wardrobe-overlay-addon 

    wardbobe
    @j10a1n15
    j10a1n15 authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    2389b8b View commit details
    Browse the repository at this point in the history

  7. add auto-adjusting global wardrobe scale 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    1b55339 View commit details
    Browse the repository at this point in the history

  8. fix slot flickering 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    c0c3332 View commit details
    Browse the repository at this point in the history

  9. make better buttons 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    e006cba View commit details
    Browse the repository at this point in the history

  10. Merge pull request #46 from ItsEmpa/wardrobe-overlay-addon 

    braowardobbebe
    @j10a1n15
    j10a1n15 authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    ae9d89d View commit details
    Browse the repository at this point in the history

  11. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    69111c2 View commit details
    Browse the repository at this point in the history

  12. funny 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    bab8b38 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #47 from ItsEmpa/wardrobe-overlay-addon 

    barodwobe
    @j10a1n15
    j10a1n15 authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    acdd722 View commit details
    Browse the repository at this point in the history

  14. added bg 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    71abf41 View commit details
    Browse the repository at this point in the history

  15. centered fix 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    c0113a5 View commit details
    Browse the repository at this point in the history

  16. warning text scaling and centered 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    147b530 View commit details
    Browse the repository at this point in the history

  17. added skyhanni text 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a7a8b80 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    4d530f9 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #48 from ItsEmpa/wardrobe-overlay-addon 

    wabobe
    @j10a1n15
    j10a1n15 authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    be2386f View commit details
    Browse the repository at this point in the history

  20. removed useless comment 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0eabdf1 View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'origin/feature/wardrobe-overlay' into f… 

    …eature/wardrobe-overlay
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    c6215a0 View commit details
    Browse the repository at this point in the history

  22. optimized alignment import 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    d3e71c8 View commit details
    Browse the repository at this point in the history

  23. optimized alignment import part 2 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    8524354 View commit details
    Browse the repository at this point in the history

  24. removed smth 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a181674 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. fixed deadlock

    @Thunderblade73
    Thunderblade73 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    448d621 View commit details
    Browse the repository at this point in the history

  2. round weight in export

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

  3. Merge branch 'beta' into tool/graph

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

  4. not working event 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    fd7ea5f View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge branch 'beta' into feature/wardrobe-overlay

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

  2. configs, fixes, cleanup, more idk 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7fb5eba View commit details
    Browse the repository at this point in the history

  3. Merge pull request #49 from ItsEmpa/wardrobe-overlay-addon 

    bardwobe
    @j10a1n15
    j10a1n15 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    f1a1bec View commit details
    Browse the repository at this point in the history

  4. no need to render multiple renderables !! 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6158dfc View commit details
    Browse the repository at this point in the history

  5. Merge pull request #50 from ItsEmpa/wardrobe-overlay-addon 

    bobewrdb
    @j10a1n15
    j10a1n15 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    68fcdeb View commit details
    Browse the repository at this point in the history

  6. fix 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    05d0f15 View commit details
    Browse the repository at this point in the history

  7. cleanup and config link fix 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bc119d0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #51 from ItsEmpa/wardrobe-overlay-addon

    @j10a1n15
    j10a1n15 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    36b4cb2 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    eca31ef View commit details
    Browse the repository at this point in the history

  10. removed stupid event 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9248577 View commit details
    Browse the repository at this point in the history

  11. small cleanup 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    54b688f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'beta' into gui-before-draw

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

  13. fix skyHanni guis bugging out the preDrawEventCanceled state

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

  14. Merge branch 'gui-before-draw' into feature/wardrobe-overlay

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

  15. render infront of actionbar 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f892d43 View commit details
    Browse the repository at this point in the history

  16. fixed not being able to click after using jumpToEditor() 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    fc088fc View commit details
    Browse the repository at this point in the history

  17. fix

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

  18. small formatting 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d753e4b View commit details
    Browse the repository at this point in the history

  19. Merge branch 'gui-before-draw' into feature/wardrobe-overlay

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

Commits on May 3, 2024

  1. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 3, 2024
    Configuration menu
    Copy the full SHA
    48d9f6a View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 4, 2024
    Configuration menu
    Copy the full SHA
    9374ba6 View commit details
    Browse the repository at this point in the history

  2. init 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    4e41a2f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/chunked' into feature/custom-lines

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

  4. cleanup 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    2e730bf View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. added some more replacements, changed to triple 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    80b1de3 View commit details
    Browse the repository at this point in the history

  2. pitch and yaw 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    b46db60 View commit details
    Browse the repository at this point in the history

  3. + date, year, time 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    77d04ca View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into tool/graph

    @Thunderblade73
    Thunderblade73 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    cf4f7c7 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'Thunderblade73/tool/graph' into feature… 

    …/custom-lines
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    b5b2a4e View commit details
    Browse the repository at this point in the history

  6. silly gui 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    92d4e4d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/wardrobe-overlay' into feature/custom-lines

    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    d9665a7 View commit details
    Browse the repository at this point in the history

  8. sillier gui 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    3fb6141 View commit details
    Browse the repository at this point in the history

  9. small look change idk 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    3dd3f5d View commit details
    Browse the repository at this point in the history

  10. edit the gui line! 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    fd84f1b View commit details
    Browse the repository at this point in the history

  11. store § as & 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    dabe823 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. config link to gui 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    3f0d5a7 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. fix 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    926327a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix/customscoreboard-transparency-thingy' into feature/… 

    …custom-lines
    @j10a1n15
    j10a1n15 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    1136a5f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'hannibal002:beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 7, 2024
    Configuration menu
    Copy the full SHA
    4c716ed View commit details
    Browse the repository at this point in the history

  4. fix time import 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    12fe008 View commit details
    Browse the repository at this point in the history

  5. tried 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    5a0f6f0 View commit details
    Browse the repository at this point in the history

  6. properly separate the 2 columns, wrap strings if too long, and separa… 

    …te renderable logic into more functions

Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 7, 2024
    Configuration menu
    Copy the full SHA
    46cfd81 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #52 from ItsEmpa/feature/custom-lines 

    custom line gui thingy
    @j10a1n15
    j10a1n15 authored May 7, 2024
    Configuration menu
    Copy the full SHA
    73a8a38 View commit details
    Browse the repository at this point in the history

  8. clickable auto fill 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    236f2ad View commit details
    Browse the repository at this point in the history

  9. Merge branch 'beta' into tool/graph 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
    @Thunderblade73
    Thunderblade73 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    1a18870 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'beta' into tool/graph

    @Thunderblade73
    Thunderblade73 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    0f735ba View commit details
    Browse the repository at this point in the history

  11. fixes

    @Thunderblade73
    Thunderblade73 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    0e9d335 View commit details
    Browse the repository at this point in the history

  12. added back the round

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

  13. correct rounding

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

Commits on May 10, 2024

  1. input background or smth 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a8bbcea View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Merge branch 'refs/heads/beta' into tool/graph

    @Thunderblade73
    Thunderblade73 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    879738a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into tool/graph 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
    @Thunderblade73
    Thunderblade73 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    88a156c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 11, 2024
    Configuration menu
    Copy the full SHA
    06fa7c6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 11, 2024
    Configuration menu
    Copy the full SHA
    14f24e7 View commit details
    Browse the repository at this point in the history

  5. fix 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    ef1167c View commit details
    Browse the repository at this point in the history

  6. fix 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    2e296c7 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Merge branch 'hannibal002:beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 12, 2024
    Configuration menu
    Copy the full SHA
    a73259d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 12, 2024
    Configuration menu
    Copy the full SHA
    c5318fc View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. fix clickable chat

    @Thunderblade73
    Thunderblade73 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    272f8ec View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge branch 'hannibal002:beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 20, 2024
    Configuration menu
    Copy the full SHA
    d640c68 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 20, 2024
    Configuration menu
    Copy the full SHA
    bfcf43f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. fix missing expose

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

  2. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    79cc2c9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    c211863 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    c51a4d9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    6eb99b6 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. Merge branch 'hannibal002:beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 25, 2024
    Configuration menu
    Copy the full SHA
    b7ecb2d View commit details
    Browse the repository at this point in the history

  2. fix

    @j10a1n15
    j10a1n15 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    8fb7efd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fork/tool/graph' into feature/custom-lines

    @j10a1n15
    j10a1n15 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    0dce230 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. doppelt hält besser

    @j10a1n15
    j10a1n15 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    48c4098 View commit details
    Browse the repository at this point in the history

  2. formatting

    @j10a1n15
    j10a1n15 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    0dfc5e8 View commit details
    Browse the repository at this point in the history

  3. changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 28, 2024
    Configuration menu
    Copy the full SHA
    2dafcb3 View commit details
    Browse the repository at this point in the history

  4. not needed 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 28, 2024
    Configuration menu
    Copy the full SHA
    2a9e8be View commit details
    Browse the repository at this point in the history

  5. Merge pull request #56 from ItsEmpa/wardrobe-overlay-addon 

    wadobbe
    @j10a1n15
    j10a1n15 authored May 28, 2024
    Configuration menu
    Copy the full SHA
    c66fe5f View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    1157f82 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    ea3c0e6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/beta' into wardrobe-overlay-addon 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    1461b8c View commit details
    Browse the repository at this point in the history

  4. fix import 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    695fc2e View commit details
    Browse the repository at this point in the history

  5. cal changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    7b69c98 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    784c972 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over… 

    …lay-addon

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    59d691b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon

    @j10a1n15
    j10a1n15 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    beed318 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/wardrobe-overlay-addon' into war… 

    …drobe-overlay-addon

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    13fc361 View commit details
    Browse the repository at this point in the history

  10. more changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    4e586cb View commit details
    Browse the repository at this point in the history

  11. Merge pull request #57 from ItsEmpa/wardrobe-overlay-addon 

    bowardobbb
    @j10a1n15
    j10a1n15 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    d27e360 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    4bbfb7b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    24899c7 View commit details
    Browse the repository at this point in the history

  3. fix 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    13501d9 View commit details
    Browse the repository at this point in the history

  4. fix 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    efdeb23 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Merge branch 'hannibal002:beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    a8ceb19 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    df77cb7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    7550d4a View commit details
    Browse the repository at this point in the history

  4. auto load 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    bc9b02a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    f162580 View commit details
    Browse the repository at this point in the history

  6. fix item pickup 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    6b41101 View commit details
    Browse the repository at this point in the history

  7. small cleanup 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    efc6f92 View commit details
    Browse the repository at this point in the history

  8. apparently we do 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    ee3987f View commit details
    Browse the repository at this point in the history

  9. changes and cleanup 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    a7408dc View commit details
    Browse the repository at this point in the history

  10. Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over… 

    …lay-addon

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
    @ItsEmpa
    ItsEmpa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    d9a0602 View commit details
    Browse the repository at this point in the history

  11. oop 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    56ebdae View commit details
    Browse the repository at this point in the history

  12. some refactoring and cleanup 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    3ca25be View commit details
    Browse the repository at this point in the history

  13. changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    04f0441 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov… 

    …erlay
    @CalMWolfs
    CalMWolfs committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    33d1958 View commit details
    Browse the repository at this point in the history

  2. add annotation, fix merge

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

  3. Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over… 

    …lay-addon
    @ItsEmpa
    ItsEmpa committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    e9843da View commit details
    Browse the repository at this point in the history

  4. fix size 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    d27e24c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #58 from ItsEmpa/wardrobe-overlay-addon

    @j10a1n15
    j10a1n15 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    d27adf5 View commit details
    Browse the repository at this point in the history

  6. oops 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    a890bd4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #59 from ItsEmpa/wardrobe-overlay-addon

    @j10a1n15
    j10a1n15 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    beaa8a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    a6c39ed View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    11bbeb7 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. first batch of changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    b8534b8 View commit details
    Browse the repository at this point in the history

  2. second batch of changes 

    Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    ee7f9a1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #60 from ItsEmpa/wardrobe-overlay-addon 

    wabrobbbdbdbbbbbbbbbbbbbbbbbbbbbbbbbd
    @j10a1n15
    j10a1n15 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    36abbc7 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge branch 'beta' into feature/wardrobe-overlay

    @j10a1n15
    j10a1n15 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8a75593 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ad4ac49 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/custom-lines 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    6a6ad70 View commit details
    Browse the repository at this point in the history

  2. fix merge

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

  3. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov… 

    …erlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e7f3952 View commit details
    Browse the repository at this point in the history

  4. fix merge

    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    26b9bfc View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/custom-lines 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    624a9d2 View commit details
    Browse the repository at this point in the history

  6. fix merge

    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    0a56a05 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov… 

    …erlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    f3b72bc View commit details
    Browse the repository at this point in the history

  8. color 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    10e1a6b View commit details
    Browse the repository at this point in the history

  9. change click stopping 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    6c446b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Merge branch 'refs/heads/beta' into fork/feature/wardrobe-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt
    @hannibal002
    hannibal002 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    483a179 View commit details
    Browse the repository at this point in the history

  2. fixed merge conflicts

    @hannibal002
    hannibal002 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    3a4426e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/wardrobe-overlay' into feature/custom-lines

    @j10a1n15
    j10a1n15 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    efcdf9c View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/custom-lines 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @CalMWolfs
    CalMWolfs committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    ab82d7f View commit details
    Browse the repository at this point in the history

  2. fix merge

    @CalMWolfs
    CalMWolfs committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    9fa831d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 authored Jun 8, 2024
    Configuration menu
    Copy the full SHA
    07b42fe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/custom-lines 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
    @CalMWolfs
    CalMWolfs committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    30b9602 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/custom-lines 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
    @CalMWolfs
    CalMWolfs committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    64075ee View commit details
    Browse the repository at this point in the history

  6. fix merge

    @CalMWolfs
    CalMWolfs committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    62bec1a View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. Merge branch 'beta' into feature/custom-lines

    @j10a1n15
    j10a1n15 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    2ad278d View commit details
    Browse the repository at this point in the history

  2. fix build 

    Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
    @j10a1n15
    j10a1n15 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    681d268 View commit details
    Browse the repository at this point in the history