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

Power rebalance #8258

Draft
wants to merge 21 commits into
base: 1.21.x
Choose a base branch
from
Draft

Power rebalance #8258

wants to merge 21 commits into from

Commits on Sep 15, 2024

  1. initial test numbers

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

  2. make heat gen numbers work adequately

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

  3. biofuel recalculation

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

Commits on Sep 17, 2024

  1. biofuel recalculation

    @thiakil
    thiakil committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    ca2021b View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. make GBG able to fully burn hydrogen produced by one Separator

    @thiakil
    thiakil committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    c7160c8 View commit details
    Browse the repository at this point in the history

  2. make separator only use special behavior if processing hydrogen. All … 

    …operations machines should now be like other machines in terms of power usage scale

todo: make separator produce partial output when limited energy
    @thiakil
    thiakil committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    235eb91 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. remove outdated todo

    @thiakil
    thiakil committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    0b4764f View commit details
    Browse the repository at this point in the history

  2. scale only the separator by operations cost

    @thiakil
    thiakil committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    03494e8 View commit details
    Browse the repository at this point in the history

  3. trial machine buffers based on max usage per full operation or 4 tick… 

    …s, whichever is higher
    @thiakil
    thiakil committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4199613 View commit details
    Browse the repository at this point in the history

  4. ensure uncapped energy containers dont return less than 0 for getNeeded

    @thiakil
    thiakil committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    6ea79a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. make biofuel base recipes manual again

    @thiakil
    thiakil committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    b0701e3 View commit details
    Browse the repository at this point in the history

  2. remove compat biofuel recipes from compostable, most should be covere… 

    …d by tags
    @thiakil
    thiakil committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    d54ec9f View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2024

  1. rewrite Gas Generator consumption, remove generators' max output rest… 

    …rictions
    @thiakil
    thiakil committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    dd0b08d View commit details
    Browse the repository at this point in the history

  2. fix bad bio recipes

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

  3. lang for bio fuel per item config

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

  4. GBG numbers

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

Commits on Oct 1, 2024

  1. dont display empty decimals from unit conversions

    @thiakil
    thiakil committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    581302f View commit details
    Browse the repository at this point in the history

  2. use multiblock method to get turbine generation rate

    @thiakil
    thiakil committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    8a14c09 View commit details
    Browse the repository at this point in the history

  3. move max floaw calculation to a method and remove dupes

    @thiakil
    thiakil committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    26a5ce8 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2024

  1. tweak turbine generation amounts

    @thiakil
    thiakil committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    3d5d295 View commit details
    Browse the repository at this point in the history

  2. Merge branch '1.21.x' into power-rebalance 

    # Conflicts:
#	src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09
#	src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55
#	src/main/java/mekanism/common/util/UnitDisplayUtils.java
    @thiakil
    thiakil committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    b67dc1e View commit details
    Browse the repository at this point in the history