Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

# Conflicts:
#	Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta

Assets/GAME/Prefabs/UI/Player_Canvas.prefab

@@ -7187,13 +7187,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 892ceea9ba1c06b4fb516e6f9eb55ff0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::InventoryCategoryManager
-  categoryButtons:
-  - {fileID: 407549691945498409}
-  - {fileID: 7857620881853131658}
-  panels:
-  - {fileID: 4092515852661730968}
-  - {fileID: 3551148638030693533}
-  defaultCategoryIndex: 0
+  categories:
+  - category: 0
+    button: {fileID: 407549691945498409}
+    panel: {fileID: 4092515852661730968}
+  - category: 1
+    button: {fileID: 7857620881853131658}
+    panel: {fileID: 3551148638030693533}
+  defaultCategory: 0
 --- !u!1001 &1985671894588496012
 PrefabInstance:
   m_ObjectHideFlags: 0