| 
							
							
								 bobloy | 0d4a4071e2 | Merge branch 'master' into nudity-develop # Conflicts:
#	nudity/__init__.py
#	nudity/info..json
#	nudity/nudity.py | 2018-10-09 10:08:49 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 9a3a62f451 | updates | 2018-10-09 10:08:37 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 75aab626f9 | Remove incomplete cogs | 2018-10-09 09:47:14 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 81cb93a6aa | Merge branch 'master' into nudity-develop # Conflicts:
#	nudity/info..json | 2018-10-09 09:33:46 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 6cc32a937c | Fix to seed | 2018-10-08 16:00:42 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 9fb05194c2 | Shovel cooldown | 2018-10-08 15:20:19 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 2633eea746 | Fix plant selection | 2018-10-08 13:49:59 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 75939546b4 | Balance changes | 2018-10-08 13:44:32 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 11ce46c36f | Black formatting | 2018-10-08 10:46:36 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 2feb6d0663 | Fix for convert bug giving infinite credits | 2018-10-08 10:39:13 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 108857b3a3 | Merge pull request #28 from bobloy/werewolf_develop Werewolf develop | 2018-10-05 11:20:57 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 3296c03de2 | Merge branch 'master' into werewolf_develop # Conflicts:
#	werewolf/builder.py
#	werewolf/game.py
#	werewolf/werewolf.py | 2018-10-05 11:14:56 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 229c4888b3 | Don't include tba's | 2018-10-05 08:52:21 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | d017ef5336 | Additional list and tts descriptions | 2018-10-05 08:27:09 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | c0b888535d | Whoops, wrong one | 2018-10-04 15:02:07 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 5ca3141707 | Don't DM everyone and spelling error | 2018-10-04 13:22:40 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 5961902015 | Merge pull request #27 from bobloy/dad-develop Dad initial commit | 2018-10-04 11:00:40 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 913cd81575 | Deprecated method | 2018-10-04 10:59:52 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | fcda813d47 | Dad initial commit | 2018-10-04 10:59:20 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | c8417e03a8 | User objects and __repr__ | 2018-10-04 08:39:59 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 6c864d50af | Even more human touch updates | 2018-10-04 08:07:42 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 6be98df427 | Merge pull request #26 from pabloleban/patch-1 Fixed some wrong names | 2018-10-03 23:51:34 -04:00 |  | 
			
				
					| 
							
							
								 Plab | 5fc5c9da44 | Update games-plab.yaml | 2018-10-03 19:44:34 -03:00 |  | 
			
				
					| 
							
							
								 bobloy | 25c1ae5c32 | Human touch | 2018-10-03 17:08:39 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 292e7000bc | Final roman numerals fix | 2018-10-03 16:49:58 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 0678e168ee | Even better roman numerals | 2018-10-03 16:30:44 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | d538ae29a5 | Roman numerals are always optional | 2018-10-03 16:11:34 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 2d6b9cc241 | Only necessary quotes and roman numeral fixing | 2018-10-03 15:52:33 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | b892e194f7 | Put in quotes to avoid colon issues | 2018-10-03 15:42:31 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 67c1ff7c8c | Temp revert | 2018-10-03 15:40:38 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 5ecdbaf9e4 | Answer improvements | 2018-10-03 13:03:00 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 5220e703e5 | Automatically unload trivia when it's already loaded | 2018-10-02 08:37:47 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 8935303f41 | Prep for Red RC1 breaking change | 2018-10-01 11:39:12 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | b71a292940 | Updated to match core trivia formatting | 2018-10-01 11:22:32 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | ae4fbbcc58 | Additional list and tts descriptions | 2018-10-01 10:17:28 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 7fc081de87 | Audio Status warning enabled | 2018-09-24 16:36:11 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | eb6fa57653 | PlantTycoon readme | 2018-09-24 16:06:25 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 8acc9a3b1c | Merge pull request #25 from bobloy/planttycoon Planttycoon V3 rewrite | 2018-09-24 16:04:35 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 2f6a518ab6 | V3 rework complete | 2018-09-24 16:03:53 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 3afb2cf43a | Info updates | 2018-09-24 13:49:05 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | caaa7af722 | Volume fix and better use of other cog | 2018-09-20 10:24:26 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | ee3d2d90f1 | modernize | 2018-09-19 15:28:38 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | e50901edc4 | modernize | 2018-09-19 08:29:08 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | beb5f125e4 | Updated csgo trivia list | 2018-09-18 15:51:18 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 89732d79d8 | Updated games trivia list | 2018-09-18 13:18:12 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 56c878ab4f | TTS moved forward to Beta, werewolf moved back to Pre-Alpha | 2018-09-18 10:45:46 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 8c00521ed8 | Merge pull request #23 from bobloy/audiotrivia-develop Audiotrivia develop | 2018-09-18 10:41:25 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 2b67a689e1 | LastSeen cleanup | 2018-09-18 10:41:12 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 5b43cfa16a | Add to ReadMe | 2018-09-18 10:40:28 -04:00 |  | 
			
				
					| 
							
							
								 bobloy | 86f1c4cee6 | Working settings | 2018-09-18 10:15:08 -04:00 |  |