Anuken b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry ...

# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties

2019-09-29 17:03:28 -04:00

..

bloomshaders

Bloom fix

2019-06-28 23:31:34 -04:00

bundles

Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry

2019-09-29 17:03:28 -04:00

cursors

Cursor antialiasing

2019-08-04 09:41:25 -04:00

fonts

Fix fonts (#424)

2019-03-10 08:03:54 -06:00

icons

Updated Mac icon

2019-08-16 12:05:00 -04: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

shaders

More drone changes

2019-06-14 21:06:58 -04:00

sounds

Thruster fix / Removed info on Steam to prevent confusion

2019-09-28 15:40:31 -04:00

sprites

Added armored conveyors

2019-09-22 15:12:15 -04:00

contributors

Added my name (#718)

2019-09-26 09:26:11 -04:00