Commit graph

1701 commits

Author SHA1 Message Date
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
Dabo Ross
c5765cc5f6 Add support for multiple channels to .join and .leave 2014-01-13 23:58:46 -08:00
Luke Rogers
75908c6ab6 Merge pull request #194 from nathanblaney/patch-4
Updated Mark :)
2014-01-13 04:20:38 -08:00
Nathan Blaney
0ae8d3d5f9 Much better 2014-01-13 20:11:01 +11:00
Luke Rogers
6f6779dcc5 Merge branch 'develop' of https://github.com/ClouDev/CloudBot into develop 2014-01-13 20:58:02 +13:00
thenoodle68
62a92b104b whoops 2014-01-13 20:57:33 +13:00
thenoodle68
a8bf157ced Mark Harmon
GLORY TO MARK HARMON
2014-01-13 20:57:26 +13:00
thenoodle68
bb6518bafb whoops 2014-01-13 20:57:08 +13:00
thenoodle68
17b51ef2fc Mark Harmon
GLORY TO MARK HARMON
2014-01-13 20:57:01 +13:00
Matt Anthony
d17234828c Update itemids.txt to Snapshot 14w02c
Remove ALL items and re-add EVERYTHING up to Snapshot 14w02c.
2014-01-12 17:36:59 -05:00
Luke Rogers
d10dcbac68 Merge pull request #191 from CHCMATT/patch-3
Update recipes.txt
2014-01-05 12:38:31 -08:00
Nathan Blaney
1febd1362d Added pycrypto requirement 2014-01-04 15:19:49 +11:00
Matt Anthony
1f403bcd7a Update recipes.txt
Add all 1.6 and 1.7 blocks.
2014-01-01 17:53:37 -05:00
Luke Rogers
6035f1b1fc test 2013-12-12 19:00:14 +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