mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,271 Commits 11 Branches 0 Tags
cd42d7d8177353176c115cfcdde7784246be9e49
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Master KwothandGitHub 6c069a254d Merge pull request #477 from appelemac/num 
!!gl [num]
 2016-07-29 18:39:54 +02:00
Master KwothandGitHub 834eb99eb2 Merge pull request #473 from blitz4694/dev 
Better strings for some error messages
 2016-07-28 23:16:26 +02:00
Master KwothandGitHub 3cd7283a57 Merge pull request #472 from blitz4694/dev 
Added usages for everything and fixed others
 2016-07-28 22:30:38 +02:00
Master KwothandGitHub ce98991c3a Merge pull request #459 from blitz4694/master 
Usage i missed
 2016-07-28 15:36:40 +02:00
Master KwothandGitHub e228e80797 Merge pull request #467 from miraai/master 
Linux Guide Fix
 2016-07-28 15:28:28 +02:00
Master KwothandGitHub ebdb265dc4 Merge pull request #462 from Kwoth/dev 
0.99.9c
 2016-07-27 07:24:56 +02:00
Master KwothandGitHub 8fad10079a Merge pull request #452 from blitz4694/master 
Fixed and added usages
 2016-07-26 14:14:05 +02:00
Master KwothandGitHub 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
Master KwothandGitHub 5cf9b08239 Merge pull request #445 from miraai/dev 
Linux Guide Update
 2016-07-24 14:10:56 +02:00
Master KwothandGitHub 32f37d4739 Update ComprehensiveGuide.md 2016-07-24 13:07:52 +02:00
Master KwothandGitHub b68c9b8c1c Merge pull request #443 from Kwoth/master 
Update ComprehensiveGuide.md
 2016-07-24 02:39:12 +02:00
Master KwothandGitHub ae0d325b47 Update ComprehensiveGuide.md 2016-07-24 02:38:12 +02:00
Master KwothandGitHub d40ac51757 Merge pull request #438 from Kwoth/dev 
updated commandlist.md
 2016-07-23 01:41:49 +02:00
Master KwothandGitHub 12134d1028 Merge pull request #437 from Kwoth/dev 
0.99.9a
 2016-07-22 21:30:17 +02:00
Master KwothandGitHub 2035bbe242 Merge pull request #427 from Kwoth/dev 
.logignore fix
 2016-07-20 20:26:24 +02:00
Master KwothandGitHub a59fe55fd7 Merge pull request #425 from Kwoth/dev 
Don't treat warning as errors
 2016-07-20 17:38:44 +02:00
Master KwothandGitHub 06a5da18c2 Merge pull request #424 from Kwoth/dev 
0.99.9
 2016-07-20 17:29:34 +02:00
Master KwothandGitHub 8d46ab762f Merge pull request #415 from appelemac/selfassignedtoggle 
.togglexclsar - make self-assignable roles exclusive (can have only 1 of them)
 2016-07-19 01:24:23 +02:00
Master KwothandGitHub c005d6c006 Merge pull request #414 from miraai/dev 
Update LinuxSetup.md
 2016-07-17 16:00:43 +02:00
Master KwothandGitHub 90329aca38 Merge pull request #413 from Kwoth/master 
merging readme update to dev
 2016-07-16 22:55:50 +02:00
Master KwothandGitHub 2358eddbaa woopsy daisy 2016-07-16 22:42:29 +02:00
Master KwothandGitHub 31b94c01cb awesome discord flair added o.o thx volt 2016-07-16 22:41:40 +02:00
Master KwothandGitHub ee224757fd Merge pull request #412 from miraai/miraai-patch-1-1 
Added installer guide for windows
 2016-07-16 22:25:22 +02:00
Master KwothandGitHub b2f8325d91 Merge pull request #405 from miraai/patch-2 
Debian jessie guide
 2016-07-14 18:18:59 +02:00
Master KwothandGitHub c6e617c2d7 Delete riot.txt 2016-07-14 09:49:38 +02:00
Master KwothandGitHub 294a5b9255 Merge pull request #398 from miraai/patch-1 
Update ComprehensiveGuide.md
 2016-07-12 21:59:35 +02:00
Master KwothandGitHub 3548b4ecbf Update linuxsetup with correct certmgr command instead of mozroots 2016-07-12 05:00:14 +02:00
Master KwothandGitHub 2452443528 Merge pull request #379 from Kwoth/dev 
updated commandlist
 2016-07-05 02:30:09 +02:00
Master KwothandGitHub b786647d8b Merge pull request #378 from Kwoth/dev 
0.99.8.3
 2016-07-04 21:05:05 +02:00
Master KwothandGitHub d264000ea7 Merge pull request #376 from Midnight-Myth/patch-1 
Fixed userpresence and logserver
 2016-07-04 19:34:07 +02:00
Master KwothandGitHub 9e05e69cfb Merge pull request #375 from Kwoth/dev 
0.99.8
 2016-07-04 09:31:08 +02:00
Master KwothandGitHub 49792fe336 Update ComprehensiveGuide.md 2016-06-30 00:31:17 +02:00
Master KwothandGitHub d5a5b6ae0f Merge pull request #360 from cbgx/master 
osu! commands
 2016-06-25 01:20:27 +02:00
Master KwothandGitHub 8b82aaaeb0 Merge pull request #356 from Kwoth/dev 
0.99.6.1
 2016-06-21 01:20:26 +02:00
Master KwothandGitHub a2b2048ee3 Merge pull request #355 from Kwoth/dev 
0.99.6
 2016-06-20 21:49:45 +02:00
Master KwothandGitHub e18fc6183e Update README.md 2016-06-20 15:10:53 +02:00
Master KwothandGitHub 7a58e6d6fa Update README.md 2016-06-20 15:09:56 +02:00
Master KwothandGitHub fb3b311e43 Merge pull request #352 from Kwoth/dev 
0.99.5
 2016-06-19 01:04:51 +02:00
Master KwothandGitHub d0fbf46031 Merge pull request #351 from appelemac/dev 
Rip improved further
 2016-06-18 15:16:59 +02:00
Master KwothandGitHub 4a708d8990 Merge pull request #347 from appelemac/dev 
Custom Random Range
 2016-06-18 14:00:47 +02:00
Master KwothandGitHub 943390935c Update ComprehensiveGuide.md 2016-06-16 15:07:21 +02:00
Master KwothandGitHub b62c952100 Update README.md 2016-06-16 01:24:12 +02:00
Master KwothandGitHub ab68227709 Update README.md 2016-06-15 23:24:56 +02:00
Master KwothandGitHub a14e3276b0 Merge pull request #345 from appelemac/dev 
Hotfix rip
 2016-06-15 16:33:09 +02:00
Master KwothandGitHub 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 KwothandGitHub 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 KwothandGitHub a9299f842d Merge pull request #342 from Kwoth/dev 
0.99 Update
 2016-06-15 13:43:34 +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
Master Kwoth 82fd1d7882 Merge pull request #332 from samdivaio/patch-8 
Update ComprehensiveGuide.md
 2016-06-07 18:28:15 +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
Master Kwoth 0dc819b449 Merge pull request #325 from Kwoth/dev 
Better -h, better .whoplays
 2016-06-04 03:07:37 +02:00
Master Kwoth 542b2948d1 Merge pull request #320 from appelemac/Ncalc 
~calc command
 2016-05-30 20:58:35 +02:00
Master Kwoth afbc970e52 Update ComprehensiveGuide.md 2016-05-29 17:10:21 +02:00
Master Kwoth 95f1e39754 Update README.md 2016-05-29 17:09:26 +02:00
Master Kwoth f897b4e212 Merge pull request #318 from MTRNord/patch-1 
Add Info for Debian 8 user
 2016-05-28 22:13:00 +02:00
Master Kwoth 0111a72a7b Merge pull request #308 from samdivaio/patch-7 
Update ComprehensiveGuide.md
 2016-05-24 13:20:01 +02:00
Master Kwoth 6d9d8a8b40 Merge pull request #305 from samdivaio/patch-6 
Improved with tiny details
 2016-05-22 13:27:08 +02:00
Master Kwoth f8be61690d Merge pull request #302 from appelemac/wowie 
~wowjoke
 2016-05-19 21:19:45 +02:00
Master Kwoth b010da3c8c Merge pull request #300 from appelemac/patch-3 
;cm and ;acm default to current channel
 2016-05-19 21:11:07 +02:00
Master Kwoth e4753c1bf6 Merge pull request #293 from samdivaio/patch-5 
Added some info, made it more clear
 2016-05-11 06:16:08 +02:00
Master Kwoth bf7a89af61 Merge pull request #288 from samdivaio/patch-4 
Added more info
 2016-05-09 16:29:01 +02:00
Master Kwoth 9e27beecf6 Merge pull request #283 from samdivaio/patch-3 
Fixed typos and some minor changes
 2016-05-09 00:21:09 +02:00
Master Kwoth 840bce09cb Merge pull request #280 from samdivaio/patch-2 
Update LinuxSetup.md
 2016-05-08 21:20:46 +02:00
Master Kwoth bb0f9fee89 Merge pull request #279 from samdivaio/patch-1 
LinuxSetup.md
 2016-05-08 20:17:55 +02:00
Master Kwoth 54f5846adc Update ComprehensiveGuide.md 2016-05-08 13:04:41 +02:00
Master Kwoth 2a63e5bbda Merge pull request #238 from appelemac/patch-4 
Custom Reactions
 2016-05-05 16:10:55 +02:00
Master Kwoth eb50b82ce6 Merge pull request #269 from appelemac/patch-5 
Non-spammy $$$ closes #267
 2016-05-05 15:54:32 +02:00
Master Kwoth dbe7dd9c1b Update README.md 2016-05-02 02:40:22 +02:00
Master Kwoth c966a0a34f Update ComprehensiveGuide.md 2016-05-02 02:01:09 +02:00
Master Kwoth cf938a25d8 Merge pull request #240 from tg44/bugfix 
Fixed currency conversion error
 2016-04-27 21:00:46 +02:00
Master Kwoth fe215e5c60 Update ComprehensiveGuide.md 2016-04-25 13:37:07 +02:00
Master Kwoth d6ca8a8846 Update ComprehensiveGuide.md 2016-04-22 18:48:58 +02:00
Master Kwoth 3da80b221e Update ComprehensiveGuide.md 2016-04-21 03:07:24 +02:00
Master Kwoth dddcee25e6 Merge pull request #228 from Midnight-Myth/patch-1 
Bot tells you when you reached your daily limit with the google api
 2016-04-21 01:49:39 +02:00
Master Kwoth 0d4d4a138c Merge pull request #225 from Gaboer/patch-1 
Update SearchHelper.cs
 2016-04-21 01:49:04 +02:00
Master Kwoth ca1a2175d2 Update ComprehensiveGuide.md 2016-04-16 06:15:25 +02:00
Master Kwoth 89b5ff0fb1 Merge pull request #221 from Delicious-Flatbread/patch-4 
Update ComprehensiveGuide.md
 2016-04-16 06:13:47 +02:00
Master Kwoth 2d0a8046ff Update README.md 2016-04-14 22:21:27 +02:00
Master Kwoth 9e76a4647e Update README.md 2016-04-14 00:09:06 +02:00
Master Kwoth 7864b2a339 Merge pull request #214 from DragonOverlord/patch-1 
Pokemon Currency small fixes
 2016-04-12 14:48:23 +02:00
Master Kwoth ccb2d2a187 Merge pull request #207 from taweko/master 
Update PokemonTypes.json
 2016-04-11 00:00:14 +02:00
Master Kwoth 2a04ac7c9f Merge pull request #206 from gwigz/master 
"!m pl" adjusted to ignore command if missing parameter
 2016-04-10 22:15:03 +02:00
Master Kwoth 5471012504 Merge pull request #193 from GoBJIuH/fixpr 
Fixed gelbooru, added safebooru and rule34xxx
 2016-04-06 21:12:33 +02:00
Master Kwoth ac93aa1dba Merge pull request #178 from appelemac/magic-items 
Externalized pokemon data
 2016-04-03 21:26:04 +02:00
Master Kwoth 2da15b1f7b Merge pull request #176 from tg44/converter 
Converter feature, closes #158
 2016-04-02 10:34:28 +02:00
Master Kwoth dc6758af76 Merge pull request #172 from appelemac/magic-items 
Magic items added, closes #172
 2016-04-01 19:48:09 +02:00
Master Kwoth 488b897690 Merge pull request #171 from LawlyPopz/master 
Added fairy, fixed poketype generator, changed psychic icon, closes #169
 2016-04-01 17:39:19 +02:00
Master Kwoth d83a5474a9 Merge pull request #161 from appelemac/magic-items 
Pokemon game redone, thx @appelemac
 2016-03-28 16:03:16 +02:00
Master Kwoth 4b21da2e16 Merge pull request #156 from LawlyPopz/master 
Added Beam.pro notification support
 2016-03-28 15:46:16 +02:00
Master Kwoth 6ee896d691 Update README.md 2016-03-28 03:41:44 +02:00
Master Kwoth 5be9da55bc Update README.md 2016-03-28 03:40:52 +02:00
Master Kwoth 26b9ec0fcf Merge pull request #155 from tg44/translate-module 
Translator added. Thanks tg44. `~trans en>fr Hello`
 2016-03-27 03:02:41 +02:00
Master Kwoth cb36ed537f Merge pull request #151 from tg44/imdb-search 
IMDB search added
 2016-03-27 01:55:04 +01:00
Master Kwoth 063f794a27 Merge pull request #150 from tg44/refactor 
Cleaner code (gambling)
 2016-03-25 13:57:10 +01:00
Master Kwoth 077f36a86d Merge pull request #148 from appelemac/patch-2 
Add comeatmebro and moveto
 2016-03-25 10:16:59 +01:00
Master Kwoth aa589dbc05 Update README.md 2016-03-23 04:18:22 +01:00
Master Kwoth bc301c1c49 Merge pull request #135 from Delicious-Flatbread/master 
HelpCommand, LogCommand updated descriptions
 2016-03-23 02:21:56 +01:00
Master Kwoth 9beaa92bb9 Merge pull request #134 from Delicious-Flatbread/patch-2 
Update Music.cs
 2016-03-23 00:39:06 +01:00
Master Kwoth 8759010249 Merge pull request #133 from Delicious-Flatbread/patch-5 
Update Administration.cs
 2016-03-22 22:46:21 +01:00