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

Fixed refactoring errors

2019-02-02 15:59:07 -05:00

convert_sounds.sh

Fixed truncated sounds

2019-08-15 14:16:41 -04:00