Commit Graph
100 Commits
Author SHA1 Message Date
Master KwothandGitHub 438fc97ae1 Merge pull request #807 from fkndean/dev
Add formatting output with scr as well as the actual output reaction.
2016-11-29 00:50:27 +01:00
Master KwothandGitHub 1695bd5534 Merge pull request #806 from fkndean/mtg-api
Magic The Gathering API
2016-11-28 11:30:06 +01:00
Master KwothandGitHub 7592cebd12 Merge pull request #804 from samdivaio/dev
read me update
2016-11-27 10:18:06 +01:00
Master KwothandGitHub 4dc2a76704 Merge pull request #802 from samdivaio/dev
Update emojis
2016-11-26 17:41:02 +01:00
Master KwothandGitHub 4081e346a6 Merge pull request #801 from samdivaio/dev
Update
2016-11-25 20:41:03 +01:00
Master KwothandGitHub 310992e3db Merge pull request #797 from samdivaio/dev
Utility and Linux Guide Update
2016-11-25 08:25:56 +01:00
Master KwothandGitHub d6250e2029 Merge pull request #795 from samdivaio/dev
Few additions and fixes
2016-11-23 20:14:14 +01:00
Master KwothandGitHub 563bd97f21 Merge pull request #793 from samdivaio/dev
Update to last PR
2016-11-22 10:32:59 +01:00
Master KwothandGitHub 389d5f7383 Merge pull request #792 from samdivaio/dev
More colours
2016-11-22 07:08:20 +01:00
Master KwothandGitHub 5776759281 Merge pull request #790 from samdivaio/dev
Update with more colours.
2016-11-21 06:14:20 +01:00
Master KwothandGitHub 484326518f Merge pull request #787 from fkndean/patch-3
Add SKK currency, closes #786
2016-11-20 17:39:35 +01:00
Master KwothandGitHub 1461dd16f7 Merge pull request #781 from samdivaio/dev
Changes.
2016-11-20 12:06:53 +01:00
Master KwothandGitHub 0e1f644d7f Merge pull request #776 from samdivaio/dev
Added colours to some outputs
2016-11-20 04:14:44 +01:00
Master KwothandGitHub 1ad7918dd8 Merge pull request #774 from samdivaio/1.0
Update with emojis, colours and few other fixes
2016-11-19 16:51:22 +01:00
Master KwothandGitHub 0ef5b47f44 Merge pull request #772 from samdivaio/1.0
lil emoji changes
2016-11-19 08:31:24 +01:00
Master KwothandGitHub 12110a7fc1 Merge pull request #771 from samdivaio/1.0
some fixes and cleanup
2016-11-19 04:00:40 +01:00
Master KwothandGitHub 3e0b56c52d Merge pull request #766 from fkndean/1.0
Add Yande.re search
2016-11-14 23:48:15 +01:00
Master KwothandGitHub eab88e5051 Merge pull request #761 from fkndean/1.0
Add BF3/BF4 API Searches (Online Players and User Search)
2016-11-13 02:36:27 +01:00
Master KwothandGitHub 5ec8693021 Merge pull request #762 from samdivaio/patch-9
Update from fearnlf01 😄
2016-11-11 20:24:44 +01:00
Master KwothandGitHub 0c031b1ed3 Merge pull request #760 from samdivaio/patch-9
Updated with cleaning and adding more info
2016-11-11 14:07:54 +01:00
Master KwothandGitHub ba08409ce4 Merge pull request #758 from fearnlj01/1.0-fearnlj01
Various changes ¯\_(ツ)_/¯
2016-11-11 02:09:56 +01:00
Master KwothandGitHub c2434db854 Merge pull request #755 from Nitix/radio
Fixed radio and slow connection Fix #601
2016-11-11 02:03:03 +01:00
Master KwothandGitHub 3f15d260e4 Merge pull request #754 from miraai/1.0
fixed confusing bullets in docs
2016-11-09 02:13:12 +01:00
Master KwothandGitHub 34b92d45d2 Merge pull request #752 from miraai/1.0
removed Cleverbot from credentials.json
2016-11-08 21:41:45 +01:00
Master KwothandGitHub bca44259fb Merge pull request #750 from miraai/1.0
JSON fix
2016-11-08 01:19:16 +01:00
Master KwothandGitHub 9084cfdc0f Merge pull request #749 from miraai/1.0
added CleverBot feature
2016-11-08 00:55:30 +01:00
Master KwothandGitHub f3ce927969 Merge pull request #740 from ZirconiumHacker/patch-1
Updated README.txt widget due to discord api changes
2016-11-05 23:25:24 +01:00
Master KwothandGitHub 143ef84c51 Merge pull request #737 from samdivaio/patch-8
Linux snapshot added to fix mono upgrading issue
2016-10-29 11:19:42 +02:00
Master KwothandGitHub b57fc9629f Merge pull request #732 from fearnlj01/patch-2
Minor change
2016-10-27 18:51:44 +02:00
Master KwothandGitHub ad46792f04 Merge pull request #730 from samdivaio/patch-7
Little Improvements
2016-10-26 06:54:42 +02:00
Master KwothandGitHub e960707994 Merge pull request #728 from fearnlj01/1.0-fearnlj01
Guide Houskeeping
2016-10-26 06:54:33 +02:00
Master KwothandGitHub 19b093c797 Merge pull request #725 from fearnlj01/1.0-fearnlj01
Goodbye sweet link to my Repo o7
2016-10-24 23:40:25 +02:00
Master KwothandGitHub a8969d0499 Merge pull request #724 from fearnlj01/patch-1
New licence
2016-10-24 19:17:33 +02:00
Master KwothandGitHub 8dbd4e1775 Merge pull request #722 from samdivaio/patch-4
Guide improved
2016-10-24 09:09:59 +02:00
Master KwothandGitHub c9ab746037 Merge pull request #721 from samdivaio/patch-3
Added spaces to the guide
2016-10-24 09:09:37 +02:00
Master KwothandGitHub 9dfc21f8b3 Merge pull request #718 from samdivaio/patch-1
Added Kwoth's Magic 
2016-10-24 06:37:44 +02:00
Master KwothandGitHub c7b5294ae7 Merge pull request #719 from samdivaio/patch-2
Added Additional Information and Magic 
2016-10-24 06:37:26 +02:00
Master KwothandGitHub d7edb3de9d Merge pull request #716 from samdivaio/1.0
Little improvement, thanks to @fearnlj01#3535
2016-10-23 20:49:36 +02:00
Master KwothandGitHub 674be6c3d5 Merge pull request #713 from Nitix/lib-exec
make .so files executable
2016-10-23 08:29:24 +02:00
Master KwothandGitHub bc85bebfc7 Merge pull request #712 from fearnlj01/1.0-fearnlj01
docs migrate guide simplified
2016-10-22 12:28:12 +02:00
Master KwothandGitHub c10cdb6cb5 Merge pull request #711 from fearnlj01/1.0-fearnlj01
Guide Update
2016-10-22 11:39:57 +02:00
Master KwothandGitHub a7015c059e Merge pull request #710 from fearnlj01/1.0-fearnlj01
Fixed what I broke
2016-10-22 06:15:57 +02:00
Master KwothandGitHub dc2450a61e Merge pull request #708 from fearnlj01/1.0-fearnlj01
Guides ->  1.0
2016-10-21 15:58:45 +02:00
Master KwothandGitHub c9d94b0392 Merge pull request #707 from Nitix/fix-perm
Change perm index to correspond to the index in the complete list (;lp)
2016-10-21 13:25:13 +02:00
Master KwothandGitHub db1892907d Merge pull request #705 from fearnlj01/patch-3
NadekoFlowers -> Currency
2016-10-20 03:52:55 +02:00
Master KwothandGitHub ac45df0c2a Merge pull request #704 from fearnlj01/patch-2
{0} all the things
2016-10-19 16:29:52 +02:00
Master KwothandGitHub a75f0ab012 Merge pull request #702 from Nitix/Fix-ban-message
Fix msg reason for ban and softban
2016-10-19 02:17:55 +02:00
Master KwothandGitHub ae545e07d5 Merge pull request #701 from miraai/1.0
Updated strings
2016-10-17 12:52:04 +02:00
Master KwothandGitHub b80f7247d8 Merge pull request #699 from miraai/1.0
.die Description improved
2016-10-17 00:32:35 +02:00
Master KwothandGitHub 0df380bba6 Merge pull request #697 from miraai/1.0
Mirai did stuff
2016-10-17 00:16:10 +02:00
Master KwothandGitHub 5137d24200 Merge pull request #695 from fearnlj01/patch-1
Custom Reactions docs update
2016-10-16 06:19:05 +02:00
Master KwothandGitHub 6b19dc5af9 Merge pull request #691 from miraai/1.0
Missing mkdocs.yml file
2016-10-13 17:07:20 +02:00
Master KwothandGitHub 2d625d0d5a Merge pull request #689 from fearnlj01/1.0-1
FAQ, Permissions Guide and index update
2016-10-13 00:19:15 +02:00
Master KwothandGitHub b264279fe9 Merge pull request #687 from fearnlj01/1.0
Custom Reactions Housekeeping
2016-10-10 19:47:08 +02:00
Master KwothandGitHub a5b74c6a67 Merge pull request #686 from fearnlj01/1.0
1.0 Docs update
2016-10-10 11:09:56 +02:00
Master KwothandGitHub 6f0a78613e Merge pull request #685 from fearnlj01/1.0
Update the Custom Reactions Guide for 1.0
2016-10-10 06:39:04 +02:00
Master KwothandGitHub 46dc18c6e2 Merge pull request #684 from fearnlj01/1.0
Permissions System 1.0 Docs
2016-10-09 22:19:46 +02:00
Master KwothandGitHub 4d1bc01718 Merge pull request #679 from Nitix/mp-fix
Fix ;mp command
2016-10-07 19:07:16 +02:00
Master KwothandGitHub 5f650bc2c6 Merge pull request #678 from Nitix/gitignore
Change gitignore to a better one
2016-10-06 07:10:10 +02:00
Master KwothandGitHub bbb325e1a3 Merge pull request #676 from fearnlj01/dev
Updating Weather API
2016-10-06 07:09:55 +02:00
Master KwothandGitHub cd2efedfb1 Merge pull request #674 from Nitix/0.9-to-1.0-migration
0.9 to 1.0 migration
2016-10-05 03:25:33 +02:00
Master KwothandGitHub 20157f1a5a Merge pull request #673 from miraai/dev
Fixed typos in the Linux guide
2016-10-04 18:24:21 +02:00
Master KwothandGitHub 4459c19e70 Merge pull request #667 from Nitix/foreign-key
Fix Foreign key with delete on cascade
2016-10-02 04:50:09 +02:00
Master KwothandGitHub c55f12ccac Merge pull request #647 from blitz4694/dev
Changing .dcr description
2016-09-22 08:18:16 +02:00
Master KwothandGitHub fc26a8f2bf Merge pull request #642 from blitz4694/dev
Changed link in acr cause movin to rtd
2016-09-18 14:32:03 +02:00
Master KwothandGitHub 4b749a99d9 Merge pull request #641 from fearnlj01/patch-1
Update link to commands list
2016-09-17 17:49:11 +02:00
Master KwothandGitHub 8425327acb Merge pull request #638 from Nitix/appveyor
Fix appveyor build
2016-09-17 02:37:26 +02:00
Master KwothandGitHub d6121f5451 Merge pull request #627 from miraai/dev
Changed Google API key steps
2016-09-11 00:15:02 +02:00
Master KwothandGitHub ec2ca03272 Merge pull request #623 from appelemac/Reply-improv
Reply-long improvements
2016-09-10 23:30:57 +02:00
Master KwothandGitHub 00ed4ba6f1 Merge pull request #625 from Nitix/version
Add version display while starting Nadeko
2016-09-10 23:20:26 +02:00
Master KwothandGitHub 7bb3d2395d Merge pull request #622 from miraai/dev
Fixed update order in LinuxGuide
2016-09-10 02:57:22 +02:00
Master KwothandGitHub 397ba798a5 Merge pull request #606 from appelemac/unitconversion
Unitconversion
2016-09-05 00:53:28 +02:00
Master KwothandGitHub 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
Master KwothandGitHub 20c7ce291e Merge pull request #600 from miraai/dev
Fixed spelling
2016-08-29 12:34:19 +02:00
Master KwothandGitHub 279e2e2047 Merge pull request #602 from Kwoth/master
docs stuff
2016-08-29 12:34:09 +02:00
Master KwothandGitHub 2721b498f3 Merge pull request #597 from Zeptaxis/patch-1
Updating unclear instructions with tmux
2016-08-27 16:34:55 +02:00
Master KwothandGitHub e64dd6548f Merge pull request #593 from Nitix/audio
SongBuffer is now a stream, and the Song will now wait correctly
2016-08-26 16:55:19 +02:00
Master KwothandGitHub 9353437796 Merge pull request #591 from Nitix/1.0
Fix appveyor build
2016-08-23 13:31:50 +02:00
Master KwothandGitHub 9d4648104a Merge pull request #590 from appelemac/math
Math Eval
2016-08-22 13:36:46 +02:00
Master KwothandGitHub 063b43a1c7 Merge pull request #578 from blitz4694/dev
Fixed a spelling mistake
2016-08-18 04:28:18 +02:00
Master KwothandGitHub 4e97e1e07c Merge pull request #569 from Kwoth/master
updated master's readme.md
2016-08-12 05:32:36 +02:00
Master KwothandGitHub 0460cbe230 Updated widget due to discord api changes 2016-08-12 05:31:33 +02:00
Master KwothandGitHub 2d800b0e19 Merge pull request #568 from Seregy/dev
Invariant Culture for parsing in osu commands
2016-08-12 01:03:24 +02:00
Master KwothandGitHub 7df54ef5ed Merge pull request #563 from miraai/dev
New Custom Reactions page, thx Nekai
2016-08-11 15:34:05 +02:00
Master KwothandGitHub 1cec241709 Merge pull request #561 from Seregy/dev
Fixed youtube time argument, closes #363
2016-08-11 07:31:46 +02:00
Master KwothandGitHub 48a05b9ec0 Merge pull request #562 from blitz4694/dev
Missed another permission in command description
2016-08-11 06:30:48 +02:00
Master KwothandGitHub 29c49816c4 Merge pull request #557 from GitBranch/dev
chinese-traditional added to translation list
2016-08-11 06:30:08 +02:00
Master KwothandGitHub 57c6f522e5 Merge pull request #560 from AraHaan/dev
Fixed some command descriptions.
2016-08-10 12:47:38 +02:00
Master KwothandGitHub eb3a082aa1 Merge pull request #554 from blitz4694/dev
Missed a permissions thing for .clr
2016-08-08 12:40:17 +02:00
Master KwothandGitHub 790fa5b866 Update Windows Guide.md 2016-08-08 12:25:00 +02:00
Master KwothandGitHub 77de0cf0d7 Merge pull request #552 from miraai/dev
changed link to Releases in docs
2016-08-08 02:57:41 +02:00
Master KwothandGitHub c991dc746a Merge pull request #550 from miraai/dev
BotID Changes
2016-08-07 22:08:53 +02:00
Master KwothandGitHub 1d70aceaef Merge pull request #546 from miraai/dev
Update Readme.md
2016-08-06 21:49:27 +02:00
Master KwothandGitHub fbe27ab4b3 Merge pull request #544 from miraai/dev
Added Readme for Commands List
2016-08-06 20:54:57 +02:00
Master KwothandGitHub 4506670d3d Merge pull request #543 from miraai/dev
docs homepage updated
2016-08-05 22:06:11 +02:00
Master KwothandGitHub 8aff8d291f Merge pull request #540 from MasterDomino/dev
fix ;cbl and ;cubl commands
2016-08-05 21:42:05 +02:00
Master KwothandGitHub cbaa0eb1b3 Update README.md 2016-08-05 04:45:28 +02:00
Master KwothandGitHub 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
Master KwothandGitHub 928b47ff57 Merge pull request #526 from blitz4694/dev
More fixes to docs
2016-08-04 03:27:11 +02:00
Master KwothandGitHub 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