Luke Rogers
87b1d3d7f4
stuff
2014-02-21 14:55:33 +13:00
Luke Rogers
2d90288856
Merge branch 'develop' into refresh
2014-02-16 17:46:20 +13:00
Luke Rogers
92796a218f
Changed something because people can't take a joke
2014-02-16 17:45:55 +13:00
Luke Rogers
45a1f65748
fixed up mcping
2014-02-16 17:26:53 +13:00
Luke Rogers
91b6d1d8f1
more db work!
2014-02-15 19:17:53 +13:00
Luke Rogers
99487b66c6
further DB work
2014-02-15 18:58:12 +13:00
Luke Rogers
2ebb30d2d7
fixed singlethread reloading, and functional database system (still no ORM usage)
2014-02-15 18:50:22 +13:00
Luke Rogers
cdc9102694
Merge branch 'develop' into refresh
...
Conflicts:
plugins/regex_chans.py
2014-02-15 18:34:37 +13:00
Luke Rogers
16ddabfe2a
db stuff
2014-02-15 18:32:51 +13:00
Luke Rogers
160785e92c
pep
2014-02-15 14:19:12 +13:00
Luke Rogers
763d73ea7a
Merge pull request #207 from xxyy/patch-1
...
Fix xkcd comics made in January throwing an error
2014-02-15 12:21:59 +13:00
xxyy
694cbbe81f
Fix xkcd comics made in January throwing an error
...
Previously, any commit written in January would throw an error because the array key for January was falsely '1' instead of the integer 1. This would lead to the moth name not being found and the error occuring.
This PR fixes that problem by changing the key of January to the integer 1.
**How to reproduce:**
Ask your CloudBot to `xkcd Regular Expressions`, an error will be shown in console.
2014-02-15 00:16:03 +01:00
Luke Rogers
e8876c2c48
Merge pull request #202 from blha303/patch-16
...
Created plugin to parse Google urls to normal urls
2014-02-15 11:19:30 +13:00
Luke Rogers
b0c6815085
fixed horoscope
2014-02-15 00:49:48 +13:00
Luke Rogers
f7af1b0726
quote_plus()
2014-02-14 23:44:05 +13:00
Luke Rogers
2c6e01a41d
Fixed up old religion.py plugin, added to disabled_stuff
2014-02-14 19:56:11 +13:00
Luke Rogers
b6558ccdd5
I've been doing this all wrong for a long time
2014-02-14 19:43:36 +13:00
Luke Rogers
3fde4692d1
small tweaks to the refresh code
2014-02-14 19:27:05 +13:00
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
