mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
824 Commits 11 Branches 0 Tags
bf7a89af61b86c2e4a723da54c82eb5b21986c62
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Master Kwoth 89507a7d51 Update ComprehensiveGuide.md 2016-03-20 23:03:49 +01:00
Master Kwoth 4631c190a9 Merge pull request #122 from appelemac/master 
User Unblacklist
 2016-03-20 19:25:53 +01:00
Master Kwoth 34de3e3df5 AppVeyor FTW ^_^ 2016-03-20 10:56:27 +01:00
Master Kwoth 5499f5df37 Update README.md 2016-03-19 21:19:54 +01:00
Master Kwoth 68f70c3594 Update README.md 2016-03-13 21:18:36 +01:00
Master Kwoth 7ee43f6b55 Update ComprehensiveGuide.md 2016-03-04 20:51:19 +01:00
Master Kwoth d0d15b22e9 fixy 2016-03-04 12:47:39 +01:00
Master Kwoth 5de9a2468f Update README.md 2016-03-04 12:47:13 +01:00
Master Kwoth 6417f41953 added config.json to readme 2016-03-04 12:46:03 +01:00
Master Kwoth babae13deb Update README.md 2016-03-04 12:43:53 +01:00
Master Kwoth 81b27988d9 Update README.md 2016-03-03 04:58:56 +01:00
Master Kwoth e91ed77cc6 Merge pull request #58 from rob5251/master 
Multiple text fixes
 2016-02-24 06:49:48 +01:00
Master Kwoth a44c3e5e7b Merge pull request #56 from rob5251/patch-1 
Update Conversations.cs
 2016-02-24 05:27:15 +01:00
Master Kwoth 086a1e1143 Merge pull request #55 from ZR2/patch-1 
Update Conversations.cs
 2016-02-24 05:22:02 +01:00
Master Kwoth 6a726888ee Merge pull request #54 from rob5251/patch-1 
Fixed mange error
 2016-02-24 04:51:38 +01:00
Master Kwoth e9222af511 added clash of clans commands to readme 2016-02-16 23:10:57 +01:00
Master Kwoth b1ac645b1f Merge pull request #23 from cuken/master 
Added Urban Dictionary Search Function
 2016-02-16 04:17:06 +01:00
Master Kwoth 3a7e7a361e Create license.md 2016-02-15 16:23:39 +01:00
Master Kwoth b63d319947 Update README.md 2016-02-14 14:52:29 +01:00
Master Kwoth ebb61f6999 Create ComprehensiveGuide.md 
thanks to unlimited saber works :O
 2016-02-14 14:34:28 +01:00
Master Kwoth ba02641619 Update README.md 2016-02-13 03:09:21 +01:00
Master Kwoth e669536dc7 updated for the upcoming release 2016-02-13 03:09:07 +01:00
Master Kwoth 7274a5d80f Merge pull request #19 from cuken/master 
Added PermissionHelper.cs, Permissons.cs
 2016-02-11 10:16:05 +01:00
Master Kwoth c17876ade2 Update README.md 2016-02-08 11:43:18 +01:00
Master Kwoth 3a175eb7fd updated readme without parse 2016-02-08 10:56:38 +01:00
Master Kwoth 4798e6ae7e Update README.md 2016-02-07 09:48:01 +01:00
Master Kwoth cbf6b322da Update README.md 2016-02-05 23:20:19 +01:00
Master Kwoth f0a77579f3 Merge pull request #16 from klincheR/patch-1 
instructions for osu,soundcloud and Mashape Api keys added.
 2016-02-05 23:14:42 +01:00
Master Kwoth e3a0321e51 Update README.md 2016-02-05 14:41:46 +01:00
Master Kwoth 9566704f3f Update README.md 2016-02-05 14:40:01 +01:00
Master Kwoth 2c1008d80a tell ppl to scroll down for commands 2016-01-29 15:55:53 +01:00
Master Kwoth fe8cc0b2bb clarified parse registration, removed win 7 notice 2016-01-28 13:33:55 +01:00
Master Kwoth db73723f67 Added an image of where to get parse id and .net key 2016-01-28 00:48:40 +01:00
Master Kwoth cd15ac93d6 Merge pull request #12 from ZR2/master 
Added new command and add new command to read me
 2016-01-26 00:42:02 +01:00
Master Kwoth 7dd3b47c8c Update README.md 2016-01-25 15:16:31 +01:00
Master Kwoth e614e2036c Merge pull request #11 from micmorris/upstream 
fixing bug with commas missing in JSON
 2016-01-25 05:59:01 +01:00
Master Kwoth 207ea6eb29 Merge pull request #10 from micmorris/upstream 
Adding perl script for google book parsing
 2016-01-25 05:22:24 +01:00
Master Kwoth e12bc961df Merge pull request #9 from ZR2/master 
Added setgame command to readme
 2016-01-25 02:08:29 +01:00
Master Kwoth a60f46578d Merge pull request #8 from ZR2/master 
setgame merge
 2016-01-24 13:20:16 +01:00
Master Kwoth 1471992916 Added dev console link to readme 2016-01-24 09:21:19 +01:00
Master Kwoth 7d460e4f73 Merge pull request #6 from ZR2/master 
Now playing command, more music info
 2016-01-23 17:28:09 +01:00
Master Kwoth 80077445f8 Merge pull request #5 from micmorris/update-trivia-correctness 
Trivia improved
 2016-01-23 08:32:32 +01:00
Master Kwoth 49b521af4d added forwardmessages to readme 2016-01-22 09:22:02 +01:00
Master Kwoth c373111149 Update README.md 2016-01-22 09:16:10 +01:00
Master Kwoth a14253a91c Update README.md 2016-01-22 09:15:52 +01:00
Master Kwoth eac933e4ec improved readme, might automate it later today. 2016-01-21 01:51:10 +01:00
Master Kwoth 56cdd6ec66 prettier readme 2016-01-20 19:00:43 +01:00
Master Kwoth 205ea071ce Update README.md 2016-01-20 18:53:18 +01:00
Master Kwoth f754a97c1c added .greet and .greetmsg to readme 2016-01-12 23:00:49 +01:00
Master Kwoth 8040a4b5ba ffmpeg explained 2016-01-12 17:28:51 +01:00
Master Kwoth 1caefa5855 readme optional json params 2016-01-11 20:10:47 +01:00
Master Kwoth 0580407267 Update README.md 2016-01-11 19:57:05 +01:00
Master Kwoth b15d88cc43 removed crawl 2016-01-11 19:42:14 +01:00
Master Kwoth 7d75d71b2b bot id clarity 2016-01-11 19:39:55 +01:00
Master Kwoth e1d1f196fe Merge pull request #2 from AraHaan/patch-1 
Update README.md thx decorator
 2016-01-09 00:02:23 +01:00
Master Kwoth a0152d4866 Update README.md 2016-01-08 09:36:02 +01:00
Master Kwoth ee6177103c Update README.md 2016-01-06 06:54:40 +01:00
Master Kwoth 9b387f2802 Update README.md 2016-01-06 00:13:26 +01:00
Master Kwoth 80827f0853 update last update,only need to remove aliases now 2016-01-05 11:04:53 +01:00
Master Kwoth 4d39d7a308 better wording 2016-01-05 11:03:33 +01:00
Master Kwoth 9fe5fbdac8 brand new readme :) 2016-01-05 11:02:20 +01:00