Commit Graph

2 Commits

Author SHA1 Message Date
TrickyLeifa
b306929311 Resolved merge conflicts.
This comment format is just tiring for the eyes. Imagine being on 1080p and not being able to read more than 5 method definitions due to comments.
2024-05-17 19:44:37 +02:00
TrickyLeifa
fefaad5394 Merge branch 'master' into kaleidoscope 2024-05-17 19:19:04 +02:00