forked from AppliedEnergistics/Applied-Energistics-2
-
Notifications
You must be signed in to change notification settings - Fork 0
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
pull
wants to merge
19
commits into
AkariNext:master
Choose a base branch
from
AppliedEnergistics:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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]>
…7385) Closes #7266. --------- Co-authored-by: Sebastian Hartte <[email protected]>
…o reach a certain stored amount (#7382) Closes #7156. --------- Co-authored-by: Sebastian Hartte <[email protected]>
Updated Translations from Crowdin https://appliedenergistics2.crowdin.com/ Co-authored-by: shartte <[email protected]>
…cting to the return value of Level#addFreshEntity
…e them (#7425) --------- Co-authored-by: James Daniels <[email protected]> Co-authored-by: Sebastian Hartte <[email protected]>
Updated Translations from Crowdin https://appliedenergistics2.crowdin.com/ Co-authored-by: shartte <[email protected]>
For larger setups with arrays of inscribers, the inputs stacking all the way to 64 makes distributing ingredients between them more difficult. https://discord.com/channels/922828438274986004/922829733132124200/1170472306754191371  
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.
Updated Translations from Crowdin https://appliedenergistics2.crowdin.com/ Co-authored-by: shartte <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )