Commit graph

1721 commits

Author SHA1 Message Date
Luke Rogers
2b5f5e925d v 2013-11-29 01:14:58 +13:00
Luke Rogers
f95b607914 cbf 2013-11-29 01:06:12 +13:00
Luke Rogers
181b43df71 gold k 2013-11-29 01:03:34 +13:00
Luke Rogers
1ecdd3a246 magic? 2013-11-29 00:36:54 +13:00
Luke Rogers
13c7e5915b rouunndddinng 2013-11-29 00:04:28 +13:00
Luke Rogers
b157b4b7af Merge branch 'develop' into refresh 2013-11-28 23:55:43 +13:00
Luke Rogers
9c94cb01f9 Merge pull request #185 from thenoodle68/patch-4
Add litecoin command reading from BTC-E
2013-11-28 02:53:01 -08:00
thenoodle68
2e66e03c7d Add litecoin command reading from BTC-E 2013-11-28 18:48:11 +08:00
Luke Rogers
d614d186c1 Update config.default 2013-11-28 16:58:08 +13:00
Luke Rogers
e549b0360f Update config.default 2013-11-28 16:54:01 +13:00
Dabo Ross
a5a5fd2dfb Update minecraft_ping to 1.7, add commands mcping6 and mcping7 for version-specific pings, having mcping try 7 and revert back to 6 is failed. 2013-11-27 03:49:06 -08:00
Andy Eff
cbe4e3177e uhh 2013-11-27 17:54:09 +13:00
Luke Rogers
6549344215 fsdfdsfsdf 2013-11-27 17:02:55 +13:00
Luke Rogers
8cea099fef tweaks 2013-11-27 17:00:21 +13:00
Luke Rogers
aa8ab33ccb Merge branch 'develop' into refresh
Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
2013-11-27 16:55:04 +13:00
Luke Rogers
f51bcf4ecf Merge pull request #183 from bbeng89/develop
Bug fixes in reddit and github plugins
2013-11-26 19:51:05 -08:00
Luke Rogers
439ef0ba1c Merge pull request #180 from daboross/patch-2
Format all plugins to pep8 guidelines
2013-11-26 19:50:51 -08:00
Blake Bengtson
b2c9f46d78 Fixed bug with ghissues truncate function. (newlines were causing problems) 2013-11-26 16:32:54 -06:00
Blake Bengtson
186f272062 Fixed bug with github plugin (string formatting was throwing exceptions) 2013-11-26 16:23:59 -06:00
Blake Bengtson
df6ee28462 Fixed bug with reddit plugin. 2013-11-26 16:07:53 -06:00
Dabo Ross
99fe34a0b1 Format everything to pep8 guidelines 2013-11-12 18:49:29 +01:00
Luke Rogers
ad62237047 Merge branch 'develop' into refresh 2013-11-11 10:01:52 +13:00
Luke Rogers
cd4b65de3d Moved calculation to the wolframalpha plugin (the old google calculator plugin no longer works correctly, sorry!(=) 2013-11-11 10:01:45 +13:00
Luke Rogers
6e53e8b9bd Merge branch 'develop' into refresh 2013-11-11 09:59:24 +13:00
Luke Rogers
b6d1620cec Merge pull request #172 from blha303/patch-15
soundc.py - Wow, how did that happen?
2013-11-10 12:53:55 -08:00
Luke Rogers
0a19fd9347 Merge pull request #177 from RobertClarke/patch-1
More flirts
2013-11-10 12:53:32 -08:00
Luke Rogers
3d739483de switch to integrated YQL code 2013-11-11 09:47:46 +13:00
Luke Rogers
a41eb47551 Merge branch 'develop' into refresh 2013-11-11 09:14:17 +13:00
Luke Rogers
12e2a445d7 fixed stock from skybot! 2013-11-11 09:13:15 +13:00
Luke Rogers
355f5ce2e6 stuff 2013-11-10 18:28:22 +13:00
RobertClarke
d58a8b5c65 More flirts 2013-11-09 19:29:00 -08:00
Luke Rogers
bae3c819ca fixed singlethread 2013-11-10 13:36:02 +13:00
Luke Rogers
f49c1b873c prototype 2013-11-10 13:23:29 +13:00
Luke Rogers
5e7d1e9c92 Merge pull request #175 from thenoodle68/patch-2
Remove steam api key
2013-11-08 23:48:27 -08:00
thenoodle68
21eb5760fd Remove steam api key 2013-11-09 15:44:02 +08:00
Luke Rogers
926b8c3f05 stuff! 2013-11-09 20:31:16 +13:00
Steven Smith
b6ce9b7e50 Wow, how did that happen? 2013-11-03 05:08:09 +08:00
Luke Rogers
fbb6204f83 this bad 2013-10-30 08:49:43 +13:00
Luke Rogers
ee057bc45a Added third default permissions group: trusted 2013-10-15 15:02:37 +13:00
Luke Rogers
c0991ffc05 disabled_plugins now disables plugins! 2013-10-15 14:59:45 +13:00
Luke Rogers
436e1bddde Update README.md 2013-10-15 14:32:52 +13:00
Luke Rogers
fb68cd1628 Update README.md 2013-10-15 14:28:48 +13:00
Luke Rogers
d330df5711 lots of nonworking code 2013-10-13 17:32:08 +13:00
Luke Rogers
ed2eefb9cd log plugin compile errors 2013-10-11 11:21:18 +13:00
Luke Rogers
b6c20d7dca more comments if you wanted them 2013-10-09 20:13:08 +13:00
Luke Rogers
74b6c1f9a7 what am I doing 2013-10-09 18:37:24 +13:00
Luke Rogers
bdcd4c9ae5 Merge branch 'develop' into refresh 2013-10-09 10:49:35 +13:00
Luke Rogers
5258e13de2 Fixes! 2013-10-09 10:49:16 +13:00
Luke Rogers
19cd24f07f renamed a few things 2013-10-08 11:44:14 +13:00
Luke Rogers
cda19bc1e3 Merge branch 'develop' into refresh 2013-10-08 11:33:36 +13:00