Scipio Wright c74ccd74a4 # Conflicts: ...

#	worlds/tunic/__init__.py
#	worlds/tunic/combat_logic.py
#	worlds/tunic/er_data.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/er_scripts.py

2024-12-15 17:10:22 -05:00

..

assertion

Stardew valley: Fixed furnace logic bug (#4163)

2024-11-12 05:27:43 +01:00

content

Stardew Valley: Refactor skill progression to use new feature system (#3662)

2024-12-01 03:52:07 +01:00

long

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

mods

# Conflicts:

2024-12-15 17:10:22 -05:00

options

# Conflicts:

2024-12-15 17:10:22 -05:00

performance

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

rules

Stardew Valley: Fix a bug where locations in logic would disappear from universal tracker as items get sent (#4230)

2024-11-30 01:46:35 +01:00

script

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

stability

# Conflicts:

2024-12-15 17:10:22 -05:00

__init__.py

# Conflicts:

2024-12-15 17:10:22 -05:00

TestBackpack.py

Stardew Valley: Cut tests by 3 minutes (#2375)

2023-10-28 00:18:33 +02:00

TestBooksanity.py

# Conflicts:

2024-12-15 17:10:22 -05:00

TestBundles.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestCrops.py

Stardew Valley: Fix a bug where locations in logic would disappear from universal tracker as items get sent (#4230)

2024-11-30 01:46:35 +01:00

TestData.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestDynamicGoals.py

Stardew Valley: Fix Crimsonfish region (#3687)

2024-08-29 08:41:57 +02:00

TestFarmType.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestFill.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestFishsanity.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestFriendsanity.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestGeneration.py

Stardew Valley: Make progressive movie theater a progression trap (#3985)

2024-11-27 00:44:33 +01:00

TestItemLink.py

Stardew Valley: 5.x.x - The Allsanity Update (#2764)

2024-03-15 13:05:14 +01:00

TestItems.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestLogic.py

Core: recontextualize CollectionState.collect (#3723)

2024-08-13 22:28:05 +02:00

TestMultiplePlayers.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestNumberLocations.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestOptionFlags.py

Stardew Valley: 5.x.x - The Allsanity Update (#2764)

2024-03-15 13:05:14 +01:00

TestOptions.py

# Conflicts:

2024-12-15 17:10:22 -05:00

TestOptionsPairs.py

# Conflicts:

2024-12-15 17:10:22 -05:00

TestRegions.py

# Conflicts:

2024-12-15 17:10:22 -05:00

TestStardewRule.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestStartInventory.py

Stardew Valley 6.x.x: The Content Update (#3478)

2024-07-07 15:04:25 +02:00

TestWalnutsanity.py

# Conflicts:

2024-12-15 17:10:22 -05:00