PO/Logs/shadercompiler-UnityShaderC...

Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler

<<<<<<< HEAD


=======
Cmd: shutdown

Quitting shader compiler process
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
idk 2022-01-15 01:05:02 +03:00			`Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'`
			`Cmd: initializeCompiler`

Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/CurrentLayout-default.dwlt # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0-prev.log # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe10.log # Logs/shadercompiler-UnityShaderCompiler.exe11.log # Logs/shadercompiler-UnityShaderCompiler.exe3.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log # Logs/shadercompiler-UnityShaderCompiler.exe8.log # Logs/shadercompiler-UnityShaderCompiler.exe9.log # obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache # obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2022-01-19 23:49:46 +03:00			`<<<<<<< HEAD`
minifix 2022-01-19 23:48:18 +03:00



Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/CurrentLayout-default.dwlt # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0-prev.log # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe10.log # Logs/shadercompiler-UnityShaderCompiler.exe11.log # Logs/shadercompiler-UnityShaderCompiler.exe3.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log # Logs/shadercompiler-UnityShaderCompiler.exe8.log # Logs/shadercompiler-UnityShaderCompiler.exe9.log # obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache # obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2022-01-19 23:49:46 +03:00			`=======`
It works, but not as it should) 2022-01-17 23:09:07 +03:00			`Cmd: shutdown`
added global list of maps + new method for working with it 2022-01-19 20:27:33 +03:00
			`Quitting shader compiler process`
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/CurrentLayout-default.dwlt # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0-prev.log # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe10.log # Logs/shadercompiler-UnityShaderCompiler.exe11.log # Logs/shadercompiler-UnityShaderCompiler.exe3.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log # Logs/shadercompiler-UnityShaderCompiler.exe8.log # Logs/shadercompiler-UnityShaderCompiler.exe9.log # obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache # obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2022-01-19 23:49:46 +03:00			`>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3`