Merge pull request 'Charlotte 💍 Lotte' (#36 ) from lotte02/polycule:main into main

Reviewed-on: Elizhium/polycule#36
Charlotte 💍 Lotte
2025-02-15 20:12:22 +01:00 · 2025-02-15 15:52:34 +01:00 · 2025-02-11 06:31:14 +01:00 · 2025-02-10 19:41:27 +01:00 · 2025-02-10 19:22:40 +01:00 · 2025-02-10 19:22:33 +01:00
2 changed files with 36 additions and 41 deletions
--- a/.gitea/workflows/render.yaml
+++ b/.gitea/workflows/render.yaml
@@ -9,7 +9,7 @@ jobs:
  render:
    runs-on: ubuntu-latest
    env:
-      PLANTUML_VERSION: '1.2024.8'
+      PLANTUML_VERSION: '1.2025.0'
    steps:
      - name: Check out repository code
        uses: actions/checkout@v4
--- a/polycule.puml
+++ b/polycule.puml
@@ -6,17 +6,17 @@ circle Mira
 circle Rachel
 'circle Evelynn
 'circle Matty
-circle Joanna
+'circle Joanna
 circle "Emily-Larra"
 'circle Celeste
-circle Kiran
-circle Soda
+'circle Kiran
+'circle Soda
 circle Evi
 'circle Kiwi
 'circle "Kiwi's polycule"
-circle Lara
-circle Jack
-circle Merel
+'circle Lara
+'circle Jack
+'circle Merel
 circle Rosie
 circle Talinka
 circle Ashley
@@ -34,44 +34,38 @@ circle Shen
 circle Enya
 circle Kyra
 circle Chloe
-circle Ria
-circle Bart
-circle Miranda
-circle Els
-circle Paul
 circle Hester
 circle Koen
 circle Sylvia
 circle Seba
-circle Pieter
-circle Noud
-circle Lies
 circle Nina
 circle Sven
 circle Tine
-circle Francis
 circle Hannah
 circle Tara
-circle "Bart 👑"
-circle Cristel
-circle Alexia
+circle Lara/Lance
+circle Lotte
+circle Laure
+circle Helena
+circle Oriana
+circle Alex
+circle Avery
+circle Thomas
+circle Pieter
+circle Anton
+circle Wyvern
+circle Tom

-Jenna -- Elizabeth : Partner
+Elizabeth -- Jenna: Partner
 Mira --  Rachel: Married
-'Evelynn --  Matty :Partner
-"Emily-Larra" --  Kiran: Partner
-Jack --  Merel: Partner
-Jack ..  Lara: Casual
-Jack ..  Soda: Casual
 Jenna -- Talinka : Partner
 Rosie -- Ashley : Engaged
 Ashley --  Talinka : Engaged
-Jack .. Joanna : Casual
 Lilia .. Ashley : Casual
 Amber -- Talinka : Partner
 Rosie -- Talinka : Partner
 Alvin -- Talinka : Partner
-Evi .. Amedee : Dating
+Amedee -- Evi : Partner
 Amber -- Ashley : Partner
 Ashley -- Jenna : Partner
 Rachel -- Ward : Partner
@@ -86,33 +80,34 @@ Shen .. Talinka : Casual
 Amedee -- Enya: Partner
 Enya -- Kyra: Married
 Amedee .. Chloe: Casual
-Amedee .. Ria: Casual
-Ria -- Bart: Partner
-Amedee .. Miranda: Casual
-Amedee .. Els: Casual
-Els -- Paul: Partner
-Chloe .. Hester: Casual
+Hester .. Chloe: Casual
 Hester .. Koen: Casual
 Chloe .. Koen: Casual
 Koen -- Sylvia: Partner
 Hester -- Seba: Partner
-Hester .. Pieter: Casual
-Hester .. Noud: Casual
 Hester .. Amedee: Situationship
-Noud -- Lies: Partner
 Koen .. Nina: Casual
 Nina -- Sven: Partner
 Tine .. Nina: Dating
 Tine .. Sven: Dating
-Tine .. "Bart 👑": Casual
-"Bart 👑" -- Cristel: Partner
 Evi -- Ashley: Partner
-Rosie -- Francis: Partner
 Mira .. Hannah : Casual
 Tara -- Mira: Partner
 Tara -- Evi: Partner
 Tara .. Amedee: Casual
-"Emily-Larra" .. Elizabeth: Dating
-Amedee .. Alexia: Dating
+Elizabeth -- "Emily-Larra": Partner
+Mira .. Glas: Casual
+Mira .. Laure: Casual
+Hannah -- "Lara/Lance": Partner
+Helena -- "Lara/Lance": Partner
+Charlotte -- Lotte: Engaged
+"Emily-Larra" .. Oriana : Casual
+"Emily-Larra" .. Alex : Casual
+"Emily-Larra" .. Avery : Casual
+Thomas .. Tine: Comet
+Pieter .. Tine: Dating
+Anton .. Tine: Dating
+Rosie -- Wyvern: Partner
+Hester .. Tom

@enduml
Author	SHA1	Message	Date
Elizhium	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
lotte02	99de9739f0	Charlotte 💍 Lotte	2025-02-15 15:52:34 +01:00
Elizhium	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
amedee	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
Elizhium	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
Elizhium	c6b3df01fe	Merge branch 'main' into main	2025-02-10 19:22:33 +01:00
Larra Emily Sarah	0e1a708dba	also fixed circle spelling...	2025-02-10 19:21:24 +01:00
Elizhium	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
Emily-Sarah-Larra	eaabba8c0f	merge upstream	2025-02-10 19:17:49 +01:00
Larra Emily Sarah	1806ee48a2	Fixed cirlces missing and oriana name	2025-02-10 19:16:40 +01:00
Elizhium	434fb58648	Merge pull request 'Update polycule.puml' (#31 ) from Emily-Sarah-Larra/polycule:main into main Reviewed-on: Elizhium/polycule#31	2025-02-10 19:09:15 +01:00
Larra Emily Sarah	e8b13dffc3	Merge remote-tracking branch 'upstream/main'	2025-02-10 19:08:17 +01:00
Emily-Sarah-Larra	3932921749	Update polycule.puml	2025-02-10 18:53:48 +01:00
Elizhium	f161eb8623	Merge pull request 'Hester & Tom are sitting in a tree...' (#32 ) from amedee/polycule:hester into main Reviewed-on: Elizhium/polycule#32	2025-02-10 15:43:04 +01:00
amedee	45e405d563	Hester & Tom are sitting in a tree...	2025-02-10 14:25:37 +01:00
Elizhium	e31f793bf3	Update polycule.puml	2025-02-08 09:46:46 +01:00
Elizhium	af6f8aa834	Update polycule.puml	2025-02-08 09:43:54 +01:00
Elizhium	3533c1dfa2	Merge pull request 'february-update' (#30 ) from amedee/polycule:february-update into main Reviewed-on: Elizhium/polycule#30	2025-02-08 09:33:03 +01:00
Emily-Sarah-Larra	697544001b	Update polycule.puml	2025-02-07 16:56:53 +01:00
Emily-Sarah-Larra	248a94f562	Update polycule.puml	2025-02-07 16:52:41 +01:00
Amedee Van Gasse ✨🌈🦄	1a6077b5d2	Bump PlantUML version to 1.2025.0	2025-02-07 12:07:48 +01:00
Amedee Van Gasse ✨🌈🦄	ad6503ed7b	February 2025 update * Add Tine's current connections * Remove some of the weaker connections	2025-02-07 12:02:22 +01:00
Elizhium	725c5cf19f	Update polycule.puml	2025-02-05 10:57:36 +01:00
Elizhium	b4a72ccfde	Update polycule.puml	2025-01-18 23:12:21 +01:00
Elizhium	77162d0746	Merge pull request 'Amedee & Evi went from dating to partner' (#29 ) from amedee/polycule:amedee-and-evi into main Reviewed-on: Elizhium/polycule#29	2025-01-09 20:28:09 +01:00
amedee	2ccc9c6592	Amedee & Evi went from dating to partner	2025-01-09 20:20:26 +01:00
Elizhium	78e7fcadef	Merge pull request 'November updates' (#28 ) from amedee/polycule:november into main Reviewed-on: Elizhium/polycule#28	2025-01-08 08:34:09 +01:00
Elizabeth	d2997001db	Merge branch 'main' of https://git.bruynooghe.dev/Elizhium/polycule	2025-01-04 12:09:17 +01:00
Elizabeth	da19aea152	updates and pruning	2025-01-04 12:06:09 +01:00
Elizhium	52d2e31d48	Merge pull request 'Update EOY changes' (#27 ) from Mira91/polycule:Mira91-patch1 into main Reviewed-on: Elizhium/polycule#27	2025-01-04 00:17:38 +01:00
Mira91	03791c6af0	Update EOY changes	2025-01-03 21:28:42 +01:00
Amedee Van Gasse ✨🌈🦄	de1c6db71d	November updates * Jelle is dating Lies, so Jelle's polycule is added * Hester broke up with Frank, so Frank's polycule is deleted * Hester is no longer dating 'boomknuffelaar' * Hester and Amedee have some unlabeled situationship? * Some shenanigans to reduce crossing lines	2024-11-14 20:00:00 +01:00