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

Added the wired charger #172

Merged
merged 11 commits into from
Jul 25, 2023
Merged

Added the wired charger #172

merged 11 commits into from
Jul 25, 2023

Commits on Jun 29, 2023

  1. Added the wired charger

    @Trytoon
    Trytoon committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    0863e85 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev/1.20.1' into mybranch/1.20.1

    @Trytoon
    Trytoon committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    115ac79 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'SleepyTrousers:dev/1.20.1' into mybranch/1.20.1

    @Trytoon
    Trytoon committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    91d6e4f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/dev/1.20.1' into mybranch/1.20.1

    @Trytoon
    Trytoon committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    a84b084 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'mybranch/1.20.1' of https://github.com/Trytoon/EnderIO-… 

    …Rewrite into mybranch/1.20.1
    @Trytoon
    Trytoon committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    24a2a17 View commit details
    Browse the repository at this point in the history

  6. Wrapped with canAct method

    @Trytoon
    Trytoon committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    3ebd14c View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2023

  1. Merge branch 'dev/1.20.1' into mybranch/1.20.1

    @Trytoon
    Trytoon committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    848b634 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge branch 'SleepyTrousers:dev/1.20.1' into mybranch/1.20.1

    @Trytoon
    Trytoon committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    2fe4926 View commit details
    Browse the repository at this point in the history

  2. Fixed the wired charger for the alpha version codebase

    @Trytoon
    Trytoon committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f1f1780 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge branch 'SleepyTrousers:dev/1.20.1' into mybranch/1.20.1

    @Trytoon
    Trytoon committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    14e536d View commit details
    Browse the repository at this point in the history

  2. Added the armor display + some datagen + added insets to the IOConfig… 

    …Widget
    @Trytoon
    Trytoon committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    cc2e931 View commit details
    Browse the repository at this point in the history