mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-13 01:07:30 +07:00
Code Issues Packages Projects Releases Wiki Activity
Files
c04c825cec5a778e517b11e939f68cd0c1e6897f
Mindustry/core
History
Anuken c04c825cec Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
2020-01-08 11:00:19 -05:00
..
assets
Merge remote-tracking branch 'origin/master'
2020-01-08 11:00:19 -05:00
assets-raw
Override inverted sorter arrow colours (#1252)
2019-12-24 00:32:04 -05:00
src/mindustry
Make rebuildable a block attribute (#1338)
2020-01-08 10:28:28 -05:00
build.gradle
…
convert_sounds.sh
…