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

Conduit Adjustments #797

Merged
merged 11 commits into from
Sep 30, 2024
Merged

Conduit Adjustments #797

merged 11 commits into from
Sep 30, 2024

Commits on Sep 15, 2024

  1. init

    @ferriarnus
    ferriarnus committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    2716154 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge branch 'dev/1.21' into conduit-changes

    @ferriarnus
    ferriarnus committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    d15f713 View commit details
    Browse the repository at this point in the history

  2. fix: filter dupe bug + particles

    @ferriarnus
    ferriarnus committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ab849ce View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2024

  1. Merge branch 'dev/1.21' into conduit-changes

    @ferriarnus
    ferriarnus committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    6582baa View commit details
    Browse the repository at this point in the history

  2. fix: make conduit remember their upgrades

    @ferriarnus
    ferriarnus committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    8014011 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. fix: conduit upgrades connections

    @ferriarnus
    ferriarnus committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    84cdeae View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev/1.21' into conduit-changes 

    # Conflicts:
#	enderio-base/src/main/java/com/enderio/base/common/menu/ItemFilterMenu.java
    @Rover656
    Rover656 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    bfe388e View commit details
    Browse the repository at this point in the history

  3. fix: Apply dupe fixes to entity filter

    @Rover656
    Rover656 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    93bad03 View commit details
    Browse the repository at this point in the history

  4. fix: Placing a conduit below an existing bundle was not working.

    @Rover656
    Rover656 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f802861 View commit details
    Browse the repository at this point in the history

  5. fix: add break sound for single conduits

    @ferriarnus
    ferriarnus committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c1b0db4 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge branch 'dev/1.21' into conduit-changes

    @Rover656
    Rover656 authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8a7648b View commit details
    Browse the repository at this point in the history