Anuken 39939f8a51 Merge https://github.com/joshuaptfan/Mindustry ...

# Conflicts:
#	core/assets/bundles/bundle.properties
#	core/src/io/anuke/mindustry/content/Blocks.java
#	core/src/io/anuke/mindustry/input/Binding.java

2019-11-18 19:40:45 -05:00

..

bloomshaders

Bloom fix

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

bundles

Merge https://github.com/joshuaptfan/Mindustry

2019-11-18 19:40:45 -05: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

Lighting improvements

2019-11-10 16:18:47 -05:00

sounds

Thruster fix / Removed info on Steam to prevent confusion

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

sprites

Beep boop add f-droid (#1087)

2019-11-18 15:52:44 -05:00

contributors

🚧 Add insulator wall (#840)

2019-10-27 17:41:00 -04:00