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

Compare commits

base: amedee/polycule:78e7fcadefad26d82e0d1a89dccf69ce55912f21
Branches Tags
amedee/polycule:main Elizhium/polycule:main Elizhium/polycule:changes Elizhium/polycule:elizhium-patch-1
...
compare: Elizhium/polycule:changes
Branches Tags
Elizhium/polycule:main Elizhium/polycule:changes Elizhium/polycule:elizhium-patch-1 amedee/polycule:main

82 Commits
78e7fcadef ... changes

Author SHA1 Message Date
Elizhium 69bbcb2e1b remove duplicate 2025-07-17 10:32:11 +02:00
Elizhium 35ea9758c2 changes 2025-07-17 10:23:13 +02:00
Elizhium 3ea7478b04 Merge branch 'main' into changes 2025-07-17 10:18:34 +02:00
Elizhium 10ea6b389c Merge branch 'lotte02-main' 2025-07-17 10:14:34 +02:00
lotte02 910672942b revert 1743fd2de4 
revert aris circle
 2025-07-07 17:47:56 +02:00
Elizhium 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
Elizhium c9702e28a5 Update polycule.puml 2025-07-04 22:34:59 +02:00
Elizhium 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
Mira91 2c24212424 Removal of Evi x Ashley, addition of Mira x Charlotte 2025-06-21 20:20:38 +02:00
lotte02 1743fd2de4 aris circle 2025-06-21 15:17:07 +02:00
lotte02 78b5150d49 Charlotte other names, Charlotte - Mira Dating, Charlotte - Aris Dating 2025-06-21 15:15:20 +02:00
Elizhium ec0c989ae1 Update polycule.puml 2025-06-16 18:58:05 +02:00
Elizhium 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
lotte02 31c4ff5178 Helllen - Ember partners 2025-06-15 22:53:42 +02:00
Elizhium a690d47b81 Update polycule.puml 2025-06-10 17:14:26 +02:00
Elizhium 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
LESA 86a4c45f92 Everbloom casual 2025-06-08 14:25:34 +02:00
Elizhium 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
lotte02 da852348f4 ember - hellen dating 2025-05-30 12:14:31 +02:00
lotte02 16949c0e32 updated name 2025-05-28 12:11:51 +02:00
Elizhium 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
LESA 736fd50c31 Hellen casual 2025-05-18 01:40:40 +02:00
LESA adcdf65f60 Hellen casual 2025-05-18 01:39:09 +02:00
LESA 976d6f293e Hellen casual 2025-05-18 01:34:52 +02:00
Elizhium 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
lotte02 43c7250322 Oriana and Gwen no longer casuals 2025-05-04 22:27:20 +02:00
Elizhium 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
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
Publish diagram / render (push) Has been cancelled
Details
Publish diagram / publish (push) Has been cancelled
Details 
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...
Render diagram / render (pull_request) Has been cancelled
Details
2025-02-10 14:25:37 +01:00
Elizhium e31f793bf3 Update polycule.puml
Publish diagram / render (push) Waiting to run
Details
Publish diagram / publish (push) Blocked by required conditions
Details
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
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
2 changed files with 65 additions and 53 deletions
Expand all files Collapse all files
.gitea/workflows/render.yaml
+1 -1
View File
@@ -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
polycule.puml
+62 -50
View File
@@ -1,4 +1,4 @@
@startuml
@startuml polycule diagram
circle Jenna
circle Elizabeth
' circle Bea
@@ -7,7 +7,7 @@ circle Rachel
'circle Evelynn
'circle Matty
'circle Joanna
circle "Emily-Larra"
circle "Emily-Larra-Sarah"
'circle Celeste
'circle Kiran
'circle Soda
@@ -26,99 +26,111 @@ 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
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 Jelle
circle Valerie
circle Everbloom
circle "Lotte/Ember"
' 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 Hellen
circle Kris
circle Nari
circle Ara
circle Lisa
circle Amy
circle Aris
Elizabeth -- Jenna: Partner
Mira -- Rachel: Married
Jenna -- Talinka : Partner
Rosie -- Ashley : Engaged
Ashley -- Talinka : Engaged
Lilia .. Ashley : Casual
Amber -- Talinka : Partner
Rosie -- Talinka : Partner
Rosie -- Talinka : Engaged
Alvin -- Talinka : Partner
Amedee .. Evi: Dating
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
Evi -- Amber : Partner
Amber -- Charlotte : Partner
Amber -- "Charlotte/Elva/Layla" : Partner
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
Mira -- Hannah : Partner
Tara -- Mira: Partner
Tara -- Evi: Partner
Tara .. Amedee: Casual
Elizabeth .. "Emily-Larra": Dating
Amedee .. Alexia: Dating
Mira .. Glas: Casual
Mira .. Laure: Casual
Hannah -- "Lara/Lance": Partner
Charlotte -- Lotte: Partner
Jelle -- Valerie: Partner
Jelle .. Hester: Casual
Jelle .. Lies: Dating
Elizabeth -- "Emily-Larra-Sarah": Partner
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
Pieter .. Tine: Dating
Anton .. Tine: Dating
Rosie -- Wyvern: Partner
Hester .. Tom
"Emily-Larra-Sarah" .. "Gwen" : Casual
"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
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