Commit graph

392 commits

Author SHA1 Message Date
Luke Rogers dd85311044 renamed gtime.py before working on it 2012-03-07 07:46:28 +13:00
Luke Rogers 6f02860279 Replaced kills = [] with my tweaked version (since neer borked my original commit of this 2012-03-07 07:35:03 +13:00
neersighted f7a0bf0352 Fixed bug in .kill 2012-03-06 10:17:49 -08:00
neersighted 5ffc63a7b4 Mereged kill, lart, and slap.py > violence.py 2012-03-06 10:14:26 -08:00
neersighted 34859743d0 Added PyDev stuff to .gitignore 2012-03-05 23:08:03 -08:00
lukeroge f4435f4557 Made quote.py return quotes from all channels if called with .q <nick> 2012-03-06 18:33:45 +13:00
neersighted db52b15570 My patch broke the bot, removed 2012-03-05 21:21:02 -08:00
lukeroge 7a1dac692a Standardised shit 2012-03-06 18:03:11 +13:00
lukeroge a459d10cfa why did we need that line? :P 2012-03-06 18:00:34 +13:00
neersighted de9fa026df realized I was repeating lines, fixed that 2012-03-05 20:59:05 -08:00
neersighted 0948ceed12 fixed minor naming issue in kill.py 2012-03-05 20:56:03 -08:00
neersighted 59628292c1 Cleaned up flirt, kill, lart, and slap.py 2012-03-05 20:53:45 -08:00
neersighted fb304bf970 fixed readme conflict
Conflicts:
	README.md
2012-03-04 19:14:54 -08:00
neersighted 4ce506c9ff bump'd version, fixed links, updated copyright 2012-03-04 19:13:19 -08:00
lukeroge 9ebc5fa95e re-added rating 2012-03-04 19:11:08 -08:00
lukeroge bf58e1a8a3 Removed penis reference that was never supposed to be pushed to github. ._. 2012-03-05 11:13:48 +13:00
lukeroge 26d8cce1c5 Update README.md 2012-03-04 14:33:38 +13:00
lukeroge 8aaede9ad6 Update README.md 2012-03-04 14:32:58 +13:00
Luke Rogers 104a4d6810 Made url parsing toggleable, added more advenced regex 2012-03-04 14:23:39 +13:00
Luke Rogers 7e3ce7ddba Re-added rating 2012-03-04 13:47:14 +13:00
neersighted be35cc586a Added proper exit codes to the wrapper 2012-03-03 15:13:13 -08:00
neersighted dba741003f added more to kill.py/slap.py 2012-03-03 14:34:21 -08:00
neersighted a82b385622 Fixed typos/added stuff to flirt.py, kill.py,and slap.py 2012-03-03 14:28:42 -08:00
neersighted fd459c951b Merge branch 'develop' of github.com:ClouDev/CloudBot into develop 2012-03-03 14:15:09 -08:00
neersighted bef009c54e Tweaks/additions to lart.py 2012-03-03 14:14:40 -08:00
lukeroge 19022fc808 Update README.md 2012-03-03 17:07:07 +13:00
neersighted 9a66001c8d Merge branches 'feature/bingtrans' and 'develop' into develop 2012-03-02 20:05:23 -08:00
neersighted bd6b620616 Swap lukeroge with ClouDev 2012-03-02 20:04:27 -08:00
neersighted c68fafc43a Change header to BING 2012-03-02 12:14:45 -08:00
neersighted a10370fdcd Quick patch for (more) unicode support 2012-03-02 11:40:51 -08:00
neersighted 95671d5241 Merged mcping.py into mctools.py
* mcping.py => mctools.py
2012-03-02 11:10:51 -08:00
neersighted e2a575aa0a Fixed typos in lart/kill/slap, added some minecraft ones too!
* Added Minecraft-Related LARTs (BECAUSE I CAN!)
* Fixed Typos (BECAUSE WE FAIL)
2012-03-02 09:53:46 -08:00
neersighted dec3690373 Fix minor bug in URL detection 2012-03-02 01:36:47 -08:00
neersighted 819620ddb1 Merge branch 'hotfix/1.1c' into develop 2012-03-01 23:03:48 -08:00
neersighted 5234eac522 Man, this patch just keeps dragin. make urlparse.py not need a / after aurl 2012-03-01 23:02:09 -08:00
neersighted d97db1b45f Merge branch 'hotfix/1.1b' into develop 2012-03-01 22:58:12 -08:00
neersighted 53da740725 Merge branch 'hotfix/1.1b' 2012-03-01 22:57:22 -08:00
neersighted f65451bc95 Why patch a patch? because of version numbers, that's why! 2012-03-01 22:56:50 -08:00
neersighted 351e179f33 Merge branch 'hotfix/1.1a' into develop 2012-03-01 22:54:37 -08:00
neersighted d50b8e79b1 Merge branch 'hotfix/1.1a' 2012-03-01 22:53:45 -08:00
neersighted a85dabef97 fix urlparse to not parse commands/respect paths. update readme with version 2012-03-01 22:52:42 -08:00
neersighted 1c2cf78316 Merge branch 'hotfix/urlregex' 2012-03-01 22:51:36 -08:00
neersighted 0f2206f68f fixed regex in urlparse.py to not parse commands, also made it respece paths 2012-03-01 22:50:47 -08:00
neersighted 9d91617975 roll back version on dev branch 2012-03-01 21:54:40 -08:00
neersighted 87f47a169b Merge branch 'release/1.1' into develop 2012-03-01 21:53:51 -08:00
neersighted fa99d1eef5 Merge branch 'release/1.1' 2012-03-01 21:53:04 -08:00
neersighted 6169e5311d Bump'd verision 2012-03-01 21:52:36 -08:00
Luke Rogers 2f2c732237 fixed a bug in plugins/factoids.py 2012-03-02 16:41:26 +13:00
Luke Rogers be0e547d22 Merge branch 'develop' of github.com:lukeroge/CloudBot into develop 2012-03-02 15:39:07 +13:00
Luke Rogers bc3b61e57f added optional factoid prefix. closes #17 2012-03-02 15:38:32 +13:00