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

Cleanup ItemStack Size #755

Closed
wants to merge 8 commits into from
Closed

Cleanup ItemStack Size #755

wants to merge 8 commits into from

Conversation

walkerselby
Copy link
Contributor

No description provided.

@walkerselby
Add NEU internal name .matches function
970aa5f 
Signed-off-by: Walker Selby <[email protected]>
@walkerselby
Cleanup
59a5fcc 
Signed-off-by: Walker Selby <[email protected]>
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 4, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 4, 2023

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@hannibal002 hannibal002 mentioned this pull request Dec 4, 2023
Closed
@walkerselby
Merge branch 'beta' into item-stack-size-cleanup
d8f7e93 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 4, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 4, 2023

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 added this to the Version 0.22 milestone Dec 4, 2023
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 14, 2023
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@walkerselby
Merge branch 'beta' into item-stack-size-cleanup
254abdc 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@walkerselby
Update ItemDisplayOverlay with new Ranchers check
cf5112b 
Signed-off-by: Walker Selby <[email protected]>
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 14, 2023
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@jani270 jani270 modified the milestones: Version 0.22, Version 0.23 Dec 14, 2023
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 16, 2023
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@walkerselby
Merge branch 'beta' into item-stack-size-cleanup
bf5f9b9 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 17, 2023
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 17, 2023
@walkerselby
Merge branch 'beta' into item-stack-size-cleanup
8459811 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 18, 2023
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 24, 2023
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@walkerselby
Merge branch 'beta' into item-stack-size-cleanup
6f1c29b 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 27, 2023
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 6, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 6, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Jan 21, 2024
@walkerselby
Copy link
Contributor Author

This PR is now stale. Will revisit and re-implement when I have time.

@walkerselby walkerselby closed this Feb 5, 2024
@github-actions github-actions bot removed Merge Conflicts There are open merge conflicts with the beta branch. Soon This Pull Request will be merged within the next couple of betas labels Feb 5, 2024
@walkerselby walkerselby deleted the item-stack-size-cleanup branch May 6, 2024 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.23
Development

Successfully merging this pull request may close these issues.
3 participants
@walkerselby @hannibal002 @jani270