Commit Graph

1606 Commits

Author SHA1 Message Date
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
miraai
e2b797c27c deleted flags
until i find a solution for the size
2016-08-14 17:59:50 +02:00
Master Kwoth
4e97e1e07c Merge pull request #569 from Kwoth/master
updated master's readme.md
2016-08-12 05:32:36 +02:00
Master Kwoth
0460cbe230 Updated widget due to discord api changes 2016-08-12 05:31:33 +02:00
Seregy
6502b971fb Invariant Culture for parsing in osu commands 2016-08-12 02:05:10 +02:00
miraai
2f2b1a2181 minor fixes 2016-08-12 02:05:10 +02:00
miraai
16ef73be21 Update index.md 2016-08-12 01:18:41 +02:00
miraai
4258583bef Update index.md 2016-08-12 01:17:32 +02:00
Master Kwoth
2d800b0e19 Merge pull request #568 from Seregy/dev
Invariant Culture for parsing in osu commands
2016-08-12 01:03:24 +02:00
Seregy
e3a53546bd Invariant Culture for parsing in osu commands 2016-08-11 21:53:00 +03:00
miraai
0f48077d50 minor fixes 2016-08-11 20:31:12 +02:00
miraai
9816724ba4 Merge pull request #567 from miraai/dev
flag test #2
2016-08-11 20:28:16 +02:00
miraai
5795b5175b flag test #2 2016-08-11 20:27:45 +02:00
miraai
e4f8af91c5 Merge pull request #1 from Kwoth/dev
Dev
2016-08-11 19:27:52 +02:00
miraai
6c99f2393b flag test 2016-08-11 19:27:18 +02:00
miraai
dbdd889386 Merge pull request #566 from miraai/dev
Okay, all good now
2016-08-11 19:11:57 +02:00
miraai
cea2c04e85 Update mkdocs.yml 2016-08-11 19:11:35 +02:00
miraai
4a4993b070 Update Linux Guide.md 2016-08-11 19:11:04 +02:00
miraai
bd38faba58 Merge pull request #565 from miraai/dev
woopsie, forgot about mkdocs
2016-08-11 19:06:44 +02:00
miraai
b71db2e75a Update index.md 2016-08-11 19:06:16 +02:00
miraai
6a9ff1c1e6 Update mkdocs.yml 2016-08-11 19:05:53 +02:00
miraai
1a01333438 Merge pull request #564 from miraai/dev
Fixed Linux Guide
2016-08-11 19:03:41 +02:00
miraai
5eb4539f20 Delete DigitalOcean Guide.md 2016-08-11 19:02:12 +02:00
miraai
a62980f3e3 Update Linux Guide.md 2016-08-11 19:01:25 +02:00
miraai
f4bb08d182 Update Linux Guide.md 2016-08-11 18:59:18 +02:00
miraai
abd67d5950 Update Custom Reactions.md 2016-08-11 15:49:10 +02:00
miraai
99442b5c9e Update Custom Reactions.md 2016-08-11 15:48:06 +02:00
Master Kwoth
7df54ef5ed Merge pull request #563 from miraai/dev
New Custom Reactions page, thx Nekai
2016-08-11 15:34:05 +02:00
miraai
412256c9bd Update Custom Reactions.md 2016-08-11 15:32:41 +02:00