Skip to content
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

[Aftershock] Handle welding requirements via extend instead of overwriting vanilla #76611

Merged
merged 1 commit into from
Sep 22, 2024

Conversation

Karol1223
Copy link
Contributor

Summary

None

Purpose of change

On the devcord it's been reported that playing with both Aftershock and Magiclysm makes some of Magiclysm's stuff unusable for welding. This is because Aftershock overwrites the vanilla requirement group instead of extending it.

Describe the solution

Changed the syntax to be done through extending instead of ovewriting

Describe alternatives you've considered

Removing the marked as not-read copy-from lines for other extended requirements in that file, but it really isn't my business why they're there

Testing

Additional context

@John-Candlebury I'd like to make sure that this is an accepted approach. Aftershock had different values for vanilla tools, but I assumed that's because the Aftershock version wasn't updated since vanilla welding audits. If I am wrong in that assumption please let me know

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 22, 2024
Copy link
Member

@John-Candlebury John-Candlebury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems correct thanks Karol

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 22, 2024
@Maleclypse Maleclypse merged commit 04238c8 into CleverRaven:master Sep 22, 2024
20 of 26 checks passed
@Karol1223 Karol1223 deleted the afs-requirements branch September 22, 2024 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants