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

Yautja Rework Holder #3955

Closed

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jul 20, 2023

Please do not close without consulting myself or one of the maintainer managers.

About the pull request

DISCLAIMER: This PR is solely for testmerging, it is an amalgamated version of all the atomized PRs in the milestone.

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: Adds many Yautja QOL updates. See above
/:cl:

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@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 Jul 24, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
@cm13-github
Copy link
Contributor

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

@realforest2001
Copy link
Member Author

Can be closed on merge of #3906

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 Sprites Remove the soul from the game. Test Merge Only This PR's purpose is for testmerges only. UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants