-
Notifications
You must be signed in to change notification settings - Fork 83
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ntnf scarab
Update ntnfscarab.yml
Update ntnfscarab.yml
Update ntnfscarab.yml
was asked to change the cocoa powder value down, so i have
Changed Dark Oasis Recipe
N.T.N.F. Scarab
Fix Block Game
Remove Dragon Timer
Fix Power Flickers
Update and Rename Adolescent Dragon to Drake
No More Munching on Uranium
Herbals Don't Contain Nicotine
Autovote System
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
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
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Memeji
approved these changes
Nov 15, 2024
FoxxoTrystan
approved these changes
Nov 15, 2024
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#351
#344
#347
#349
#354
#352
#350
#343
#353
#348