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

..

Actions

Magic system refactor part 1 (#1709)

2025-08-25 20:40:10 +03:00

Cooking

adapt codebase

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

Dash

Big content update (#1484)

2025-06-29 00:02:04 +03:00

Demiplane

Update CP14DemiplaneMapWindow.xaml (#1699)

2025-08-24 01:43:28 +03:00

Discord

Merge pull request #1004 from crystallpunk-14/ed-11-03-2025-discord-auth

2025-04-15 22:50:08 +03:00

Farming

Give some love to farming (#1124)

2025-04-03 15:29:08 +03:00

IdentityRecognition

Balance tweaks (#1741)

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

Input

New belt controls (#1298)

2025-06-03 14:39:39 +03:00

JoinQueue

test with joinqueue

2025-05-21 00:31:04 +03:00

Localization

Blood moon part 2 (#1272)

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

MagicEnergy

Magic system refactor part 1 (#1709)

2025-08-25 20:40:10 +03:00

MagicSpell

Spellcasting upgrade (#543)

2024-11-07 16:04:49 +03:00

MagicSpellStorage

serverization??? (#1457)

2025-06-21 20:51:07 +03:00

MagicVision

Magical vision skill (#1467)

2025-06-26 13:49:53 +03:00

MagicWeakness

Unstable demiplane update (#866)

2025-02-09 17:18:24 +03:00

ModularCraft

Bugfixes + QoL (#1218)

2025-04-25 13:39:20 +03:00

NightVision

Carcat night vision (#1046)

2025-03-21 16:53:59 +03:00

Options

Auto CBT (#997)

2025-03-09 23:29:20 +03:00

Overlays

Planetarization (#1040)

2025-03-19 12:52:37 +03:00

Religion

Gathering resourses redesign (#1594)

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

Roof

fix (#1466)

2025-06-23 22:55:26 +03:00

Shitcode

Ice bow artifact (#1200)

2025-04-19 17:24:57 +03:00

Skill

Add supports for different skillpoints types (#1581)

2025-07-27 13:47:05 +03:00

Sponsor

Simple sponsorship system (#1189)

2025-04-17 19:55:25 +03:00

Temperature

Fire update (#602)

2024-11-21 22:01:14 +03:00

Trading

Gathering resourses redesign (#1594)

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

UserInterface

Vampire clan battle gamemode (#1672)

2025-08-22 18:46:28 +03:00

Vampire

Vampire hotfix (#1696)

2025-08-23 01:56:01 +03:00

Wallpaper

Balance bugtweak (#881)

2025-02-10 22:07:25 +03:00

Wave

Auto CBT (#997)

2025-03-09 23:29:20 +03:00

Workbench

Backpacks description and categories (#1647)

2025-08-10 17:25:34 +03:00