diff --git a/Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab b/Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab index a68eda2..669994f 100644 Binary files a/Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab and b/Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab differ diff --git a/Assets/SmartMergeRegistrator.cs.meta b/Assets/SmartMergeRegistrator.cs.meta new file mode 100644 index 0000000..0880a75 --- /dev/null +++ b/Assets/SmartMergeRegistrator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0bae4947f6aedab4e920f0a6b94cf17a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset index a0a4b33..f857ff8 100644 --- a/ProjectSettings/RiderScriptEditorPersistedState.asset +++ b/ProjectSettings/RiderScriptEditorPersistedState.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 0} m_Name: m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState - lastWriteTicks: -8584934212363266927 + lastWriteTicks: -8584932391242735107