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

Browse Source

 Conflicts:

	core/assets/bundles/bundle_ko.properties

	core/src/mindustry/type/UnitType.java

...

This commit is contained in:

Anuken

2021-11-22 10:12:48 -05:00

parent 6edf0a27a4 25f98fdeb0

commit 65f36faf71

42 changed files with 8369 additions and 1504 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

553

core/assets/bundles/bundle_tk.properties

File diff suppressed because it is too large Load Diff