Adam Saudagar 8f7b6b71c4 Merge remote-tracking branch 'origin/master' into feature/fullauto ... # Conflicts: # fishy/engine/fullautofisher/controls.py # fishy/engine/fullautofisher/engine.py # fishy/engine/fullautofisher/mode/calibrator.py # fishy/engine/fullautofisher/mode/recorder.py # fishy/engine/fullautofisher/player.py # fishy/engine/semifisher/fishing_event.py # fishy/gui/config_top.py		2021-05-12 20:44:55 +05:30
..
__init__.py	connected mode select in config with the engine	2021-05-02 21:10:38 +05:30
calibrator.py	Merge remote-tracking branch 'origin/master' into feature/fullauto	2021-05-12 20:44:55 +05:30
imode.py	connected mode select in config with the engine	2021-05-02 21:10:38 +05:30
player.py	connected mode select in config with the engine	2021-05-02 21:10:38 +05:30
recorder.py	Merge remote-tracking branch 'origin/master' into feature/fullauto	2021-05-12 20:44:55 +05:30