Commit Graph

963 Commits

Author SHA1 Message Date
Master Kwoth
b03031062b Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2016-06-15 16:36:56 +02:00
Master Kwoth
a14e3276b0 Merge pull request #345 from appelemac/dev
Hotfix rip
2016-06-15 16:33:09 +02:00
Master Kwoth
819d130dc4 Merge remote-tracking branch 'refs/remotes/origin/master' into dev
# Conflicts:
#	NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs
2016-06-15 16:29:45 +02:00
appelemac
00eb8acaf6 Hofix 2016-06-15 16:28:28 +02:00
Master Kwoth
6c8593b644 Merge pull request #343 from appelemac/dev
Rip improved. Now shows the avatar of the rip'd person
2016-06-15 16:18:53 +02:00
Master Kwoth
80c9e4964b Merge pull request #344 from darxmorph/master
We don't need to download the translate output
2016-06-15 16:17:30 +02:00
Master Kwoth
dada0b64c5 cleanup + .softban added 2016-06-15 16:12:34 +02:00
Henry
bbf091e760 We don't need to download the translate output
Don't save the translator output to a file
2016-06-15 16:08:17 +02:00
appelemac
e4137acc65 bleh 2016-06-15 16:05:20 +02:00
appelemac
85b6bb555b Remove magnificent FAQ 2016-06-15 16:03:25 +02:00
appelemac
6d0fe62094 rip 2016-06-15 15:55:37 +02:00
appelemac
c7ce776075 Merge remote-tracking branch 'refs/remotes/Kwoth/master' into dev 2016-06-15 15:47:50 +02:00
appelemac
9423e7887d RIP & FAQ 2016-06-15 15:44:57 +02:00
Master Kwoth
7e0c8a9fee Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2016-06-15 14:21:13 +02:00
Master Kwoth
a9299f842d Merge pull request #342 from Kwoth/dev
0.99 Update
2016-06-15 13:43:34 +02:00
Master Kwoth
3c74d1915e removed some trash 2016-06-15 13:42:36 +02:00
Master Kwoth
6ab37df781 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-06-12 15:11:55 +02:00
Master Kwoth
84fe644db3 fixed typo 2016-06-12 15:11:51 +02:00
appelemac
b37ecf80e4 Revert "Revert "rip upgrade""
This reverts commit 081b0abcc4.
2016-06-09 19:56:05 +02:00
appelemac
c187cfa814 Merge remote-tracking branch 'refs/remotes/Kwoth/master' into dev 2016-06-09 19:55:58 +02:00
Master Kwoth
c14ed6d2d8 Merge pull request #329 from appelemac/dev
.leave command
2016-06-09 19:48:02 +02:00
Master Kwoth
4f85366c02 Merge pull request #336 from Kwoth/master
Hopefuly this is right
2016-06-09 19:40:07 +02:00
appelemac
081b0abcc4 Revert "rip upgrade"
This reverts commit 091701e931.
2016-06-09 19:26:29 +02:00
appelemac
091701e931 rip upgrade
I'm not scaling the strings *hands off*
2016-06-07 19:54:55 +02:00
Master Kwoth
82fd1d7882 Merge pull request #332 from samdivaio/patch-8
Update ComprehensiveGuide.md
2016-06-07 18:28:15 +02:00
samvaio
bf77e2c793 Added more info and gif thanks to PooPeePants#7135 2016-06-07 14:03:43 +05:30
samvaio
01cd6c461e Update ComprehensiveGuide.md 2016-06-07 13:44:53 +05:30
samvaio
92f1416860 Added more info and gif thanks to PooPeePants#7135 2016-06-07 13:38:40 +05:30
samvaio
ebe65e8955 Added more info thanks to PooPeePants#7135 2016-06-07 13:36:13 +05:30
samvaio
3dfb62e104 Update ComprehensiveGuide.md 2016-06-07 13:26:08 +05:30
Master Kwoth
0c6f67fac9 Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2016-06-07 01:08:08 +02:00
Master Kwoth
46bfcb56b9 trello fix? 2016-06-07 01:03:41 +02:00
appelemac
d899f13f71 Update SelfCommands.cs 2016-06-05 22:18:52 +02:00
appelemac
e6cd56946c Revert "Code analysis recommended this"
This reverts commit 1f8dd72606.
2016-06-05 20:50:44 +02:00
appelemac
1f8dd72606 Code analysis recommended this
¯\_(ツ)_/¯
2016-06-05 19:56:31 +02:00
appelemac
0b588927e1 Merge remote-tracking branch 'refs/remotes/Kwoth/master' into dev 2016-06-05 19:42:12 +02:00
appelemac
f05f753065 Add usage to $award 2016-06-05 19:42:07 +02:00
appelemac
db15d302b9 Leave command 2016-06-05 19:24:09 +02:00
Master Kwoth
68eed39596 Merge pull request #327 from appelemac/patch-7
return on error message in .aar
2016-06-04 20:46:09 +02:00
appelemac
d8f85910af return on error message... 2016-06-04 16:54:11 +02:00
Master Kwoth
221d5d9028 .leave commands added 2016-06-04 07:45:20 +02:00
Master Kwoth
c540b2c3d6 Removed hide/unhide commands. Removed "Trivia cancelled" console message. Slight change to .newavatar 2016-06-04 03:16:47 +02:00
Master Kwoth
0dc819b449 Merge pull request #325 from Kwoth/dev
Better -h, better .whoplays
2016-06-04 03:07:37 +02:00
Master Kwoth
052fa32e55 .whoplays final fancy fix 2016-06-04 03:06:20 +02:00
Master Kwoth
88368be749 more informative commandran 2016-06-03 02:20:01 +02:00
Master Kwoth
f9489ea8b2 prettier .whopalys 2016-06-02 21:34:25 +02:00
Master Kwoth
e96189b944 better .whoplays format 2016-06-02 21:31:06 +02:00
Master Kwoth
57c7a9cd3e Added support server to the help thing 2016-05-31 23:13:44 +02:00
Master Kwoth
3a9de38b86 SelfAssignedRoles no longer have hardcoded prefixes, thx Draconic Sleepyhead 2016-05-31 17:12:14 +02:00
Master Kwoth
5dadfb4deb maybe better ropl? 2016-05-30 23:06:58 +02:00