Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.idea/libraries/lib.xml
#	.idea/misc.xml
#	gruppe06-hufflepuff-projekt3-catan.iml
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Edge.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class

.idea/libraries/lib.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="lib">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/slf4j-api-2.0.0-alpha1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/text-io-3.4.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/slf4j-api-2.0.0-alpha1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

gruppe06-hufflepuff-projekt3-catan.iml

@@ -6,7 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="openjdk-17" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib" level="project" />
     <orderEntry type="module-library" scope="TEST">