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: Pet Nametag #1880

Merged
merged 59 commits into from
Sep 11, 2024
Merged

Conversation

j10a1n15
Copy link
Contributor

@j10a1n15 j10a1n15 commented May 24, 2024

Dependencies

What

Adds options to modify the look of pet nametags, like removing the player name, or hiding the level of the pet.

Images

image

Changelog New Features

  • Added option to hide pet nametag text. - Empa + j10a1n15

ItsEmpa and others added 18 commits May 3, 2024 23:02
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
…mponent

Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
#	src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
#	src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
#	src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
3
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 24, 2024
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 removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 24, 2024
Copy link

Conflicts have been resolved! 🎉

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 May 24, 2024
@hannibal002 hannibal002 added this to the Version 0.26 milestone May 24, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 24, 2024
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 Jun 14, 2024
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 Jun 16, 2024
Copy link

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

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 Jun 16, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 31, 2024
Copy link

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

Copy link

github-actions bot commented Sep 1, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 1, 2024
@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Sep 9, 2024
@hannibal002 hannibal002 enabled auto-merge (squash) September 11, 2024 11:56
@hannibal002 hannibal002 merged commit c48d82d into hannibal002:beta Sep 11, 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 11, 2024
@j10a1n15 j10a1n15 deleted the feature/pet-nametag-3 branch September 11, 2024 16:31
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.

7 participants