Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4c7259843c97e1ea9d97fc9c1a2ca5145801e005
Mindustry/core/assets/bundles/bundle.properties
Anuken 4c7259843c Merge branch 'master' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
2019-10-20 10:21:35 -04:00

65 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink