tanks commit for stable branch - #5403
Closed
markoatonc wants to merge 1724 commits into
Closed
Conversation
Resprites sand, converts it to a greyscale palette
…stract-areas Mark a bunch of areas as abstract, skip abstract areas in area usage test
Move the holodeck into a modpack
SSmapping: ZM Z-group regen fixes
Fix gitignore not specifying repo root
Reworks bees and beehives.
Lighting: Fix assertion failures around z-level edge transitions
Move fishing into a modpack
Fix typo in ore image rotation matrix
…ker-power Make breaker boxes no longer a power subtype
Contributor
|
Your local branch was out of date when you authored the commit, and there is a conflict. |
MistakeNot4892
added
awaiting author
Contributor
Author
|
#5405 is the correct version because git broke my local branches. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
Description of changes
Why and what will this PR improve
Authorship