Anuken 3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: gradle.properties		2021-06-28 18:57:27 -04:00
..
baseparts	Generic node/bridge placement system	2020-12-18 12:41:13 -05:00
bloomshaders	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
bundles	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-06-28 18:57:27 -04:00
cubemaps/stars
cursors
fonts
icons	WIP payload deconstructor	2021-06-24 12:35:44 -04:00
maps	Suppress certain mod errors on client load	2021-06-25 14:37:32 -04:00
music
scripts	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
shaders	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
sounds	Serializable -> JsonSerializable	2021-02-12 15:41:28 -05:00
sprites	Unspoiled	2021-06-02 11:15:30 -04:00
contributors	Update bundle_th.properties (#5319)	2021-06-25 12:59:07 -04:00
logicids.dat	Logic wait & content look up instructions	2021-06-24 15:38:20 -04:00