Commit Graph

648 Commits

Author SHA1 Message Date
Master Kwoth
488b897690 Merge pull request #171 from LawlyPopz/master
Added fairy, fixed poketype generator, changed psychic icon, closes #169
2016-04-01 17:39:19 +02:00
HACKERS\Wayne
d7d2a999fe Fix
Fixed IntToPoketype
2016-04-01 16:36:40 +01:00
HACKERS\Wayne
1c66c369a7 Fixed pokemon
i have fixed the stats between the pokemon types and added the fairy
type to the types!
2016-04-01 16:26:13 +01:00
Master Kwoth
28368ec205 Fixed negative remainder closes #170 fixed steeltype numType, ref #169 2016-04-01 16:20:58 +02:00
Master Kwoth
22ac84f28a timeout increased, unignored currency_images in gitignore 2016-04-01 08:17:06 +02:00
Master Kwoth
24d98406a0 fixed currency name in pokemon module, closes #168 2016-04-01 07:19:08 +02:00
Master Kwoth
430c642adc forgot to add currency_images 2016-03-31 19:44:41 +02:00
Master Kwoth
79fc73b865 bomberman game started 2016-03-31 17:48:26 +02:00
Master Kwoth
589b5bcd93 back to 4.5.2 2016-03-31 17:48:14 +02:00
Master Kwoth
37ffceb8ff client get set 2016-03-31 07:50:34 +02:00
Master Kwoth
c93f020538 Aurelion sol image added 2016-03-31 06:33:15 +02:00
Master Kwoth
80cc129aac Only users with managechannels can use .topic now (permission oversight) 2016-03-30 19:21:32 +02:00
Master Kwoth
778cc3b6b5 added >plant and >pick commands, closes #163 , changed .net target to 4.6 2016-03-30 18:54:57 +02:00
Master Kwoth
2a71b43268 updated commandlist 2016-03-30 13:08:37 +02:00
Master Kwoth
1ff54fee2e $take and $award bot owner commands added. ref #163 2016-03-30 12:46:02 +02:00
Master Kwoth
f80b20d6d6 closes #162 Caching stream status for a single check. Hopefuly fixes some issues. 2016-03-30 12:26:41 +02:00
Master Kwoth
dac81f776b new alias for music, added ~revav (although unsatisfactory), closes #31 2016-03-30 12:08:10 +02:00
Master Kwoth
d1fb241cb6 .remind added. Has here, me and [channel_name] options, closes #51
For now, month is 30 days.
2016-03-30 11:44:26 +02:00
Master Kwoth
522ab4b389 Updated radio command description 2016-03-30 09:24:33 +02:00
Master Kwoth
0d8598c845 reorganized administration 2016-03-29 15:20:18 +02:00
Master Kwoth
a6ae2701f7 for blitz ;p 2016-03-29 14:55:10 +02:00
Master Kwoth
55ac8fe7e5 prettier jokes 2016-03-29 14:41:00 +02:00
Master Kwoth
ca614f6ff7 added ~ym ~cn and ~rj joke commands, thanks to @tg44 , closees #105 2016-03-29 14:27:57 +02:00
Master Kwoth
af0e3c4c98 Added catfact, ref #101 2016-03-29 14:02:45 +02:00
Master Kwoth
6989e978e3 more fixes,improvements and scraps 2016-03-28 17:38:07 +02:00
Master Kwoth
4ff0c0cf34 woopsy, commented out unneeded stuff 2016-03-28 17:05:56 +02:00
Master Kwoth
d5ea8f69c8 > will be commadchar for now 2016-03-28 16:45:10 +02:00
Master Kwoth
a76fd7c7c9 changes to pokemon part 1 2016-03-28 16:44:39 +02:00
Master Kwoth
d83a5474a9 Merge pull request #161 from appelemac/magic-items
Pokemon game redone, thx @appelemac
2016-03-28 16:03:16 +02:00
appelemac
b3bad995fd Cmd list
I'm working on the pokemoves~
2016-03-28 15:59:22 +02:00
appelemac
743bc531ff Merge remote-tracking branch 'refs/remotes/Kwoth/master' 2016-03-28 15:57:31 +02:00
Master Kwoth
7eb05080b0 fixed beam, thanks @LawlyPopz for implementing 99% of it 2016-03-28 15:51:17 +02:00
Master Kwoth
4b21da2e16 Merge pull request #156 from LawlyPopz/master
Added Beam.pro notification support
2016-03-28 15:46:16 +02:00
appelemac
78f8182a31 remove magicitemsv1, add TLModule to NADekoBot 2016-03-28 15:36:15 +02:00
appelemac
76d56e63d3 Revert ">magicitems added"
This reverts commit 41a6b84934.
2016-03-28 15:31:01 +02:00
appelemac
4c9b6185aa Merge remote-tracking branch 'refs/remotes/Kwoth/master'
# Conflicts:
#	NadekoBot/Modules/Games.cs
2016-03-28 15:27:50 +02:00
appelemac
671cc01306 Changed GetMoves to extension method, used PascalCase, 2016-03-28 13:26:14 +02:00
appelemac
ddbe51e33b Revert "Json made better"
This reverts commit 5ab3267ea1.
2016-03-28 12:47:09 +02:00
Master Kwoth
d72c809ae4 Currency name and sign should be external now! 2016-03-28 04:37:05 +02:00
Master Kwoth
6ee896d691 Update README.md 2016-03-28 03:41:44 +02:00
Master Kwoth
5be9da55bc Update README.md 2016-03-28 03:40:52 +02:00
Master Kwoth
c9c572296a commandlist update 2016-03-28 02:58:34 +02:00
appelemac
5ab3267ea1 Json made better 2016-03-27 22:02:21 +02:00
appelemac
7c6e1918e8 Changed defaultmoves
From LawlyPoppz
2016-03-27 18:36:42 +02:00
appelemac
41a6b84934 >magicitems added
It's all working, though I'm not sure why it's also in the
config_example....
2016-03-27 16:42:13 +02:00
appelemac
6eca7745d3 Division
LOTS OF WORK, THIS WAS
2016-03-27 14:55:49 +02:00
appelemac
5496531bf2 Should do it~ 2016-03-27 11:07:52 +02:00
appelemac
7c17cc24cd Merge remote-tracking branch 'refs/remotes/Kwoth/master'
# Conflicts:
#	NadekoBot/NadekoBot.cs
2016-03-27 11:00:29 +02:00
appelemac
53b5803f25 Merge to single file, implemented most suggestions 2016-03-27 10:57:30 +02:00
Master Kwoth
5e154cbcd1 case insensitive language names 2016-03-27 06:07:11 +02:00