Ed f84e1ba04d Merge branch 'master' into ed-25-08-2025-upstream-sync ...

# Conflicts:
#	Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml

2025-09-08 11:33:44 +03:00

..

_CP14

Alch guidebook refactor (#1717)

2025-09-08 02:45:11 +03:00

Guidebook

Added "highly illegal" contraband to guidebook (#38176)

2025-08-18 17:51:33 +02:00

Gameplay.txt

Fix tiny grammar/spelling issues (#23534)

2024-01-04 23:35:31 +01:00

Intro.txt

Rename "Server Info" to ServerInfo (#15436)

2023-04-16 10:55:59 +10:00

Sandbox.txt

Rename "Server Info" to ServerInfo (#15436)

2023-04-16 10:55:59 +10:00