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
items
mechs
shapes
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