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

 Conflicts:

	core/src/mindustry/content/Blocks.java

2021-06-09 17:10:49 -04:00

..

icon_64.png

New icon

2019-08-12 13:29:02 -04:00

icon.icns

Updated Mac icon

2019-08-16 12:05:00 -04:00

icon.ico

New icon

2019-08-12 13:29:02 -04:00

icons.properties

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

2021-06-09 17:10:49 -04:00