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

Backport Model Registration Changes #4647

Merged
merged 2 commits into from
Aug 28, 2020
Merged

Backport Model Registration Changes #4647

merged 2 commits into from
Aug 28, 2020

Conversation

shartte
Copy link
Member

@shartte shartte commented Aug 26, 2020

This backports the model registration changes from 1.16, which means we register our model loaders inside the model registry event, and not later.

(Also contains the pom.xml change so we can immediately push a release after)

Hopefully fixes #4634

shartte and others added 2 commits August 26, 2020 17:56
* Fixes #4575 by updating Forge (ModelRegistryEvent is a modbus event but was misflagged as not being one). And update Forge because their breaking change breaks our mod.

* Update gradle.properties

Co-authored-by: yueh <yueh@users.noreply.github.com>

* Update src/main/resources/META-INF/mods.toml

Co-authored-by: yueh <yueh@users.noreply.github.com>

Co-authored-by: yueh <yueh@users.noreply.github.com>

(cherry picked from commit 8733c2c)
(cherry picked from commit 00d4c20)
@shartte shartte requested a review from yueh August 26, 2020 15:58
@shartte shartte added this to the 7.0.x - 1.15 milestone Aug 26, 2020
@shartte shartte merged commit faa00cd into 7.x-1.15 Aug 28, 2020
@shartte shartte deleted the fix-4634 branch August 28, 2020 13:57
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants