Anuken d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/version.properties # core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java		2018-02-27 19:58:34 -05:00
..
backgrounds	Changed rotation control scheme, fixed "transparent" boxes	2017-12-07 21:55:13 -05:00
blocks	New resources, blocks, core no longer accepts fuel materials	2018-02-22 20:12:20 -05:00
enemies	Implemented new enemy system (largely untested)	2018-01-03 13:53:50 -05:00
mechs	Fixed bugs with player list, rturret description and deserialization	2018-01-30 22:11:54 -05:00
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	Added fullscreen, player outlines, better weapon display	2018-01-29 15:24:10 -05:00
blank.png
bullet.png
chainbullet.png
enemyarrow.png	Various optimizations; made healer enemies explode after a while	2017-12-10 15:06:33 -05:00
icon-coal.png
icon-dirium.png
icon-glass.png	New resources, blocks, core no longer accepts fuel materials	2018-02-22 20:12:20 -05:00
icon-iron.png	Made friendly fire an option	2018-01-16 15:00:46 -05:00
icon-quartz.png	New resources, blocks, core no longer accepts fuel materials	2018-02-22 20:12:20 -05:00
icon-silicon.png	New resources, blocks, core no longer accepts fuel materials	2018-02-22 20:12:20 -05:00
icon-steel.png
icon-stone.png
icon-titanium.png
icon-uranium.png
laser.png
laserend.png
laserfull.png	Optimized conveyors and all timer blocks, edited laser FX	2017-12-09 13:36:41 -05:00
pack.json
shell.png
shot-long.png
shot.png
titanshell.png