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

Mono Color

• d8ec75701d Problem with invites still, panic bobloy 2020-08-21 17:29:54 -04:00
• 5693d690e1 Autobanking with templates bobloy 2020-08-21 17:22:56 -04:00
• 79cc34d331 Merge branch 'master' into stealemoji_develop bobloy 2020-08-21 17:07:36 -04:00
• ec6fa7331b
  Merge pull request #124 from bobloy/launchlib_initial bobloy 2020-08-21 14:22:35 -04:00
• 5af7adfe57 Inital "launch" of launchlib and better alphabetization #124 bobloy 2020-08-21 14:21:13 -04:00
• 59c22dcc3a Inital "launch" of launchlib bobloy 2020-08-21 14:18:39 -04:00
• 9ddb1696ac Handle user leaving during processing bobloy 2020-08-21 10:32:13 -04:00
• c62cde4159
  Merge pull request #123 from bobloy/timerole_hours bobloy 2020-08-21 10:26:25 -04:00
• 317a9cb3a9 Add support for hours #123 bobloy 2020-08-21 10:25:05 -04:00
• 67e7c3bae8 Small refactoring bobloy 2020-08-21 09:54:11 -04:00
• dcf1c85ebc
  Merge pull request #122 from bobloy/chatter-in-dm bobloy 2020-08-21 08:56:25 -04:00
• ba03fb5127 Add dm chatting #122 bobloy 2020-08-21 08:54:23 -04:00
• 4a9f0b9e74 Template guilds bobloy 2020-08-19 18:14:56 -04:00
• 7574117d9a WIP ConquestGame and per guild saving bobloy 2020-08-19 15:57:02 -04:00
• f0d33f0354 Better mask combination bobloy 2020-08-18 21:21:48 -04:00
• e2e5477661 Better number positioning, better mask combining and generation bobloy 2020-08-18 17:02:58 -04:00
• 8abeca3d1e Merge branch 'master' into conquest_develop bobloy 2020-08-18 11:07:56 -04:00
• b7ad892b7f await eligibility bobloy 2020-08-18 10:54:42 -04:00
• 438a1be410 Use message_eligible_as_command and no more user_allowed bobloy 2020-08-18 10:43:42 -04:00
• 22ed50dd98
  Merge pull request #121 from bobloy/3.4_compatibility_v2 bobloy 2020-08-18 10:32:49 -04:00
• 340f1dbff4 Grammar #121 bobloy 2020-08-18 10:32:34 -04:00
• f8fcb4c736 Max bot version unnecessary bobloy 2020-08-18 10:31:47 -04:00
• c953bad13e Min bot version bumps bobloy 2020-08-18 10:31:28 -04:00
• 29f44e887f Forgot parenthesis bobloy 2020-08-18 10:26:13 -04:00
• d43a1ec80c Black formatting bobloy 2020-08-18 10:24:13 -04:00
• 151eca1c76 More 3.4 compatibility, mentions and listeners bobloy 2020-08-18 10:01:10 -04:00
• aadd9a61a8 Merge branch 'master' into conquest_develop bobloy 2020-08-18 08:20:22 -04:00
• 3d4a6578fd
  Merge pull request #111 from bobloy/maybe_send_embeds bobloy 2020-08-18 08:17:54 -04:00
• 6a76d43c3d Merge branch 'master' into maybe_send_embeds #111 bobloy 2020-08-18 08:17:21 -04:00
• 7507141ec4
  Merge pull request #112 from bobloy/3.4_compatibility bobloy 2020-08-18 08:12:46 -04:00
• 62b6209ae9 Merge branch 'master' into 3.4_compatibility #112 bobloy 2020-08-18 08:11:45 -04:00
• c3c40c594e More region classification bobloy 2020-08-17 16:41:56 -04:00
• b46a5920f7 Merge branch 'master' into conquest_develop bobloy 2020-08-17 11:15:04 -04:00
• e570058014
  Merge pull request #120 from bobloy/stealemoji_develop bobloy 2020-08-17 09:37:05 -04:00
• 5c0b0b6bff Clear stolen emojis, and print stolen emojis #120 bobloy 2020-08-17 09:36:23 -04:00
• 52fc284f5a WIP Classification bobloy 2020-08-17 08:17:49 -04:00
• ef925b1621 Map maker is almost working bobloy 2020-08-13 17:33:09 -04:00
• 719e8903fd Merge branch 'master' into conquest_develop bobloy 2020-08-13 13:05:15 -04:00
• 58ad3fc978 It's actually a maximum bobloy 2020-08-13 12:18:31 -04:00
• 79b755556e Merge branch 'master' into 3.4_compatibility bobloy 2020-08-13 12:13:03 -04:00
• 53649137a2
  Merge pull request #119 from bobloy/chatter_develop bobloy 2020-08-13 12:08:55 -04:00
• c302be7fb5
  Merge pull request #117 from bobloy/bobloy-patch-1 bobloy 2020-08-13 12:07:16 -04:00
• 5c80beea44
  Merge pull request #118 from bobloy/chatter_develop bobloy 2020-08-13 12:06:57 -04:00
• f9ae2d6f7e It's actually a maximum #119 bobloy 2020-08-13 12:06:27 -04:00
• 4fcc12a2d8 Allow specifying algorithm and model #118 bobloy 2020-08-13 12:02:54 -04:00
• f55bc4d583
  Update README.md #117 bobloy 2020-08-13 09:57:50 -04:00
• 07b90c30a0 Don't use os, more mapmaker bobloy 2020-08-13 09:48:16 -04:00
• a1b89c9f9d More map maper and notes on regioner bobloy 2020-08-12 17:37:38 -04:00
• f93986e65f Reorder methods bobloy 2020-08-12 15:28:36 -04:00
• cb03c17459
  Merge pull request #116 from bobloy/nudity-develop bobloy 2020-08-12 15:04:13 -04:00
• a787835915 Add Nudity to README.md #116 bobloy 2020-08-12 15:00:03 -04:00
• 361265b983 Functioning nudity detection bobloy 2020-08-12 14:57:36 -04:00
• 8b7ebc57c3 Merge branch 'master' into nudity-develop bobloy 2020-08-12 13:17:05 -04:00
• 11258d3e76 mapmapker back to conquest.py bobloy 2020-08-12 13:16:47 -04:00
• 0b4e0310f9 Merge branch 'master' into conquest_develop bobloy 2020-08-12 11:18:39 -04:00
• e5947953aa Merge branch 'master' into chatter_develop bobloy 2020-08-12 11:18:21 -04:00
• c02244ceb5
  More Conquest Updates (#115) bobloy 2020-08-12 11:00:41 -04:00
• 5fff65c7d5 WIP mapmaker #115 bobloy 2020-08-12 10:59:52 -04:00
• 8012a20ddb Don't load current map if it doesn't exist bobloy 2020-08-12 10:58:51 -04:00
• e8eb3f76e4 confirmation bobloy 2020-08-12 10:57:47 -04:00
• 29bb51c6cd
  Update info.json (#114) zephyrkul 2020-08-12 08:50:28 -06:00
• a98eb75c0f Logger and Ubuntu trainer bobloy 2020-08-12 10:40:03 -04:00
• 3b156d8275 Split mapmaker bobloy 2020-08-12 10:03:07 -04:00
• ae200eb911 This isn't dad bobloy 2020-08-12 09:46:07 -04:00
• 7161e8e28c Merge branch 'master' into conquest_develop bobloy 2020-08-12 09:44:17 -04:00
• 6e9d31df03 ccrole isn't incomplete bobloy 2020-08-12 09:44:01 -04:00
• 03b42b04ef Merge branch 'master' into conquest_develop bobloy 2020-08-12 09:42:34 -04:00
• f944879896 Why tf were so many hidden? bobloy 2020-08-12 09:41:41 -04:00
• 42aab1e801 More map maker WIP bobloy 2020-08-12 09:38:35 -04:00
• dc8d314713 Start of map maker, ambiguous file format (probably just jpg and png) bobloy 2020-08-11 17:23:42 -04:00
• 11a5a7505b Fix invalid json bobloy 2020-08-10 17:48:28 -04:00
• b9dbad8bd1
  Conquest initial (#113) bobloy 2020-08-10 17:03:25 -04:00
• 942b49e6fc Black formatting bobloy 2020-08-06 21:06:03 -04:00
• 5dcbf562d3 No good reason for this to be lower bobloy 2020-08-06 16:16:31 -04:00
• 4f6232fb7d Fix this send_help mistake bobloy 2020-08-06 13:39:51 -04:00
• 50e0eacf24 Merge branch 'master' into 3.4_compatibility bobloy 2020-08-06 13:32:01 -04:00
• ae915b4fff Ignore both venvs bobloy 2020-08-06 13:27:55 -04:00
• 7e1f59462c Ignore both venvs bobloy 2020-08-06 13:27:16 -04:00
• c7ea0e4d5e Updated to delete data correctly bobloy 2020-08-06 13:24:08 -04:00
• 035b395eb5 Add end_user_data_statementto info.json bobloy 2020-08-06 13:23:53 -04:00
• 36dc74cfb1 Add red_delete_data_for_user bobloy 2020-08-06 11:34:05 -04:00
• ea71aafb52 Updated dad to handle dark theme by sending the message ourselves bobloy 2020-08-03 17:17:11 -04:00
• b9bf89b799 Embeds sherlock_initial bobloy 2020-08-03 16:11:58 -04:00
• 8de1aa2082 Merge branch 'master' into sherlock_initial bobloy 2020-08-03 15:39:19 -04:00
• a08b72c83d Merge branch 'master' into maybe_send_embeds bobloy 2020-08-03 15:35:57 -04:00
• bda61e3ada Handle permission errors bobloy 2020-08-03 15:35:34 -04:00
• 810670f5c0 Use maybe_send_embed instead bobloy 2020-08-03 15:24:52 -04:00
• 0fef7c899c Use socialscan until sherlock works bobloy 2020-08-03 15:18:56 -04:00
• 61866b2c22 Add TODO bobloy 2020-08-03 14:46:47 -04:00
• 3e4ddb24f0
  Add calls to super().__init__ (#110) bobloy 2020-08-03 13:11:35 -04:00
• 71791a2f5a
  Remove incorrect 3.4+ compatibility layer (#103) jack1142 2020-08-03 19:04:57 +02:00
• 31fec3add1
  Better console progress. Delete data command (#109) bobloy 2020-08-03 12:48:27 -04:00
• 90d033aa50 No await in __init__ bobloy 2020-07-30 17:31:18 -04:00
• bedeb0e2ce Remove print statements bobloy 2020-07-30 16:22:59 -04:00
• 240888e55b
  Update README.md bobloy 2020-07-30 12:59:49 -04:00
• 8dba6f06cf Merge remote-tracking branch 'origin/master' bobloy 2020-07-30 12:47:37 -04:00
• 99b4a1d9f5 Actually remove mention from submitted text bobloy 2020-07-30 12:47:21 -04:00
• e75c0bb737
  Update README.md bobloy 2020-07-30 12:38:46 -04:00
• ac31115750
  Update README.md bobloy 2020-07-30 10:50:10 -04:00
• 9c09d18699
  Update README.md bobloy 2020-07-30 10:20:09 -04:00