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: Armor Stack Display #1811

Merged
merged 10 commits into from
Jul 6, 2024
Merged

Conversation

Xupie
Copy link
Contributor

@Xupie Xupie commented May 16, 2024

What

Added Armor Stack Display (Crimson, Terror etc.)

Changelog New Features

  • Add Armor Stack Display. - Xupie
    • Display the number of stacks on armor pieces like Crimson, Terror etc.

@Xupie Xupie changed the title Armorstackdisplay Feature: Armor Stack Display May 16, 2024
@hannibal002 hannibal002 added this to the Version 0.26 milestone May 16, 2024
@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.

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 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 added the Merge Conflicts There are open merge conflicts with the beta branch. label May 29, 2024
Xupie added 2 commits June 3, 2024 00:20
…ckdisplay

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
Copy link

github-actions bot commented Jun 2, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 2, 2024
@Xupie Xupie requested a review from CalMWolfs June 2, 2024 22:38
@Xupie Xupie requested a review from CalMWolfs June 3, 2024 10:12
@hannibal002 hannibal002 modified the milestones: Version 0.27, Version 0.26 Jul 6, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Jul 6, 2024
@hannibal002 hannibal002 merged commit 4314c0c into hannibal002:beta Jul 6, 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 Jul 6, 2024
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.

3 participants