Ed 2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml

2024-07-23 12:24:42 +03:00

..

UI

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

2024-07-23 12:24:42 +03:00

ConstructionGhostComponent.cs

Content update for NetEntities (#18935)

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

ConstructionPlacementHijack.cs

Content update for NetEntities (#18935)

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

ConstructionSystem.cs

Remove all Assigned Values that are Never Used (#30110)

2024-07-18 20:22:23 -04:00

FlatpackSystem.cs

Flatpacks and the Flatpacker 1001 (#23338)

2024-01-03 17:16:02 +11:00