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

map recipes #631

Merged
merged 9 commits into from
Oct 10, 2024
Merged

map recipes #631

merged 9 commits into from
Oct 10, 2024

Commits on Aug 20, 2024

  1. start work

    @ix0rai
    ix0rai committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c9519e5 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge remote-tracking branch 'refs/remotes/quiltmc/24w40a' into recipes 

    # Conflicts:
#	mappings/net/minecraft/recipe/InputSlotFiller.mapping
#	mappings/net/minecraft/recipe/RecipeMatcher.mapping
    @ix0rai
    ix0rai committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    61e2203 View commit details
    Browse the repository at this point in the history

  2. work

    @ix0rai
    ix0rai committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    80230c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. complete recipes

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

  2. drop invalid mappings

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

Commits on Oct 9, 2024

  1. Merge remote-tracking branch 'quiltmc/1.21.2-pre1' into recipes 

    # Conflicts:
#	mappings/net/minecraft/world/World.mapping
    @ix0rai
    ix0rai committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    e640b5b View commit details
    Browse the repository at this point in the history

  2. complete for 1.21.2-pre1 and remove 'account' name

    @ix0rai
    ix0rai committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    37ed413 View commit details
    Browse the repository at this point in the history

  3. drop invalid mappings

    @ix0rai
    ix0rai committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9414f0e View commit details
    Browse the repository at this point in the history

  4. Update simple_type_field_names.json5 

    Co-authored-by: Will <[email protected]>
    @ix0rai @supersaiyansubtlety
    ix0rai and supersaiyansubtlety authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    d124d77 View commit details
    Browse the repository at this point in the history