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

Fix more collisions #3246

Merged
merged 11 commits into from
Sep 21, 2024
Merged

Fix more collisions #3246

merged 11 commits into from
Sep 21, 2024
+14 −280

Commits on Sep 21, 2024

  1. Fix carpet cleaning collisions

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    06a0de0 View commit details
    Browse the repository at this point in the history

  2. Redundant bartworks gem macerating

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    46dd8f7 View commit details
    Browse the repository at this point in the history

  3. Remove the entire bw ore loader. All the ores are caught by gt alread… 

    …y. Also some other redundant gem nonsense.
    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    4466175 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/master' into fix-more-collisions

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    e4bf0ff View commit details
    Browse the repository at this point in the history

  5. Remove redundant canner recipes for tin cans

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    559bd6f View commit details
    Browse the repository at this point in the history

  6. Remove various redundant gt++ recycling and packager recipes

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    b82f3eb View commit details
    Browse the repository at this point in the history

  7. Use circuits for gt++ weird machine covers

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    6c0c8d7 View commit details
    Browse the repository at this point in the history

  8. Use aMainOutput to prevent duplicate registry of autoclave crop recip… 

    …es and maintain original function
    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    52ceed3 View commit details
    Browse the repository at this point in the history

  9. Remove forestry recipes being re-registered in a railcraft recipe loa… 

    …der...
    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    a2a18c8 View commit details
    Browse the repository at this point in the history

  10. Fix mistaken main output for tin

    @FourIsTheNumber
    FourIsTheNumber committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    8ee8af8 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into fix-more-collisions

    @BlueHero233
    BlueHero233 committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    498f77d View commit details
    Browse the repository at this point in the history