# 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