霧雨烨 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
..
staffOfTheUndead.tscn	Merge branch 'refs/heads/master' into item_refactory_combined	2024-06-12 22:13:55 +08:00