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

A cleaner merge of my changes #36

Merged
merged 10 commits into from
Sep 13, 2022
Merged

A cleaner merge of my changes #36

merged 10 commits into from
Sep 13, 2022

Commits on Sep 11, 2022

  1. Merge pull request #2 from Thorfusion/1.7.10 

    Merge Upstream
    @DrParadox7
    DrParadox7 authored Sep 11, 2022
    Configuration menu
    Copy the full SHA
    d37d044 View commit details
    Browse the repository at this point in the history

  2. Nerf Fusion Reactor 

    From 200k+ RF/t to around 1.5k RF/t on lower injection rates.
    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    0404919 View commit details
    Browse the repository at this point in the history

  3. Added Methane Gas

    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    a6cb745 View commit details
    Browse the repository at this point in the history

  4. Oredictionary for Metallurgic infuser + Sawmill balance 

    Metallurgic Infuser now accepts any diamond oredictionary.
Fix Sawmill outputting ready-made rubber from logs instead of resin.
    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    f922b8c View commit details
    Browse the repository at this point in the history

  5. Allow reduce particle from completed multiblocks 

    Users can now reduce particle effects emitted from completed multiblocks.
May enhance performance.
    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    de284aa View commit details
    Browse the repository at this point in the history

  6. More configs for Heat Generator 

    Regulate Heat Generator efficiency
Enable/Disable Heat Generator ability to output heat
    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    9bca7c6 View commit details
    Browse the repository at this point in the history

  7. Missing Lang for Teleporter

    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    524fa01 View commit details
    Browse the repository at this point in the history

  8. Cardboard Boxes are now single use

    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    d32bb14 View commit details
    Browse the repository at this point in the history

  9. Add Methane to gas burner fuel list

    @DrParadox7
    DrParadox7 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    282c21d View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Remove redundant oredict fix

    @DrParadox7
    DrParadox7 committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    a8944e0 View commit details
    Browse the repository at this point in the history