Commit graph

304 commits

Author SHA1 Message Date
TheEdgeNK
390f96db11 even better 2018-03-11 00:27:18 -05:00
TheEdgeNK
277102eeb5 sexy readme 2018-03-11 00:18:14 -05:00
Trey
15442f7b97
contributing shizz 2018-03-11 00:08:06 -05:00
Unknown
483fefd878 testing again 2018-03-10 23:18:41 -04:00
Unknown
51ad56e62d testing on the main server 2018-03-10 23:17:51 -04:00
Unknown
383fb55047 my luck wasn't good enough 2018-03-10 23:13:19 -04:00
Unknown
e9ed8e2427 testing my luck again 2018-03-10 23:12:40 -04:00
Unknown
cf1cbc5b71 Merge remote-tracking branch 'origin/master' 2018-03-10 22:54:56 -04:00
Unknown
45db638e11 testing my luck 2018-03-10 22:54:50 -04:00
jtsshieh
1d0f8c3ba1
Update README.md 2018-03-10 19:49:44 -05:00
Unknown
4abdbab174 circleci 2018-03-10 19:41:17 -05:00
Unknown
2ae8351ad9 stupind 2018-03-10 16:41:12 -05:00
Unknown
fc1b105082 mores stupid things 2018-03-10 16:38:51 -05:00
Unknown
c76a7c72a2 trying this please work 2018-03-10 16:36:46 -05:00
Unknown
d9eaf7d0c4 try this stupid thing 2018-03-10 16:21:01 -05:00
Unknown
bc85d04d68 testing new feature 2018-03-10 16:04:21 -05:00
Unknown
66395437bd more stuff 2018-03-09 22:43:49 -05:00
Unknown
144128d1df dingus me 2018-03-09 22:42:57 -05:00
Unknown
cd6814547a trying 2018-03-09 22:41:59 -05:00
Unknown
777c9b20d4 dimbo 2018-03-09 22:28:48 -05:00
Unknown
14954ccb8f Merge remote-tracking branch 'origin/master' 2018-03-09 22:24:45 -05:00
Unknown
66f92c9566 FIX DUMBO 2018-03-09 22:24:10 -05:00
pokesudenk
b35aec9d8d TREY IS DIMB BOMBER ! 🤔 2018-03-09 22:23:14 -05:00
pokesudenk
f5af521bac e c o n o m y 2018-03-09 22:19:17 -05:00
Unknown
bc82187e2b grammer that i undid? 2018-03-09 22:10:52 -05:00
Unknown
8ed156358c things 2018-03-09 22:09:54 -05:00
Unknown
002483a6fe reason check 2018-03-09 22:05:45 -05:00
Unknown
ad437cde8f economy functions 2018-03-09 22:03:06 -05:00
Unknown
c707cd7ed0 maybe things 2018-03-09 21:54:28 -05:00
Unknown
9a6661af9c its all the same slots system 2018-03-09 21:53:41 -05:00
Unknown
ef137f3367 things 2018-03-09 21:51:02 -05:00
Unknown
c398bd02d1 forgot this 2018-03-09 21:49:00 -05:00
Unknown
4b7b4e323d WARNINGS 2018-03-09 21:48:28 -05:00
Unknown
bc69001b48 Merge remote-tracking branch 'origin/master' 2018-03-09 21:39:51 -05:00
Unknown
a863ba35ea warning :( 2018-03-09 21:39:48 -05:00
Unknown
1cec125104 Auto stash before merge of "master" and "origin/master" 2018-03-09 21:33:00 -05:00
09b6a30cd7 New story! 2018-03-09 21:32:46 -05:00
Unknown
214506cbe5 Auto stash before merge of "master" and "origin/master" 2018-03-09 21:29:53 -05:00
pokesudenk
bfac5167c4 excessivehardcoding? 2018-03-09 21:18:53 -05:00
Unknown
b5f4a88f85 things 2018-03-09 21:13:14 -05:00
Unknown
f358f39798 dumb justin 2018-03-09 21:00:19 -05:00
jtsshieh
2cd3309275 linty lint 2018-03-09 20:59:29 -05:00
Unknown
39bd1d4692 Merge remote-tracking branch 'origin/master' 2018-03-09 20:54:57 -05:00
jtsshieh
9547631cfc Revert "Merge branch 'master' of https://github.com/PokeWorld/PokeBot"
This reverts commit 54505ce7eb.
2018-03-09 20:54:02 -05:00
pokesudenk
97753021f8 you get the drill (interrogate plugin) 2018-03-09 20:52:26 -05:00
jtsshieh
54505ce7eb Merge branch 'master' of https://github.com/PokeWorld/PokeBot 2018-03-09 20:45:14 -05:00
pokesudenk
91f54020dd jail plugin 2018-03-09 20:45:09 -05:00
jtsshieh
0575a6687e fun stuff 2018-03-09 20:43:05 -05:00
pokesudenk
4d253ab491 Merge branch 'master' of https://github.com/PokeWorld/PokeBot 2018-03-09 20:39:42 -05:00
pokesudenk
bac1c22013 fixed many Grammars 2018-03-09 20:38:46 -05:00