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

work on J3DMaterialFactory and J3DMaterialFactory_v21 #2012

Merged
merged 2 commits into from
Dec 28, 2023

Conversation

randomsalience
Copy link
Collaborator

No description provided.

@hatal175
Copy link
Contributor

Solve the conflict and you're golden

@randomsalience
Copy link
Collaborator Author

Okay, the conflict is resolved

@Trueffeloot Trueffeloot merged commit 9780adc into zeldaret:main Dec 28, 2023
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