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
..
blocks	Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework	2019-12-27 01:41:06 -05:00
editor
effects	Lighting improvements	2019-11-10 16:18:47 -05:00
items
mechs	Alpha stuff	2019-10-16 18:57:19 -04:00
shapes
ui	Added Feathub to the "About" tab (#1234)	2019-12-19 19:33:24 -05:00
units	Display document import errors on iOS	2019-11-09 15:30:02 -05:00
weapons	Alpha sprite	2019-10-16 18:36:02 -04:00
zones
pack.json