Commit Graph

3890 Commits

Author SHA1 Message Date
miraai
07fd374a1c Merge pull request #6 from Kwoth/dev
Updating fork dev
2016-07-28 20:24:51 +02:00
miraai
54bed4ecc9 Merge pull request #5 from Kwoth/master
Updating fork
2016-07-28 20:22:03 +02:00
Kwoth
968c5ad388 added testdatamodel to test sqlite speeds sometimes 2016-07-28 19:31:03 +02:00
Kwoth
8457f9970a removed some legacy code, thanks blitz 2016-07-28 17:53:32 +02:00
Kwoth
4fc49f76b5 8ball now properly mentions someone. 2016-07-28 17:15:40 +02:00
Kwoth
d765b16649 return if there is an error assigning roles 2016-07-28 16:19:44 +02:00
Kwoth
204674f047 updated commandlist 2016-07-28 15:48:28 +02:00
Master Kwoth
ce98991c3a Merge pull request #459 from blitz4694/master
Usage i missed
2016-07-28 15:36:40 +02:00
Kwoth
f7acc2da23 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-28 15:34:52 +02:00
Kwoth
ddbddc573a Help updated 2016-07-28 15:34:43 +02:00
Master Kwoth
e228e80797 Merge pull request #467 from miraai/master
Linux Guide Fix
2016-07-28 15:28:28 +02:00
miraai
28c12c9e13 Update LinuxSetup.md 2016-07-28 15:22:57 +02:00
Master Kwoth
ebdb265dc4 Merge pull request #462 from Kwoth/dev
0.99.9c
2016-07-27 07:24:56 +02:00
Kwoth
6f6453e430 updated discord.net 2016-07-27 07:22:36 +02:00
Kwoth
f025a5a062 format 2016-07-27 03:10:36 +02:00
Kwoth
7147d2f0b1 More CoC 2016-07-27 03:03:27 +02:00
cameron reuter
97e03af966 Usage i missed 2016-07-27 06:30:56 +10:00
Kwoth
135c00823d more work on clashofclans by Dragon 2016-07-26 16:05:08 +02:00
Kwoth
c3130ba428 commandlist update 2016-07-26 14:56:50 +02:00
Kwoth
cd2b75b9ef Merge remote-tracking branch 'refs/remotes/origin/master' into dev
# Conflicts:
#	NadekoBot/Modules/Utility/UtilityModule.cs
2016-07-26 14:16:20 +02:00
Master Kwoth
8fad10079a Merge pull request #452 from blitz4694/master
Fixed and added usages
2016-07-26 14:14:05 +02:00
Kwoth
961a42a8c3 clash of clans saving started, needs more work 2016-07-26 14:10:19 +02:00
Kwoth
0521a71fa8 animal racing reposting fix 2016-07-26 14:09:51 +02:00
blitz4694
19ee5e5197 Update MusicModule.cs 2016-07-26 14:56:06 +10:00
blitz4694
7c90c07b98 Update NSFWModule.cs 2016-07-26 12:00:11 +10:00
blitz4694
7b1979e9bb Update HelpModule.cs 2016-07-26 11:59:22 +10:00
blitz4694
22c2c23d3d Update GamesModule.cs 2016-07-26 11:58:57 +10:00
blitz4694
bdf3223810 Update GamblingModule.cs 2016-07-26 11:58:11 +10:00
blitz4694
f00ffe17cc Update AdministrationModule.cs 2016-07-26 11:57:08 +10:00
blitz4694
e4ef3ce85f Update AdministrationModule.cs 2016-07-26 11:55:39 +10:00
blitz4694
9e38cfd6c6 Update AdministrationModule.cs 2016-07-26 11:53:48 +10:00
blitz4694
5b3edc914f Update ClashOfClansModule.cs 2016-07-26 11:49:48 +10:00
blitz4694
5d24774a86 Update AdministrationModule.cs 2016-07-26 11:46:06 +10:00
cameron reuter
e7b1a13882 Fixed and added usages 2016-07-26 11:39:14 +10:00
Kwoth
5db1214440 inrole changed to not require permissions. Will require manage messages for long roles.
Won't work with [at]everyone too.
2016-07-26 01:48:37 +02:00
Kwoth
c1632da0f0 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-26 01:32:51 +02:00
Kwoth
a6f3a29be4 wrapped async void thing in try catch just in case 2016-07-26 01:32:40 +02:00
Kwoth
531c9821ae Lets try doing this for fun 2016-07-26 01:02:02 +02:00
Kwoth
c1a0dc455f Betting on animal races done 2016-07-26 01:00:55 +02:00
Kwoth
c20d743e80 Print which link failed to shorten 2016-07-26 01:00:36 +02:00
Kwoth
76fc3be986 Logging execution times of commands. 2016-07-26 01:00:17 +02:00
Master Kwoth
ef960da294 Merge pull request #449 from Tibo442/patch-1
Fix destruction of text channels being counted as creation of text channels
2016-07-25 23:39:54 +02:00
Tibo
6ee099023f Fix destruction of text channels being counted as creation of text channels 2016-07-25 23:33:34 +02:00
Kwoth
bbf2789704 Still want logging to console, only not Writing to database. 2016-07-25 16:59:40 +02:00
Kwoth
96c204e077 ~woof added, thanks @Fiasc0 , #448 2016-07-25 14:41:21 +02:00
Kwoth
a7618b1ee4 Animal Racing added ($race, $joinrace). Need to add betting to it. 2016-07-25 04:21:37 +02:00
Kwoth
fce0da50f1 Merge branch 'music-rewrite' into dev 2016-07-24 18:02:01 +02:00
Kwoth
ae85cfeed3 Merged branch dev into dev 2016-07-24 18:00:36 +02:00
Kwoth
facf138bee ?! 2016-07-24 18:00:25 +02:00
Kwoth
922739be63 Now not prebuffering more than 100 megs of PCM data 2016-07-24 18:00:11 +02:00