898 Commits

Author SHA1 Message Date
bobloy
4e35a13577 Restoring lost regions, finish reduction of norway 2021-09-07 08:55:19 -04:00
bobloy
374c521e71 Convert takes optional masks parameter 2021-09-03 15:15:25 -04:00
bobloy
5ce95038f2 AsyncIters to stop heartbeat issues, standardize mask image mode, fix weight in recalculate region, add convert masks, 2021-09-03 14:35:09 -04:00
bobloy
439873de95 rename recalculatecenter to recalculate, add cleanup 2021-09-03 14:34:08 -04:00
bobloy
393cc6e523 Reduction of Norway 2021-09-03 14:25:06 -04:00
bobloy
aa84cd1a9e More ck2 updates 2021-09-01 16:51:35 -04:00
bobloy
ff7455495d Better region centering, randomized samples, fixed merge weights, recalculating center, no more data nesting data 2021-09-01 14:22:14 -04:00
bobloy
4108069671 Add recalculatecenter, mapmaker region 2021-09-01 14:21:37 -04:00
bobloy
ca4cf5408b WIP ck2 map 2021-09-01 10:43:56 -04:00
bobloy
cd49b07448 Add fonts 2021-08-31 14:41:36 -04:00
bobloy
6762d3cbde Add fonts 2021-08-31 14:41:15 -04:00
bobloy
8acca64264 Add fonts 2021-08-31 14:40:51 -04:00
bobloy
44b724fd71 More future maps 2021-08-31 14:40:40 -04:00
bobloy
ee1eaa1d90 Upgrade simple to png 2021-08-26 14:03:53 -04:00
bobloy
9cf466c78e Functioning map maker 2021-08-25 17:51:59 -04:00
bobloy
978d6f8627 rest converted, time to fix maps 2021-08-20 15:21:31 -04:00
bobloy
2315bd9fc3 The rest converted??? 2021-08-19 17:29:41 -04:00
bobloy
e02c7ba14b beginning of set map 2021-08-09 10:02:08 -04:00
bobloy
836911ee89 Merge branch 'master' into conquest_develop 2021-07-23 17:08:40 -04:00
bobloy
1e87eacf83 Add edited timestamp 2021-07-23 16:13:07 -04:00
bobloy
3e25c8a13f Saving and loading 2021-07-23 16:02:26 -04:00
bobloy
d987018664 More zoom WIP 2021-07-23 09:27:32 -04:00
bobloy
25e90c350f More progress on switched to ConquestGame class 2021-07-22 17:25:13 -04:00
bobloy
2d0c9e31b3 WIP self.current_map 2021-07-16 11:32:47 -04:00
bobloy
80db00890d Merge branch 'master' into conquest_develop
# Conflicts:
#	conquest/conquest.py
#	conquest/mapmaker.py
2021-07-16 09:28:44 -04:00
bobloy
61fa006e33 QoL fixes 2021-07-16 09:26:06 -04:00
bobloy
4183607372 Add option for skipping bots 2021-07-15 16:05:39 -04:00
bobloy
2421c4e9bf Add sm and md to requirements 2021-07-15 15:09:41 -04:00
bobloy
b2e843e781 Invalid timestring instead of error 2021-07-15 14:57:33 -04:00
bobloy
1e535c2f3e
Merge pull request from XargsUK/master
additional exit conditions to recyclingplant
2021-07-08 08:34:31 -04:00
bobloy
fd80819618 Merge branch 'master' into XargsUK_master 2021-07-08 08:33:53 -04:00
bobloy
a5ff888f4c black reformat 2021-07-08 08:33:29 -04:00
bobloy
3eb499bf0e black reformat 2021-07-08 08:30:21 -04:00
bobloy
698dafade4 Add chatter initialization 2021-07-08 08:29:18 -04:00
Brad Duncan
15ecf72c64 Update recyclingplant.py 2021-07-08 07:37:45 +01:00
Brad Duncan
1d514f80c6 adding no response exit condition
Previously, if no response was provided by the user, the function would continuously loop.

I've modified the timeout to 20 seconds. When there's no response, +! to timeoutcount variable. When there's been 3 timeouts, break.
2021-07-08 07:37:37 +01:00
bobloy
b752bfd153 Stop looking at DMs 2021-07-06 13:50:15 -04:00
bobloy
47269ba8f4 fix has_table, move age and minutes to trainset 2021-07-06 12:01:27 -04:00
bobloy
e0a361b952 remove en_core_web_sm as dependency 2021-07-06 10:52:25 -04:00
bobloy
2a18760a83
Merge pull request from bobloy/chatter_fox
Use Bobloy's chatterbot for Chatter
2021-07-06 10:10:09 -04:00
bobloy
b26afdf2db Merge branch 'master' into chatter_fox
# Conflicts:
#	chatter/requirements.txt
2021-07-06 10:09:41 -04:00
bobloy
86cc1fa35a Don't specify pyaml 2021-07-05 14:14:40 -04:00
bobloy
6f0c88b1ac change default models, fix requirements 2021-07-01 17:19:29 -04:00
bobloy
c165313031 no reply errors in cache 2021-07-01 15:25:38 -04:00
bobloy
9c63c12656 Don't need requirements file 2021-06-30 17:29:31 -04:00
bobloy
a55ae8a511 Use Bobloy's chatterbot fork 2021-06-30 17:29:00 -04:00
bobloy
bc12aa866e Fix formatting 2021-05-25 10:13:36 -04:00
bobloy
dbafd6ffd7
Merge pull request from aleclol/master
Fix error on `[p]lovecalculator` command
2021-05-24 10:40:19 -04:00
aleclol
52ca2f6a45
Update lovecalculator.py 2021-05-18 15:27:55 -04:00
bobloy
2937b6ac92 List of dicts 2021-05-03 13:58:35 -04:00