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

Add ProdigyTech compatibility #173

Merged
merged 21 commits into from
Jul 6, 2024
Merged

Add ProdigyTech compatibility #173

merged 21 commits into from
Jul 6, 2024

Commits on Jun 6, 2024

  1. Made Prodigy Tech compilable, added Solderer

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    9bcfb77 View commit details
    Browse the repository at this point in the history

  2. solderer: separated Pattern from Input

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    06dc275 View commit details
    Browse the repository at this point in the history

  3. prodigytech: added Zorra Altar integration

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e57f99d View commit details
    Browse the repository at this point in the history

  4. prodigytech: added the simple machines

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    108b062 View commit details
    Browse the repository at this point in the history

  5. prodigytech: added primordialis reactor

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    59ae567 View commit details
    Browse the repository at this point in the history

  6. prodigytech: added atomic reshaper

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    8943018 View commit details
    Browse the repository at this point in the history

  7. zorra altar: better way to create custom items

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    316a31c View commit details
    Browse the repository at this point in the history

  8. prodigytech: added explosion furnace

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    31b58a4 View commit details
    Browse the repository at this point in the history

  9. prodigytech: add example localization

    @Wizzerinus
    Wizzerinus committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    4212f96 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. prodigytech: pull request fixes

    @Wizzerinus
    Wizzerinus committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    07373e0 View commit details
    Browse the repository at this point in the history

  2. prodigytech: set proper @Property annotations

    @Wizzerinus
    Wizzerinus committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    30f4d37 View commit details
    Browse the repository at this point in the history

  3. prodigytech: pr fixes (2)

    @Wizzerinus
    Wizzerinus committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    b5b2d4c View commit details
    Browse the repository at this point in the history

  4. prodigytech: restore debug variables to false

    @Wizzerinus
    Wizzerinus committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    a7b4a92 View commit details
    Browse the repository at this point in the history

  5. prodigytech: code cleanup

    @Wizzerinus
    Wizzerinus committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    6b5929d View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. prodigytech: pr fixes (3)

    @Wizzerinus
    Wizzerinus committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    0ee4d0e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. prodigytech: made adjustments that made sense

    @Wizzerinus
    Wizzerinus committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ec93b1b View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. prodigytech: change to 'greater than 0' wording

    @Wizzerinus
    Wizzerinus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    38c65f2 View commit details
    Browse the repository at this point in the history

  2. prodigytech: somewhat improved EFAdditives code

    @Wizzerinus
    Wizzerinus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    ae5bd5e View commit details
    Browse the repository at this point in the history

  3. prodigytech: made SimpleRecipeHandlers public

    @Wizzerinus
    Wizzerinus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    5958438 View commit details
    Browse the repository at this point in the history

  4. prodigytech: convert Explosive/Dampener into records

    @Wizzerinus
    Wizzerinus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    a2bd649 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge branch 'master' into compat/prodigytech 

    # Conflicts:
#	gradle.properties
#	src/main/java/com/cleanroommc/groovyscript/compat/mods/ModSupport.java
#	src/main/resources/assets/groovyscript/lang/en_us.lang
    @Wizzerinus
    Wizzerinus committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    c1e6f73 View commit details
    Browse the repository at this point in the history