Hades branch improvements #12
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
* add hades revisted crafts and update sound api for sounds (#10) * add hades revisted crafts and update sound api for sounds * fix #9 * fix #9 part 2 * Add hades_bucket to crafts. Fix some bugs. * Fix dependencies and recipes. Disable silicon if hades_materials is aviable. * Remove unused dependence. * Clear original recipe for palstic base from hades_materials. Prevent dual plastic cook recipe. * Use register_alias_force. * Fix spaces vs tabs. Co-authored-by: wsor4035 <24964441+wsor4035@users.noreply.github.com>
|
@sfence appears we have some merge conflicts |
|
Hm... I am not sure what happened but on my side, it looks like commit 99d64e2 in branch hades fixes the problem. Do not matter that it contains nothing. |
|
Fixed the merge conflicts, also I noticed some formatting inconsistencies so I fixed those too :) |
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.
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.
see above