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: Personal Compactor Overlay #1869

Merged
merged 65 commits into from
Sep 7, 2024
Merged

Feature: Personal Compactor Overlay #1869

merged 65 commits into from
Sep 7, 2024

Commits on May 19, 2024

  1. start 

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

  2. j10 changes 

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

Commits on May 22, 2024

  1. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay
    @ItsEmpa
    ItsEmpa committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ec9c36b View commit details
    Browse the repository at this point in the history

  2. init 

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

Commits on May 23, 2024

  1. comment 

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

  2. changed it to single renderable 

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

  3. omg finally 

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

  4. yayyy 

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

  5. change name 

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

  6. move to RenderableInventory 

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

  7. added status 

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

  8. switch to inventory update instead 

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

Commits on May 29, 2024

  1. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

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

  2. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

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

  3. fix render tooltip event

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

  4. Merge remote-tracking branch 'refs/remotes/origin/beta' into personal… 

    …-compactor-overlay

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

  5. fix merge 

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

  6. Merge branch 'refs/heads/fork/fix-tooltip-event' into personal-compac… 

    …tor-overlay
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    1c765c4 View commit details
    Browse the repository at this point in the history

  7. change regex imports and remove workaround 

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

  8. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
    @ItsEmpa
    ItsEmpa committed May 29, 2024
    Configuration menu
    Copy the full SHA
    9fcf3ac View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
    @ItsEmpa
    ItsEmpa committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ae3f785 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
    @ItsEmpa
    ItsEmpa committed May 30, 2024
    Configuration menu
    Copy the full SHA
    bd3a199 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
    @ItsEmpa
    ItsEmpa committed May 31, 2024
    Configuration menu
    Copy the full SHA
    16925e7 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons

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

  2. fix issue with position updating 

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

Commits on Jun 3, 2024

  1. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
    @ItsEmpa
    ItsEmpa committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c3ccc52 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. changes 

    Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
    @ItsEmpa @CalMWolfs
    ItsEmpa and CalMWolfs authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    af96614 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons

    @ItsEmpa
    ItsEmpa committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    05981a5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
    @ItsEmpa
    ItsEmpa committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fdf38eb 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/ItsEmpa/personal-compactor-o… 

    …verlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    1680c6a 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
    df2ea62 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/ItsEmpa/personal-compactor-o… 

    …verlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
    @CalMWolfs
    CalMWolfs committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    9589fa2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into fork/ItsEmpa/custom-scoreboard-ad… 

    …dons

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

  3. fix merge

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

  4. fix merge

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

Commits on Jun 9, 2024

  1. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
    @ItsEmpa
    ItsEmpa committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    708b21b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/beta' into personal… 

    …-compactor-overlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
    @ItsEmpa
    ItsEmpa committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    4147c64 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
    @ItsEmpa
    ItsEmpa committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    1377a93 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay
    @ItsEmpa
    ItsEmpa committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    690bd03 View commit details
    Browse the repository at this point in the history

  3. some formatting 

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

  4. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay
    @ItsEmpa
    ItsEmpa committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    0f625fc View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
    @ItsEmpa
    ItsEmpa committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    14b34b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
    @ItsEmpa
    ItsEmpa committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4772a7f View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
#	src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
    @ItsEmpa
    ItsEmpa committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    f910aeb View commit details
    Browse the repository at this point in the history

  2. fix merge 

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

  3. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay
    @ItsEmpa
    ItsEmpa committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    74b15d0 View commit details
    Browse the repository at this point in the history

  4. fix style 

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

  5. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay
    @ItsEmpa
    ItsEmpa committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    e84de8e View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Merge branch 'refs/heads/beta' into fork/ItsEmpa/custom-scoreboard-ad… 

    …dons

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
    @hannibal002
    hannibal002 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    10a1fbd View commit details
    Browse the repository at this point in the history

  2. formatting

    @hannibal002
    hannibal002 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    4276e51 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. . 

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

  2. Merge remote-tracking branch 'origin/custom-scoreboard-addons' into c… 

    …ustom-scoreboard-addons
    @ItsEmpa
    ItsEmpa committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    31352ce View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
    @ItsEmpa
    ItsEmpa committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    872b3fc View commit details
    Browse the repository at this point in the history

  2. fix merge 

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

  3. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay
    @ItsEmpa
    ItsEmpa committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    c40a199 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Merge branch 'refs/heads/beta' into custom-scoreboard-addons 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
    @ItsEmpa
    ItsEmpa committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    6e4230e View commit details
    Browse the repository at this point in the history

  2. fix merge

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

  3. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
    @ItsEmpa
    ItsEmpa committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    b93b5ae View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Merge branch 'refs/heads/beta' into fork/ItsEmpa/custom-scoreboard-ad… 

    …dons
    @hannibal002
    hannibal002 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    530866e View commit details
    Browse the repository at this point in the history

  2. formatting

    @hannibal002
    hannibal002 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0c52f47 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge branch 'refs/heads/custom-scoreboard-addons' into personal-comp… 

    …actor-overlay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
    @ItsEmpa
    ItsEmpa committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    ad8809d View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Merge branch 'refs/heads/beta' into personal-compactor-overlay 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
    @ItsEmpa
    ItsEmpa committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    46d2cae View commit details
    Browse the repository at this point in the history

  2. fix merge 

    Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
    @ItsEmpa
    ItsEmpa committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    15b960a View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Merge branch 'refs/heads/beta' into fork/ItsEmpa/personal-compactor-o… 

    …verlay
    @hannibal002
    hannibal002 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    84086e3 View commit details
    Browse the repository at this point in the history

  2. code cleanup

    @hannibal002
    hannibal002 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    7648b12 View commit details
    Browse the repository at this point in the history