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

Merge manifests for hybrid mod jar #2457

Merged
merged 2 commits into from
Jan 24, 2024

Conversation

me4502
Copy link
Member

@me4502 me4502 commented Jan 6, 2024

This appears to fix #2442 for 7.2.x. The issue reports further issues on 7.3, so my plan is to get this into 7.2.x, merge that into master, and then fix the lack of refmap.

This has been tested by ensuring that it mentions mixins during startup, and that the UPDATE flag is both present and functional (as that's dependent on mixins). I did not encounter the mixin failures that were mentioned in the linked issue, that might have been specific to the prior version used.

@me4502 me4502 requested a review from octylFractal January 6, 2024 12:40
@me4502 me4502 enabled auto-merge (squash) January 7, 2024 11:33
@me4502 me4502 disabled auto-merge January 24, 2024 07:11
me4502 and others added 2 commits January 24, 2024 21:07
See if this makes CI happy

Try this on CI

It seems to mistake the second arg as the wrong type, so split them up

Fix formatting

Switch to shadowJar as it's now miraculously working
@me4502 me4502 force-pushed the fix/hybrid-mod-forge-mixin-manifest branch from e850871 to 8d2429a Compare January 24, 2024 11:08
@me4502 me4502 merged commit d533be4 into version/7.2.x Jan 24, 2024
5 of 6 checks passed
@me4502 me4502 deleted the fix/hybrid-mod-forge-mixin-manifest branch January 24, 2024 11:08
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