Skip to content

Conversation

@viciscat
Copy link
Collaborator

No description provided.

@LifeIsAParadox LifeIsAParadox added the reviews needed This PR needs reviews label Sep 13, 2025
@TheMychenik
Copy link
Contributor

+rep

@AzureAaron AzureAaron added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Dec 6, 2025
# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java
#	src/main/resources/assets/skyblocker/lang/en_us.json
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Dec 12, 2025
@Alex33856 Alex33856 added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Dec 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge conflicts This PR has merge conflicts that need solving.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants