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

PR to add in the TES candyswordcane tile #214

Merged
merged 13 commits into from
Mar 2, 2024
Merged

PR to add in the TES candyswordcane tile #214

merged 13 commits into from
Mar 2, 2024

Commits on Dec 10, 2023

  1. Create Candy Cane Sword Cane 

    untested
    @uthuluc
    uthuluc authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    1fa6130 View commit details
    Browse the repository at this point in the history

  2. Update Candy Cane Sword Cane

    @uthuluc
    uthuluc authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    64613ca View commit details
    Browse the repository at this point in the history

  3. Update Candy Cane Sword Cane

    @uthuluc
    uthuluc authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    5456e3a View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. adding a few new conditions, testing

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    0f3f04c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into tes-candy-cane-sword-cane

    @docrostov
    docrostov authored Mar 2, 2024
    Configuration menu
    Copy the full SHA
    b60b304 View commit details
    Browse the repository at this point in the history

  3. trying to get the damn tile to actually show on bundle

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    95b9037 View commit details
    Browse the repository at this point in the history

  4. ...oh, yeah, adding it to IOTMS.ash would do it

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    37e4293 View commit details
    Browse the repository at this point in the history

  5. accidental copy/paste error

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    cb6dbfd View commit details
    Browse the repository at this point in the history

  6. a few last logic changes

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    12f9065 View commit details
    Browse the repository at this point in the history

  7. add back in-run check for final main push

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    2a764e1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into tes-candy-cane-sword-cane

    @docrostov
    docrostov authored Mar 2, 2024
    Configuration menu
    Copy the full SHA
    37d1119 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'tes-candy-cane-sword-cane' of https://github.com/loathe… 

    …rs/TourGuide into tes-candy-cane-sword-cane
    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    cf8606b View commit details
    Browse the repository at this point in the history

  10. small spring shoes changes

    @docrostov
    docrostov committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    180b54f View commit details
    Browse the repository at this point in the history