Commit Graph

126 Commits

Author SHA1 Message Date
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
0e1a708dba also fixed circle spelling... 2025-02-10 19:21:24 +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
eaabba8c0f merge upstream 2025-02-10 19:17:49 +01:00
1806ee48a2 Fixed cirlces missing and oriana name 2025-02-10 19:16:40 +01:00
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
e8b13dffc3 Merge remote-tracking branch 'upstream/main' 2025-02-10 19:08:17 +01:00
3932921749 Update polycule.puml 2025-02-10 18:53:48 +01:00
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
45e405d563 Hester & Tom are sitting in a tree... 2025-02-10 14:25:37 +01:00
e31f793bf3 Update polycule.puml 2025-02-08 09:46:46 +01:00
af6f8aa834 Update polycule.puml 2025-02-08 09:43:54 +01:00
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
697544001b Update polycule.puml 2025-02-07 16:56:53 +01:00
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
725c5cf19f Update polycule.puml 2025-02-05 10:57:36 +01:00
b4a72ccfde Update polycule.puml 2025-01-18 23:12:21 +01:00
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
2ccc9c6592 Amedee & Evi went from dating to partner 2025-01-09 20:20:26 +01:00
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
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
03791c6af0 Update EOY changes 2025-01-03 21:28:42 +01:00