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: Starred Mob Highlight + Fels Highlight/Line #1558

Merged
merged 14 commits into from
Aug 26, 2024
Merged

Feature: Starred Mob Highlight + Fels Highlight/Line #1558

merged 14 commits into from
Aug 26, 2024

Commits on Apr 26, 2024

  1. done

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

  2. typo

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

Commits on May 25, 2024

  1. Merge branch 'refs/heads/beta' into mobdetection/dungeon

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

  2. Merge branch 'refs/heads/beta' into mobdetection/dungeon 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
#	src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
    @Thunderblade73
    Thunderblade73 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    2a7ae03 View commit details
    Browse the repository at this point in the history

  3. fix missing ?.

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

Commits on Jun 1, 2024

  1. Merge branch 'refs/heads/beta' into fork/Thunderblade73/mobdetection/… 

    …dungeon
    @CalMWolfs
    CalMWolfs committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    996f870 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge branch 'refs/heads/beta' into fork/Thunderblade73/mobdetection/… 

    …dungeon
    @CalMWolfs
    CalMWolfs committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    faea99a View commit details
    Browse the repository at this point in the history

  2. code cleanup

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

Commits on Jun 10, 2024

  1. Merge branch 'beta' into mobdetection/dungeon

    @Thunderblade73
    Thunderblade73 authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    cd797b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. Merge branch 'refs/heads/beta' into fork/Thunderblade73/mobdetection/… 

    …dungeon

# Conflicts:
#	.idea/dictionaries/default_user.xml
    @hannibal002
    hannibal002 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    5286c5e View commit details
    Browse the repository at this point in the history

  2. fixed merge conflict

    @hannibal002
    hannibal002 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    7d9f4d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'refs/heads/beta' into fork/Thunderblade73/mobdetection/… 

    …dungeon
    @hannibal002
    hannibal002 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    47ca34a View commit details
    Browse the repository at this point in the history

  2. code cleanup

    @hannibal002
    hannibal002 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    257a3f1 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. fix for config changes not applying

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