Anuken be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties		2020-02-04 12:25:18 -05:00
..
bloomshaders	Bloom fix	2019-06-28 23:31:34 -04:00
bundles	Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl	2020-02-04 12:25:18 -05:00
cursors	Cursor antialiasing	2019-08-04 09:41:25 -04:00
fonts	Fixed 103 network compatibility	2020-01-27 10:19:18 -05:00
icons	Added underflow gates	2020-01-20 18:54:25 -05:00
maps	Travis testing	2019-09-12 17:19:01 -04:00
music	Fixed "disconnected" bug / Updated menu music	2019-09-01 10:19:13 -04:00
planets	Added accurate planet generation	2020-01-18 13:24:14 -05:00
scripts	New, improved minimap / Bugfixes	2019-12-29 17:56:10 -05:00
shaders	Hexagonal planet	2020-01-11 00:39:37 -05:00
sounds	Thruster fix / Removed info on Steam to prevent confusion	2019-09-28 15:40:31 -04:00
sprites	Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl	2020-02-04 12:25:18 -05:00
contributors	Add - tutorial localized, description coverage++, fix broken translations (#1327)	2020-01-05 17:41:41 -05:00