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

..

Components

Gathering resourses redesign (#1594)

2025-08-04 13:35:55 +03:00

CP14BloodMoonCurseRule.cs

fixes

2025-08-04 12:56:12 +03:00

CP14BloodMoonRule.cs

Blood moon part 2 (#1272)

2025-05-17 14:12:49 +03:00

CP14CommonObjectivesRule.cs

Random bugfixes and balance (#1088)

2025-03-29 22:08:58 +03:00

CP14CrashingShipRule.cs

adapt codebase

2025-08-25 17:00:57 +03:00

CP14ExpeditionToWindlandsRule.cs

adapt codebase

2025-08-25 17:00:57 +03:00

CP14PersonalObjectivesRule.cs

Random content (#815)

2025-01-28 13:04:10 +03:00

CP14VampireRuleSystem.cs

Balance tweaks (#1741)

2025-09-07 14:22:30 +03:00

CP14WeatherRule.cs

Dynamic demiplane weather + farming hotfix (#1131)

2025-04-04 10:35:48 +03:00