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: Arachne kill timer #1993

Merged
merged 12 commits into from
Sep 7, 2024
Merged

Feature: Arachne kill timer #1993

merged 12 commits into from
Sep 7, 2024

Commits on Jun 4, 2024

  1. arachne kill timer

    @MTOnline69
    MTOnline69 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    7430019 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'hannibal002:beta' into arachne-timer

    @MTOnline69
    MTOnline69 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    20b1ea8 View commit details
    Browse the repository at this point in the history

  3. requested changes

    @MTOnline69
    MTOnline69 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    afeb83a View commit details
    Browse the repository at this point in the history

  4. oops

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

  5. bit of code cleanup

    @CalMWolfs
    CalMWolfs committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    a42460f 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/MTOnline69/arachne-timer 

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

  2. fix merge

    @CalMWolfs
    CalMWolfs committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    7ea0fe7 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/MTOnline69/arachne-timer 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
    @CalMWolfs
    CalMWolfs committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    9f5121f 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/MTOnline69/arachne-timer

    @hannibal002
    hannibal002 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    3afa84a 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
    38f63bf View commit details
    Browse the repository at this point in the history

  3. regex tests

    @MTOnline69
    MTOnline69 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    06bdc9d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/arachne-timer' into arachne-timer

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