Anuken 56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/content/Blocks.java core/src/mindustry/content/Planets.java core/src/mindustry/io/SaveFileReader.java core/src/mindustry/mod/ClassMap.java core/src/mindustry/type/UnitType.java core/src/mindustry/world/Block.java		2021-10-14 21:00:14 -04:00
..
baseparts
bloomshaders
bundles	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-10-14 21:00:14 -04:00
cubemaps/stars
cursors
fonts
icons	More branch merging	2021-10-14 20:58:03 -04:00
maps	Slight difficulty increase of Desolate Rift	2021-09-22 19:21:58 -04:00
music	Converted soundtrack to ogg	2021-10-07 12:07:26 -04:00
scripts	Added 2 versatile trigger event types (#6130)	2021-10-10 08:08:04 -04:00
shaders	More branch merging	2021-10-14 20:58:03 -04:00
sounds	Map editor bugfixes / Re-added build noise	2021-09-09 17:04:55 -04:00
sprites	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-08-10 15:15:07 -04:00
contributors	Add unitSpawnEvent (#5876)	2021-08-28 10:53:19 -04:00
logicids.dat	More branch merging	2021-10-14 20:58:03 -04:00