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

bring over #797 #814

Merged
merged 3 commits into from
Oct 1, 2024
Merged

bring over #797 #814

merged 3 commits into from
Oct 1, 2024

Conversation

ferriarnus
Copy link
Member

@ferriarnus ferriarnus commented Sep 26, 2024 •
edited
Loading

Description

Contains many changes and fixes for the 1.20.1 conduits

Fixes

  • Use textures for break particles of conduits
  • Add break sounds

Adjustments

  • fluid conduit rates
  • made item conduits not limited by slots
  • make upgrades save the data

TODO

  • If this is a draft, populate this with remaining tasks. Otherwise, remove this section.

Breaking Changes

List any breaking changes in this section, such as: changed/removed APIs, changed or removed items/blocks or modifications to recipes and gameplay mechanics.

Checklist

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
  • I have made corresponding changes to the documentation.
  • My changes are ready for review from a contributor.

Rover656 added a commit that referenced this pull request Sep 26, 2024
@Rover656 @ferriarnus
fix: Item duplication with filters
d2a46b2 
Modifies Ferri's solution from GH-814 to also fix duplication using the 1-9 keys.
Also applies the number key fix to the machine menus.

Closes: GH-769
Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Rover656 added a commit that referenced this pull request Sep 26, 2024
@Rover656 @ferriarnus
fix: Item duplication with filters
7003071 
Modifies Ferri's solution from GH-814 to also fix duplication using the 1-9 keys.
Also applies the number key fix to the machine menus.

Closes: GH-769
Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Rover656 added a commit that referenced this pull request Sep 26, 2024
@Rover656 @ferriarnus
fix: Item duplication with filters
e2d537c 
Modifies Ferri's solution from GH-814 to also fix duplication using the 1-9 keys.
Also applies the number key fix to the machine menus.

Closes: GH-769
Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Rover656 added a commit that referenced this pull request Sep 26, 2024
@Rover656 @ferriarnus
fix: Item duplication with filters
c572a47 
Modifies Ferri's solution from GH-814 to also fix duplication using the 1-9 keys.
Also applies the number key fix to the machine menus.

Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Ported-From: e2d537c
Rover656 added a commit that referenced this pull request Sep 29, 2024
@Rover656 @ferriarnus
fix: Item duplication with filters
560f058 
Modifies Ferri's solution from GH-814 to also fix duplication using the 1-9 keys.
Also applies the number key fix to the machine menus.

Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Ported-From: e2d537c
Rover656 added a commit that referenced this pull request Sep 29, 2024
@Rover656 @ferriarnus
fix: Item duplication with filters
88c01d9 
Modifies Ferri's solution from GH-814 to also fix duplication using the 1-9 keys.
Also applies the number key fix to the machine menus.

Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Ported-From: e2d537c
@ferriarnus ferriarnus marked this pull request as ready for review October 1, 2024 15:53
Rover656
Rover656 approved these changes Oct 1, 2024
View reviewed changes
Copy link
Member

@Rover656 Rover656 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thank you Ferri!

@Rover656 Rover656 merged commit 677f77d into Team-EnderIO:lts/1.20.1 Oct 1, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rover656 Rover656 Rover656 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ferriarnus @Rover656