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.

Sign up for GitHub

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

Jump to bottom

Make Cat's Grace and Ogre Strength mutually exclusive #73599

Merged
merged 1 commit into from
May 10, 2024
Merged

Make Cat's Grace and Ogre Strength mutually exclusive #73599

merged 1 commit into from
May 10, 2024

Conversation

Maleclypse
Copy link
Member

Summary

None

Purpose of change

Fix #73593

Describe the solution

Replace duplicate eagle_sight with ogre_strength

Describe alternatives you've considered

leaving for someone else

Testing

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mods: Magiclysm Anything to do with the Magiclysm mod <Bugfix> This is a fix for a bug (or closes open issue) labels May 9, 2024
@github-actions github-actions bot requested a review from KorGgenT May 9, 2024 04:56
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 9, 2024
@dseguin dseguin merged commit 10a7e40 into CleverRaven:master May 10, 2024
25 of 26 checks passed
@Maleclypse Maleclypse deleted the Make-Ogre's-strength-and-Cat's-Grace-Exclusive branch May 12, 2024 05:02
@Maleclypse Maleclypse added the 0.H Backport PR to backport to the 0.H stable release canddiate label May 21, 2024
Procyonae pushed a commit to Procyonae/Cataclysm-DDA that referenced this pull request May 24, 2024
@Maleclypse @Procyonae
Fix CleverRaven#73593 (CleverRaven#73599)
6f4fc64
@Procyonae Procyonae mentioned this pull request May 24, 2024
Merged
kevingranade pushed a commit that referenced this pull request May 26, 2024
@Procyonae @Maleclypse
Fix #73593 (#73599) (#74040)
f0f41ba 
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
@Procyonae Procyonae added 0.H Backported and removed 0.H Backport PR to backport to the 0.H stable release canddiate labels May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

Assignees
No one assigned
Labels
0.H Backported astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Magiclysm Anything to do with the Magiclysm mod Mods Issues related to mods or modding
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Magiclysm: Cat's Grace should list Ogre's Strength in it's remove_effects code [low priority]
3 participants
@Maleclypse @dseguin @Procyonae