Patrick 'Quezler' Mounier 8a089ba3c9 Resolve conflicts ... # 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		2019-11-12 08:44:26 +01:00
..
blocks	Resolve conflicts	2019-11-12 08:44:26 +01:00
editor
effects
items
mechs
shapes
ui	Mobile schematics / Randomized projector reloads	2019-10-31 22:44:07 -04:00
units	Display document import errors on iOS	2019-11-09 15:30:02 -05:00
weapons
zones
pack.json