Commit Graph

2 Commits

Author SHA1 Message Date
霧雨烨
76daa88bac Merge branch 'refs/heads/master' into item_refactory_combined
# Conflicts:
#	locals/Slogan.ja.translation
#	scripts/character/CharacterTemplate.cs
#	scripts/character/Player.cs
#	scripts/inventory/HotBar.cs
#	scripts/inventory/IItemContainer.cs
#	scripts/item/weapon/ProjectileWeapon.cs
#	scripts/item/weapon/WeaponTemplate.cs
2024-06-12 22:13:55 +08:00
霧雨烨
026c7ff32f Add single item stack type, move the weapon namespace into the item namespace, and I think it's ready to be merged into the new interface 2024-06-12 00:51:40 +08:00