Commit graph

1646 commits

Author SHA1 Message Date
Luke Rogers
e84b181f80 Merge branch 'develop' into refresh 2014-02-14 19:18:18 +13:00
Luke Rogers
27b62feb5f tweakages 2014-02-14 19:13:30 +13:00
Luke Rogers
29258fdcac Merge pull request #205 from blha303/patch-17
xkcd.py - xkcd search and autoresponse
2014-02-14 18:46:27 +13:00
Steven Smith
86a0333afd xkcd.py - xkcd search and autoresponse 2014-02-14 13:44:12 +08:00
Luke Rogers
014c4bdc4b Merge branch 'develop' into refresh
Conflicts:
	plugins/factoids.py
	plugins/geoip.py
2014-02-14 17:05:52 +13:00
Luke Rogers
526d1de989 asdf 2014-02-14 17:03:49 +13:00
Luke Rogers
d6683b32f4 PEP-8 2014-02-14 17:03:08 +13:00
Luke Rogers
004ceb79fc Spelling, docstrings 2014-02-14 16:49:41 +13:00
Luke Rogers
5d0e28bf91 oops 2014-02-14 16:42:17 +13:00
Luke Rogers
bf9468a4aa Merge branch 'develop' into refresh
Conflicts:
	disabled_stuff/mygengo_translate.py
	plugins/attacks.py
	plugins/core_sieve.py
	plugins/fortune.py
	plugins/geoip.py
	plugins/mark.py
2014-02-14 16:41:51 +13:00
Luke Rogers
a76ff29d4b Tidy Imports 2014-02-14 16:36:57 +13:00
Luke Rogers
4447e6cd1f more little things 2014-02-14 16:30:38 +13:00
Luke Rogers
b4d7e200a3 Tweaks, improved reddit 2014-02-14 16:21:00 +13:00
Luke Rogers
7265413a21 Merge pull request #204 from daboross/patch-2
Add per-channel regex filtering
2014-02-14 13:08:18 +13:00
Dabo Ross
6086a7c6da Add per-channel regex filtering. 2014-02-13 10:24:29 -08:00
Luke Rogers
6169be6da1 no message 2014-02-14 01:04:50 +13:00
Luke Rogers
ee0ad67a16 tidying! 2014-02-14 00:47:01 +13:00
Luke Rogers
ada153c8bc Delete disabled_plugins 2014-02-13 23:21:07 +13:00
Luke Rogers
3a13621ae4 Delete puush.py 2014-02-13 22:18:00 +13:00
Dabo Ross
289561e76a Resolve 'time' name conflicts 2014-02-13 20:55:06 +13:00
Luke Rogers
c21b358f9b messing with dice 2014-02-13 20:51:11 +13:00
Luke Rogers
136acd126d Reduce line length 2014-02-13 20:47:47 +13:00
Luke Rogers
a7e931541f Fixed mcping on windows :) 2014-02-13 20:07:01 +13:00
Luke Rogers
223bef30a5 pepepepep8 2014-02-13 15:09:22 +13:00
Luke Rogers
cd5ae1d32b further pepping, spelling and other such things 2014-02-13 15:02:44 +13:00
Luke Rogers
6cc7554cd8 A dash of PEP-8 2014-02-13 14:34:50 +13:00
Luke Rogers
398b34fad5 Disabled mark.py @md-5 2014-02-13 12:34:03 +13:00
Luke Rogers
b35c977c35 Merge branch 'develop' into refresh 2014-02-13 12:06:11 +13:00
Luke Rogers
10ef353782 Get game description from meta tags - no pesky HTML to strip 2014-02-13 12:00:33 +13:00
Luke Rogers
1c9216ac1d commented! 2014-02-13 11:57:10 +13:00
Luke Rogers
a9d0d006ab magic, or something 2014-02-13 11:48:33 +13:00
Luke Rogers
c2884242b3 Catch much errors 2014-02-13 10:54:20 +13:00
Luke Rogers
294a97b629 fixed minecraftwiki, thanks josephrooks! 2014-02-13 10:41:01 +13:00
Luke Rogers
2fde060dc4 Update URL 2014-02-13 10:10:34 +13:00
Luke Rogers
df1023da55 fix mcwiki 2014-02-13 09:36:28 +13:00
Dabo Ross
954ff2ad00 Add command not found message when using .help one a non-command 2014-02-12 14:22:27 +13:00
Luke Rogers
ddf39e4b42 stuff 2014-02-11 17:19:17 +13:00
Luke Rogers
d524d8fa6b Merge branch 'develop' into refresh
Conflicts:
	plugins/mark.py
2014-02-11 17:05:52 +13:00
Luke Rogers
afdf5ccfe9 Revamped and re-added scene search command from Skybot 2014-02-11 17:04:21 +13:00
Luke Rogers
fa66cf3c87 simplified code 2014-02-11 17:02:52 +13:00
Luke Rogers
90bb260f5f Merge pull request #199 from Mu5tank05/patch-2
Mark now works with out an input
2014-01-25 02:00:23 -08:00
Nathan Blaney
af8b07d20b Mark now works with out an input 2014-01-25 16:28:16 +11:00
Luke Rogers
728ab6f60b Update slaps.json 2014-01-23 14:00:19 +13:00
Luke Rogers
d3aa2d3edd Merge pull request #192 from nathanblaney/patch-3
Added pycrypto requirement
2014-01-15 12:42:15 -08:00
Luke Rogers
4f5a8e3ed5 Merge pull request #193 from CHCMATT/patch-1
Update itemids.txt to Snapshot 14w02c
2014-01-15 12:41:38 -08:00
Luke Rogers
d7195dce0e Merge pull request #197 from daboross/patch-3
Fix the correction plugin
2014-01-15 12:41:30 -08:00
Luke Rogers
efef951501 Merge pull request #195 from daboross/patch-2
Add support for multiple channels to .join and .leave
2014-01-15 12:41:19 -08:00
Luke Rogers
ae1c9d0788 Merge pull request #198 from daboross/patch-4
Fix twitch plugin - Don't assume that data has any elements
2014-01-15 12:41:09 -08:00
Dabo Ross
8b6647f521 Don't assume that data has any elements 2014-01-14 00:19:50 -08:00
Dabo Ross
aecf61746f Fix correction to actually work, and change format 2014-01-14 00:15:27 -08:00