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

Consistent Marloss/Mycus/Mycal case #56251

Merged
merged 1 commit into from
Mar 22, 2022
Merged

Consistent Marloss/Mycus/Mycal case #56251

merged 1 commit into from
Mar 22, 2022

Conversation

Faalagorn
Copy link
Contributor

Summary

None

Purpose of change

Consistently use Mycus/Marloss.

Describe the solution

Change all instancess of Mycus/Mycal and Marloss to uppercase, except the explicit writing of Mycuses which use lowercase everwyewhere.

Describe alternatives you've considered

Don't touch docs and comments, don't touch or do things differently for No Fungi mod.

Testing

Game compiles fine, the changes (except the code and docs) can be seen when interacting with specified items in game.

Additional context

Also fixed some typos for "Mute" mutation not being capitalized as well as some I think wrongly used item from the No Funghi mod. Fixes several Transifex issues.

@Faalagorn Faalagorn requested a review from I-am-Erk as a code owner March 20, 2022 16:49
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON NPC / Factions NPCs, AI, Speech, Factions, Ownership json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Mar 20, 2022
@Faalagorn Faalagorn changed the title Consistent Marloss/Mycal casing Consistent Marloss/Mycus/Mycal case Mar 20, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 20, 2022
@ZhilkinSerg ZhilkinSerg merged commit f740204 into CleverRaven:master Mar 22, 2022
@Faalagorn Faalagorn deleted the marloss-mycal branch March 22, 2022 17:51
@Faalagorn Faalagorn mentioned this pull request Apr 23, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@I-am-Erk I-am-Erk Awaiting requested review from I-am-Erk

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Faalagorn @ZhilkinSerg