Anuken 9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/version.properties		2018-03-09 20:58:21 -05:00
..
backgrounds
blocks	Added LiquidDrill	2018-03-09 10:09:32 -05:00
effects	More reorganization, implemented multiblock drills, API changes	2018-03-04 22:00:32 -05:00
enemies
items	More reorganization, implemented multiblock drills, API changes	2018-03-04 22:00:32 -05:00
mechs
shapes	New resources, blocks, core no longer accepts fuel materials	2018-02-22 20:12:20 -05:00
ui	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00
weapons
pack.json	Added in-game changelogs	2018-03-09 17:11:01 -05:00