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

feat: add new 1.21.2+ folders and bump pack formats #449

Merged
merged 6 commits into from
Dec 12, 2024

Conversation

misode
Copy link
Contributor

@misode misode commented Oct 23, 2024

Adds these two folders to the resource pack

@RitikShah
Copy link
Member

RitikShah commented Oct 23, 2024

Running poetry lock should fix the executing 2.0.0 being yanked.
There also might be an update we need to make for updating the pack format numbers? Might be good to document the update process in a markdown file, we can work on that after summit.

@edayot
Copy link
Contributor

edayot commented Oct 23, 2024

that odd, my PR did manage to get all dependencies and not this one
#450

@RitikShah
Copy link
Member

Can we get @edayot's branch into this one so there's one 1.21.2 branch that we can merge?

@RitikShah
Copy link
Member

RitikShah commented Dec 8, 2024

TODO

  • Merge 1 21 2 update #450 into this (pack formats)
  • items
  • equipments (moved from models/equipment)
  • Figure out custom_model_data merging..
    • Make it "work fine", handle special logic directly in weld

@misode misode mentioned this pull request Dec 8, 2024
@misode misode changed the title feat: add models/equipment and post_effect folders feat: add new 1.21.2+ folders and bump pack formats Dec 8, 2024
@misode
Copy link
Contributor Author

misode commented Dec 8, 2024

@RitikShah This PR is ready now. Item model merging will have to be done in a later PR.

Copy link
Member

@RitikShah RitikShah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good, will address beet.contrib.model_merging in a future PR.

@RitikShah RitikShah merged commit 9ba853e into mcbeet:main Dec 12, 2024
1 check passed
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.

3 participants