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: Highlight Placeable NPCs (Stranded) #723

Merged
merged 7 commits into from
Dec 11, 2023

Conversation

walkerselby
Copy link
Contributor

Create StrandedConfig
Add Highlight Placeable NPCs Feature

  • Highlights NPCs in the stranded menu that are placeable but not placed.

@hannibal002
Copy link
Owner

How can I review this when I have never heard of placeable NPC's

@walkerselby
Copy link
Contributor Author

How can I review this when I have never heard of placeable NPC's

Time to learn :)

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

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/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 26, 2023
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 Nov 26, 2023
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 26, 2023
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 Nov 26, 2023
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 26, 2023
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Nov 30, 2023
@hannibal002 hannibal002 changed the title Feature: Highlight Placeable NPCs Feature: Highlight Placeable NPCs (Stranded) Nov 30, 2023
Copy link

github-actions bot commented Dec 9, 2023

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 Dec 9, 2023
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 9, 2023
Copy link

github-actions bot commented Dec 9, 2023

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 self-requested a review December 11, 2023 20:02
@hannibal002 hannibal002 merged commit 9a5d44a into hannibal002:beta Dec 11, 2023
2 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Dec 11, 2023
@walkerselby walkerselby deleted the stranded-npcs branch December 14, 2023 13:51
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