Merge branch 'main' into 'main'

Main

See merge request !188

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

.idea/workspace.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="96ba2e5e-82b2-41dd-8461-05316c7fd5d7" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Scenes/Map.unity" beforeDir="false" afterPath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Scenes/Map.unity" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Game/Game.cs" beforeDir="false" afterPath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Game/Game.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Game/Notification.cs" beforeDir="false" afterPath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Game/Notification.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Map/NextDay.cs" beforeDir="false" afterPath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Map/NextDay.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Map/SellScript.cs" beforeDir="false" afterPath="$PROJECT_DIR$/unity_project/Marsgriculteur/Assets/Script/Map/SellScript.cs" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2IV91OpdHv2rzuR76FrCDjuudeC" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/EliseM/Documents/t3_2022&quot;
-  }
-}</component>
-  <component name="RunManager">
-    <configuration default="true" type="JetRunConfigurationType">
-      <module name="t3_2022" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
-      <module name="t3_2022" />
-      <option name="filePath" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="96ba2e5e-82b2-41dd-8461-05316c7fd5d7" name="Changes" comment="" />
-      <created>1670255668691</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1670255668691</updated>
-    </task>
-    <servers />
-  </component>
-</project>
\ No newline at end of file