Mira91/polycule
1
0
Fork 0
forked from Elizhium/polycule
Code Pull Requests Activity

Compare commits

base: Mira91/polycule:Mira91-patch1
Branches Tags
Mira91/polycule:main Mira91/polycule:Mira91-patch1 Elizhium/polycule:main Elizhium/polycule:changes Elizhium/polycule:elizhium-patch-1
..
compare: Mira91/polycule:1bfa17ce555217d242e804dda3f12ed173307711
Branches Tags
Mira91/polycule:main Mira91/polycule:Mira91-patch1 Elizhium/polycule:main Elizhium/polycule:changes Elizhium/polycule:elizhium-patch-1

57 Commits
Mira91-patch1 .. 1bfa17ce55

Author SHA1 Message Date
Mira91 1bfa17ce55 Update polycule.puml 2025-04-27 10:14:05 +02:00
Elizhium c4fec7ac09 Update polycule.puml 2025-04-17 09:56:07 +02:00
Elizhium 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
Mira91 37b3f3b02a Addition of Evi x Kris, removal of Mira x Laure 2025-04-16 11:55:38 +02:00
Elizhium 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
LESA c12e3ef3ff Lotte and Larra stop dating same for Gwen and Oriana 2025-04-09 14:13:57 +02:00
Elizhium cb02108ea6 Update polycule.puml 2025-03-25 08:45:34 +01:00
Elizhium 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
Mira91 f7d2851608 Update polycule.puml 2025-03-16 18:57:23 +01:00
Elizhium 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
LESA 999196fe48 forgot to change with elizabeth relation 2025-03-13 12:23:52 +01:00
Elizhium 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
LESA 46bfbb6edb stupid ass name fix 2025-03-13 12:19:35 +01:00
LESA 3f3d97cb2e Extra name on diagram for Larra/Sarah/Emily 2025-03-13 12:10:14 +01:00
LESA a3469672ab New partner of Amber 2025-03-13 12:08:21 +01:00
Elizhium 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
Mira91 919a033c0f Addition of Sarah for Tara, Mira+Lara/Lance 2025-03-09 07:19:55 +01:00
Elizhium 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
lotte02 06aa177e2e fix: incorrect line type between Emily-Lotte 2025-03-07 11:31:33 +01:00
lotte02 77cde4edec Emily-Lotte Dating 2025-03-07 11:29:42 +01:00
Elizhium 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
LESA 5da6f4829e Going casual with the lottes 2025-03-05 21:41:27 +01:00
Elizhium 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
LESA f1cc96db51 Oriana started dating Gwen, Avery missing connections. Extra casual. 2025-02-28 16:51:39 +01:00
Elizhium 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
Mira91 721127f7c5 Update polycule.puml 2025-02-16 19:41:02 +01:00
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
LESA 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
LESA eaabba8c0f merge upstream 2025-02-10 19:17:49 +01:00
LESA 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
LESA e8b13dffc3 Merge remote-tracking branch 'upstream/main' 2025-02-10 19:08:17 +01:00
LESA 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
LESA 697544001b Update polycule.puml 2025-02-07 16:56:53 +01:00
LESA 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
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
2 changed files with 51 additions and 47 deletions
Expand all files Collapse all files
.gitea/workflows/render.yaml
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
render: render:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
PLANTUML_VERSION: '1.2024.8' PLANTUML_VERSION: '1.2025.0'
steps: steps:
- name: Check out repository code - name: Check out repository code
uses: actions/checkout@v4 uses: actions/checkout@v4
polycule.puml
+50 -46
View File
@@ -6,17 +6,17 @@ circle Mira
circle Rachel 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
circle Evi circle Evi
'circle Kiwi 'circle Kiwi
'circle "Kiwi's polycule" 'circle "Kiwi's polycule"
circle Lara 'circle Lara
circle Jack 'circle Jack
circle Merel 'circle Merel
circle Rosie circle Rosie
circle Talinka circle Talinka
circle Ashley circle Ashley
@@ -34,45 +34,43 @@ circle Shen
circle Enya circle Enya
circle Kyra circle Kyra
circle Chloe circle Chloe
circle Ria
circle Bart
circle Miranda
circle Els
circle Paul
circle Hester circle Hester
circle Koen circle Koen
circle Sylvia circle Sylvia
circle Seba circle Seba
circle Pieter
circle Noud
circle Lies
circle Nina circle Nina
circle Sven circle Sven
circle Tine circle Tine
circle Francis
circle Hannah circle Hannah
circle Tara circle Tara
circle "Bart 👑" circle Lara/Lance
circle Cristel circle Lotte
circle Alexia ' circle Laure
circle Laure circle Helena
circle Oriana
circle Alex
circle Thomas
circle Pieter
circle Anton
circle Wyvern
circle Tom
circle Gwen
circle Sarah
circle Nicholas
circle Kris
circle Nari
circle Ara
Jenna -- Elizabeth : Partner Elizabeth -- Jenna: Partner
Mira -- Rachel: Married Mira -- Rachel: Married
'Evelynn -- Matty :Partner
"Emily-Larra" -- Kiran: Partner
Jack -- Merel: Partner
Jack .. Lara: Casual
Jack .. Soda: Casual
Jenna -- Talinka : Partner Jenna -- Talinka : Partner
Rosie -- Ashley : Engaged Rosie -- Ashley : Engaged
Ashley -- Talinka : Engaged Ashley -- Talinka : Engaged
Jack .. Joanna : Casual
Lilia .. Ashley : Casual Lilia .. Ashley : Casual
Amber -- Talinka : Partner Amber -- Talinka : Partner
Rosie -- Talinka : Partner Rosie -- Talinka : Partner
Alvin -- Talinka : Partner Alvin -- Talinka : Partner
Evi .. Amedee : Dating Amedee -- Evi : Partner
Amber -- Ashley : Partner Amber -- Ashley : Partner
Ashley -- Jenna : Partner Ashley -- Jenna : Partner
Rachel -- Ward : Partner Rachel -- Ward : Partner
@@ -81,42 +79,48 @@ 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
Enya -- Kyra: Married Enya -- Kyra: Married
Amedee .. Chloe: Casual Amedee .. Chloe: Casual
Amedee .. Ria: Casual Hester .. Chloe: Casual
Ria -- Bart: Partner
Amedee .. Miranda: Casual
Amedee .. Els: Casual
Els -- Paul: Partner
Chloe .. Hester: Casual
Hester .. Koen: Casual Hester .. Koen: Casual
Chloe .. Koen: Casual Chloe .. Koen: Casual
Koen -- Sylvia: Partner Koen -- Sylvia: Partner
Hester -- Seba: Partner Hester -- Seba: Partner
Hester .. Pieter: Casual
Hester .. Noud: Casual
Hester .. Amedee: Situationship Hester .. Amedee: Situationship
Noud -- Lies: Partner
Koen .. Nina: Casual Koen .. Nina: Casual
Nina -- Sven: Partner Nina -- Sven: Partner
Tine .. Nina: Dating Tine .. Nina: Dating
Tine .. Sven: Dating Tine .. Sven: Dating
Tine .. "Bart 👑": Casual
"Bart 👑" -- Cristel: Partner
Evi -- Ashley: Partner Evi -- Ashley: Partner
Rosie -- Francis: Partner Mira -- Hannah : Partner
Mira .. Hannah : Casual
Tara -- Mira: Partner Tara -- Mira: Partner
Tara -- Evi: Partner Tara -- Evi: Partner
Tara .. Amedee: Casual Tara .. Amedee: Casual
"Emily-Larra" .. Elizabeth: Dating Elizabeth -- "Emily-Larra-Sarah": Partner
Amedee .. Alexia: Dating
Mira .. Glas: Casual Mira .. Glas: Casual
Mira .. Laure: Casual Hannah -- "Lara/Lance": Partner
Helena -- "Lara/Lance": Partner
Charlotte -- Lotte: Engaged
"Emily-Larra-Sarah" .. Oriana : Casual
"Emily-Larra-Sarah" .. Alex : Casual
Thomas .. Tine: Comet
Pieter .. Tine: Dating
Anton .. Tine: Dating
Rosie -- Wyvern: Partner
Hester .. Tom
"Emily-Larra-Sarah" .. "Gwen" : Casual
Oriana .. "Gwen" : Casual
"Emily-Larra-Sarah" .. Lotte: Casual
"Emily-Larra-Sarah" .. Charlotte : Casual
Mira -- "Lara/Lance": Partner
Tara .. Sarah: Casual
Amber -- Nicholas : Partner
Evi .. Kris : Casual
Tara .. Gwen: Casual
Hannah .. Nari : Casual
Nari -- Ara : Partner
@enduml @enduml