Anuken 186a2aaa45 Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/ai/BlockIndexer.java # core/src/mindustry/core/World.java # core/src/mindustry/entities/traits/Entity.java # core/src/mindustry/entities/type/BaseEntity.java # core/src/mindustry/entities/type/TileEntity.java # core/src/mindustry/world/blocks/defense/MendProjector.java # core/src/mindustry/world/blocks/defense/OverdriveProjector.java # core/src/mindustry/world/blocks/production/Drill.java # gradle.properties		2019-12-27 01:41:06 -05:00
..
bloomshaders	Bloom fix	2019-06-28 23:31:34 -04:00
bundles	Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework	2019-12-27 01:41:06 -05:00
cursors	Cursor antialiasing	2019-08-04 09:41:25 -04:00
fonts	І	2019-12-16 12:50:18 -05: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
scripts	Renamed Calls -> Call	2019-12-26 23:00:26 -05: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	Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework	2019-12-27 01:41:06 -05:00
contributors	Added Chinese translator (#1250)	2019-12-22 12:01:41 -05:00