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

Fixes wrong death message id in DamageTypes docs #194

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Fixes wrong death message id in DamageTypes docs #194

merged 1 commit into from
Nov 16, 2024

Conversation

starforcraft
Copy link
Contributor

grafik

@ChampionAsh5357 ChampionAsh5357 added the incorrect Fixes incorrect information. label Nov 13, 2024
IchHabeHunger54
IchHabeHunger54 requested changes Nov 14, 2024
View reviewed changes
Copy link
Member

@IchHabeHunger54 IchHabeHunger54 left a comment

Choose a reason for hiding this comment

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

Thank you for the contribution!

While it is correct that death messages start with death.attack. and not just death., the mod id should still be kept somewhere. I've added this as a suggested change.

docs/resources/server/damagetypes.md Outdated Show resolved Hide resolved
@starforcraft starforcraft force-pushed the fix-message_id-damagetype branch from cbcc73c to 8df8097 Compare November 14, 2024 17:41
IchHabeHunger54
IchHabeHunger54 previously approved these changes Nov 14, 2024
View reviewed changes
Copy link
Member

@IchHabeHunger54 IchHabeHunger54 left a comment

Choose a reason for hiding this comment

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

Approved, will be merged after #178 because we've set a docs freeze until that one is done.

@neoforged-automation neoforged-automation bot added the needs rebase This Pull Request needs to be rebased before being merged label Nov 15, 2024
@neoforged-automation
Copy link

@starforcraft, this pull request has conflicts, please resolve them for this PR to move forward.

@IchHabeHunger54
Copy link
Member

Rebase, and then you should be good to go.

@IchHabeHunger54 IchHabeHunger54 enabled auto-merge (squash) November 15, 2024 23:24
auto-merge was automatically disabled November 16, 2024 11:06

Head branch was pushed to by a user without write access

@neoforged-automation neoforged-automation bot removed the needs rebase This Pull Request needs to be rebased before being merged label Nov 16, 2024
@starforcraft @IchHabeHunger54
Update damagetypes.md
205729e 
Co-Authored-By: IchHabeHunger54 <[email protected]>
@starforcraft starforcraft force-pushed the fix-message_id-damagetype branch from c9dfac2 to 205729e Compare November 16, 2024 11:12
@IchHabeHunger54 IchHabeHunger54 merged commit 491c04c into neoforged:main Nov 16, 2024
@starforcraft starforcraft deleted the fix-message_id-damagetype branch November 16, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IchHabeHunger54 IchHabeHunger54 IchHabeHunger54 approved these changes

Assignees
No one assigned
Labels
incorrect Fixes incorrect information.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@starforcraft @IchHabeHunger54 @ChampionAsh5357