mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 15:02:03 -08:00
Code Issues Projects Releases Wiki Activity
Mindustry/core
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
..
assets Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 2020-09-29 18:31:42 +03:00
assets-raw Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 2020-09-29 18:31:42 +03:00
src/mindustry Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 2020-09-29 18:31:42 +03:00
build.gradle Cleanup 2020-06-15 21:52:51 -04:00
convert_sounds.sh