Commit Graph

2485 Commits

Author SHA1 Message Date
Kwoth
fa1eeff06f Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-08-04 04:31:00 +02:00
Kwoth
e5682ce2cd Just making sure nothing is running before bot is ready.
This is hopefuly addressing shared nadeko issues
2016-08-04 04:30:54 +02:00
miraai
2d81408bb1 Merge pull request #528 from miraai/dev
Update index.md
2016-08-04 04:17:02 +02:00
miraai
5f57e77a27 Update index.md
Added banner for invite
Link to NadekoBot server
2016-08-04 04:15:21 +02:00
Master Kwoth
3a5d9bbbbc Merge pull request #527 from miraai/dev
Maybe this will add the "edit on github" link
2016-08-04 03:53:07 +02:00
miraai
975b08bcd4 github tryout 2016-08-04 03:52:09 +02:00
miraai
6125605aff Merge pull request #22 from Kwoth/dev
Dev
2016-08-04 03:50:28 +02:00
Kwoth
cb0633baff commandlist update 2016-08-04 03:30:25 +02:00
Master Kwoth
928b47ff57 Merge pull request #526 from blitz4694/dev
More fixes to docs
2016-08-04 03:27:11 +02:00
blitz4694
11a48384e0 Update AdministrationModule.cs 2016-08-04 11:25:49 +10:00
blitz4694
ed6e10adb8 Update VoicePlusTextCommand.cs 2016-08-04 11:24:21 +10:00
Master Kwoth
a39d0c5b01 Merge pull request #525 from miraai/dev
Changed hears to be actual hearts on donate page
2016-08-04 03:24:16 +02:00
miraai
a7e29ffc3f better hearts 2016-08-04 03:23:13 +02:00
miraai
aceafd754e better hearts #2 2016-08-04 03:22:37 +02:00
miraai
6fe397e74e Merge pull request #21 from Kwoth/dev
hearts
2016-08-04 03:20:49 +02:00
miraai
6a9eeb9b96 Update index.md 2016-08-04 03:19:01 +02:00
miraai
c3c515262a better hearts 2016-08-04 03:18:27 +02:00
Master Kwoth
5db31e9888 Merge pull request #524 from miraai/dev
Donate page
2016-08-04 03:15:06 +02:00
Kwoth
0ecb3c3a55 made newavatar usage smaller to fix the docs 2016-08-04 03:14:22 +02:00
miraai
c2fa8088aa Update mkdocs.yml 2016-08-04 03:08:55 +02:00
miraai
95bbccf9c7 Update mkdocs.yml 2016-08-04 03:08:47 +02:00
miraai
5f71fa4519 Added Donate 2016-08-04 03:08:05 +02:00
miraai
8b10427033 Merge pull request #20 from Kwoth/dev
just pls
2016-08-04 03:06:19 +02:00
miraai
105777daf9 Added Donate page 2016-08-04 03:04:50 +02:00
Kwoth
612d77bd26 Added buddha to protect from bugs, regenerated commandlist 2016-08-04 02:55:09 +02:00
miraai
0ada43e7ad New Donate page 2016-08-04 02:48:41 +02:00
Kwoth
33d3ec1f74 Updated commandlist, optimized a bit, changed -guide 2016-08-04 02:43:06 +02:00
Kwoth
625059d6dd Merged branch revert-522-dev into dev 2016-08-04 02:36:35 +02:00
miraai
55ce2c8229 Revert "Fixed things" 2016-08-04 02:34:03 +02:00
miraai
5f5cef2cb1 Merge pull request #522 from blitz4694/dev
Fixed things
2016-08-04 02:20:46 +02:00
blitz4694
cf4109a45e Stuff i flubbed 2016-08-04 10:17:56 +10:00
Master Kwoth
2421bb660b Merge pull request #509 from blitz4694/dev
Missed things
2016-08-04 02:16:31 +02:00
blitz4694
f33a9f014b Stuff still getting deleted mysteriously 2016-08-04 10:16:31 +10:00
cameron reuter
3ec3a84480 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot.git into dev 2016-08-04 10:14:29 +10:00
miraai
15ed31b234 Merge pull request #521 from miraai/dev
Updated commandslist
2016-08-04 02:09:39 +02:00
miraai
3152111a00 Merge pull request #19 from Kwoth/dev
Dev
2016-08-04 02:09:03 +02:00
miraai
31a267de63 Commands List fix 2016-08-04 02:08:10 +02:00
miraai
33490d74fc Merge pull request #520 from miraai/dev
readthedocs fixes
2016-08-04 02:04:31 +02:00
miraai
c79feca663 update mkdocs 2016-08-04 02:04:03 +02:00
miraai
115aaf00fa Update index.md 2016-08-04 02:03:33 +02:00
miraai
6b7d42e04b update mkdocs 2016-08-04 02:03:01 +02:00
miraai
f931bebfb9 rename 2016-08-04 02:02:31 +02:00
miraai
dcf3ac4d7e all is well 2016-08-04 02:01:58 +02:00
miraai
79ad67e77f moving 2016-08-04 02:01:22 +02:00
miraai
ad89cf35b9 JSON Explanations fixes 2016-08-04 01:57:28 +02:00
miraai
863723dbde FAQ fixes 2016-08-04 01:52:54 +02:00
miraai
62c55c0c34 Windows Guide fix #2 2016-08-04 01:46:50 +02:00
miraai
7ac09b1aef Update Building from Source.md 2016-08-04 01:41:03 +02:00
miraai
7f236a1eee Merge pull request #18 from Kwoth/dev
Merge pull request #519 from miraai/dev
2016-08-04 01:38:17 +02:00
miraai
fdcd24d222 Merge pull request #519 from miraai/dev
readthedocs minor fixes
2016-08-04 01:30:06 +02:00