Commit Graph

3196 Commits

Author SHA1 Message Date
samvaio
c95a8d8a09 Merge pull request #14 from Kwoth/dev
update
2016-11-30 01:53:45 +05:30
fkndean
d2ca35b965 Merge remote-tracking branch 'upstream/dev' into dev 2016-11-29 15:03:35 -05:00
Master Kwoth
98edb33673 Merge pull request #816 from Kwoth/dev
1.0
2016-11-29 19:54:17 +01:00
Kwoth
269463e5c9 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-29 19:42:16 +01:00
Kwoth
5d3b99c445 added install scripts 2016-11-29 19:36:53 +01:00
Master Kwoth
cd12956433 Merge pull request #811 from samdivaio/dev
Update
2016-11-29 17:45:39 +01:00
samvaio
07ff8bf654 Update Windows Guide.md 2016-11-29 21:17:23 +05:30
samvaio
159bed5552 Update Windows Guide.md 2016-11-29 21:16:17 +05:30
samvaio
20766818af Update Windows Guide.md 2016-11-29 21:12:34 +05:30
samvaio
84fc90645f Update OSX Guide.md 2016-11-29 19:59:05 +05:30
samvaio
ed41b80ca9 Update OSX Guide.md 2016-11-29 19:49:00 +05:30
fkndean
da21308345 Fix to match Kwoth's d.net changes. 2016-11-29 09:01:06 -05:00
fkndean
6c534f4233 Initial commit for rich embed change for message output. Started on .stats command. 2016-11-29 08:47:06 -05:00
Kwoth
2774c5d81c updated discord.net 2016-11-29 14:36:56 +01:00
samvaio
3b55316020 Merge pull request #13 from Kwoth/dev
update
2016-11-29 17:18:39 +05:30
Master Kwoth
59fe1f2a30 Merge pull request #813 from ByFurriesForFurries/dev
Grammar pls
2016-11-29 10:38:54 +01:00
samvaio
6dd457e132 Update Linux Guide.md 2016-11-29 07:29:59 +05:30
samvaio
bdb347ef7c Update Linux Guide.md 2016-11-29 07:22:24 +05:30
FrostTheFox
603b3f297b
Best fix ever. 2016-11-28 20:17:00 -05:00
samvaio
52e294db04 Merge pull request #12 from Kwoth/dev
updates from kwoth
2016-11-29 05:36:25 +05:30
samvaio
7d611f1ed8 Update Linux Guide.md 2016-11-29 05:29:24 +05:30
samvaio
9e45d04121 Linux Guide updated
with latest Linux AIO installer commands.
2016-11-29 05:25:47 +05:30
Master Kwoth
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
samvaio
12a6f86d82 Merge pull request #11 from Kwoth/dev
update
2016-11-29 01:21:22 +05:30
Kwoth
9d4061265d Fix to .grdel and .byedel 2016-11-28 20:47:10 +01:00
fkndean
e90190ef2d Merge remote-tracking branch 'upstream/dev' into dev 2016-11-28 06:04:54 -05:00
Kwoth
9d79cdee13 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-28 11:39:32 +01:00
Kwoth
f1318a31ff Updated discord.net 2016-11-28 11:39:23 +01:00
Master Kwoth
1695bd5534 Merge pull request #806 from fkndean/mtg-api
Magic The Gathering API
2016-11-28 11:30:06 +01:00
Pg
e21767cc4a Re-add the credential.json 2016-11-28 02:28:53 +01:00
fkndean
c50e192dbe whoops accidentally removed Google. 2016-11-27 20:19:12 -05:00
fkndean
7ad43e8345 Just append card url instead of downloading. 2016-11-27 20:17:46 -05:00
Pg
3fbd52d74b Fix presenttation and change data connection 2016-11-28 02:15:08 +01:00
Pg
90c80c7bd9 Fix database creation
Add the Table PokeGame to the database initialisation
2016-11-28 02:14:29 +01:00
Kwoth
51c6743fec Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-28 01:12:15 +01:00
Kwoth
1e2d5ee6b7 Fixed greetdmmsg 2016-11-28 01:11:53 +01:00
Kwoth
2e7ff45bd5 removed expired token 2016-11-27 21:53:58 +01:00
fkndean
df71f020e2 Add formatting output with scr as well as the actual output reaction. 2016-11-27 13:02:39 -05:00
fkndean
d363af4dfe remove message output - kwoth request 2016-11-27 12:16:22 -05:00
fkndean
a32fd3a2cb Add card description in output message. 2016-11-27 12:12:40 -05:00
fkndean
ffc1f5a061 Add Magic The Gathering card search 2016-11-27 12:00:37 -05:00
Pg
ad62716b34 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-27 17:59:50 +01:00
Master Kwoth
7592cebd12 Merge pull request #804 from samdivaio/dev
read me update
2016-11-27 10:18:06 +01:00
Pg
21b2f1252a PokeGame work, initialisation of database unstable, need to do with sql-request 2016-11-27 03:51:10 +01:00
samvaio
9effc09384 Update README.md 2016-11-27 03:57:14 +05:30
samvaio
8b00595db8 Update README.md 2016-11-27 03:56:01 +05:30
samvaio
03f783f6bf Update README.md 2016-11-27 03:54:38 +05:30
samvaio
3b99857adc Update README.md 2016-11-27 03:52:17 +05:30
samvaio
d0074d3b5b Update README.md 2016-11-27 03:38:31 +05:30
samvaio
714a2cce0e Update README.md 2016-11-27 03:35:16 +05:30