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

Industrial magic matrix #353

Merged
merged 46 commits into from
Apr 3, 2024
Merged

Industrial magic matrix #353

merged 46 commits into from
Apr 3, 2024

Commits on Mar 31, 2024

  1. Test

    @il2005713
    il2005713 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    8bb0335 View commit details
    Browse the repository at this point in the history

  2. Test

    @il2005713
    il2005713 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    404f687 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main'

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    b4730bb View commit details
    Browse the repository at this point in the history

  4. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    2205849 View commit details
    Browse the repository at this point in the history

  5. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    c4ca24f View commit details
    Browse the repository at this point in the history

  6. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    2453d4f View commit details
    Browse the repository at this point in the history

  7. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    a44bf83 View commit details
    Browse the repository at this point in the history

  8. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    c491603 View commit details
    Browse the repository at this point in the history

  9. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    a031ef0 View commit details
    Browse the repository at this point in the history

  10. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    c42ad14 View commit details
    Browse the repository at this point in the history

  11. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    d0b1da3 View commit details
    Browse the repository at this point in the history

  12. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    b285cd8 View commit details
    Browse the repository at this point in the history

  13. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    4811abc View commit details
    Browse the repository at this point in the history

  14. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    125e3c9 View commit details
    Browse the repository at this point in the history

  15. add Bee Engineer recipe

    @Nxer @xiaoxing2005
    Nxer authored and xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    5b880de View commit details
    Browse the repository at this point in the history

  16. add Space Apiary Module recipes

    @Nxer @xiaoxing2005
    Nxer authored and xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    1f9157f View commit details
    Browse the repository at this point in the history

  17. add Advanced Nether Star recipe in Crystalline Infinitier

    @Nxer @xiaoxing2005
    Nxer authored and xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    7c7bbf6 View commit details
    Browse the repository at this point in the history

  18. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    dadaa5e View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/IndustrialMagicMatrix' into Indu… 

    …strialMagicMatrix
    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    0a4ed83 View commit details
    Browse the repository at this point in the history

  20. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    bb3b90d View commit details
    Browse the repository at this point in the history

  21. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    a0019e0 View commit details
    Browse the repository at this point in the history

  22. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    e0cf3e9 View commit details
    Browse the repository at this point in the history

  23. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    02f1956 View commit details
    Browse the repository at this point in the history

  24. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    ea3b27a View commit details
    Browse the repository at this point in the history

  25. Merge remote-tracking branch 'origin/IndustrialMagicMatrix' into Indu… 

    …strialMagicMatrix
    @xiaoxing2005
    xiaoxing2005 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    6e95009 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    ae62344 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Nxer:main' into IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    70baaa6 View commit details
    Browse the repository at this point in the history

  3. add Bee Engineer recipe

    @Nxer @xiaoxing2005
    Nxer authored and xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    d89ae95 View commit details
    Browse the repository at this point in the history

  4. add Space Apiary Module recipes

    @Nxer @xiaoxing2005
    Nxer authored and xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    ce19d90 View commit details
    Browse the repository at this point in the history

  5. Test

    @il2005713 @xiaoxing2005
    il2005713 authored and xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    e974443 View commit details
    Browse the repository at this point in the history

  6. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    25d3ef7 View commit details
    Browse the repository at this point in the history

  7. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    d052bb8 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ce39b63 View commit details
    Browse the repository at this point in the history

  2. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    6b7d0c2 View commit details
    Browse the repository at this point in the history

  3. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    8492cd3 View commit details
    Browse the repository at this point in the history

  4. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    edba3b0 View commit details
    Browse the repository at this point in the history

  5. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    c15cef3 View commit details
    Browse the repository at this point in the history

  6. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    5b08b51 View commit details
    Browse the repository at this point in the history

  7. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7f3d925 View commit details
    Browse the repository at this point in the history

  8. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    edfc794 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Merge branch 'IndustrialMagicMatrix' 

    # Conflicts:
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/loader/RecipeLoader.java
#	src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang
#	src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang
    @xiaoxing2005
    xiaoxing2005 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1868325 View commit details
    Browse the repository at this point in the history

  2. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9c562da View commit details
    Browse the repository at this point in the history

  3. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    450aa4c View commit details
    Browse the repository at this point in the history

  4. IndustrialMagicMatrix

    @xiaoxing2005
    xiaoxing2005 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    a4a6fde View commit details
    Browse the repository at this point in the history

  5. fix

    @xiaoxing2005
    xiaoxing2005 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    f80e581 View commit details
    Browse the repository at this point in the history

  6. fix

    @xiaoxing2005
    xiaoxing2005 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    71af783 View commit details
    Browse the repository at this point in the history