25 Commits

Author SHA1 Message Date
69bbcb2e1b remove duplicate 2025-07-17 10:32:11 +02:00
35ea9758c2 changes 2025-07-17 10:23:13 +02:00
3ea7478b04 Merge branch 'main' into changes 2025-07-17 10:18:34 +02:00
10ea6b389c Merge branch 'lotte02-main' 2025-07-17 10:14:34 +02:00
910672942b revert 1743fd2de4
revert aris circle
2025-07-07 17:47:56 +02:00
6314db1184 Merge pull request 'Add Everbloom x Amy dating' (#55) from Amy/polycule:main into main
Reviewed-on: Elizhium/polycule#55
2025-07-05 01:43:34 +02:00
Amy
352dbdb010 Add Everbloom x Amy dating 2025-07-05 01:34:45 +02:00
c9702e28a5 Update polycule.puml 2025-07-04 22:34:59 +02:00
d2b7103c26 Merge pull request 'Removal of Evi x Ashley, addition of Mira x Charlotte' (#54) from Mira91/polycule:main into main
Reviewed-on: Elizhium/polycule#54
2025-06-24 19:48:10 +02:00
2c24212424 Removal of Evi x Ashley, addition of Mira x Charlotte 2025-06-21 20:20:38 +02:00
1743fd2de4 aris circle 2025-06-21 15:17:07 +02:00
78b5150d49 Charlotte other names, Charlotte - Mira Dating, Charlotte - Aris Dating 2025-06-21 15:15:20 +02:00
ec0c989ae1 Update polycule.puml 2025-06-16 18:58:05 +02:00
01bb62b283 Merge pull request 'Helllen - Ember partners' (#52) from lotte02/polycule:main into main
Reviewed-on: Elizhium/polycule#52
2025-06-16 18:56:36 +02:00
31c4ff5178 Helllen - Ember partners 2025-06-15 22:53:42 +02:00
a690d47b81 Update polycule.puml 2025-06-10 17:14:26 +02:00
7f05adfbdd Merge pull request 'Everbloom casual - Lara/Lance replaced with everbloom' (#51) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#51
2025-06-09 13:37:51 +02:00
86a4c45f92 Everbloom casual 2025-06-08 14:25:34 +02:00
9a1b3a21b9 Merge pull request 'Ember - Hellen dating' (#50) from lotte02/polycule:main into main
Reviewed-on: Elizhium/polycule#50
2025-05-30 12:36:08 +02:00
da852348f4 ember - hellen dating 2025-05-30 12:14:31 +02:00
16949c0e32 updated name 2025-05-28 12:11:51 +02:00
30df76a192 Merge pull request 'Hellen casual' (#49) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#49
2025-05-21 17:22:32 +02:00
736fd50c31 Hellen casual 2025-05-18 01:40:40 +02:00
Elizabeth
8be2f7f334 Merge branch 'changes' of https://git.bruynooghe.dev/Elizhium/polycule into changes 2024-08-06 19:06:21 +02:00
Elizabeth
7d219974d8 linked tali and aeryn 2024-08-06 19:06:18 +02:00

View File

@@ -1,4 +1,4 @@
@startuml
@startuml polycule diagram
circle Jenna
circle Elizabeth
' circle Bea
@@ -26,10 +26,10 @@ circle Alvin
circle Amedee
circle Ward
circle Kathy
circle Glas
circle glas
circle Ari
circle Frede
circle Charlotte
circle "Charlotte/Elva/Layla"
circle Shen
circle Enya
circle Kyra
@@ -43,8 +43,8 @@ circle Sven
circle Tine
circle Hannah
circle Tara
circle Lara/Lance
circle Lotte
circle Everbloom
circle "Lotte/Ember"
' circle Laure
circle Helena
circle Oriana
@@ -57,33 +57,32 @@ circle Tom
circle Gwen
circle Sarah
circle Nicholas
<<<<<<< HEAD
circle Hellen
=======
circle Kris
circle Nari
circle Ara
>>>>>>> upstream/main
circle Lisa
circle Amy
circle Aris
Elizabeth -- Jenna: Partner
Mira -- Rachel: Married
Mira -- Rachel: Married
Jenna -- Talinka : Partner
Rosie -- Ashley : Engaged
Ashley -- Talinka : Engaged
Ashley -- Talinka : Engaged
Lilia .. Ashley : Casual
Amber -- Talinka : Partner
Rosie -- Talinka : Partner
Rosie -- Talinka : Engaged
Alvin -- Talinka : Partner
Amedee -- Evi : Partner
Amber -- Ashley : Partner
Ashley -- Jenna : Partner
Rachel -- Ward : Partner
Ward -- Kathy : Engaged
Ward -- Glas : Partner
Ward -- glas : Partner
Kathy -- Ari : Partner
Ari -- Frede : Partner
Mira -- Evi : Partner
Amber -- Charlotte : Partner
Amber -- "Charlotte/Elva/Layla" : Partner
Shen .. Talinka : Casual
Amedee -- Enya: Partner
Enya -- Kyra: Married
@@ -98,16 +97,15 @@ Koen .. Nina: Casual
Nina -- Sven: Partner
Tine .. Nina: Dating
Tine .. Sven: Dating
Evi -- Ashley: Partner
Mira -- Hannah : Partner
Tara -- Mira: Partner
Tara -- Evi: Partner
Tara .. Amedee: Casual
Elizabeth -- "Emily-Larra-Sarah": Partner
Mira .. Glas: Casual
Hannah -- "Lara/Lance": Partner
Helena -- "Lara/Lance": Partner
Charlotte -- Lotte: Engaged
Mira .. glas: Casual
Hannah -- "Everbloom": Partner
Helena -- "Everbloom": Partner
"Charlotte/Elva/Layla" -- "Lotte/Ember": Engaged
"Emily-Larra-Sarah" .. Oriana : Casual
"Emily-Larra-Sarah" .. Alex : Casual
Thomas .. Tine: Comet
@@ -116,9 +114,9 @@ Anton .. Tine: Dating
Rosie -- Wyvern: Partner
Hester .. Tom
"Emily-Larra-Sarah" .. "Gwen" : Casual
"Emily-Larra-Sarah" .. Lotte: Casual
"Emily-Larra-Sarah" .. Charlotte : Casual
Mira -- "Lara/Lance": Partner
"Emily-Larra-Sarah" .. "Lotte/Ember": Casual
"Emily-Larra-Sarah" .. "Charlotte/Elva/Layla" : Casual
Mira -- "Everbloom": Partner
Tara .. Sarah: Casual
Amber -- Nicholas : Partner
"Emily-Larra-Sarah" .. Hellen : Casual
@@ -126,5 +124,13 @@ Evi .. Kris : Casual
Tara .. Gwen: Casual
Hannah .. Nari : Casual
Nari -- Ara : Partner
"Lotte/Ember" -- Hellen : Partner
Everbloom .. "Emily-Larra-Sarah" : Casual
Lisa -- Ashley : Partner
Lisa -- Amber : Partner
Everbloom .. Amy : Dating
"Charlotte/Elva/Layla" -- Mira : Dating
"Charlotte/Elva/Layla" -- Aris : Dating
Talinka .. Wyvern : Casual
@enduml