Commit Graph

1305 Commits

Author SHA1 Message Date
Master Kwoth
88027192e3 Merge pull request #493 from blitz4694/dev
Fixed a usage description
2016-08-02 01:21:13 +02:00
blitz4694
4e9ca9ec48 mirai is still lazy 2016-08-02 09:18:00 +10:00
Kwoth
71b3385509 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-08-01 22:22:53 +02:00
Master Kwoth
eaa155bede Merge pull request #490 from miraai/master
Edited Docker Guide
2016-08-01 22:01:47 +02:00
Master Kwoth
1ffb426f1b Merge pull request #491 from miraai/dev
Linux Guide Fix
2016-08-01 22:01:35 +02:00
miraai
1c390cd33f Update LinuxSetup.md 2016-08-01 21:57:10 +02:00
miraai
33e38848e8 Update DockerGuide.md 2016-08-01 21:49:50 +02:00
miraai
e2c33e4aff Update DockerGuide.md 2016-08-01 21:49:35 +02:00
miraai
c5755af036 Update DockerGuide.md 2016-08-01 21:48:54 +02:00
miraai
fb10d03399 Update DockerGuide.md 2016-08-01 21:48:06 +02:00
miraai
a1da64e4ff Merge pull request #10 from Kwoth/dev
Dev
2016-08-01 21:40:26 +02:00
Master Kwoth
edcd375fe8 Merge pull request #489 from miraai/dev
New ComprehensiveGuide
2016-08-01 21:33:38 +02:00
miraai
13745f1e1c Update and rename WindowsGuide.md to ComprehensiveGuide.md 2016-08-01 21:30:30 +02:00
miraai
a8777b4e00 Rename ComprehensiveGuide.md to WindowsGuide.md 2016-08-01 21:23:46 +02:00
miraai
e296e23e8b Update ComprehensiveGuide.md 2016-08-01 21:22:01 +02:00
miraai
ac1fea3f53 Update ComprehensiveGuide.md 2016-08-01 21:21:16 +02:00
miraai
938c8e220d Merge pull request #9 from Kwoth/dev
Dev
2016-08-01 20:13:25 +02:00
Master Kwoth
a2dcfd8bde Update DockerGuide.md 2016-08-01 18:00:07 +02:00
Master Kwoth
601f44ecd0 Update DockerGuide.md 2016-08-01 17:59:00 +02:00
Master Kwoth
36c7e48e03 Update DockerGuide.md 2016-08-01 17:57:50 +02:00
Master Kwoth
86b6883c75 Create DockerGuide.md 2016-08-01 17:55:38 +02:00
Kwoth
ea62b2e174 Added 2 custom reactions from donators 2016-08-01 17:11:26 +02:00
Master Kwoth
4bca94de04 Merge pull request #484 from Nitix/dev-bugfix/478
Change how we handle audio file buffer, FIX #478
2016-08-01 03:28:11 +02:00
Master Kwoth
23b9f58287 Merge pull request #486 from blitz4694/dev
Missing stuff
2016-08-01 03:26:57 +02:00
cameron reuter
5272d6d97c Stuff i missed cause mirai was lazy 2016-08-01 11:24:04 +10:00
cameron reuter
3b613b5050 missed another 2016-08-01 11:08:33 +10:00
Nitix
3ce4a0c2ef Change how we handle audio file buffer, FIX #478
Now it would create small files 20Mb and rotate them
Each file order are identified by a number (type long)
When a file has been read, Song will be delete it.
2016-07-31 23:17:52 +02:00
Kwoth
115e0d30fd Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-31 20:06:13 +02:00
Kwoth
3aff5d0a12 User presence updates are now sent every 5 seconds. #468 2016-07-31 20:06:09 +02:00
Master Kwoth
b105965060 Merge pull request #483 from Tibo442/patch-3
Make autoplay tracks be queued from bot and not someone else
2016-07-31 17:33:22 +02:00
Tibo
014f89f115 Make autoplay tracks be queued from bot and not someone else 2016-07-31 17:30:20 +02:00
Kwoth
31b2558523 fix #470 , !!ap now takes a random video out of 4 related ones 2016-07-31 17:01:56 +02:00
miraai
cd42d7d817 Merge pull request #8 from Kwoth/dev
Dev
2016-07-31 15:41:41 +02:00
miraai
33a02f2aa7 Merge pull request #7 from Kwoth/master
updated discord.net
2016-07-31 15:40:34 +02:00
Kwoth
93af77778e Merge branch 'master' into dev 2016-07-30 15:19:44 +02:00
Kwoth
dce9d00eb9 updated discord.net 2016-07-30 15:19:09 +02:00
Kwoth
9077eac7c7 updated -donate command 2016-07-30 15:08:08 +02:00
Kwoth
670a8ddf82 Revert "rewrote database stuff to be async, hopefuly it works properly."
This reverts commit 11ed1500ba.
2016-07-30 01:21:48 +02:00
Kwoth
11ed1500ba rewrote database stuff to be async, hopefuly it works properly. 2016-07-29 23:33:21 +02:00
Kwoth
f32ff91226 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-29 18:42:47 +02:00
Kwoth
e804c078fa longer startup for shared nakeda 2016-07-29 18:42:25 +02:00
Master Kwoth
6c069a254d Merge pull request #477 from appelemac/num
!!gl [num]
2016-07-29 18:39:54 +02:00
Kwoth
2f56937af1 added musicdata to gitignore 2016-07-29 15:29:22 +02:00
Kwoth
c82f7feaf4 woopsie, unimportant NRE fixed 2016-07-29 15:27:05 +02:00
appelemac
6f407d7989 Merge remote-tracking branch 'refs/remotes/Kwoth/dev' into num 2016-07-29 15:14:43 +02:00
appelemac
d4646140d3 Delete 1469797859.64474 2016-07-29 15:13:44 +02:00
appelemac
34755aaf6e Revert "Revert "getlink takes optional param now""
This reverts commit e2195f5f66.
2016-07-29 15:12:04 +02:00
appelemac
e2195f5f66 Revert "getlink takes optional param now"
This reverts commit ea99d315c4.
2016-07-29 15:11:54 +02:00
appelemac
ea99d315c4 getlink takes optional param now 2016-07-29 15:11:45 +02:00
appelemac
c14556ffc1 Merge remote-tracking branch 'refs/remotes/Kwoth/master' into num 2016-07-29 15:10:15 +02:00