Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source

 Conflicts:

	core/assets/bundles/bundle_ko.properties

	core/assets/bundles/bundle_zh_CN.properties

	core/assets/bundles/bundle_zh_TW.properties

...

This commit is contained in:

Anuken

2021-11-22 12:11:31 -05:00

parent 65f36faf71 cec39f8a70

commit a48911b983

37 changed files with 1707 additions and 1913 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

core/assets/bundles/bundle_zh_CN.properties

+368 -364

File diff suppressed because it is too large Load Diff