Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

Magnet

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

Themes

Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream

2025-05-12 14:25:42 +03:00

biome_markers.yml

Add additional Biome Markers. (#36300)

2025-04-05 14:03:19 +02:00

biome_ore_templates_low.yml

Add additional Biome Markers. (#36300)

2025-04-05 14:03:19 +02:00

biome_ore_templates.yml

Mining Rebalance (#30920)

2024-08-16 11:43:54 +10:00

biome_templates.yml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

dungeon_configs.yml

DungeonData rework (#37172)

2025-05-18 03:10:30 +10:00

dungeon_presets.yml

Dungeon generation refactor (#17121)

2023-06-27 19:17:42 +10:00

dungeon_room_packs.yml

Dungeon generation refactor (#17121)

2023-06-27 19:17:42 +10:00

salvage_difficulties.yml

Expeditions rework (#18960)

2023-09-19 22:52:01 +10:00

salvage_factions.yml

Localization of the Salvage Expedition Console (#30339)

2024-07-30 10:05:19 -04:00

salvage_loot.yml

Chemistry bottle cleanup (#35911)

2025-03-23 13:24:55 +01:00

salvage_misc.yml

Salvage expeditions (#12745)

2023-04-20 10:43:13 +10:00

salvage_mods.yml

Localization of the Salvage Expedition Console (#30339)

2024-07-30 10:05:19 -04:00

salvage_rewards.yml

Chemistry bottle cleanup (#35911)

2025-03-23 13:24:55 +01:00

vgroid.yml

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00