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
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
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
music
planets	Added accurate planet generation	2020-01-18 13:24:14 -05:00
scripts
shaders
sounds
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