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

Advancements #496

Merged
merged 10 commits into from
Nov 10, 2023
Merged

Advancements #496

merged 10 commits into from
Nov 10, 2023

Commits on Sep 16, 2023

  1. advancements

    @Platymemo
    Platymemo committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    c994243 View commit details
    Browse the repository at this point in the history

  2. juicy 100%

    @Platymemo
    Platymemo committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    93ffe94 View commit details
    Browse the repository at this point in the history

  3. Update CompoundLootCondition.mapping 

    what

Co-authored-by: Eli Orona <[email protected]>
    @Platymemo @OroArmor
    Platymemo and OroArmor authored Sep 16, 2023
    Configuration menu
    Copy the full SHA
    6e710a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. jsonObject -> json

    @Platymemo
    Platymemo committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    8b3e574 View commit details
    Browse the repository at this point in the history

  2. complete Criterion -> CriterionTrigger change

    @Platymemo
    Platymemo committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    aef8df2 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/advancements' into advancements

    @Platymemo
    Platymemo committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    02ebe7c View commit details
    Browse the repository at this point in the history

  4. update AdvancementUpdateS2CPacket

    @Platymemo
    Platymemo committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    da3d582 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Merge branch '1.20.2-rc2' into advancements

    @github-actions
    github-actions[bot] authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    061e252 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. Merge branch '23w44a' into advancements 

    # Conflicts:
#	mappings/net/minecraft/recipe/RecipeUnlocker.mapping
#	mappings/net/minecraft/util/dynamic/Codecs.mapping
    @ix0rai
    ix0rai committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    42f2ae6 View commit details
    Browse the repository at this point in the history

  2. resolve comments

    @ix0rai
    ix0rai committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    9735c76 View commit details
    Browse the repository at this point in the history