Commit Graph

2 Commits

Author SHA1 Message Date
霧雨烨
d12ddc566b Merge remote-tracking branch 'refs/remotes/origin/master' into item_refactory
# Conflicts:
#	locals/Item.csv
#	locals/Weapon.en.translation
#	locals/Weapon.ja.translation
#	locals/Weapon.zh.translation
#	scripts/inventory/UniversalItemContainer.cs
#	scripts/utils/NodeUtils.cs
2024-06-13 10:15:15 +08:00
f219380a5f
Add a backpack for testing.
加入测试使用的背包。
2024-06-12 23:42:35 +08:00