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: Chocolate Shop Price #1601

Merged
merged 8 commits into from
May 1, 2024
Merged

Feature: Chocolate Shop Price #1601

merged 8 commits into from
May 1, 2024

Conversation

hannibal002
Copy link
Owner

Dependencies

What

Show chocolate to coin prices inside the Chocolate Shop inventory.

![image](https://github.com/hannibal002/SkyHanni/assets/24389977/e21407ac-9beb-436a-a680-97497e87bf06) ![image](https://github.com/hannibal002/SkyHanni/assets/24389977/ec9b93d1-b53f-4fe7-9bc0-ba769911e1c6)

Changelog New Features

  • Added Chocolate Shop Price. - hannibal2
    • Show chocolate to coin prices inside the Chocolate Shop inventory.

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Apr 30, 2024
@hannibal002 hannibal002 added this to the Version 0.25 milestone Apr 30, 2024
@hannibal002 hannibal002 changed the title doing big moves Feature: Chocolate Shop Price Apr 30, 2024
@hannibal002 hannibal002 added the Waiting on Dependency PR waiting for a dependency pr to be merged label Apr 30, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 1, 2024
Copy link

github-actions bot commented May 1, 2024

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

@CalMWolfs CalMWolfs self-requested a review May 1, 2024 03:45
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 1, 2024
Copy link

github-actions bot commented May 1, 2024

Conflicts have been resolved! 🎉

@CalMWolfs CalMWolfs merged commit a2abc88 into beta May 1, 2024
7 checks passed
@CalMWolfs CalMWolfs deleted the chocolate-shop-price branch May 1, 2024 04:51
@github-actions github-actions bot removed Soon This Pull Request will be merged within the next couple of betas Waiting on Dependency PR waiting for a dependency pr to be merged labels May 1, 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.

2 participants