Commit Graph

1551 Commits

Author SHA1 Message Date
Master Kwoth
9353437796 Merge pull request #591 from Nitix/1.0
Fix appveyor build
2016-08-23 13:31:50 +02:00
Nitix
9bd919b450 Fix appveyor build 2016-08-22 19:35:39 +02:00
Kwoth
fa5317b2ee Ignored project.lock.json hopefuly 2016-08-22 13:56:06 +02:00
Master Kwoth
9d4648104a Merge pull request #590 from appelemac/math
Math Eval
2016-08-22 13:36:46 +02:00
appelemac
f66d42b891 stage for PR 2016-08-22 12:09:36 +02:00
appelemac
f5cb629a63 remove this? 2016-08-22 12:07:40 +02:00
appelemac
aa69703768 add files? 2016-08-22 12:06:44 +02:00
appelemac
fd5916a54d remove files? 2016-08-22 12:06:29 +02:00
appelemac
3006ea1c48 Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into math
# Conflicts:
#	src/NadekoBot/project.json
#	src/NadekoBot/project.lock.json
2016-08-22 12:06:06 +02:00
appelemac
bdd9aef7ac stage for merge 2016-08-22 12:01:08 +02:00
appelemac
1b7927e8da Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into math 2016-08-22 11:56:30 +02:00
appelemac
5648b58d07 Added functions and constants 2016-08-22 11:56:26 +02:00
Kwoth
90a1aa45a9 Fixed some broken command strings 2016-08-22 00:47:06 +02:00
Kwoth
c218d1da96 Replacements. Converted music, not tested. 2016-08-22 00:37:39 +02:00
appelemac
5d5b06ddd3 necessary things 2016-08-21 19:45:15 +02:00
appelemac
89a0eb93e6 Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into math
# Conflicts:
#	src/NadekoBot/Modules/Searches/Searches.cs
2016-08-21 19:32:17 +02:00
appelemac
3432e3fde3 calculate 2016-08-21 19:31:13 +02:00
Kwoth
4317e97113 Some replacements, osu commands converted 2016-08-21 18:00:03 +02:00
Kwoth
5e4628ec10 Renamed to google service and using urlshortner api lib too. .roles are ordered by position now. 2016-08-21 16:16:11 +02:00
Kwoth
09ff6aefb7 Mentionrole is now mentioning once again 2016-08-21 04:34:26 +02:00
Kwoth
8271bf41d6 Small fix/debug 2016-08-21 03:44:09 +02:00
Kwoth
57a2caef84 Fixed raffle 2016-08-21 03:35:28 +02:00
Kwoth
e7b6f110a3 Updated discord.net, fixes to parser 2016-08-21 03:06:40 +02:00
Kwoth
7cfb04cdfa Fixed mashape api key loading 2016-08-21 01:01:50 +02:00
Kwoth
5600afe96a Mashape key now loading, ~# and ~ud sould work 2016-08-21 00:53:41 +02:00
Kwoth
9e158b53b0 Now properly loading youtubeapikey from credentials 2016-08-21 00:47:39 +02:00
Kwoth
30fde5fa83 Fixed ~yt definitely? 2016-08-21 00:41:15 +02:00
Kwoth
3e4ce6ad23 Fixed ~chucknorris 2016-08-21 00:35:42 +02:00
Kwoth
5d37d4529d Fixed prune by removing cache? Fixed error on ~yt by removing contracts? 2016-08-21 00:31:00 +02:00
Kwoth
65cdc15cd7 Fixed prune @someone ? fixed temp 8ball? 2016-08-20 22:55:45 +02:00
Kwoth
586e21b1c1 Fixed commands in other files not loading 2016-08-20 22:35:27 +02:00
Kwoth
3aefb2d991 Fixes to some missing commands 2016-08-20 20:53:01 +02:00
Kwoth
1d685757bf Compiles and runs now \ o / 2016-08-20 19:38:55 +02:00
Kwoth
c446b889c7 Work on gambling, lolban 2016-08-20 19:13:29 +02:00
Kwoth
acebc6e914 Animal racing done, more mass replacements 2016-08-20 17:02:33 +02:00
Kwoth
43c9e7d04d Some replacements, main gambling file done 2016-08-20 16:43:44 +02:00
Kwoth
68454a7b2f Simplified sending, more gambling done but commented out (needs DB) 2016-08-20 16:33:18 +02:00
Kwoth
5de1bd5600 Added gambling, raffle done 2016-08-20 16:10:37 +02:00
Kwoth
8e79e4e877 Did a full pass on stuff done so far 2016-08-20 16:02:06 +02:00
Kwoth
e8ffcbf7f6 More work 2016-08-20 13:05:57 +02:00
Kwoth
ac7147f5c1 Fixed help command descriptions 2016-08-19 11:03:41 +02:00
Kwoth
5f4af88627 Fixed some stuff, updated discord.net 2016-08-19 01:28:26 +02:00
Kwoth
9d128f1ff3 Fixes, more stuff, .stats added? 2016-08-18 23:00:54 +02:00
Kwoth
64f7680fe7 Ignore .vs 2016-08-18 17:35:23 +02:00
Kwoth
846e7120b4 A lot more work on converting 2016-08-18 17:33:45 +02:00
Kwoth
d6477b9d90 A lot of work on administration module 2016-08-16 18:00:52 +02:00
Kwoth
d7f8126fe4 Updated gitignore 2016-08-16 16:57:29 +02:00
Kwoth
dcddd5bbe8 trivia, help module converted 2016-08-16 16:53:38 +02:00
Kwoth
915153cd0a Pokemon module placeholder, Dragon should PR here 2016-08-16 15:52:26 +02:00
Kwoth
d6465fb6af Trivia converted, removed currency reward 2016-08-16 15:29:48 +02:00