Fabian Dill d24ee45462 Merge branch 'main' into Archipelago_Main ... # Conflicts: # BaseClasses.py # LttPAdjuster.py # Main.py # Mystery.py # Utils.py # WebHostLib/generate.py # playerSettings.yaml		2021-04-01 11:44:37 +02:00
..
alttp	Merge branch 'main' into Archipelago_Main	2021-04-01 11:44:37 +02:00
factorio	Factorio integration	2021-04-01 11:40:58 +02:00
generic	Allow HK items in shops and allow settings local/non-local items for HK	2021-02-24 00:36:37 +01:00
hk	Factorio integration	2021-04-01 11:40:58 +02:00
__init__.py	Factorio integration	2021-04-01 11:40:58 +02:00