Commit Graph

3323 Commits

Author SHA1 Message Date
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
samvaio
added98a55 Update README.md 2016-11-27 03:34:11 +05:30
samvaio
397d48afc3 Update README.md 2016-11-27 03:33:26 +05:30
Pg
12dc9af8e6 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-26 20:18:56 +01:00
Master Kwoth
4dc2a76704 Merge pull request #802 from samdivaio/dev
Update emojis
2016-11-26 17:41:02 +01:00
samvaio
a02ace3165 Merge pull request #10 from Kwoth/dev
update
2016-11-26 22:05:07 +05:30
samvaio
03df016082 Update README.md 2016-11-26 21:56:59 +05:30
samvaio
d627a7d370 Update README.md 2016-11-26 21:53:11 +05:30
samvaio
6ef6cd9719 Update README.md 2016-11-26 21:50:11 +05:30
samvaio
d27f54f39a Update README.md 2016-11-26 21:47:57 +05:30
samvaio
284983f17a Update README.md 2016-11-26 21:39:38 +05:30
samvaio
69baa97ba4 Update README.md 2016-11-26 21:37:39 +05:30
samvaio
6810d62b73 Update README.md 2016-11-26 21:35:29 +05:30
samvaio
9fae3e16a8 Update README.md 2016-11-26 21:25:40 +05:30
samvaio
9b780bd070 Update README.md 2016-11-26 21:24:13 +05:30
samvaio
5962e6bc55 Update README.md 2016-11-26 21:21:24 +05:30
samvaio
b85f827e03 Update README.md 2016-11-26 21:07:19 +05:30
samvaio
9b47763886 Update Games.cs 2016-11-26 20:45:17 +05:30
samvaio
fdee8e4685 Update Games.cs
- emojis added supporting on ios and android
2016-11-26 20:35:56 +05:30
samvaio
5c72871eb8 Update Games.cs 2016-11-26 20:31:05 +05:30
samvaio
f60c75343e Update README.md 2016-11-26 19:47:46 +05:30
samvaio
43f9888148 Update README.md 2016-11-26 19:42:49 +05:30
samvaio
19c932c978 Update README.md 2016-11-26 19:41:30 +05:30
samvaio
fd26dc46d7 Update README.md 2016-11-26 19:40:43 +05:30