Skip to content

Improve research parsing code [1.21]#10736

Merged
Raycoms merged 4 commits intoversion/1.21from
feature/improve_research_serialization_121
May 11, 2025
Merged

Improve research parsing code [1.21]#10736
Raycoms merged 4 commits intoversion/1.21from
feature/improve_research_serialization_121

Conversation

@Thodor12
Copy link
Copy Markdown
Contributor

See #10732

…on_121

# Conflicts:
#	src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json
#	src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/athlete.json
#	src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/moq.json
#	src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nimble.json
#	src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/swift.json
#	src/main/java/com/minecolonies/core/client/gui/WindowResearchTree.java
@Raycoms Raycoms merged commit 13bf906 into version/1.21 May 11, 2025
5 checks passed
@Raycoms Raycoms deleted the feature/improve_research_serialization_121 branch May 11, 2025 08:49
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