diff --git a/.gitignore b/.gitignore index da881a0e..ff2c4dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ obj/ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs -**/Bin/Debug/** **/Bin/Release/ **/Bin/PRIVATE/ !**/Bin/Debug/opus.dll @@ -19,9 +18,11 @@ obj/ !**/Bin/Debug/Nito.AsyncEx.dll !**/Bin/Debug/WebSocket4Net.dll !**/Bin/Debug/sqlite3.dll -!**/Bin/Debug/data/* -!**/Bin/Debug/data/ !**/Bin/Debug/credentials_example.json +NadekoBot/bin/debug/*.* +NadekoBot/bin/debug/data/permissions +NadekoBot/bin/debug/data/incidents +!NadekoBot/bin/Debug/data/currency_images/* Tests/bin # NuGet Packages diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs index c7f254ba..2fbb48f4 100644 --- a/NadekoBot/NadekoBot.cs +++ b/NadekoBot/NadekoBot.cs @@ -111,7 +111,7 @@ namespace NadekoBot Client = new DiscordClient(new DiscordConfigBuilder() { MessageCacheSize = 10, - ConnectionTimeout = 60000, + ConnectionTimeout = 120000, LogLevel = LogSeverity.Warning, LogHandler = (s, e) => Console.WriteLine($"Severity: {e.Severity}" +