-
-
Notifications
You must be signed in to change notification settings - Fork 20
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
Release v2.0.0-milestone.3.3 #475
Merged
Merged
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
Merge main into develop branch
We want to only have 1 base disk model. The leds of the disk (in this case, "inactive") should be rendered independently if we easily want to allow for extra disk models. This also separates the disk model from the disk drive in the asset folder hierarchy.
So that we know which disk is in the inventory, for custom disk rendering purposes.
Custom disk models
We will need it for the portable grid soon, which is not a mulistorage.
refactor: decouple storage state from multistorage
Block, recipe and models.
Basic portable grid content
Generifies disk inventory and extracts the internal multistorage as a "StateTrackedStorage". The storage channel type component of the internal multistorage has been moved into TypedStorage, as it's not necessary for the portable grid or StateTrackedStorage.
Refactors energy info packets and syncing so we can reuse.
Don't force people to use our own extended menu provider.
Portable grid menu
…etwork merge The grid would only sync resources that were part of the (removed) slave network after a network merge because the storages from the master network just "remain" and don't get removed and re-added. In 1d4d3ae an initial fix was made to ensure correct behavior for network splits, by making the grid highest-priority and relying on the moved storages re-adding themselves afterwards. However, for network merges, it would completely ignore storages that were already part of the new network as those remain and don't get re-added. If the storages from the new network remain and don't get re-added, we need to notify the grid of these storages somehow (by re-syncing). This change adds the re-syncing (replay) necessary for network merges. For network splits, it will still re-sync (replay) but won't actually do anything as the network is newly-created and empty at that point.
fix: grid not retrieving resources from the new master network in a network merge
Generalizes grid watcher registration management code.
…eractions feat: portable grid interactions
feat: port to minecraft 1.20.4
feat: portable grid item
RegistryFixedCodec doesn't work on Fabric for some reason.
fix: incompatibility with invmove
feat: chinese translation by Jiangsubei
Quality Gate passedIssues Measures |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Hi @raoulvdberge!
This PR was created in response to a manual trigger of the release workflow here: https://github.com/refinedmods/refinedstorage2/actions/runs/7944946052.
Merging this PR will publish the release.