霧雨烨 9c8d98da02 Merge branch 'refs/heads/master' into loot_rebuild ... # Conflicts: # data/itemRegs/weapons.yaml # locals/Log.csv # prefab/weapons/staffOfTheUndead.tscn # scripts/character/CharacterTemplate.cs # scripts/item/ItemTypeManager.cs # scripts/item/weapon/WeaponTemplate.cs # scripts/loader/uiLoader/MainMenuLoader.cs		2024-06-16 17:32:29 +08:00
..
staffOfTheUndead.tscn	Merge branch 'refs/heads/master' into loot_rebuild	2024-06-16 17:32:29 +08:00