Ed acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2 ...

# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs

2025-03-03 23:23:40 +03:00

..

UI

Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

2024-11-23 01:48:24 +03:00

ConstructionGhostComponent.cs

Fix build ghosts not being placeable on a new round. (#35097)

2025-02-18 23:34:15 +11:00

ConstructionPlacementHijack.cs

Content update for NetEntities (#18935)

2023-09-11 09:42:41 +10:00

ConstructionSystem.cs

Fix build ghosts not being placeable on a new round. (#35097)

2025-02-18 23:34:15 +11:00

FlatpackSystem.cs

Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside FlatpackSystem` (#35457)

2025-02-24 18:37:50 +01:00