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

should allow dupe dragons to trigger titles #126

Merged
merged 22 commits into from
Oct 25, 2024
Merged

should allow dupe dragons to trigger titles #126

merged 22 commits into from
Oct 25, 2024

Commits on Oct 23, 2024

  1. should allow dupe dragons to trigger titles

    @SubAt0m1c
    SubAt0m1c committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9400771 View commit details
    Browse the repository at this point in the history

  2. slight blood camp code adjustments

    @SubAt0m1c
    SubAt0m1c committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5b4ae6f View commit details
    Browse the repository at this point in the history

  3. fixed arrow death never working (woops)

    @SubAt0m1c
    SubAt0m1c committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3d48cb4 View commit details
    Browse the repository at this point in the history

  4. fixed pos message at not working

    @SubAt0m1c
    SubAt0m1c committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    93947c6 View commit details
    Browse the repository at this point in the history

  5. concurrency woo and better edit mode display text thingy

    @SubAt0m1c
    SubAt0m1c committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3b7110b View commit details
    Browse the repository at this point in the history

  6. waypoint thingys

    @SubAt0m1c
    SubAt0m1c committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e926b25 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Merge branch 'refs/heads/melody2' 

    # Conflicts:
#	odinmain/src/main/kotlin/me/odinmain/utils/SplitsManager.kt
    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    44e3900 View commit details
    Browse the repository at this point in the history

  2. waypoint thingys 2!!!

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    2fd9f88 View commit details
    Browse the repository at this point in the history

  3. removed those useless settings!!!

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4363faa View commit details
    Browse the repository at this point in the history

  4. slight adjustment

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    67abfd2 View commit details
    Browse the repository at this point in the history

  5. betterish mayb

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    fe49fde View commit details
    Browse the repository at this point in the history

  6. Merge branch 'odtheking:main' into main

    @SubAt0m1c
    SubAt0m1c authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    2d12b08 View commit details
    Browse the repository at this point in the history

  7. HATE CONCURRENTMODIFICATIONS

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    f002c33 View commit details
    Browse the repository at this point in the history

  8. make priority only run once and add sarcophagus room core

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0b36a0a View commit details
    Browse the repository at this point in the history

  9. better stuff

    @SubAt0m1c
    SubAt0m1c committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b5043a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Merge branch 'main' into main

    @SubAt0m1c
    SubAt0m1c authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    93d7b7d View commit details
    Browse the repository at this point in the history

  2. woops

    @SubAt0m1c
    SubAt0m1c committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    54a7f7c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main'

    @SubAt0m1c
    SubAt0m1c committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    8e12cb8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'odtheking:main' into main

    @SubAt0m1c
    SubAt0m1c authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6ac85a7 View commit details
    Browse the repository at this point in the history

  5. bonsai fixes

    @SubAt0m1c
    SubAt0m1c committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    c48bd07 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/main'

    @SubAt0m1c
    SubAt0m1c committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7a2ad04 View commit details
    Browse the repository at this point in the history

  7. od fixes

    @SubAt0m1c
    SubAt0m1c committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    8d8b8db View commit details
    Browse the repository at this point in the history