Merge #150

Merged
greg6775 merged 18 commits from master into greg-dev 2019-12-03 18:15:28 +01:00

18 commits

Author SHA1 Message Date
Skidder
a0d61b6277
Merge pull request #149 from BigBotNetwork/greg-dev
Not a nice fix
2019-12-03 09:14:58 -08:00
Skidder
ccefa1147c
Merge pull request #148 from BigBotNetwork/greg-dev
I hate this listener
2019-12-03 08:56:27 -08:00
Skidder
53b5d685cc
Merge pull request #147 from BigBotNetwork/greg-dev
rage rage rage
2019-12-03 08:28:53 -08:00
Skidder
bbc6b7c108
Merge pull request #146 from BigBotNetwork/greg-dev
Maybe this will fix everything
2019-12-03 08:14:59 -08:00
Skidder
98b7074ef0
Merge pull request #145 from BigBotNetwork/greg-dev
:(
2019-12-03 08:07:37 -08:00
Skidder
a66b1595d6
Merge pull request #144 from BigBotNetwork/greg-dev
Debug
2019-12-03 07:56:41 -08:00
Skidder
b41d360b15
Merge pull request #143 from BigBotNetwork/greg-dev
Greg dev
2019-12-03 07:05:39 -08:00
Skidder
ad33b957fb
Merge pull request #141 from BigBotNetwork/revert-139-revert-137-greg-dev
Revert "Revert "Rules with custom emotes""
2019-12-02 22:02:42 -08:00
Skidder
baea86549c
Revert "Revert "Rules with custom emotes"" 2019-12-03 07:02:06 +01:00
Skidder
023e167f0a
Merge pull request #139 from BigBotNetwork/revert-137-greg-dev
Revert "Rules with custom emotes"
2019-12-02 12:13:34 -08:00
Skidder
647e48c592
Revert "Rules with custom emotes" 2019-12-02 21:13:20 +01:00
Skidder
49512aa355
Merge pull request #138 from BigBotNetwork/greg-dev
Triggers timeout
2019-12-02 12:04:05 -08:00
Skidder
f2227627cd
Deploy new rule feature
Rules with custom emotes
2019-12-02 11:44:54 -08:00
Skidder
61d7e9ba3f Set theme jekyll-theme-cayman 2019-12-02 19:40:14 +01:00
Skidder
8840219162 Set theme jekyll-theme-cayman 2019-12-02 19:39:14 +01:00
Skidder
534654748a
Merge pull request #136 from BigBotNetwork/greg-dev
Hotfix
2019-12-02 09:15:23 -08:00
Skidder
a913353a19
Merge pull request #131 from BigBotNetwork/greg-dev
Invite Detector and code improvements
2019-12-02 04:59:23 -08:00
Skidder
967aee5d95
Merge pull request #119 from BigBotNetwork/greg-dev
Remove ":"
2019-12-01 01:02:59 -08:00