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

More centralized string reverts (CleverRaven#38421) #92

Merged
merged 64 commits into from
Feb 28, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

kevingranade and others added 30 commits February 23, 2020 03:27
`xgettext` can only extract the first string when using ternary
operator. Considering that the "not possessive" context was
introduced in #27482 and it is not ambiguous now. We can remove
this context for better extraction.
Generic name to object, volume to string
Remove "not possessive" context
Fix Eat menu resetting after consuming food
Gunmod name to object, volume to string
ZhilkinSerg and others added 29 commits February 27, 2020 09:26
Generic name to object, flags to array, volume to string
Spell name to object (artifact spells)
Book name to object, time to string, volume to string
Container name to object, volume to string
Cap aim level when there is no target or when the target is not visible
Disable -Wredundant-decls in CMake on Windows build
Spawn dried lentils in bags like dried beans
* Generic name to object

* Update data/json/items/generic.json

Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>

* Update data/json/items/generic.json

Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>

* Update data/json/items/generic.json

Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>

Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Remove leather duster from survivor duster recipe
Added basic controls help to Android prelaunch menu
Spawn dried lentils in bags
Remove leather duster from survivor duster recipe
* Revert "Move string consts from iuse"

This reverts commit d692f0a.

* Complete revert

* Revert "Move string consts to file"

This reverts commit 7b89cc2.

* Complete revert
@fengjixuchui fengjixuchui merged commit 8a77f76 into fengjixuchui:master Feb 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants