CaitSith2
|
8316a1902d
|
Move death link byte to sram
|
2021-11-11 12:07:17 -08:00 |
|
pepperpow
|
fc62b4e0bd
|
Bartering Update
|
2021-09-03 13:26:30 -05:00 |
|
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 |
|
Fabian Dill
|
6455dc3ffc
|
Merge branch 'main' into breaking_changes
# Conflicts:
# README.md
|
2021-03-13 23:34:38 +01:00 |
|
Fabian Dill
|
0d576eefbb
|
Merge branch 'main' into breaking_changes
# Conflicts:
# Main.py
# worlds/alttp/EntranceRandomizer.py
|
2021-03-03 01:54:52 +01:00 |
|
Fabian Dill
|
122e360ec8
|
Merge branch 'main' into breaking_changes
# Conflicts:
# MultiClient.py
# Utils.py
# worlds/alttp/ItemPool.py
# worlds/alttp/Main.py
# worlds/alttp/Shops.py
|
2021-02-19 13:45:50 +01:00 |
|
Fabian Dill
|
a646594f08
|
Merge branch 'main' into breaking_changes
# Conflicts:
# BaseClasses.py
# Fill.py
# MultiClient.py
# MultiServer.py
# Utils.py
# test/dungeons/TestDungeon.py
# test/inverted/TestInverted.py
# test/inverted_minor_glitches/TestInvertedMinor.py
# test/inverted_owg/TestInvertedOWG.py
# test/minor_glitches/TestMinor.py
# test/owg/TestVanillaOWG.py
# test/vanilla/TestVanilla.py
# worlds/alttp/ItemPool.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
|
2021-01-30 23:29:32 +01:00 |
|
Fabian Dill
|
08ca4245c1
|
Merge branch 'main' into breaking_changes
# Conflicts:
# Adjuster.py
# AdjusterMain.py
# BaseClasses.py
# MultiClient.py
# MultiServer.py
# Mystery.py
# Utils.py
# WebHostLib/downloads.py
# WebHostLib/generate.py
# dumpSprites.py
# test/TestBase.py
# worlds/alttp/EntranceRandomizer.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
|
2021-01-03 13:13:59 +01:00 |
|
Fabian Dill
|
4f8c737eec
|
squashed commit of many breaking changes
Dropping Support for Python 3.7; adding support for Python 3.9
|
2020-10-19 08:26:31 +02:00 |
|