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

Feature: Rift time Nametag Format #2015

Merged
merged 6 commits into from
Sep 7, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Jun 6, 2024

What

Adds a feature to format rift time on top of player's nametags in minutes and seconds

Images

image

Changelog New Features

  • Added Rift Time Real-Time Nametag Format. - Empa

Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@hannibal002 hannibal002 added this to the Version 0.27 milestone Jun 7, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
Copy link

github-actions bot commented Jun 8, 2024

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

…rmat

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
Copy link

github-actions bot commented Jun 8, 2024

Conflicts have been resolved! 🎉

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

github-actions bot commented Aug 2, 2024

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/data/EntityData.kt
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 Aug 14, 2024
@jani270 jani270 modified the milestones: Version 0.28, Version 0.27 Sep 7, 2024
@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Sep 7, 2024
@hannibal002 hannibal002 merged commit 88416ed into hannibal002:beta Sep 7, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Sep 7, 2024
MTOnline69 pushed a commit to MTOnline69/SkyHanni that referenced this pull request Sep 11, 2024
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
@ItsEmpa ItsEmpa deleted the feature/rift-time-format branch October 12, 2024 15: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.

4 participants