DESKTOP-DDTRVOR\asus 2bee2c42b6 Merge branch 'main' into TT
# Conflicts:
#	.gitignore
#	Blacksmith/Assets/Editor/StarkBuilderSetting.asset
#	Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta
#	Blacksmith/Assets/Script/GameSystem.cs
#	Blacksmith/Assets/Script/UI/ForgePanel.cs
#	Blacksmith/UserSettings/Layouts/default-2022.dwlt
#	Blacksmith/project.config.json
2024-12-23 15:25:21 +08:00

12 lines
243 B
Plaintext

fileFormatVersion: 2
guid: ab33bcf0d5772b145a71e111b94ff711
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: