Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upMOAR bugfixes. #5085
Conversation
Rivet-the-Zombie
added some commits
Dec 16, 2013
This comment has been minimized.
This comment has been minimized.
|
Is there any reason this hasn't merged yet? I'm assuming the error is because of Jenkin's shit-fit recently but a lot of people are noticing it. |
This comment has been minimized.
This comment has been minimized.
|
It's waiting to merge because for the last several days I've been the only one merging stuff, and it's bad form to merge your own PRs. |
This comment has been minimized.
This comment has been minimized.
|
I'm actually not sure about the merge conflict, it wants to put back one of the things that was removed, and change something that doesn't look like it was touched? |
This comment has been minimized.
This comment has been minimized.
|
I'll go through this and produce an up-to-date version so there's no conflicts. |
Rivet-the-Zombie
closed this
Dec 21, 2013
Rivet-the-Zombie
deleted the
Rivet-the-Zombie:new-recipes-fix
branch
Dec 23, 2013
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Rivet-the-Zombie commentedDec 16, 2013
Some fixes introduced by the new recipes and such, tightens up numbers related to recent additions, and gives the combat chainsaw some fuel capacity once more (a normal chainsaw has 400 and the recipe calls for an additional fuel tank)