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