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

Update previous food tags #10385

Merged
merged 6 commits into from
Nov 24, 2024
Merged

Update previous food tags #10385

merged 6 commits into from
Nov 24, 2024

Conversation

Thodor12
Copy link
Contributor

Changes proposed in this pull request

  • Upon request of Ray after accidental merge. Updated the food tags to just datagen, not be included in the ItemFood
  • Undone food builder logic in ModItemsInitializer
  • Brought list code more in line with what Ray already made for the cook rework
  • Ran datagen, but no changes were made

Testing

  • Yes I tested this before submitting it.
  • I also did a multiplayer test.

Review please

…the cook rework (datagen was ran but no changes were necessary to json files)
Raycoms
Raycoms previously approved these changes Oct 31, 2024
Copy link
Contributor

@Raycoms Raycoms left a comment

Choose a reason for hiding this comment

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

Much better

# Conflicts:
#	src/main/java/com/minecolonies/api/items/ModItems.java
#	src/main/java/com/minecolonies/apiimp/initializer/ModItemsInitializer.java
#	src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java
#	src/main/java/com/minecolonies/core/items/ItemFood.java
marchermans
marchermans previously approved these changes Nov 19, 2024
@Raycoms Raycoms merged commit a908203 into version/1.21 Nov 24, 2024
5 checks passed
@Raycoms Raycoms deleted the fix/food_tags branch November 24, 2024 11:04
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