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.

Sign up for GitHub

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

Jump to bottom

Revert Diets #649

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Revert Diets #649

merged 2 commits into from
Dec 4, 2023

Conversation

FoxxoTrystan
Copy link
Contributor

About the PR

Unrestrict Diets.

Why / Balance

Requested.

Technical details

.yml files changes.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 FoxxoTrystan

  • tweak: Diets got reverted for the moment.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Dec 4, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Dec 4, 2023
Cheackraze
Cheackraze approved these changes Dec 4, 2023
View reviewed changes
Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

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

this is just until we can go through all the foods and ensure they are properly tagged so they can be eaten and we dont have starving people

@Cheackraze Cheackraze merged commit 3ebf91d into new-frontiers-14:master Dec 4, 2023
8 of 9 checks passed
FrontierATC added a commit that referenced this pull request Dec 4, 2023
@FrontierATC
Automatic Changelog (#649)
956cbe8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cheackraze Cheackraze Cheackraze approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FoxxoTrystan @Cheackraze