Commit Graph

4196 Commits

Author SHA1 Message Date
Master Kwoth
750c456142 Merge pull request #507 from blitz4694/dev
Put things back
2016-08-03 03:47:28 +02:00
cameron reuter
1c21157f97 I swear these keep getting deleted 2016-08-03 11:44:51 +10:00
Kwoth
6baa58af72 Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2016-08-03 03:44:02 +02:00
Master Kwoth
e58f5fa3c0 Merge pull request #506 from Kwoth/dev
commandlist fix
2016-08-03 03:42:02 +02:00
Kwoth
cb645c2900 commandlist fix? 2016-08-03 03:40:45 +02:00
Master Kwoth
56e7a8380a Merge pull request #505 from Kwoth/dev
commandlist regenerated for 0.99.9x
2016-08-02 23:29:00 +02:00
Kwoth
baf4c42f90 regenerated commandlist 2016-08-02 23:26:44 +02:00
Kwoth
7df4c3a971 Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2016-08-02 18:55:33 +02:00
Kwoth
ac379ad4b5 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-08-02 18:54:43 +02:00
Kwoth
5d166c57af removed unused sqlite dlls 2016-08-02 18:53:47 +02:00
Master Kwoth
615d8bb58e Update LinuxSetup.md 2016-08-02 18:08:05 +02:00
Master Kwoth
1c67d7642d Merge pull request #501 from Kwoth/dev
0.99.9x
2016-08-02 18:04:38 +02:00
Master Kwoth
e7c5dc03d4 Merge pull request #499 from blitz4694/dev
Improved descriptions with required permission
2016-08-02 16:10:50 +02:00
cameron reuter
b5e0e257d8 Got bored so i thought i'd add stuff 2016-08-03 00:06:08 +10:00
Master Kwoth
b66b9eabdc Updated DockerGuide on how to see the console output 2016-08-02 15:21:31 +02:00
Kwoth
5964725190 should work on mono once again >.> 2016-08-02 14:03:02 +02:00
Kwoth
b6bca56f0a Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-08-02 04:54:59 +02:00
Kwoth
1ee6e1e923 testing docs 2016-08-02 04:54:39 +02:00
Master Kwoth
5c006555f1 Update README.md 2016-08-02 04:49:27 +02:00
Master Kwoth
6ffbb406cd Update README.md 2016-08-02 03:03:06 +02:00
Master Kwoth
6da9a9925d Merge pull request #496 from miraai/dev
Updated usages
2016-08-02 02:26:53 +02:00
Kwoth
e1990c8152 woopsie daisy 2016-08-02 02:19:56 +02:00
miraai
e8e6f3286c Update TrelloModule.cs 2016-08-02 02:15:29 +02:00
miraai
70de5aca59 Update CustomReactions.cs 2016-08-02 02:13:03 +02:00
miraai
ecacd4515d Update ClashOfClansModule.cs 2016-08-02 02:11:30 +02:00
miraai
29d0e66d10 Update SearchesModule.cs 2016-08-02 02:06:07 +02:00
Kwoth
03cacdbb25 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-08-02 02:04:38 +02:00
Kwoth
2fff6aaf0d increased delay time for shared nadeko >.> 2016-08-02 02:04:35 +02:00
Kwoth
e7f06c38b4 some random formatting 2016-08-02 02:03:46 +02:00
miraai
55e9115bcb Update MusicModule.cs 2016-08-02 02:02:58 +02:00
Master Kwoth
4dd0e33116 Merge pull request #495 from miraai/patch-3
Update UtilityModule.cs
2016-08-02 02:01:46 +02:00
miraai
8726a8ac79 Update GamblingModule.cs 2016-08-02 02:00:52 +02:00
miraai
cf8d105c6f Update RipCommand.cs 2016-08-02 01:59:43 +02:00
miraai
d5001f8d90 Update AdministrationModule.cs 2016-08-02 01:57:56 +02:00
miraai
138b8ae7e9 Update PermissionsModule.cs 2016-08-02 01:56:32 +02:00
miraai
778c06ec8d Update FilterWordsCommand.cs 2016-08-02 01:54:25 +02:00
miraai
ecd8f82204 Update FilterInvitesCommand.cs 2016-08-02 01:53:12 +02:00
miraai
f682ee31be Update SelfAssignedRolesCommand.cs 2016-08-02 01:45:55 +02:00
miraai
da5e4eb68d Update UtilityModule.cs 2016-08-02 01:38:46 +02:00
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
7399f798bc archer's custom reaction 2016-08-01 22:23:29 +02:00
Kwoth
71b3385509 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-08-01 22:22:53 +02:00
miraai
5d7ecbc63d Merge pull request #11 from Kwoth/dev
Dev
2016-08-01 22:02:58 +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