Merge remote-tracking branch 'origin/main' into planning

# Conflicts:
#	CHANGELOG.md
#	content/_meta/README.md
#	content/_meta/npc-authoring-style-guide.md
#	wiki/_templates/cultural-group.md
#	wiki/_templates/institution.md
#	wiki/_templates/star-system.md
#	wiki/characters/devra.md
#	wiki/characters/drin.md
#	wiki/characters/harek.md
#	wiki/characters/lera-sessik.md
#	wiki/characters/maret-korr.md
#	wiki/characters/naia-tamm.md
#	wiki/characters/nils-davan.md
#	wiki/characters/pell.md
#	wiki/characters/renn.md
#	wiki/characters/resha.md
#	wiki/characters/sabel.md
#	wiki/characters/sera-venn.md
#	wiki/characters/torek-lintar.md
#	wiki/characters/voss.md
#	wiki/star-systems/krenn/index.md
This commit is contained in:
2026-03-14 00:24:53 +01:00
575 changed files with 5163 additions and 6440 deletions
@@ -1,3 +1,14 @@
---
title: "Round 2 Notes"
description: "Qatux compilation of all round 2 participant outputs and convergence points"
type: workshop
status: archived
workshop: generator-architecture
agent: ""
round: 2
created: 2026-02-27
---
# Generator Architecture Workshop — Round 2 Notes
**Compiled by:** Qatux (Documenter)