-
Notifications
You must be signed in to change notification settings - Fork 154
Adding Crow, Missed Enchants, partial Bestiary, and more #2223
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
Merged
Merged
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
6f44a84
Various Fixes and Lore updates
Bentcheesee 6a0bd4d
Merge pull request #1 from NotEnoughUpdates/master
Bentcheesee d431c61
updating some of bestiary
Bentcheesee e667be3
Merge branch 'master' of https://github.com/Bentcheesee/NEU-REPO
Bentcheesee 078c31d
Adding Turbos, Reforge Stones, and Crow
Bentcheesee 8582800
Missed Crop Fever
Bentcheesee 0b515c4
Add Firefly Pest, Crow Update, add parents
Bentcheesee 30f9426
Merge branch 'master' into master
Bentcheesee 4a3af0a
crow
Bentcheesee cb84da6
Merge branch 'master' of https://github.com/Bentcheesee/NEU-REPO
Bentcheesee 1be52b6
Update PEST_FIREFLY_MONSTER.json
Bentcheesee 8f903b1
Merge branch 'master' into master
Bentcheesee d1fc602
okay hopefully nothing else is messed up
Bentcheesee 0849f4c
Merge branch 'master' of https://github.com/Bentcheesee/NEU-REPO
Bentcheesee 3c6b7d6
Merge branch 'master' into master
Bentcheesee 4ff89ea
again
Bentcheesee 5f9e0ec
Merge branch 'master' of https://github.com/Bentcheesee/NEU-REPO
Bentcheesee 125ac07
Merge branch 'master' into master
Bentcheesee fbc9957
fix: Crow nbt and reforgestones double space
jani270 436bff1
fix: order for new reforge stones
jani270 b315306
Merge branch 'master' into master
jani270 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -747,4 +747,4 @@ | |
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.