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

Goat horns and item cooldowns for 1.21.2 #5102

Merged
merged 10 commits into from
Oct 31, 2024
Merged

Goat horns and item cooldowns for 1.21.2 #5102

merged 10 commits into from
Oct 31, 2024

Commits on Oct 24, 2024

  1. Fix item cooldowns, work on goat horns

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

  2. Remove TODO

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

  3. Some more cleanup

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

  4. Fix item cooldowns more

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

  5. Remove TODO in Enchantment record

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

Commits on Oct 25, 2024

  1. Add reading of inline/custom holders

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

  2. Merge remote-tracking branch 'upstream/feature/1.21.2' into feature/1… 

    ….21.2
    @eclipseisoffline
    eclipseisoffline committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    221f15e View commit details
    Browse the repository at this point in the history

  3. Remove code duplication in jukebox song reading

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

Commits on Oct 30, 2024

  1. Merge branch 'feature/1.21.2' of https://github.com/GeyserMC/Geyser i… 

    …nto fork/eclipseisoffline/feature/1.21.2
    @Camotoy
    Camotoy committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8322a49 View commit details
    Browse the repository at this point in the history

  2. Make GeyserInstrument an interface

    @Camotoy
    Camotoy committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7c22b7c View commit details
    Browse the repository at this point in the history