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

cleanup the kube recipe schema #1268

Merged
merged 5 commits into from
May 17, 2024
Merged

cleanup the kube recipe schema #1268

merged 5 commits into from
May 17, 2024

Commits on May 17, 2024

  1. cleanup the kube recipe schema

    @YoungOnionMC
    YoungOnionMC committed May 17, 2024
    Configuration menu
    Copy the full SHA
    07e3769 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sc/intermediary-1.20.5-port' into yo-recipe-schema-clea… 

    …nup2
    @YoungOnionMC
    YoungOnionMC authored May 17, 2024
    Configuration menu
    Copy the full SHA
    6fb0b8b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sc/intermediary-1.20.5-port' of https://github.com/Youn… 

    …gOnionMC/GregTech-Modern into yo-recipe-schema-cleanup2

# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java
    @YoungOnionMC
    YoungOnionMC committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f60c52f View commit details
    Browse the repository at this point in the history

  4. spotles

    @YoungOnionMC
    YoungOnionMC committed May 17, 2024
    Configuration menu
    Copy the full SHA
    af552c4 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/yo-recipe-schema-cleanup2' into … 

    …yo-recipe-schema-cleanup2

# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java
    @YoungOnionMC
    YoungOnionMC committed May 17, 2024
    Configuration menu
    Copy the full SHA
    4b99b68 View commit details
    Browse the repository at this point in the history