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

Internal Change: Regex To Pattern in BazaarApi, CropAccessoryData, andDicerRngCounter #647

Merged
merged 10 commits into from
Dec 4, 2023

Conversation

walkerselby
Copy link
Contributor

Change Regex to Pattern
Add Skyblock check to onChat so messages outside SkyBlock are not checked

@hannibal002 hannibal002 added this to the Version 0.22 milestone Oct 29, 2023
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 7, 2023
Copy link

github-actions bot commented Nov 7, 2023

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

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerDropTracker.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 7, 2023
Copy link

github-actions bot commented Nov 7, 2023

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 7, 2023
Copy link

github-actions bot commented Nov 7, 2023

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

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerDropTracker.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 8, 2023
Copy link

github-actions bot commented Nov 8, 2023

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 self-requested a review December 4, 2023 03:19
@hannibal002 hannibal002 merged commit ab74fb1 into hannibal002:beta Dec 4, 2023
2 checks passed
@walkerselby walkerselby deleted the toPattern-pt1 branch December 5, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants