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
..
bloomshaders
bundles	Merge remote-tracking branch 'origin/master'	2020-01-08 11:00:19 -05:00
cursors
fonts	Changed Cyrillic font	2020-01-06 08:37:19 -05:00
icons
maps
music
scripts	New, improved minimap / Bugfixes	2019-12-29 17:56:10 -05:00
shaders
sounds
sprites	Override inverted sorter arrow colours (#1252)	2019-12-24 00:32:04 -05:00
contributors	Add - tutorial localized, description coverage++, fix broken translations (#1327)	2020-01-05 17:41:41 -05:00