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

pull into master #8

Merged
merged 17 commits into from
Nov 27, 2021
Merged

pull into master #8

merged 17 commits into from
Nov 27, 2021

Commits on Aug 16, 2021

  1. Revert "add railcraft lib" 

    This reverts commit 8c8bb96.
    @Dream-Master
    Dream-Master committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    b0af2d0 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2021

  1. Merge branch 'master' of github.com:GTNewHorizons/Computronics

    @Dream-Master
    Dream-Master committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    5133f06 View commit details
    Browse the repository at this point in the history

  2. fix chromium dioxide recipe 

    Wrong recipe for Chromium Dioxide Dust #8548
GTNewHorizons/GT-New-Horizons-Modpack#8548
    @Dream-Master
    Dream-Master committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    c352d19 View commit details
    Browse the repository at this point in the history

  3. bump version 

    (cherry picked from commit 0f9755e)
    @Dream-Master
    Dream-Master committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    26b851b View commit details
    Browse the repository at this point in the history

  4. Changed RC dependency on our fork

    @repo-alt
    repo-alt committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    08d35b9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from repo-alt/feature/build-fix2 

    Changed RC dependency on our fork
    @Dream-Master
    Dream-Master authored Nov 14, 2021
    Configuration menu
    Copy the full SHA
    a637c9f View commit details
    Browse the repository at this point in the history

  6. update railcraft version

    @Dream-Master
    Dream-Master committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    eab8a2b View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2021

  1. bump rc version

    @Dream-Master
    Dream-Master committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    c914530 View commit details
    Browse the repository at this point in the history

  2. Prevent mac/windows garbage

    @bombcar
    bombcar committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    0e5fe86 View commit details
    Browse the repository at this point in the history

  3. Update to allow build

    @bombcar
    bombcar committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    ece9029 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from bombcar/GTNH 

    Fix build
    @Dream-Master
    Dream-Master authored Nov 21, 2021
    Configuration menu
    Copy the full SHA
    8b5f7f8 View commit details
    Browse the repository at this point in the history

  5. remove dev from version

    @Dream-Master
    Dream-Master committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    d96fd65 View commit details
    Browse the repository at this point in the history

  6. Fix the build

    @Glease
    Glease committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    dfa6309 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'GTNH' into patch-buildscript

    @Dream-Master
    Dream-Master authored Nov 21, 2021
    Configuration menu
    Copy the full SHA
    1b9f11d View commit details
    Browse the repository at this point in the history

  8. Merge pull request #6 from GTNewHorizons/patch-buildscript 

    Fix the build
    @Dream-Master
    Dream-Master authored Nov 21, 2021
    Configuration menu
    Copy the full SHA
    8aca14f View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. Maybe fix GTNewHorizons/GT-New-Horizons-Modpack#8909

    @Glease
    Glease committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    8ee02e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2021

  1. Merge pull request #7 from GTNewHorizons/patch-bees 

    Maybe fix GTNewHorizons/GT-New-Horizons-Modpack#8909
    @Dream-Master
    Dream-Master authored Nov 27, 2021
    Configuration menu
    Copy the full SHA
    1956ec7 View commit details
    Browse the repository at this point in the history