Commit Graph

1634 Commits

Author SHA1 Message Date
Kwoth
acf45a1fc0 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-09-24 01:21:07 +02:00
Kwoth
1f2782fe32 Removed message created and file uploaded logserver events 2016-09-24 01:20:55 +02:00
Master Kwoth
c55f12ccac Merge pull request #647 from blitz4694/dev
Changing .dcr description
2016-09-22 08:18:16 +02:00
blitz4694
983de33d86 Update CustomReactionsCommands.cs 2016-09-21 14:33:04 +10:00
blitz4694
604638a266 Changing .dcr description
It was confusing some people
2016-09-20 14:09:09 +10:00
Kwoth
ffc0bf7e03 Merged branch dev into dev 2016-09-18 18:30:27 +02:00
Kwoth
415e28a2ab Fixed twitch stream, and response messages. 2016-09-18 18:30:18 +02:00
Kwoth
798567ee5d Fixed twitch stream, and response messages. 2016-09-18 18:30:18 +02:00
Kwoth
bc3010cef2 Added missing custom reaction from patreon 2016-09-18 18:30:01 +02:00
Kwoth
957dcd7482 Cleanup. Trivia can't be ran with less than 3 quesitons. (>t 3) 2016-09-18 18:29:38 +02:00
Master Kwoth
fc26a8f2bf Merge pull request #642 from blitz4694/dev
Changed link in acr cause movin to rtd
2016-09-18 14:32:03 +02:00
blitz4694
35b3a55601 Changed link in acr cause movin to rtd 2016-09-18 12:59:52 +10:00
Master Kwoth
4b749a99d9 Merge pull request #641 from fearnlj01/patch-1
Update link to commands list
2016-09-17 17:49:11 +02:00
Jordan Fearnley
5ec0440b8e Update link to commands list
The default link you get when doing `-h` should now reference the command list on the docs, rather than the github wiki
2016-09-17 16:16:12 +01:00
miraai
ad17ff2552 fixed bullets 2016-09-17 00:44:49 +02:00
miraai
68049b2ed8 Merge pull request #634 from miraai/dev
Mirai did stuff
2016-09-13 15:41:57 +02:00
miraai
69b8290a9c Update Frequently Asked Questions.md 2016-09-13 15:39:47 +02:00
miraai
e7392727cb Better FAQ 2016-09-13 15:37:45 +02:00
miraai
d0bf760a4c Fixed Permissions System, thanks Nekai 2016-09-13 15:36:32 +02:00
miraai
8982772a80 New JSON Explanations, thanks to Nekai <3 2016-09-13 15:33:49 +02:00
miraai
e6de6a226e fixed typo
ty xnaas
2016-09-13 15:31:00 +02:00
miraai
956be02a4f added screen thingy
Thanks to @fearnlj01
2016-09-13 15:25:28 +02:00
miraai
f415529c8d Merge pull request #1 from Kwoth/dev
Dev
2016-09-13 15:11:37 +02:00
Master Kwoth
d6121f5451 Merge pull request #627 from miraai/dev
Changed Google API key steps
2016-09-11 00:15:02 +02:00
miraai
aad26cd159 Changed Google API key steps
Google changed how to create google API key, no more server key
2016-09-11 00:04:18 +02:00
Kwoth
bc7bc724ec config_example updated 2016-09-10 18:28:39 +02:00
Master Kwoth
7bb3d2395d Merge pull request #622 from miraai/dev
Fixed update order in LinuxGuide
2016-09-10 02:57:22 +02:00
miraai
671d7c700f Fixed update order in LinuxGuide 2016-09-10 02:48:40 +02:00
Kwoth
ea5191476a Revert "Fixes to currency stuff"
This reverts commit 77373a4a4a.
2016-09-09 00:22:14 +02:00
Kwoth
77373a4a4a Fixes to currency stuff 2016-09-09 00:21:53 +02:00
Kwoth
61390e8530 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-09-05 22:26:14 +02:00
Kwoth
267a04cc25 Some changes to make nadeko survive until 1.0 2016-09-05 22:26:01 +02:00
Kwoth
55221b7bf5 cleanup 2016-09-05 21:34:59 +02:00
Kwoth
d8182a663a Streams have 60 second delay after starting up, refresh every 60 seconds 2016-09-05 21:19:08 +02:00
Kwoth
3e06c64765 Added patreon reward custom reactions 2016-09-05 21:17:19 +02:00
Kwoth
9a8829eb12 fix serverinfo emojis 2016-09-05 21:17:03 +02:00
Master Kwoth
aef0168f74 Merge pull request #603 from ritsu/dev
Fix typo in docs for installing Mono on CentOS/Fedora
2016-08-29 16:26:56 +02:00
ritsu
7c593a5588 Merge pull request #1 from ritsu/fix-typo-docs-mono-centos
Fix typo in docs for Installing Mono on CentOS
2016-08-29 10:22:09 -04:00
ritsu
022da6bee5 Fix typo in docs for Installing Mono on CentOS 2016-08-29 10:21:47 -04:00
Master Kwoth
20c7ce291e Merge pull request #600 from miraai/dev
Fixed spelling
2016-08-29 12:34:19 +02:00
Master Kwoth
279e2e2047 Merge pull request #602 from Kwoth/master
docs stuff
2016-08-29 12:34:09 +02:00
miraai
7cad5c47b4 Fixed a spelling mistake 2016-08-29 01:17:45 +02:00
miraai
f51f2101d4 Merge pull request #3 from Kwoth/dev
Dev
2016-08-29 01:15:58 +02:00
Master Kwoth
2721b498f3 Merge pull request #597 from Zeptaxis/patch-1
Updating unclear instructions with tmux
2016-08-27 16:34:55 +02:00
Zeptaxis
9e2b2d4a30 fixed a typo 2016-08-27 14:48:07 +02:00
Zeptaxis
468f0402ed Updating unclear instructions with tmux
I had to google because I thought the Ctrl+B+D thing wasnt' working, so I propose this small update to make it more clear that you need to press Ctrl+B and then D and not all at the same time.
2016-08-27 13:37:33 +02:00
Master Kwoth
063b43a1c7 Merge pull request #578 from blitz4694/dev
Fixed a spelling mistake
2016-08-18 04:28:18 +02:00
blitz4694
7c64ccb2af Fixed a spelling mistake 2016-08-18 07:33:48 +10:00
miraai
d365a579ec Merge pull request #573 from miraai/dev
deleted flags
2016-08-14 18:02:17 +02:00
miraai
975079686c Update Linux Guide.md 2016-08-14 18:00:47 +02:00