Commit Graph

762 Commits

Author SHA1 Message Date
Master Kwoth
7864b2a339 Merge pull request #214 from DragonOverlord/patch-1
Pokemon Currency small fixes
2016-04-12 14:48:23 +02:00
DragonOverlord
9e587fead7 removed - 2016-04-12 12:56:52 +02:00
DragonOverlord
f4b158bd79 Pokemon Currency small fixes 2016-04-12 12:55:49 +02:00
Master Kwoth
3150b2da6b Removed some stray console writelines 2016-04-12 03:28:44 +02:00
Master Kwoth
cc89d37ba5 fixed carbon updates, changed dark poke icon 2016-04-12 03:07:51 +02:00
Master Kwoth
3af13550c2 Moved carbon stats on server join and leave 2016-04-12 00:32:21 +02:00
Master Kwoth
d79514305b Able to send botdata to carbon now (if compliant?). 2016-04-12 00:18:56 +02:00
Master Kwoth
2a625451b0 music can't go higher than 100% now. 2016-04-12 00:10:00 +02:00
Master Kwoth
633c38ba13 !m lopl will no longer queue hidden and system files. 2016-04-11 02:57:29 +02:00
Master Kwoth
ccb2d2a187 Merge pull request #207 from taweko/master
Update PokemonTypes.json
2016-04-11 00:00:14 +02:00
taweko
4918fa8a14 Update PokemonTypes.json 2016-04-10 14:55:25 -07:00
taweko
9a2ddf24f4 Update PokemonTypes.json
Updated Pokemon types to reflect Bulbapedia's Gen VI type effectiveness chart. (Fixed errors due to missing commas)
2016-04-10 13:57:16 -07:00
taweko
f483839478 Merge pull request #1 from Kwoth/master
Update
2016-04-10 13:47:33 -07:00
Master Kwoth
2a04ac7c9f Merge pull request #206 from gwigz/master
"!m pl" adjusted to ignore command if missing parameter
2016-04-10 22:15:03 +02:00
gwigz
d47aa7e380 "!m pl" adjusted to ignore command if missing parameter 2016-04-10 17:50:34 +01:00
Master Kwoth
b997b740d9 update commandlist.md, uncommented music, woopsy 2016-04-10 02:55:14 +02:00
Master Kwoth
59a373a14f Private message reply is now configurable in Config.json, closes #201, other small changes 2016-04-10 02:38:46 +02:00
Master Kwoth
cf5e89d6a2 >heal and >plant are now correctly using currency name/sign. closes #202 2016-04-10 02:20:35 +02:00
Master Kwoth
d8e0883b33 magicitem 2016-04-10 00:40:26 +02:00
Master Kwoth
a5f3f53f8f target 4.5.2 2016-04-09 19:45:07 +02:00
Master Kwoth
0e510b4aa7 Trivia nohint added (>t nohint) closes #194 2016-04-09 16:55:22 +02:00
Master Kwoth
873037a238 !m save and !m load work properly now, Music is much less spammy 2016-04-09 15:21:19 +02:00
Master Kwoth
c7ffb98391 Updated discord.net to fix ALL the bugs 2016-04-09 14:15:34 +02:00
Master Kwoth
e4114b4f97 Added option to login with a token. 2016-04-09 14:15:02 +02:00
Master Kwoth
62797a88f1 Remove greet messages after 5 minutes 2016-04-09 04:39:48 +02:00
Master Kwoth
2c5bee9a3f Someone else did it! 2016-04-09 02:01:13 +02:00
Master Kwoth
84efa58780 Finished load/save 2016-04-07 13:11:29 +02:00
Master Kwoth
4f898dc653 Loading almost done 2016-04-07 12:30:58 +02:00
Master Kwoth
4e2820080b playlist saving done 2016-04-07 11:39:16 +02:00
Master Kwoth
df32d2cf13 small fix+ codestyle change 2016-04-06 21:19:29 +02:00
Master Kwoth
5471012504 Merge pull request #193 from GoBJIuH/fixpr
Fixed gelbooru, added safebooru and rule34xxx
2016-04-06 21:12:33 +02:00
GoBJIuH
7b2417c71b Fixed gelbooru, added safebooru and rule34xxx 2016-04-06 15:54:27 +03:00
Master Kwoth
217a4caa81 new discord.net version 2016-04-06 13:35:14 +02:00
Master Kwoth
9140222987 newer newtonsoft 2016-04-05 12:29:19 +02:00
Christopher F
99f3d74fd3 started work on !m pls 2016-04-05 11:54:22 +02:00
Master Kwoth
9c4da557c7 Remind crash prevention on too long reminders. 2016-04-05 00:25:48 +02:00
Master Kwoth
f85e94482d metric/imperial order. thx jimmyfarscape 2016-04-04 09:36:34 +02:00
Master Kwoth
ac93aa1dba Merge pull request #178 from appelemac/magic-items
Externalized pokemon data
2016-04-03 21:26:04 +02:00
appelemac
7f7215f6ec Moved PokemonTypes to json 2016-04-03 12:52:59 +02:00
appelemac
ca17101586 moved PokemonMoves to their own json 2016-04-02 23:17:42 +02:00
appelemac
4a758b412f Removed hardcoded pokemoves 2016-04-02 22:18:44 +02:00
appelemac
d82cd19b7b Merge remote-tracking branch 'refs/remotes/Kwoth/master' 2016-04-02 22:14:16 +02:00
appelemac
2141431732 Merge remote-tracking branch 'refs/remotes/Kwoth/master' 2016-04-02 19:44:45 +02:00
Master Kwoth
472ab614a2 commandlist fixy 2016-04-02 16:06:48 +02:00
Master Kwoth
8af8e6b612 commandlist all the things 2016-04-02 16:03:43 +02:00
Master Kwoth
b5fab7328b remind description added 2016-04-02 15:38:18 +02:00
Master Kwoth
c751cacf5c updated readme 2016-04-02 11:21:37 +02:00
Master Kwoth
2da15b1f7b Merge pull request #176 from tg44/converter
Converter feature, closes #158
2016-04-02 10:34:28 +02:00
Gergő Törcsvári
22ca4f305e feature (converter): implemented 2016-04-02 03:36:52 +02:00
Master Kwoth
d657c8a071 hacky quick preview works, commented out command init 2016-04-02 00:57:02 +02:00