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 + Fix: Chocolate Factory Party Time 🥳️‍🌈 #3054

Merged
merged 23 commits into from
Dec 17, 2024

Conversation

DavidArthurCole
Copy link
Contributor

@DavidArthurCole DavidArthurCole commented Dec 13, 2024

Dependencies

Because this started as an accident while I was trying to do something else:

And because the date-time will need to get party-ified:

What

Adds a party mode to the chocolate factory.
The images below are after I've merged it into the other on-going Hoppity PRs.
On a more serious note this will also fix an issue with the stray flash would be "over" the top of other items rendered in CF due to having an unstable priority.

Images

https://imgur.com/a/1HXOW7q

Changelog New Features

  • Added party mode for Chocolate Factory. - Daveed
    • Using it is not recommended.

Changelog Fixes

  • Fixed stray flash overlaying other Chocolate Factory information. - Daveed

@github-actions github-actions bot added the Bug Fix Bug fixes label Dec 13, 2024
@hannibal002 hannibal002 added this to the Version 0.28 milestone Dec 13, 2024
@hannibal002 hannibal002 added the Waiting on Dependency PR waiting for a dependency pr to be merged label Dec 13, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 13, 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 Dec 13, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 15, 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 Dec 15, 2024
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 merged commit c00cf55 into hannibal002:beta Dec 17, 2024
6 checks passed
@github-actions github-actions bot removed Bug Fix Bug fixes Waiting on Dependency PR waiting for a dependency pr to be merged labels Dec 17, 2024
@hannibal002 hannibal002 changed the title Fix + Feature: Chocolate Factory Party Time 🥳️‍🌈 Feature + Fix: Chocolate Factory Party Time 🥳️‍🌈 Dec 17, 2024
@DavidArthurCole DavidArthurCole deleted the PartyTime branch December 17, 2024 22:11
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