bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							9ddb1696ac 
							
						 
					 
					
						
						
							
							Handle user leaving during processing  
						
						
						
						
					 
					
						2020-08-21 10:32:13 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c62cde4159 
							
						 
					 
					
						
						
							
							Merge pull request  #123  from bobloy/timerole_hours  
						
						... 
						
						
						
						Add support for hours 
						
						
					 
					
						2020-08-21 10:26:25 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							317a9cb3a9 
							
						 
					 
					
						
						
							
							Add support for hours  
						
						
						
						
					 
					
						2020-08-21 10:25:05 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							67e7c3bae8 
							
						 
					 
					
						
						
							
							Small refactoring  
						
						
						
						
					 
					
						2020-08-21 09:54:11 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dcf1c85ebc 
							
						 
					 
					
						
						
							
							Merge pull request  #122  from bobloy/chatter-in-dm  
						
						... 
						
						
						
						Add dm chatting 
						
						
					 
					
						2020-08-21 08:56:25 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							ba03fb5127 
							
						 
					 
					
						
						
							
							Add dm chatting  
						
						
						
						
					 
					
						2020-08-21 08:54:23 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							b7ad892b7f 
							
						 
					 
					
						
						
							
							await eligibility  
						
						
						
						
					 
					
						2020-08-18 10:54:42 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							438a1be410 
							
						 
					 
					
						
						
							
							Use message_eligible_as_command and no more user_allowed  
						
						
						
						
					 
					
						2020-08-18 10:43:42 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22ed50dd98 
							
						 
					 
					
						
						
							
							Merge pull request  #121  from bobloy/3.4_compatibility_v2  
						
						... 
						
						
						
						More 3.4 compatibility, mentions and listeners 
						
						
					 
					
						2020-08-18 10:32:49 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							340f1dbff4 
							
						 
					 
					
						
						
							
							Grammar  
						
						
						
						
					 
					
						2020-08-18 10:32:34 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							f8fcb4c736 
							
						 
					 
					
						
						
							
							Max bot version unnecessary  
						
						
						
						
					 
					
						2020-08-18 10:31:47 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							c953bad13e 
							
						 
					 
					
						
						
							
							Min bot version bumps  
						
						
						
						
					 
					
						2020-08-18 10:31:28 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							29f44e887f 
							
						 
					 
					
						
						
							
							Forgot parenthesis  
						
						
						
						
					 
					
						2020-08-18 10:26:13 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							d43a1ec80c 
							
						 
					 
					
						
						
							
							Black formatting  
						
						
						
						
					 
					
						2020-08-18 10:24:13 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							151eca1c76 
							
						 
					 
					
						
						
							
							More 3.4 compatibility, mentions and listeners  
						
						
						
						
					 
					
						2020-08-18 10:01:10 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3d4a6578fd 
							
						 
					 
					
						
						
							
							Merge pull request  #111  from bobloy/maybe_send_embeds  
						
						... 
						
						
						
						Use maybe_send_embed instead
Now's a good a time as any 
						
						
					 
					
						2020-08-18 08:17:54 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							6a76d43c3d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into maybe_send_embeds  
						
						
						
						
					 
					
						2020-08-18 08:17:21 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7507141ec4 
							
						 
					 
					
						
						
							
							Merge pull request  #112  from bobloy/3.4_compatibility  
						
						... 
						
						
						
						3.4 compatibility 
						
						
					 
					
						2020-08-18 08:12:46 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							62b6209ae9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 3.4_compatibility  
						
						
						
						
					 
					
						2020-08-18 08:11:45 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e570058014 
							
						 
					 
					
						
						
							
							Merge pull request  #120  from bobloy/stealemoji_develop  
						
						... 
						
						
						
						Clear stolen emojis, and print stolen emojis 
						
						
					 
					
						2020-08-17 09:37:05 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0b0b6bff 
							
						 
					 
					
						
						
							
							Clear stolen emojis, and print stolen emojis  
						
						
						
						
					 
					
						2020-08-17 09:36:23 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							58ad3fc978 
							
						 
					 
					
						
						
							
							It's actually a maximum  
						
						
						
						
					 
					
						2020-08-13 12:18:31 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							79b755556e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 3.4_compatibility  
						
						... 
						
						
						
						# Conflicts:
#	ccrole/info.json
#	chatter/chat.py
#	reactrestrict/info.json 
						
						
					 
					
						2020-08-13 12:13:03 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							53649137a2 
							
						 
					 
					
						
						
							
							Merge pull request  #119  from bobloy/chatter_develop  
						
						... 
						
						
						
						Chatter Threshold: It's actually a maximum 
						
						
					 
					
						2020-08-13 12:08:55 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c302be7fb5 
							
						 
					 
					
						
						
							
							Merge pull request  #117  from bobloy/bobloy-patch-1  
						
						... 
						
						
						
						Update README.md 
						
						
					 
					
						2020-08-13 12:07:16 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5c80beea44 
							
						 
					 
					
						
						
							
							Merge pull request  #118  from bobloy/chatter_develop  
						
						... 
						
						
						
						Chatter Updates 
						
						
					 
					
						2020-08-13 12:06:57 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							f9ae2d6f7e 
							
						 
					 
					
						
						
							
							It's actually a maximum  
						
						
						
						
					 
					
						2020-08-13 12:06:27 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							4fcc12a2d8 
							
						 
					 
					
						
						
							
							Allow specifying algorithm and model  
						
						
						
						
					 
					
						2020-08-13 12:02:54 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f55bc4d583 
							
						 
					 
					
						
						
							
							Update README.md  
						
						... 
						
						
						
						Add notes about `trainubuntu` 
						
						
					 
					
						2020-08-13 09:57:50 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cb03c17459 
							
						 
					 
					
						
						
							
							Merge pull request  #116  from bobloy/nudity-develop  
						
						... 
						
						
						
						Nudity Detection Cog 
						
						
					 
					
						2020-08-12 15:04:13 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							a787835915 
							
						 
					 
					
						
						
							
							Add Nudity to README.md  
						
						
						
						
					 
					
						2020-08-12 15:00:03 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							361265b983 
							
						 
					 
					
						
						
							
							Functioning nudity detection  
						
						
						
						
					 
					
						2020-08-12 14:57:36 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							8b7ebc57c3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into nudity-develop  
						
						
						
						
					 
					
						2020-08-12 13:17:05 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							e5947953aa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into chatter_develop  
						
						
						
						
					 
					
						2020-08-12 11:18:21 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c02244ceb5 
							
						 
					 
					
						
						
							
							More Conquest Updates ( #115 )  
						
						... 
						
						
						
						* Start of map maker, ambiguous file format (probably just jpg and png)
* More map maker WIP
* This isn't dad
* Split mapmaker
* Don't load current map if it doesn't exist
* WIP mapmaker 
						
						
					 
					
						2020-08-12 11:00:41 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							e8eb3f76e4 
							
						 
					 
					
						
						
							
							confirmation  
						
						
						
						
					 
					
						2020-08-12 10:57:47 -04:00 
						 
				 
			
				
					
						
							
							
								zephyrkul 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							29bb51c6cd 
							
						 
					 
					
						
						
							
							Update info.json ( #114 )  
						
						
						
						
					 
					
						2020-08-12 10:50:28 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							a98eb75c0f 
							
						 
					 
					
						
						
							
							Logger and Ubuntu trainer  
						
						
						
						
					 
					
						2020-08-12 10:40:03 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							6e9d31df03 
							
						 
					 
					
						
						
							
							ccrole isn't incomplete  
						
						
						
						
					 
					
						2020-08-12 09:44:01 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							f944879896 
							
						 
					 
					
						
						
							
							Why tf were so many hidden?  
						
						
						
						
					 
					
						2020-08-12 09:41:41 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							11a5a7505b 
							
						 
					 
					
						
						
							
							Fix invalid json  
						
						
						
						
					 
					
						2020-08-10 17:48:28 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b9dbad8bd1 
							
						 
					 
					
						
						
							
							Conquest initial ( #113 )  
						
						... 
						
						
						
						* Initial files
* Functioning image coloring
* Add more commands, untested
* Add map list, move set to under conquest, and WIP saving map
* ALl masks, mostly working commands
* Unneeded original.jpg
* Rename to simple, WIP numbered
* Use numbers as mask, probably need to switch to png soon
* Save to config, test zoom levels
* Handle zoom properly, save it to json for each map as well
* Move maps to WIP folder
* WIP folder not in data folder
* Info and READMe updates 
						
						
					 
					
						2020-08-10 17:03:25 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							942b49e6fc 
							
						 
					 
					
						
						
							
							Black formatting  
						
						
						
						
					 
					
						2020-08-06 21:06:03 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							5dcbf562d3 
							
						 
					 
					
						
						
							
							No good reason for this to be lower  
						
						
						
						
					 
					
						2020-08-06 16:16:31 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							4f6232fb7d 
							
						 
					 
					
						
						
							
							Fix this send_help mistake  
						
						
						
						
					 
					
						2020-08-06 13:39:51 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							50e0eacf24 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 3.4_compatibility  
						
						
						
						
					 
					
						2020-08-06 13:32:01 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							ae915b4fff 
							
						 
					 
					
						
						
							
							Ignore both venvs  
						
						
						
						
					 
					
						2020-08-06 13:27:55 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							7e1f59462c 
							
						 
					 
					
						
						
							
							Ignore both venvs  
						
						
						
						
					 
					
						2020-08-06 13:27:16 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ea0e4d5e 
							
						 
					 
					
						
						
							
							Updated to delete data correctly  
						
						
						
						
					 
					
						2020-08-06 13:24:08 -04:00 
						 
				 
			
				
					
						
							
							
								bobloy 
							
						 
					 
					
						
						
						
						
							
						
						
							035b395eb5 
							
						 
					 
					
						
						
							
							Add end_user_data_statementto info.json  
						
						
						
						
					 
					
						2020-08-06 13:23:53 -04:00