Anuken 4dae27da98 Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/assets/bundles/bundle_ru.properties		2018-08-01 18:44:25 -04:00
..
assets	Merge remote-tracking branch 'origin/master'	2018-08-01 18:44:25 -04:00
assets-raw/sprites	Added mission completion dialog / Bundle fixes	2018-08-01 18:31:44 -04:00
src	Added mission completion dialog / Bundle fixes	2018-08-01 18:31:44 -04:00
build.gradle	Added texture generation system	2018-06-15 18:06:05 -04:00