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

1.12 stuff #16

Merged
merged 4 commits into from
May 10, 2020
Merged

1.12 stuff #16

merged 4 commits into from
May 10, 2020

Commits on May 10, 2020

  1. Added 1.12 content

    @Zokonius
    Zokonius committed May 10, 2020
    Configuration menu
    Copy the full SHA
    15d7f74 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Zoko/release/1.7.10/2.3' into 1.12-stuff 

    # Conflicts:
#	.gitignore
#	gradle.properties
#	src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
    @Dream-Master
    Dream-Master committed May 10, 2020
    Configuration menu
    Copy the full SHA
    dfd1941 View commit details
    Browse the repository at this point in the history

  3. update jenkins

    @Dream-Master
    Dream-Master committed May 10, 2020
    Configuration menu
    Copy the full SHA
    bace7f9 View commit details
    Browse the repository at this point in the history

  4. change version

    @Dream-Master
    Dream-Master committed May 10, 2020
    Configuration menu
    Copy the full SHA
    1e30b56 View commit details
    Browse the repository at this point in the history