Ed 4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2024-12-22 15:48:30 +03:00

..

Magnet

Demiplan modifiers (#526)

2024-11-01 18:08:57 +03:00

Themes

Demiplan polishing 2 (#528)

2024-11-02 00:59:55 +03:00

biome_markers.yml

Gateway destinations (#21040)

2023-11-14 19:23:40 -07:00

biome_ore_templates.yml

Mining Rebalance (#30920)

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

biome_templates.yml

Flora clean up (#33839)

2024-12-16 20:20:36 +01:00

dungeon_configs.yml

Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream

2024-12-22 15:48:30 +03: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

Mining Rebalance (#30920)

2024-08-16 11:43:54 +10: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

Remove vehicles (#24681)

2024-02-01 11:33:10 +11:00

vgroid.yml

Demiplan modifiers (#526)

2024-11-01 18:08:57 +03:00