Commit Graph

4316 Commits

Author SHA1 Message Date
Kwoth
f32ff91226 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-29 18:42:47 +02:00
Kwoth
e804c078fa longer startup for shared nakeda 2016-07-29 18:42:25 +02:00
Master Kwoth
6c069a254d Merge pull request #477 from appelemac/num
!!gl [num]
2016-07-29 18:39:54 +02:00
Kwoth
2f56937af1 added musicdata to gitignore 2016-07-29 15:29:22 +02:00
Kwoth
c82f7feaf4 woopsie, unimportant NRE fixed 2016-07-29 15:27:05 +02:00
appelemac
6f407d7989 Merge remote-tracking branch 'refs/remotes/Kwoth/dev' into num 2016-07-29 15:14:43 +02:00
appelemac
d4646140d3 Delete 1469797859.64474 2016-07-29 15:13:44 +02:00
appelemac
34755aaf6e Revert "Revert "getlink takes optional param now""
This reverts commit e2195f5f66.
2016-07-29 15:12:04 +02:00
appelemac
e2195f5f66 Revert "getlink takes optional param now"
This reverts commit ea99d315c4.
2016-07-29 15:11:54 +02:00
appelemac
ea99d315c4 getlink takes optional param now 2016-07-29 15:11:45 +02:00
appelemac
c14556ffc1 Merge remote-tracking branch 'refs/remotes/Kwoth/master' into num 2016-07-29 15:10:15 +02:00
Kwoth
2dc9ce169b commandlog should print when something errors now 2016-07-29 14:37:11 +02:00
Kwoth
32dff133a9 Print no results properly, removed leftover rule34 2016-07-29 14:18:30 +02:00
Kwoth
6002ee2ed2 ~hentai speed improved by 0.3-0.5 seconds :D 2016-07-29 14:11:44 +02:00
Kwoth
93a75ba92a fixed leet message to long potentialy 2016-07-29 14:01:55 +02:00
Kwoth
3b2df8c6bc fixd prune occasional bug #428 2016-07-29 13:53:03 +02:00
Kwoth
994d514353 animal racing fixes, #476 , commandlist updated 2016-07-29 13:06:24 +02:00
Kwoth
ef4e146138 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-29 02:35:17 +02:00
Kwoth
4b5e3896ed installed sqlite.net PCL version, has esqlite3.dll included for both x86 and x64 2016-07-29 02:34:50 +02:00
Master Kwoth
834eb99eb2 Merge pull request #473 from blitz4694/dev
Better strings for some error messages
2016-07-28 23:16:26 +02:00
blitz4694
b69663d4cf Pleasing kwoth now 2016-07-29 07:12:11 +10:00
blitz4694
6be43a6389 Pleasing nekai 2016-07-29 06:43:23 +10:00
blitz4694
033acead60 small mistake 2016-07-29 06:31:40 +10:00
Master Kwoth
3cd7283a57 Merge pull request #472 from blitz4694/dev
Added usages for everything and fixed others
2016-07-28 22:30:38 +02:00
cameron reuter
6ae6334bd2 Added all usages and fixed others 2016-07-29 06:26:05 +10:00
cameron reuter
96359a38bf test usage 2016-07-29 04:40:44 +10:00
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