fetch upstream #4
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Not-A-Normal-Robot
force-pushed
the
wip-all-in-one
branch
from
4b432da to
b6d4c6a
Compare
Member
Author
|
oh come on the conflict is still there ;~; |
Not-A-Normal-Robot
force-pushed
the
wip-all-in-one
branch
from
b6d4c6a to
4b432da
Compare
MrZ626
force-pushed
the
main
branch
2 times, most recently
from
3bbabd1 to
0fc7178
Compare
MrZ626
force-pushed
the
main
branch
3 times, most recently
from
d259e05 to
9e0e93d
Compare
MrZ626
force-pushed
the
main
branch
3 times, most recently
from
dde1f56 to
7f50161
Compare
MrZ626
force-pushed
the
main
branch
2 times, most recently
from
b2d9370 to
0ba26aa
Compare
ParticleG
force-pushed
the
main
branch
3 times, most recently
from
234d7e4 to
5f664c0
Compare
ParticleG
force-pushed
the
main
branch
4 times, most recently
from
68d0b76 to
ed11faf
Compare
限制自定义菜单背景选择范围 微调自定义背景设置ui 整理代码
* stop cc from running under pctrain * Update customGame.lua --------- Co-authored-by: MrZ_26 <1046101471@qq.com>
* Viewlog fix * Fix log viewer * Fix on-screen key get pressed with emojis * Little improvement (I think?) * Update net_game.lua --------- Co-authored-by: MrZ_26 <1046101471@qq.com>
* Update attacker_u.lua attempt fix for #1213 * Update defender_n.lua --------- Co-authored-by: arisutendou-key <127687869+arisutendou-key@users.noreply.github.com>
* Added russian language * fixed typo * removed rus. dict. as its not even started * small change again. added one space * forgor to credit myself * Fixed credits * Fixed credits again
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.