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

..

ap_names

# Conflicts:

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

__init__.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

animal_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

animal_product_names.py

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

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

artisan_good_names.py

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

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

book_names.py

Stardew Valley: Fix Daggerfish, Cropsanity; Move Some Rules to Content Packs; Add Missing Shipsanity Location (#3626)

2024-07-25 09:22:46 +02:00

building_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

bundle_names.py

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

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

calendar_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

craftable_names.py

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

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

crop_names.py

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

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

currency_names.py

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

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

decoration_names.py

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

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

entrance_names.py

Stardew Valley: Improve Junimo Kart Regions #3984

2024-09-23 00:14:04 +02:00

fertilizer_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

festival_check_names.py

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

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

fish_names.py

Stardew Valley: Fix Daggerfish, Cropsanity; Move Some Rules to Content Packs; Add Missing Shipsanity Location (#3626)

2024-07-25 09:22:46 +02:00

flower_names.py

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

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

food_names.py

Stardew Valley: Fix Daggerfish, Cropsanity; Move Some Rules to Content Packs; Add Missing Shipsanity Location (#3626)

2024-07-25 09:22:46 +02:00

forageable_names.py

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

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

fruit_tree_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

generic_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

geode_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

gift_names.py

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

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

goal_names.py

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

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

ingredient_names.py

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

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

machine_names.py

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

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

material_names.py

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

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

metal_names.py

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

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

monster_drop_names.py

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

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

monster_names.py

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

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

performance_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

quality_names.py

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

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

quest_names.py

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

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

region_names.py

Stardew Valley: Improve Junimo Kart Regions #3984

2024-09-23 00:14:04 +02:00

season_names.py

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

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

seed_names.py

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

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

skill_names.py

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

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

special_order_names.py

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

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

spells.py

Stardew Valley: Fix magic altar logic (#3417)

2024-05-29 20:16:19 +02:00

tool_names.py

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

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

tv_channel_names.py

Stardew Valley: 4.x.x - The Ginger Update (#1931)

2023-07-19 20:26:38 +02:00

villager_names.py

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

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

wallet_item_names.py

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

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

weapon_names.py

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

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