Anuken 39a0dde1f4 Merge branch 'master' of https://github.com/Anuken/Mindustry into lights ... # Conflicts: # core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java		2019-11-10 14:12:43 -05:00
..
bloomshaders	Bloom fix	2019-06-28 23:31:34 -04:00
bundles	Implement build autopausing (#1017)	2019-11-08 16:56:06 -05:00
cursors	Cursor antialiasing	2019-08-04 09:41:25 -04:00
fonts
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	Cleanup	2019-10-03 22:39:57 -04:00
sounds	Thruster fix / Removed info on Steam to prevent confusion	2019-09-28 15:40:31 -04:00
sprites	Mobile schematics / Randomized projector reloads	2019-10-31 22:44:07 -04:00
contributors	🚧 Add insulator wall (#840)	2019-10-27 17:41:00 -04:00