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: Draconic Sacrifice Tracker #2077

Open
wants to merge 21 commits into
base: beta
Choose a base branch
from

Conversation

superhize
Copy link
Contributor

@superhize superhize commented Jun 13, 2024

What

Tracker for the Draconic Altar sacrifices

Images

Hypacrosaurus_t9pgMtPhjI
Thrasher_F6fd8LxIow

Changelog New Features

  • Draconic Sacrifice Tracker. - HiZe

@superhize superhize marked this pull request as ready for review June 14, 2024 14:01
@hannibal002 hannibal002 added this to the Version 0.27 milestone Jun 14, 2024
@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.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 18, 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 Aug 26, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 4, 2024
Copy link

github-actions bot commented Oct 4, 2024

Conflicts have been resolved! 🎉

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

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

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Oct 11, 2024
superhize and others added 2 commits October 13, 2024 16:40
…ificeTracker.kt

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 13, 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 Oct 14, 2024
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/config/commands/Commands.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 14, 2024
Copy link

Conflicts have been resolved! 🎉

Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

worked for me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Soon This Pull Request will be merged within the next couple of betas
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants