Artemis-the-gr8 db3f94cc80 Merge branch 'main' into database ... # Conflicts: # dependency-reduced-pom.xml # pom.xml		2023-10-31 11:22:12 +01:00
..
java/com/artemis/the/gr8/playerstats	Merge branch 'main' into database	2023-10-31 11:22:12 +01:00
resources	Updated to v2.1 for release	2023-10-26 11:36:28 +02:00