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

Floofstation Release V3 #355

Merged
merged 55 commits into from
Nov 15, 2024
Merged

Floofstation Release V3 #355

merged 55 commits into from
Nov 15, 2024

Conversation

Fansana
Copy link
Owner

@Fansana Fansana commented Nov 15, 2024

JasmineRickards and others added 30 commits November 9, 2024 01:43
was asked to change the cocoa powder value down, so i have
Copy link
Contributor

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files labels Nov 15, 2024
@github-actions github-actions bot closed this Nov 15, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Nov 15, 2024
@Fansana Fansana reopened this Nov 15, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 15, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 15, 2024
@FoxxoTrystan FoxxoTrystan merged commit 95e093a into stable Nov 15, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants