Patrick 'Quezler' Mounier ed765ad10a Merge branch 'master' into crater ... # 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		2020-01-10 12:02:07 +01:00
..
blocks	Merge branch 'master' into crater	2020-01-10 12:02:07 +01:00
editor
effects	Lighting improvements	2019-11-10 16:18:47 -05:00
items	Cleanup, main menu progress	2019-07-03 23:36:51 -04:00
mechs	Bugfixes	2019-07-10 09:55:31 -04:00
shapes	Fixed performance regression / Removed useless fallback sprites	2019-07-03 17:07:22 -04:00
ui	Added Feathub to the "About" tab (#1234)	2019-12-19 19:33:24 -05:00
units	Revert "🎩"	2020-01-03 17:26:19 +01:00
weapons
zones
pack.json	Source reformat	2019-04-08 09:03:18 -04:00