44 Commits

Author SHA1 Message Date
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
adcdf65f60 Hellen casual 2025-05-18 01:39:09 +02:00
976d6f293e Hellen casual 2025-05-18 01:34:52 +02:00
c1ff2700cb Merge pull request 'Oriana and Gwen no longer casuals' (#48) from lotte02/polycule:main into main
Reviewed-on: Elizhium/polycule#48
2025-05-05 00:01:40 +02:00
43c7250322 Oriana and Gwen no longer casuals 2025-05-04 22:27:20 +02:00
b2a9620480 Merge pull request 'Nari x Hannah casual, addition of Nari and Ara' (#47) from Mira91/polycule:main into main
Reviewed-on: Elizhium/polycule#47
2025-04-30 06:58:11 +02:00
1bfa17ce55 Update polycule.puml 2025-04-27 10:14:05 +02:00
c4fec7ac09 Update polycule.puml 2025-04-17 09:56:07 +02:00
18d592bee4 Merge pull request 'Addition of Evi x Kris, removal of Mira x Laure' (#46) from Mira91/polycule:main into main
Reviewed-on: Elizhium/polycule#46
2025-04-17 09:49:17 +02:00
37b3f3b02a Addition of Evi x Kris, removal of Mira x Laure 2025-04-16 11:55:38 +02:00
39b39f4655 Merge pull request 'Lotte and Larra stop dating same for Gwen and Oriana' (#45) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#45
2025-04-09 17:30:05 +02:00
c12e3ef3ff Lotte and Larra stop dating same for Gwen and Oriana 2025-04-09 14:13:57 +02:00
cb02108ea6 Update polycule.puml 2025-03-25 08:45:34 +01:00
1a924aa559 Merge pull request 'Mira x Lara/Lance partner' (#44) from Mira91/polycule:main into main
Reviewed-on: Elizhium/polycule#44
2025-03-16 19:57:21 +01:00
f7d2851608 Update polycule.puml 2025-03-16 18:57:23 +01:00
d79c1c89dc Merge pull request 'forgot to change with elizabeth relation oops' (#43) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#43
2025-03-13 12:25:02 +01:00
999196fe48 forgot to change with elizabeth relation 2025-03-13 12:23:52 +01:00
ff6e55c988 Merge pull request 'Some changes new partner Amber + updated name' (#42) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#42
Reviewed-by: Elizhium <elizabeth.bruynooghe@gmail.com>
2025-03-13 12:21:41 +01:00
46bfbb6edb stupid ass name fix 2025-03-13 12:19:35 +01:00
3f3d97cb2e Extra name on diagram for Larra/Sarah/Emily 2025-03-13 12:10:14 +01:00
a3469672ab New partner of Amber 2025-03-13 12:08:21 +01:00
c0383e7d4f Merge pull request 'Addition of Sarah for Tara, Mira+Lara/Lance' (#41) from Mira91/polycule:main into main
Reviewed-on: Elizhium/polycule#41
2025-03-09 08:13:34 +01:00
919a033c0f Addition of Sarah for Tara, Mira+Lara/Lance 2025-03-09 07:19:55 +01:00
8182aec0f8 Merge pull request 'Emily and Lotte Dating' (#40) from lotte02/polycule:main into main
Reviewed-on: Elizhium/polycule#40
2025-03-07 13:54:18 +01:00
06aa177e2e fix: incorrect line type between Emily-Lotte 2025-03-07 11:31:33 +01:00
77cde4edec Emily-Lotte Dating 2025-03-07 11:29:42 +01:00
1981f4ea14 Merge pull request 'Going casual with the lottes' (#39) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#39
2025-03-05 21:56:41 +01:00
5da6f4829e Going casual with the lottes 2025-03-05 21:41:27 +01:00
4ef8f85705 Merge pull request 'Oriana started dating Gwen, Avery missing connections. Extra casual.' (#38) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#38
2025-02-28 19:21:19 +01:00
f1cc96db51 Oriana started dating Gwen, Avery missing connections. Extra casual. 2025-02-28 16:51:39 +01:00
b5a9df2f9b Merge pull request 'Mira/Hannah Partner and light trolling of Rachel' (#37) from Mira91/polycule:main into main
Reviewed-on: Elizhium/polycule#37
2025-02-16 20:16:35 +01:00
721127f7c5 Update polycule.puml 2025-02-16 19:41:02 +01:00
207fe64c8c Merge pull request 'Charlotte 💍 Lotte' (#36) from lotte02/polycule:main into main
Reviewed-on: Elizhium/polycule#36
2025-02-15 20:12:22 +01:00
99de9739f0 Charlotte 💍 Lotte 2025-02-15 15:52:34 +01:00
171b9d0f47 Merge pull request 'Undo merge conflict resolution' (#35) from amedee/polycule:fix-merge-conflict into main
Reviewed-on: Elizhium/polycule#35
2025-02-11 06:31:14 +01:00
db67bc7512 Undo merge conflict resolution
Removed connections were re-added in 46a1126c and 434fb586.
This commit removes them again.
2025-02-10 19:41:27 +01:00
93cd18d8c0 Merge pull request 'also fixed circle spelling...' (#34) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#34
2025-02-10 19:22:40 +01:00
c6b3df01fe Merge branch 'main' into main 2025-02-10 19:22:33 +01:00
46a1126c38 Merge pull request 'main' (#33) from Emily-Sarah-Larra/polycule:main into main
Reviewed-on: Elizhium/polycule#33
2025-02-10 19:19:19 +01:00

View File

@@ -7,7 +7,7 @@ circle Rachel
'circle Evelynn 'circle Evelynn
'circle Matty 'circle Matty
'circle Joanna 'circle Joanna
circle "Emily-Larra" circle "Emily-Larra-Sarah"
'circle Celeste 'circle Celeste
'circle Kiran 'circle Kiran
'circle Soda 'circle Soda
@@ -43,21 +43,24 @@ circle Sven
circle Tine circle Tine
circle Hannah circle Hannah
circle Tara circle Tara
circle Lara/Lance circle Everbloom
circle Lotte circle "Lotte/Ember"
circle Laure ' circle Laure
circle Helena circle Helena
circle Oriana circle Oriana
circle Alex circle Alex
circle Avery
circle Thomas circle Thomas
circle Pieter circle Pieter
circle Anton circle Anton
circle Wyvern circle Wyvern
circle Tom circle Tom
circle Jelle circle Gwen
circle Valerie circle Sarah
circle Lies circle Nicholas
circle Hellen
circle Kris
circle Nari
circle Ara
Elizabeth -- Jenna: Partner Elizabeth -- Jenna: Partner
Mira -- Rachel: Married Mira -- Rachel: Married
@@ -77,7 +80,6 @@ Ward -- Glas : Partner
Kathy -- Ari : Partner Kathy -- Ari : Partner
Ari -- Frede : Partner Ari -- Frede : Partner
Mira -- Evi : Partner Mira -- Evi : Partner
Evi -- Amber : Partner
Amber -- Charlotte : Partner Amber -- Charlotte : Partner
Shen .. Talinka : Casual Shen .. Talinka : Casual
Amedee -- Enya: Partner Amedee -- Enya: Partner
@@ -94,26 +96,34 @@ Nina -- Sven: Partner
Tine .. Nina: Dating Tine .. Nina: Dating
Tine .. Sven: Dating Tine .. Sven: Dating
Evi -- Ashley: Partner Evi -- Ashley: Partner
Mira .. Hannah : Casual Mira -- Hannah : Partner
Tara -- Mira: Partner Tara -- Mira: Partner
Tara -- Evi: Partner Tara -- Evi: Partner
Tara .. Amedee: Casual Tara .. Amedee: Casual
Elizabeth -- "Emily-Larra": Partner Elizabeth -- "Emily-Larra-Sarah": Partner
Mira .. Glas: Casual Mira .. Glas: Casual
Mira .. Laure: Casual Hannah -- "Everbloom": Partner
Hannah -- "Lara/Lance": Partner Helena -- "Everbloom": Partner
Helena -- "Lara/Lance": Partner Charlotte -- "Lotte/Ember": Engaged
Charlotte -- Lotte: Partner "Emily-Larra-Sarah" .. Oriana : Casual
Jelle -- Valerie: Partner "Emily-Larra-Sarah" .. Alex : Casual
Jelle .. Hester: Casual
Jelle .. Lies: Dating
"Emily-Larra" .. Oriana : Casual
"Emily-Larra" .. Alex : Casual
"Emily-Larra" .. Avery : Casual
Thomas .. Tine: Comet Thomas .. Tine: Comet
Pieter .. Tine: Dating Pieter .. Tine: Dating
Anton .. Tine: Dating Anton .. Tine: Dating
Rosie -- Wyvern: Partner Rosie -- Wyvern: Partner
Hester .. Tom Hester .. Tom
"Emily-Larra-Sarah" .. "Gwen" : Casual
"Emily-Larra-Sarah" .. "Lotte/Ember": Casual
"Emily-Larra-Sarah" .. Charlotte : Casual
Mira -- "Everbloom": Partner
Tara .. Sarah: Casual
Amber -- Nicholas : Partner
"Emily-Larra-Sarah" .. Hellen : Casual
Evi .. Kris : Casual
Tara .. Gwen: Casual
Hannah .. Nari : Casual
Nari -- Ara : Partner
"Lotte/Ember" -- Hellen : Dating
Everbloom .. "Emily-Larra-Sarah" : Casual
@enduml @enduml