Commit Graph

216 Commits

Author SHA1 Message Date
jw b4447dd547
Merge pull request #30 from scoobybejesus/master
hotline gif and deathtobitcoin2
2017-12-06 08:22:18 -08:00
shillogatu bf57fb7762 Merge remote-tracking branch 'jwinterm/master' into shill 2017-11-28 16:28:26 -06:00
jw a13de55a73
Merge pull request #29 from unknownids/patch-4
Update trifling.py
2017-11-25 13:44:23 -08:00
root 889c17823f Update before pull 2017-11-25 21:43:51 +00:00
scoobybejesus 7a1116f9a0
hotline gif and deathtobitcoin2
"Devs pay me plus interest!!"
2017-11-24 22:42:26 -05:00
unknownids 22ca9bebef
Update trifling.py
add luigism
2017-11-24 15:11:59 -07:00
anonimal 3dfbf7f379
price: s/bcc/bch/g 2017-11-17 22:11:48 +00:00
jw bc75268a76
Merge pull request #27 from anonimal/trifling
trifling: add encryption wisdom
2017-11-08 06:38:42 -08:00
root d4014a998b Fix praw stuff 2017-11-08 14:38:11 +00:00
anonimal f2e454a8dd
trifling: add encryption wisdom 2017-11-08 04:36:08 +00:00
jw 0d0c4533bd
Merge pull request #26 from anonimal/orff
trifling: add line from the Carmina Burana codex
2017-11-03 08:16:48 -07:00
root 8196e6fe2f pubg 2017-11-03 15:16:18 +00:00
anonimal b5102e8dfb
trifling: add line from the Carmina Burana codex 2017-11-02 23:13:00 +00:00
root cec92c7ed9 Update donate and add b2x 2017-10-19 02:25:13 +00:00
root 97f0dcdcce jimbell 2017-10-11 13:44:53 +00:00
root 9da1730227 jimbell 2017-10-11 13:43:01 +00:00
root a5e767266d Fix tall 2017-10-07 13:42:27 +00:00
root ed722077fa add bithumb 2017-10-05 13:46:29 +00:00
root c39648a711 Fix network command 2017-10-03 00:58:43 +00:00
root aad5389552 Fix wat 2017-09-23 22:01:56 +00:00
root 2ab5160fc1 indian rupees 2017-09-23 03:23:26 +00:00
root d002dc90f4 joshua1234 to john_alan 2017-09-23 00:11:43 +00:00
jw f9274d9fcd Merge pull request #25 from shillogatu/shill
Shill
2017-09-17 13:46:46 -07:00
root 3ac03b52b9 Update before merge 2017-09-17 20:46:31 +00:00
shillogatu c2b939f863 whoops 2017-09-17 10:36:31 -06:00
shillogatu d7c7d66f97 No negative fork time
remove negative fork time
2017-09-17 10:33:34 -06:00
root 718bcf8500 Update before pull 2017-09-14 02:43:48 +00:00
root f70cd2c222 Merge branch 'master' of https://github.com/jwinterm/monerobux 2017-09-10 06:18:15 +00:00
root 180840c69e update before merge 2017-09-10 06:16:57 +00:00
jw 3154c47dd3 Merge pull request #23 from unknownids/patch-1
Update trifling.py
2017-09-09 23:16:25 -07:00
unknownids c08acdf09e Update trifling.py 2017-09-09 23:13:43 -07:00
root bca1fdbc2d Fix bithumb and fork date 2017-09-08 02:46:53 +00:00
jw 5e1a7c854e Merge pull request #22 from scoobybejesus/patch-3
Bithumb in xmrtall?
2017-09-07 19:28:55 -07:00
scoobybejesus 38d4d7a389 Bithumb in xmrtall?
Thumb doesn't denominate XMR in BTC.  This is converted from XMRKRW using Thumb's BTCKRW rate.
2017-09-07 16:40:29 -04:00
root 79e10e5955 Fix xmrtall 2017-09-06 03:40:37 +00:00
jw 47e0cd99cd Merge pull request #21 from scoobybejesus/patch-2
xmrtall
2017-09-05 20:15:02 -07:00
scoobybejesus 3279fb606c xmrtall
Consider changing formats/calc's for krak and bfx to reflect volume in BTC.
2017-09-05 20:47:31 -04:00
root 06305dd081 yoda 2017-09-01 01:10:57 +00:00
root e7f7c85432 Add lambo 2017-08-16 03:16:11 +00:00
root d2fc6d7198 Fix new krak trigger option decimaling 2017-08-09 00:09:21 +00:00
root c2c8ed4f67 Fix new krak trigger option 2017-08-09 00:06:59 +00:00
jw 148d486b2c Merge pull request #20 from scoobybejesus/patch-1
Add krak trigger.
2017-08-08 16:56:21 -07:00
scoobybejesus e599e57c6c Added krak trigger
Quick error fix to:
Added `if not trigger.group` line, and indented all below by 4 spaces.
C&P'ed polo "else" section into krak, and modified as necessary.
Commented out polo section unused.
Added kraktrig string, to append coin ticker.
Please check my kraktrig comments.
Also, I'm not sure if the stringtosay .format will work the way I did it.  Even if concatenating strings works, I think the volume might be in the coin, rather than BTC (XBT); and I don't know json one bit, so I don't know what to change.
2017-08-05 00:10:57 -04:00
scoobybejesus 9556ad6d66 Update price.py
Quick error fix
2017-08-05 00:08:55 -04:00
scoobybejesus c485cc0a56 Add krak trigger.
Added `if not trigger.group` line, and indented all below by 4 spaces.
C&P'ed polo "else" section into krak, and modified as necessary.
Commented out polo section unused.
Added kraktrig string, to append coin ticker.
Please check my kraktrig comments.
Also, I'm not sure if the stringtosay .format will work the way I did it.  Even if concatenating strings works, I think the volume might be in the coin, rather than BTC (XBT); and I don't know json one bit, so I don't know what to change.
2017-08-04 23:01:07 -04:00
root 0d829bd63e Bitcoin trash 2017-07-28 04:01:49 +00:00
jw 4829c51bb3 Merge pull request #19 from ferretinjapan/master
.trebucet command and fixed .whaleornot
2017-07-27 20:40:14 -07:00
ferretinjapan d0643a8b97 .trebuchet command and whaleornot number as a float 2017-07-24 15:34:38 +00:00
root a0c4318bdc Add sid command 2017-07-24 05:17:41 +00:00
root b9935305a0 Add hero 2017-07-15 00:57:04 +00:00