Commit Graph

4610 Commits

Author SHA1 Message Date
Master Kwoth
5ec8693021 Merge pull request #762 from samdivaio/patch-9
Update from fearnlf01 😄
2016-11-11 20:24:44 +01:00
samvaio
9833bb3d53 Merge pull request #3 from fearnlj01/patch-3
I can now say I have PR'd into a PR
2016-11-11 20:15:13 +05:30
Master Kwoth
0c031b1ed3 Merge pull request #760 from samdivaio/patch-9
Updated with cleaning and adding more info
2016-11-11 14:07:54 +01:00
fkndean
870c11526f Add BF3/BF4 API Searches (Online Players and User Search) 2016-11-11 08:05:52 -05:00
Jordan Fearnley
ca1cf8fd94 I can now say I have PR'd into a PR
It appears Ubuntu 16.10 escaped my testing ¯\_(ツ)_/¯

The changes are pretty much just me being picky but hey ho
2016-11-11 12:13:58 +00:00
samvaio
1bdf53fa7f Update Linux Guide.md
Done 😊
2016-11-11 17:22:46 +05:30
samvaio
776729d921 Update Linux Guide.md
Done
2016-11-11 17:10:41 +05:30
samvaio
37ae146146 Update Linux Guide.md
Okay hopefully final changes
2016-11-11 17:09:18 +05:30
samvaio
ef5b0a358d Update Linux Guide.md
moarrr changes
2016-11-11 17:03:46 +05:30
samvaio
1005ba4acf Update Linux Guide.md
Fixes
2016-11-11 16:58:40 +05:30
samvaio
ed2ab0df90 Updated with cleaning and adding more info 2016-11-11 16:54:30 +05:30
Master Kwoth
ba08409ce4 Merge pull request #758 from fearnlj01/1.0-fearnlj01
Various changes ¯\_(ツ)_/¯
2016-11-11 02:09:56 +01:00
Master Kwoth
c2434db854 Merge pull request #755 from Nitix/radio
Fixed radio and slow connection Fix #601
2016-11-11 02:03:03 +01:00
Jordan Fearnley
5c32062b2f Various changes ¯\_(ツ)_/¯
Summary of Changes:
- Betroll won't give you the greater than 90 bonus for rolling 90
anymore
- Send usage updated for clarity
- I missed some stuff when the  `config.json` stopped having "null"
everywhere, this fixes it, *I think.*
- more whitespacing in the linux guide for people like Kwoth who want to
just be able to copy paste commands

- I'm kinda just guessing this'll work so if it doesn't then, "woopsie"
2016-11-11 00:54:53 +00:00
Jordan Fearnley
8c39c33eba Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-11-10 23:14:14 +00:00
Kwoth
afe459feb6 More fixes to migration 2016-11-10 23:46:41 +01:00
Kwoth
98576311c1 Fixed migration of currency from 0.9 to 1.0 2016-11-10 22:31:15 +01:00
Kwoth
df8b67e3c8 Fixed a bugged answer in trivia 2016-11-10 21:12:43 +01:00
Nitix
49a629f869 Uncomment debug test 2016-11-10 02:12:56 +01:00
Nitix
ff34710ea6 Fixed radio and slow connection 2016-11-10 02:11:25 +01:00
Kwoth
c88d516345 updated version number to rc2 :D 2016-11-10 02:02:22 +01:00
Kwoth
cc08f71bc6 Improvements 2016-11-09 19:28:26 +01:00
Kwoth
72608fae28 More mistakes 2016-11-09 18:01:14 +01:00
Kwoth
1039983fa7 fixed mistake in merge 2016-11-09 17:59:44 +01:00
Kwoth
9687da3dd0 Merge branch 'fkndean-1.0' into 1.0
Merged fkndean1.0 - wikia and minecraftquery
2016-11-09 16:58:04 +01:00
Kwoth
4d73748cc5 merged 2016-11-09 16:50:40 +01:00
Kwoth
9958a4fde5 Merge branch '1.0' of https://github.com/Kwoth/NadekoBot into 1.0 2016-11-09 16:08:52 +01:00
Kwoth
d7eca59a74 Added ~shorten, updated commandlist with fixed 2016-11-09 07:30:20 +01:00
Master Kwoth
3f15d260e4 Merge pull request #754 from miraai/1.0
fixed confusing bullets in docs
2016-11-09 02:13:12 +01:00
miraai
64f80d80d0 removed ones i missed 2016-11-09 01:32:47 +01:00
miraai
94ecd8f6b1 removed dots 2016-11-09 00:42:48 +01:00
miraai
1945e3ef4c Merge pull request #3 from Kwoth/1.0
1.0
2016-11-09 00:40:05 +01:00
Kwoth
47bc208826 changing mute role no longer requires restart of .antispam/.antiraid 2016-11-08 22:40:20 +01:00
Kwoth
b1b4afc0e8 Cleverbot now mentions person it is talking to 2016-11-08 22:31:46 +01:00
Kwoth
aea73fd71f Merge branch '1.0' of https://github.com/Kwoth/NadekoBot into 1.0 2016-11-08 22:22:51 +01:00
Kwoth
19bf146e4a AntiRaid/Antispam now log to .logserver instead of guild owner DM 2016-11-08 22:22:39 +01:00
Kwoth
c6bab91c40 Error message when mashape isn't specified 2016-11-08 22:05:04 +01:00
Master Kwoth
34b92d45d2 Merge pull request #752 from miraai/1.0
removed Cleverbot from credentials.json
2016-11-08 21:41:45 +01:00
miraai
f9bf74b7f2 fix fix 2016-11-08 21:34:12 +01:00
miraai
bc32531719 Merge pull request #2 from Kwoth/1.0
1.0
2016-11-08 21:33:38 +01:00
Kwoth
6350efd7f9 Alphabetical TOC in commandlist. Removed whitespaces 2016-11-08 20:30:34 +01:00
Kwoth
1217162def Autotranslate QOL + fix 2016-11-08 19:28:18 +01:00
Kwoth
eab28824ef Cleverbot reworked 2016-11-08 19:27:44 +01:00
Master Kwoth
bca44259fb Merge pull request #750 from miraai/1.0
JSON fix
2016-11-08 01:19:16 +01:00
miraai
2e91791025 fix 2016-11-08 01:10:06 +01:00
miraai
84799f35ff Merge pull request #1 from Kwoth/1.0
Merge pull request #749 from miraai/1.0
2016-11-08 01:09:25 +01:00
Master Kwoth
9084cfdc0f Merge pull request #749 from miraai/1.0
added CleverBot feature
2016-11-08 00:55:30 +01:00
miraai
12ab3ceb84 added CleverBot feature 2016-11-08 00:39:19 +01:00
Kwoth
ccdd19d6ff commandlist updated 2016-11-07 23:11:34 +01:00
Kwoth
3677fe2ff1 >cleverbot added 2016-11-07 22:50:00 +01:00