9c8d98da02
# 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 |
||
---|---|---|
.. | ||
Action.csv | ||
Action.csv.import | ||
DeathInfo.csv | ||
DeathInfo.csv.import | ||
InputMapping.csv | ||
InputMapping.csv.import | ||
Item.csv | ||
Item.csv.import | ||
Log.csv | ||
Log.csv.import | ||
Misc.csv | ||
Misc.csv.import | ||
slogan.csv | ||
slogan.csv.import | ||
UI.csv | ||
UI.csv.import |