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

Combined all edits (#98 and #100) #106

Merged

Conversation

MnFeN
Copy link
Contributor

@MnFeN MnFeN commented Apr 9, 2024

There were too many branched edits from me because I accidentally used a wrong mail address on one of my PC, and the history was messed up. So I combined all of them and added them in a single submit after the 1.1.7.4 branch ca5dcf7.

All the original updates after this were from me (except the manifest.xml, and these codes were also combined), so all the possible conflicts would follow the newly submitted code. Thank you!

The update descriptions were in #98 and #100.

@paissaheavyindustries paissaheavyindustries merged commit 1da8784 into paissaheavyindustries:master Apr 21, 2024
1 check failed
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