Fox-V3

Commit Graph

Select branches

Hide Pull Requests

aaatracker_develop

annd_develop

bangame-develop

ccrole_develop

cogguide_develop

conquest_develop

decrypt_initial

fight-fixes

flag_develop

flask-develop

howdoi

isitdown_initial

lseen_develop

master

qrinvite_develop

readme_updates

sayurl-develop

secrethitler-develop

sherlock_initial

timerole_roleconfig

triggercmd-develop

ww_develop

#1

#10

#101

#103

#104

#105

#106

#107

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#129

#13

#130

#131

#132

#134

#136

#138

#14

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#154

#156

#157

#157

#158

#159

#16

#163

#164

#167

#168

#169

#172

#174

#175

#178

#179

#18

#180

#183

#186

#189

#19

#190

#191

#193

#198

#198

#2

#20

#21

#22

#23

#25

#26

#27

#28

#3

#34

#36

#37

#38

#4

#41

#42

#43

#44

#47

#49

#5

#51

#53

#54

#56

#57

#6

#60

#61

#62

#63

#64

#65

#67

#69

#7

#71

#75

#76

#78

#79

#8

#81

#83

#84

#85

#87

#9

#96

#97

#98

1a5aaff268 initial commit of FIFO, RedConfigJobStore is WIP bobloy 2020-08-25 16:03:36 -0400
ea0cb8c51b hours and days bobloy 2020-08-24 13:02:48 -0400
4ca97437db

Merge pull request #127 from bobloy/chatter_develop bobloy 2020-08-24 12:53:18 -0400
6f414be6ab Add chat channel #127 bobloy 2020-08-24 12:51:57 -0400
c2c6d61a35

Merge pull request #126 from bobloy/stealemoji_develop bobloy 2020-08-24 09:46:50 -0400
834a0f462d

Merge pull request #125 from bobloy/launchlib_develop bobloy 2020-08-24 09:45:09 -0400
43e2a46c55 Chatter install instructions in install message bobloy 2020-08-24 08:57:12 -0400
2ea7819b8b Library updated, use the new functioning async api calls #125 bobloy 2020-08-24 08:27:36 -0400
a0042da170 "fix" sending invites #126 bobloy 2020-08-24 08:19:55 -0400
500915b947 Game data is different bobloy 2020-08-22 13:26:17 -0400
36d6e5c9bf Merge branch 'master' into conquest_develop bobloy 2020-08-22 13:26:01 -0400
d8ec75701d Problem with invites still, panic bobloy 2020-08-21 17:29:54 -0400
5693d690e1 Autobanking with templates bobloy 2020-08-21 17:22:56 -0400
79cc34d331 Merge branch 'master' into stealemoji_develop bobloy 2020-08-21 17:07:36 -0400
ec6fa7331b

Merge pull request #124 from bobloy/launchlib_initial bobloy 2020-08-21 14:22:35 -0400
5af7adfe57 Inital "launch" of launchlib and better alphabetization #124 bobloy 2020-08-21 14:21:13 -0400
59c22dcc3a Inital "launch" of launchlib bobloy 2020-08-21 14:18:39 -0400
9ddb1696ac Handle user leaving during processing bobloy 2020-08-21 10:32:13 -0400
c62cde4159

Merge pull request #123 from bobloy/timerole_hours bobloy 2020-08-21 10:26:25 -0400
317a9cb3a9 Add support for hours #123 bobloy 2020-08-21 10:25:05 -0400
67e7c3bae8 Small refactoring bobloy 2020-08-21 09:54:11 -0400
dcf1c85ebc

Merge pull request #122 from bobloy/chatter-in-dm bobloy 2020-08-21 08:56:25 -0400
ba03fb5127 Add dm chatting #122 bobloy 2020-08-21 08:54:23 -0400
4a9f0b9e74 Template guilds bobloy 2020-08-19 18:14:56 -0400
7574117d9a WIP ConquestGame and per guild saving bobloy 2020-08-19 15:57:02 -0400
f0d33f0354 Better mask combination bobloy 2020-08-18 21:21:48 -0400
e2e5477661 Better number positioning, better mask combining and generation bobloy 2020-08-18 17:02:58 -0400
8abeca3d1e Merge branch 'master' into conquest_develop bobloy 2020-08-18 11:07:56 -0400
b7ad892b7f await eligibility bobloy 2020-08-18 10:54:42 -0400
438a1be410 Use `message_eligible_as_command` and no more `user_allowed` bobloy 2020-08-18 10:43:42 -0400
22ed50dd98

Merge pull request #121 from bobloy/3.4_compatibility_v2 bobloy 2020-08-18 10:32:49 -0400
340f1dbff4 Grammar #121 bobloy 2020-08-18 10:32:34 -0400
f8fcb4c736 Max bot version unnecessary bobloy 2020-08-18 10:31:47 -0400
c953bad13e Min bot version bumps bobloy 2020-08-18 10:31:28 -0400
29f44e887f Forgot parenthesis bobloy 2020-08-18 10:26:13 -0400
d43a1ec80c Black formatting bobloy 2020-08-18 10:24:13 -0400
151eca1c76 More 3.4 compatibility, mentions and listeners bobloy 2020-08-18 10:01:10 -0400
aadd9a61a8 Merge branch 'master' into conquest_develop bobloy 2020-08-18 08:20:22 -0400
3d4a6578fd

Merge pull request #111 from bobloy/maybe_send_embeds bobloy 2020-08-18 08:17:54 -0400
6a76d43c3d Merge branch 'master' into maybe_send_embeds #111 bobloy 2020-08-18 08:17:21 -0400
7507141ec4

Merge pull request #112 from bobloy/3.4_compatibility bobloy 2020-08-18 08:12:46 -0400
62b6209ae9 Merge branch 'master' into 3.4_compatibility #112 bobloy 2020-08-18 08:11:45 -0400
c3c40c594e More region classification bobloy 2020-08-17 16:41:56 -0400
b46a5920f7 Merge branch 'master' into conquest_develop bobloy 2020-08-17 11:15:04 -0400
e570058014

Merge pull request #120 from bobloy/stealemoji_develop bobloy 2020-08-17 09:37:05 -0400
5c0b0b6bff Clear stolen emojis, and print stolen emojis #120 bobloy 2020-08-17 09:36:23 -0400
52fc284f5a WIP Classification bobloy 2020-08-17 08:17:49 -0400
ef925b1621 Map maker is almost working bobloy 2020-08-13 17:33:09 -0400
719e8903fd Merge branch 'master' into conquest_develop bobloy 2020-08-13 13:05:15 -0400
58ad3fc978 It's actually a maximum bobloy 2020-08-13 12:18:31 -0400
79b755556e Merge branch 'master' into 3.4_compatibility bobloy 2020-08-13 12:13:03 -0400
53649137a2

Merge pull request #119 from bobloy/chatter_develop bobloy 2020-08-13 12:08:55 -0400
c302be7fb5

Merge pull request #117 from bobloy/bobloy-patch-1 bobloy 2020-08-13 12:07:16 -0400
5c80beea44

Merge pull request #118 from bobloy/chatter_develop bobloy 2020-08-13 12:06:57 -0400
f9ae2d6f7e It's actually a maximum #119 bobloy 2020-08-13 12:06:27 -0400
4fcc12a2d8 Allow specifying algorithm and model #118 bobloy 2020-08-13 12:02:54 -0400
f55bc4d583

Update README.md #117 bobloy 2020-08-13 09:57:50 -0400
07b90c30a0 Don't use os, more mapmaker bobloy 2020-08-13 09:48:16 -0400
a1b89c9f9d More map maper and notes on regioner bobloy 2020-08-12 17:37:38 -0400
f93986e65f Reorder methods bobloy 2020-08-12 15:28:36 -0400
cb03c17459

Merge pull request #116 from bobloy/nudity-develop bobloy 2020-08-12 15:04:13 -0400
a787835915 Add Nudity to README.md #116 bobloy 2020-08-12 15:00:03 -0400
361265b983 Functioning nudity detection bobloy 2020-08-12 14:57:36 -0400
8b7ebc57c3 Merge branch 'master' into nudity-develop bobloy 2020-08-12 13:17:05 -0400
11258d3e76 mapmapker back to conquest.py bobloy 2020-08-12 13:16:47 -0400
0b4e0310f9 Merge branch 'master' into conquest_develop bobloy 2020-08-12 11:18:39 -0400
e5947953aa Merge branch 'master' into chatter_develop bobloy 2020-08-12 11:18:21 -0400
c02244ceb5

More Conquest Updates (#115) bobloy 2020-08-12 11:00:41 -0400
5fff65c7d5 WIP mapmaker #115 bobloy 2020-08-12 10:59:52 -0400
8012a20ddb Don't load current map if it doesn't exist bobloy 2020-08-12 10:58:51 -0400
e8eb3f76e4 confirmation bobloy 2020-08-12 10:57:47 -0400
29bb51c6cd

Update info.json (#114) zephyrkul 2020-08-12 08:50:28 -0600
a98eb75c0f Logger and Ubuntu trainer bobloy 2020-08-12 10:40:03 -0400
3b156d8275 Split mapmaker bobloy 2020-08-12 10:03:07 -0400
ae200eb911 This isn't dad bobloy 2020-08-12 09:46:07 -0400
7161e8e28c Merge branch 'master' into conquest_develop bobloy 2020-08-12 09:44:17 -0400
6e9d31df03 ccrole isn't incomplete bobloy 2020-08-12 09:44:01 -0400
03b42b04ef Merge branch 'master' into conquest_develop bobloy 2020-08-12 09:42:34 -0400
f944879896 Why tf were so many hidden? bobloy 2020-08-12 09:41:41 -0400
42aab1e801 More map maker WIP bobloy 2020-08-12 09:38:35 -0400
0c010f7314

Update info.json #114 zephyrkul 2020-08-12 07:37:55 -0600
dc8d314713 Start of map maker, ambiguous file format (probably just jpg and png) bobloy 2020-08-11 17:23:42 -0400
11a5a7505b Fix invalid json bobloy 2020-08-10 17:48:28 -0400
b9dbad8bd1

Conquest initial (#113) bobloy 2020-08-10 17:03:25 -0400
a4321c74e7 Info and READMe updates #113 bobloy 2020-08-10 17:02:42 -0400
4875c7b964 WIP folder not in data folder bobloy 2020-08-10 17:00:59 -0400
0814810b9f Move maps to WIP folder bobloy 2020-08-10 17:00:32 -0400
8532d4dc01 Handle zoom properly, save it to json for each map as well bobloy 2020-08-10 16:41:05 -0400
ff3b6cf2a5 Save to config, test zoom levels bobloy 2020-08-10 15:24:00 -0400
4118f1a91f Use numbers as mask, probably need to switch to png soon bobloy 2020-08-10 13:49:04 -0400
5203aba042 Rename to simple, WIP numbered bobloy 2020-08-10 13:39:57 -0400
5ca834ea3c Unneeded original.jpg bobloy 2020-08-10 12:07:42 -0400
02232431f6 ALl masks, mostly working commands bobloy 2020-08-10 12:06:33 -0400
020d4645e8 Add map list, move set to under conquest, and WIP saving map bobloy 2020-08-10 07:27:56 -0400
43520893b3 Add more commands, untested bobloy 2020-08-06 21:59:51 -0400
942b49e6fc Black formatting bobloy 2020-08-06 21:06:03 -0400
5060c2f7fd Functioning image coloring bobloy 2020-08-06 18:12:08 -0400
947cf08291 Initial files bobloy 2020-08-06 16:17:10 -0400
5dcbf562d3 No good reason for this to be lower bobloy 2020-08-06 16:16:31 -0400
4f6232fb7d Fix this send_help mistake bobloy 2020-08-06 13:39:51 -0400