mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'Kwoth/1.9' into 1.9

Browse Source
This commit is contained in:
Shikhir Arora
2017-11-08 06:54:12 -05:00
parent 82d9728b5d 759bb0982e
commit 22f474a1df
5 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs
View File

@@ -164,11 +164,8 @@ namespace NadekoBot.Modules.Gambling
int.TryParse(match.Groups["n2"].ToString(), out int n2) && int.TryParse(match.Groups["n2"].ToString(), out int n2) &&
n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0) n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0)
{ {
if (!int.TryParse(match.Groups["add"].Value, out int add) || int.TryParse(match.Groups["add"].Value, out int add);
!int.TryParse(match.Groups["sub"].Value, out int sub)) int.TryParse(match.Groups["sub"].Value, out int sub);
{
return;
}
var arr = new int[n1]; var arr = new int[n1];
for (int i = 0; i < n1; i++) for (int i = 0; i < n1; i++)

2
NadekoBot.Core/Modules/Games/Services/GamesService.cs
View File

@@ -200,7 +200,7 @@ namespace NadekoBot.Modules.Games.Services
{ {
var sent = await channel.SendFileAsync( var sent = await channel.SendFileAsync(
fileStream, fileStream,
"drop.png", "drop.gif",
toSend).ConfigureAwait(false); toSend).ConfigureAwait(false);
msgs[0] = sent; msgs[0] = sent;

2
NadekoBot.Core/Services/Impl/StatsService.cs
View File

@@ -21,7 +21,7 @@ namespace NadekoBot.Core.Services.Impl
private readonly IBotCredentials _creds; private readonly IBotCredentials _creds;
private readonly DateTime _started; private readonly DateTime _started;
public const string BotVersion = "2.3.6"; public const string BotVersion = "2.4.1";
public string Author => "Kwoth#2560"; public string Author => "Kwoth#2560";
public string Library => "Discord.Net"; public string Library => "Discord.Net";

4
build.ps1
View File

@@ -1,4 +0,0 @@
appveyor-retry dotnet restore NadekoBot.sln -v Minimal /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet build NadekoBot.sln -c "Release" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }

2
pack.ps1
View File

@@ -1,2 +0,0 @@
dotnet pack "src\NadekoBot\NadekoBot.csproj" -c "Release" -o "../../artifacts" --no-build --version-suffix "$Env:BUILD" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }