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

Fix: Skill Display #1058

Merged
merged 5 commits into from
Feb 25, 2024
Merged

Conversation

superhize
Copy link
Contributor

  • Fixed progress bar trying to get out of your screen
  • Fixed negative time remaining in ETA display
  • Fixed command levelwithxp/xpforlevel
  • Match xp/h timer with the session timer

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Feb 25, 2024
Copy link

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

@superhize superhize mentioned this pull request Feb 25, 2024
@hannibal002 hannibal002 added the Bug Fix Bug fixes label Feb 25, 2024
@hannibal002 hannibal002 added this to the Version 0.23 milestone Feb 25, 2024
@hannibal002 hannibal002 self-requested a review February 25, 2024 17:43
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Feb 25, 2024
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 merged commit ea2a886 into hannibal002:beta Feb 25, 2024
3 checks passed
@github-actions github-actions bot removed the Bug Fix Bug fixes label Feb 25, 2024
@superhize superhize deleted the skill_progress_fix branch June 17, 2024 14:57
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