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

Hybrasia branch for merge #6257

Closed
wants to merge 147 commits into from

Conversation

cuberound
Copy link
Contributor

@cuberound cuberound commented May 7, 2024

About the pull request

I do not know how to handle merge conflicts on someone elses project, yes me dumb, basicly, ignore this

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added something
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
spellcheck: fixed a few typos
ui: changed something relating to user interfaces
code: changed some code
refactor: refactored some code
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
mapadd: added a new map or section to a map
maptweak: tweaked a map
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label May 7, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels May 7, 2024
@cuberound cuberound closed this May 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants