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

Brewing recipes #161

Open
wants to merge 28 commits into
base: 1.19.4
Choose a base branch
from
Open

Brewing recipes #161

wants to merge 28 commits into from

Commits on Aug 5, 2022

  1. brewing fuel registry

    @Platymemo
    Platymemo committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    0d973e0 View commit details
    Browse the repository at this point in the history

  2. quilt brewing recipes

    @Platymemo
    Platymemo committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    b834560 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'QuiltMC/1.19' into 1.19+brewing_recipes

    @Platymemo
    Platymemo committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    8cf04c8 View commit details
    Browse the repository at this point in the history

  4. fix incompatibility with vanilla clients

    @Platymemo
    Platymemo committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    a00e0fa View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2022

  1. test brewing recipe

    @Platymemo
    Platymemo committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    d5789d4 View commit details
    Browse the repository at this point in the history

  2. brewing recipes ready for review

    @Platymemo
    Platymemo committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    8b845fc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'QuiltMC/1.19' into 1.19+brewing_recipes

    @Platymemo
    Platymemo committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    e55b31d View commit details
    Browse the repository at this point in the history

  4. quick fix

    @Platymemo
    Platymemo committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    e205201 View commit details
    Browse the repository at this point in the history

  5. apply licenses

    @Platymemo
    Platymemo committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    40b60f5 View commit details
    Browse the repository at this point in the history

  6. apply suggestions

    @Platymemo
    Platymemo committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    c42ad20 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. Apply javadoc suggestions 

    Co-authored-by: ADudeCalledLeo <[email protected]>
    @Platymemo @Leo40Git
    Platymemo and Leo40Git authored Aug 9, 2022
    Configuration menu
    Copy the full SHA
    3581671 View commit details
    Browse the repository at this point in the history

  2. Extend max values for brewing fuel and brew time

    @Platymemo
    Platymemo committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    312b54e View commit details
    Browse the repository at this point in the history

  3. missed a suggestion 

    Co-authored-by: ADudeCalledLeo <[email protected]>
    @Platymemo @Leo40Git
    Platymemo and Leo40Git authored Aug 9, 2022
    Configuration menu
    Copy the full SHA
    1b642b5 View commit details
    Browse the repository at this point in the history

  4. Apply suggestions 

    Co-authored-by: ADudeCalledLeo <[email protected]>
    @Platymemo @Leo40Git
    Platymemo and Leo40Git authored Aug 9, 2022
    Configuration menu
    Copy the full SHA
    e4bd994 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. Merge remote-tracking branch 'QuiltMC/1.19' into brewing-recipes

    @Platymemo
    Platymemo committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    d2cd203 View commit details
    Browse the repository at this point in the history

  2. Clear brewing ingredients on reload

    @Platymemo
    Platymemo committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    36424a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. dont crash with vanilla recipes

    @Platymemo
    Platymemo committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    de4faf0 View commit details
    Browse the repository at this point in the history

  2. fix potion villager trades

    @Platymemo
    Platymemo committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    fb046cb View commit details
    Browse the repository at this point in the history

  3. brewing docs

    @Platymemo
    Platymemo committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    f072fd3 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. more compatible mixin

    @Platymemo
    Platymemo committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    0ac3b3a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2022

  1. deduplicate recipe match checks

    @Platymemo
    Platymemo committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    bf63a47 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. Merge remote-tracking branch 'QuiltMC/1.19.4' into brewing-recipes 

    # Conflicts:
#	library/data/recipe/build.gradle
#	library/data/recipe/src/main/resources/quilt_recipe.mixins.json
#	library/item/item_content_registry/src/main/java/org/quiltmc/qsl/item/content/registry/impl/ItemContentRegistriesClientInitializer.java
#	library/item/item_content_registry/src/main/java/org/quiltmc/qsl/item/content/registry/impl/ItemContentRegistriesInitializer.java
#	library/item/item_content_registry/src/testmod/resources/data/quilt/attachments/minecraft/item/brewing_fuel_time.json
    @Platymemo
    Platymemo committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    494ce5b View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. update brewing recipes

    @Platymemo
    Platymemo committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    984d0a5 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge branch '1.19.4' into brewing-recipes

    @EnnuiL
    EnnuiL authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    9d77336 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Ennui Langeweile <[email protected]>
    @Platymemo @EnnuiL
    Platymemo and EnnuiL authored Apr 13, 2023
    Configuration menu
    Copy the full SHA
    f19b914 View commit details
    Browse the repository at this point in the history

  2. move recipe serializer registration to onInitialize

    @Platymemo
    Platymemo committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    56260fb View commit details
    Browse the repository at this point in the history

  3. move brewing recipes to the quilt namespace

    @Platymemo
    Platymemo committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    80d2d31 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. Merge branch '1.19.4' into brewing-recipes

    @EnnuiL
    EnnuiL authored Apr 22, 2023
    Configuration menu
    Copy the full SHA
    ce54b86 View commit details
    Browse the repository at this point in the history