Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CheetoHead 2019-12-20 15:23:14 -05:00
commit 33551c4d81
20 changed files with 1316 additions and 426 deletions

View file

@ -211,7 +211,7 @@ redo_secondary={
[locale]
translations=PoolStringArray( "res://Translations/#Translations.en.translation", "res://Translations/#Translations.el.translation", "res://Translations/#Translations.fr.translation", "res://Translations/#Translations.de.translation", "res://Translations/#Translations.pl.translation", "res://Translations/#Translations.ru.translation", "res://Translations/#Translations.zh_TW.translation" )
translations=PoolStringArray( "res://Translations/#Translations.en.translation", "res://Translations/#Translations.el.translation", "res://Translations/#Translations.fr.translation", "res://Translations/#Translations.de.translation", "res://Translations/#Translations.pl.translation", "res://Translations/#Translations.ru.translation", "res://Translations/#Translations.zh_TW.translation", "res://Translations/#Translations.pt_BR.translation" )
locale_filter=[ 0, [ ] ]
[rendering]