Merge branch 'day_length-sx' into jgrpp
Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/timetable_cmd.cpp
This commit is contained in:
@@ -1637,6 +1637,7 @@ static SettingsContainer &GetSettingsTree()
|
||||
SettingsPage *accounting = main->Add(new SettingsPage(STR_CONFIG_SETTING_ACCOUNTING));
|
||||
{
|
||||
accounting->Add(new SettingEntry("economy.inflation"));
|
||||
accounting->Add(new SettingEntry("economy.day_length_factor"));
|
||||
accounting->Add(new SettingEntry("difficulty.initial_interest"));
|
||||
accounting->Add(new SettingEntry("difficulty.max_loan"));
|
||||
accounting->Add(new SettingEntry("difficulty.subsidy_multiplier"));
|
||||
|
Reference in New Issue
Block a user