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.

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

[pull] master from AppliedEnergistics:master #2

Open
wants to merge 19 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 1, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

62832 and others added 7 commits October 1, 2023 12:59
…s other than IBasicCellItem (#7377)

Provides an API method that dictates whether a cell is empty or not in
order for a non-empty cell with a custom `StorageCell` implementation to
not be stored in other cells.

There is, however, the caveat that cells that do implement `StorageCell`
on their own, if accepting `AEItemKey`s, will need to also implement
their own checks for other non-empty cells within their insertion logic
each time.

Also closes #6819.

---------

Co-authored-by: Sebastian Hartte <[email protected]>
Prior to this the Matter Cannon used the parent `item/handheld`, which
made it look very strange and missized when held in first and third
person.

---------

Co-authored-by: Sebastian Hartte <[email protected]>
…o reach a certain stored amount (#7382)

Closes #7156.

---------

Co-authored-by: Sebastian Hartte <[email protected]>
…cting to the return value of Level#addFreshEntity
@pull pull bot added the ⤵️ pull label Oct 1, 2023
shartte and others added 12 commits October 6, 2023 01:13
…e them (#7425)


---------

Co-authored-by: James Daniels <[email protected]>
Co-authored-by: Sebastian Hartte <[email protected]>
If the new max power was lower than the current power, the clamping took
only place if the new max power was larger than the default max power,
i.e. it worked for any energy card but the last one.

Fixes #7431

There is a potential for refactoring here, depending on whether the 3
functions setAEMaxPowerMultiplier, setAEMaxPower, and resetAEMaxPower
are considered to be a stable API or not. I chose to not refactor for
compatibility reasons. Deciding if that is the way to go is up to a
reviewer in my opinion.

Be advised that this is my first time coding for any Minecraft mod, but
the change should be small enough for a starter task.
@shartte shartte deleted the branch AkariNext:master November 11, 2023 18:59
@shartte shartte deleted the master branch November 11, 2023 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants