Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d4441711a77c24564b1fb3e2a72f0942e46788f3
Mindustry/core/assets/sprites/fallback
History
slava0135 cbc2205347 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites.png
	core/assets/sprites/fallback/sprites2.png
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
2020-09-29 18:31:42 +03:00
..
sprites2.png
Fixed #2735
2020-09-26 09:46:16 -04:00
sprites3.png
Re-packed sprites from PR
2020-09-28 18:42:09 -04:00
sprites4.png
Re-packed sprites from PR
2020-09-28 18:42:09 -04:00
sprites5.png
Re-packed sprites from PR
2020-09-28 18:42:09 -04:00
sprites6.png
New liquid turret - Tsunami
2020-09-25 11:49:04 +03:00
sprites7.png
Re-packed sprites from PR
2020-09-28 18:42:09 -04:00
sprites8.png
Re-packed sprites from PR
2020-09-28 18:42:09 -04:00
sprites.atlas
Unbroke wave sprite
2020-09-26 22:20:02 -04:00
sprites.png
Fixed #2735
2020-09-26 09:46:16 -04:00