Ed fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml

2024-07-28 20:58:48 +03:00

..

Commands

Make some prototypes use frozen collections (#22576)

2023-12-25 15:12:22 +11:00

Components

Add a system for modifying entity names without causing conflicts (#27863)

2024-06-16 15:38:53 -04:00

Containers/EntitySystems

Moved Serverside solution container code to shared (yes that includes ensureSolution!) (#27478)

2024-05-06 17:27:36 -07:00

EntitySystems

Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream

2024-07-28 20:58:48 +03:00

TileReactions

Replace obsolete EntityWhitelist IsValid usages part 2 (#28506)

2024-06-03 17:40:03 -04:00