From 6e9746bd849953d830f36ba86344f7f197510f66 Mon Sep 17 00:00:00 2001 From: PokingPines <118520090+PokingPines@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:23:42 +0200 Subject: [PATCH 1/2] L --- .../URP_Support/URP/URP_Standard.unitypackage.meta} | 2 +- .../Timers/SampleScene_timers.json.meta} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename Assets/Imported Assets/{SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta => EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta} (74%) rename Assets/{Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta => ML-Agents/Timers/SampleScene_timers.json.meta} (62%) diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta b/Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta similarity index 74% rename from Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta rename to Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta index 2f7eb2e..f5c706f 100644 --- a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta +++ b/Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58f7e79a87c79824597746e8c1bfe400 +guid: d884527f3e242c144af52b11faf49d2f DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta b/Assets/ML-Agents/Timers/SampleScene_timers.json.meta similarity index 62% rename from Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta rename to Assets/ML-Agents/Timers/SampleScene_timers.json.meta index 73c9a86..adca138 100644 --- a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta +++ b/Assets/ML-Agents/Timers/SampleScene_timers.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f58d25b9e504a4f41ab4a71cf87c1845 -DefaultImporter: +guid: 4af2646cae3014146bf467e2830fdb41 +TextScriptImporter: externalObjects: {} userData: assetBundleName: From 6979490b559d37432852907292692eb92fdac138 Mon Sep 17 00:00:00 2001 From: PokingPines <118520090+PokingPines@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:28:58 +0200 Subject: [PATCH 2/2] L --- Assets/Images/Car Icons.meta | 2 +- .../Toon Vehicles/Textures/Gradient/Materials.meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Images/Car Icons.meta b/Assets/Images/Car Icons.meta index 48e88b4..60c310a 100644 --- a/Assets/Images/Car Icons.meta +++ b/Assets/Images/Car Icons.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta -guid: d884527f3e242c144af52b11faf49d2f +guid: 8c4ea7980396ef44790197912891dea8 ======= guid: d5d570160164b804ca24a36b21a621db folderAsset: yes diff --git a/Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta b/Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta index 0e878af..d065b64 100644 --- a/Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta +++ b/Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta -guid: 4af2646cae3014146bf467e2830fdb41 +guid: 604fbff49b150b941bdc2ebd21de54e8 TextScriptImporter: ======= guid: 27000db5eaa3d9f42bceff430c265d3a