Commit graph

1584 commits

Author SHA1 Message Date
thenoodle68
17b51ef2fc Mark Harmon
GLORY TO MARK HARMON
2014-01-13 20:57:01 +13:00
Luke Rogers
7d87e5470f Don't need that anymore! 2013-12-12 15:17:06 +13:00
Luke Rogers
1a6f76bd03 Merge branch 'develop' into refresh 2013-12-12 15:14:45 +13:00
Luke Rogers
e29ea1c613 moved to new util structure from refresh 2013-12-12 15:13:32 +13:00
Luke Rogers
6cf3fcda84 Merge branch 'develop' into refresh 2013-12-12 15:08:51 +13:00
Luke Rogers
b25b8d6cec I'm an idiot 2013-12-12 15:06:29 +13:00
Luke Rogers
df894932d2 Merge branch 'develop' into refresh
Conflicts:
	plugins/util/timeformat.py
2013-12-12 12:41:02 +13:00
Luke Rogers
cda99f1852 tweaks 2013-12-11 17:31:57 +13:00
Luke Rogers
e94c607b3e documentation! 2013-12-11 17:27:42 +13:00
Luke Rogers
6decd65a19 split format_time out to a util module! 2013-12-11 17:17:56 +13:00
Luke Rogers
0384fd16ab Merge branch 'develop' into refresh 2013-12-11 17:14:38 +13:00
Luke Rogers
b65e6e5a75 Don't show URL if it just parsed a URL 2013-12-11 17:11:34 +13:00
Luke Rogers
fdbcb967bb totally removed karma 2013-12-04 14:12:50 +13:00
Luke Rogers
8b8623eb9e I fix, you tube? 2013-12-03 22:54:38 +13:00
Luke Rogers
57e53e8eb7 *dance* 2013-12-02 23:16:34 +13:00
Luke Rogers
be3df6718f ianalmore 2013-12-02 23:10:08 +13:00
Luke Rogers
1e22ca4995 ianal 2013-12-02 23:06:26 +13:00
Luke Rogers
4236b7bc29 and this 2013-12-02 23:04:36 +13:00
Luke Rogers
97e7741434 modular! 2013-12-02 23:03:29 +13:00
Luke Rogers
3df53f95a8 re-added .randomplugin @blha303 2013-12-02 22:55:58 +13:00
Luke Rogers
8c62f418c9 ffs 2013-12-01 23:14:09 +13:00
Luke Rogers
f038ba215f Merge branch 'develop' into refresh
Conflicts:
	plugins/core_sieve.py
2013-12-01 22:55:22 +13:00
Luke Rogers
91c827a03b unfinished 2013-12-01 22:53:40 +13:00
Luke Rogers
4c5087773d refresh works vaugely better 2013-12-01 22:52:33 +13:00
Luke Rogers
fb84e17e34 Merge pull request #188 from daboross/patch-5
Simplify permissions checking and only print value if user is in group
2013-11-30 23:50:47 -08:00
Luke Rogers
bdce09435a Merge branch 'develop' into refresh 2013-12-01 20:44:24 +13:00
Luke Rogers
3e073c8278 a bunch of things 2013-12-01 20:44:04 +13:00
Luke Rogers
8317ba0920 only ping once 2013-12-01 20:10:53 +13:00
Luke Rogers
bb73e70112 split commands properly 2013-12-01 19:37:12 +13:00
Luke Rogers
017fd4fc2e simple :D 2013-12-01 19:28:24 +13:00
Luke Rogers
b3a8703d15 redesigned bukkit plugin search (still needs work and readding random plugin) 2013-12-01 19:11:39 +13:00
Luke Rogers
a37fc245d0 added variable accuracy to the time_format function (really should move this, huh) 2013-12-01 18:38:08 +13:00
Dabo Ross
2eb6112f2f Improve permissions checking 2013-11-30 10:44:52 -08:00
Luke Rogers
a59becca73 . 2013-12-01 00:56:07 +13:00
Luke Rogers
77459a0879 plurals! 2013-12-01 00:49:09 +13:00
Luke Rogers
b489b9d3c7 Merge remote-tracking branch 'noodle/patch-5' into develop
Conflicts:
	plugins/youtube.py - fixed
2013-12-01 00:42:56 +13:00
Luke Rogers
8b18c33ce5 stuff 2013-12-01 00:39:40 +13:00
thenoodle68
cdf8922f4d Added decades and centuries
Will need slightly different logic for different naming conventions.
2013-11-30 19:33:12 +08:00
Luke Rogers
f55c8f8d4e improved the time format function some more 2013-11-30 23:18:45 +13:00
Luke Rogers
78912b908f this mostly works (should we make those time functions another module?) 2013-11-30 21:16:44 +13:00
Luke Rogers
fb08870f4a bunch'o'stuff 2013-11-30 19:19:04 +13:00
Luke Rogers
2fa3a5a015 er 2013-11-30 17:40:09 +13:00
Luke Rogers
06a5cadd2f Merge branch 'develop' into refresh 2013-11-30 16:59:03 +13:00
Luke Rogers
6ff926246b bing bong 2013-11-30 16:58:32 +13:00
Luke Rogers
6b4f3ac546 Merge pull request #186 from daboross/patch-4
Remove executable permissions
2013-11-29 19:48:45 -08:00
Dabo Ross
323d045868 Remove executable permissions 2013-11-29 19:47:40 -08:00
Luke Rogers
a78a86602d Merge branch 'develop' into refresh 2013-11-30 16:47:18 +13:00
Luke Rogers
4ccfd1e3ca Newegg URL parser? :D 2013-11-30 16:37:01 +13:00
Luke Rogers
834cbaabd8 *puffs* 2013-11-30 00:21:26 +13:00
Luke Rogers
d3fbf1bc80 bitbitbit 2013-11-30 00:05:55 +13:00