Commit Graph

2564 Commits

Author SHA1 Message Date
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
Master Kwoth
82cfd7cacf added istyping to translate command 2016-03-27 05:02:51 +02:00
Master Kwoth
e2ecc6e608 imdb stuff fixed and improved 2016-03-27 05:01:22 +02:00
Master Kwoth
26b9ec0fcf Merge pull request #155 from tg44/translate-module
Translator added. Thanks tg44. `~trans en>fr Hello`
2016-03-27 03:02:41 +02:00
Master Kwoth
cb36ed537f Merge pull request #151 from tg44/imdb-search
IMDB search added
2016-03-27 01:55:04 +01:00
HACKERS\Wayne
e4517fa0db Added Beam 2016-03-26 23:35:05 +00:00
Gergő Törcsvári
874aa18f9f feature (translator): added the translator functionality 2016-03-26 21:58:23 +01:00
appelemac
88ed05127b Settype bugfixing 2016-03-26 21:03:44 +01:00
appelemac
84e20cbd83 response to settype & lists all moves after resetting to defaultmoves 2016-03-26 20:51:33 +01:00
appelemac
9d4d608a3d Fixed addmove
stupid innocent bug, you were
2016-03-26 20:36:34 +01:00
appelemac
1cd7a0cdeb Fix defaultmoves 2016-03-26 20:23:05 +01:00
appelemac
6a0f7a46cf Fixed DB bug 2016-03-26 19:47:14 +01:00
Gergő Törcsvári
a49b1066d3 fix (imdb): better toString 2016-03-26 17:47:35 +01:00
appelemac
7812d66e4a Added pokedefaultmoves to set defaultmoves 2016-03-26 16:52:33 +01:00
appelemac
f7807d0b9a Removed remnants in games.cs 2016-03-26 15:23:27 +01:00
appelemac
8b3355f8c7 Pokemon game O.O 2016-03-26 15:18:26 +01:00
appelemac
2e9aa4106f TEST~~~~TEST
testing if this'll work =.=
2016-03-26 14:59:37 +01:00
Master Kwoth
6ca49dca49 $give added 2016-03-26 03:25:03 +01:00
Master Kwoth
2bf5cca125 critical error 2016-03-26 02:37:56 +01:00
Master Kwoth
340bc03342 googie is evil, no need to credit him 2016-03-26 02:37:56 +01:00
Gergő Törcsvári
df05e84754 fix (imdb): error handling added 2016-03-25 18:03:25 +01:00
Gergő Törcsvári
c38cdd8605 feature (imdb): IMDB search added 2016-03-25 17:19:15 +01:00
Master Kwoth
063f794a27 Merge pull request #150 from tg44/refactor
Cleaner code (gambling)
2016-03-25 13:57:10 +01:00
Gergő Törcsvári
5f7cdae83b fix (csproj): commited modifications 2016-03-25 13:44:58 +01:00
Gergő Törcsvári
93b9a54c0f typo fix 2016-03-25 13:04:22 +01:00
Gergő Törcsvári
6678b17a0f typo fix 2016-03-25 13:01:44 +01:00
Gergő Törcsvári
05c72ff08a refactor (gambling module): some codecleanup and reorganization 2016-03-25 12:48:22 +01:00
Master Kwoth
077f36a86d Merge pull request #148 from appelemac/patch-2
Add comeatmebro and moveto
2016-03-25 10:16:59 +01:00
appelemac
ff039b8ee4 Add comeatmebro etc 2016-03-25 09:54:31 +01:00
Master Kwoth
aa589dbc05 Update README.md 2016-03-23 04:18:22 +01:00
Master Kwoth
35a3cacc58 logs now show user was banned. ref #114 2016-03-23 04:11:02 +01:00
Master Kwoth
bc301c1c49 Merge pull request #135 from Delicious-Flatbread/master
HelpCommand, LogCommand updated descriptions
2016-03-23 02:21:56 +01:00
Master Kwoth
eaddf003ef added channel unblacklist, server not coming, closes #113 2016-03-23 00:38:17 +01:00
Master Kwoth
9beaa92bb9 Merge pull request #134 from Delicious-Flatbread/patch-2
Update Music.cs
2016-03-23 00:39:06 +01:00
Delicious-Flatbread
c7b16c624c Update LogCommand.cs 2016-03-22 19:35:26 -04:00