solve conflicts
parent
86cce72c
No related branches found
No related tags found
Showing
- game/engines/default/engine/Birther.lua 1 addition, 1 deletiongame/engines/default/engine/Birther.lua
- game/engines/default/engine/Chat.lua 1 addition, 1 deletiongame/engines/default/engine/Chat.lua
- game/engines/default/engine/I18N.lua 34 additions, 14 deletionsgame/engines/default/engine/I18N.lua
- game/engines/default/engine/dialogs/ShowEquipInven.lua 2 additions, 2 deletionsgame/engines/default/engine/dialogs/ShowEquipInven.lua
- game/engines/default/engine/dialogs/ShowEquipment.lua 1 addition, 1 deletiongame/engines/default/engine/dialogs/ShowEquipment.lua
- game/engines/default/engine/dialogs/ShowInventory.lua 1 addition, 1 deletiongame/engines/default/engine/dialogs/ShowInventory.lua
- game/engines/default/engine/dialogs/ShowPickupFloor.lua 1 addition, 1 deletiongame/engines/default/engine/dialogs/ShowPickupFloor.lua
- game/engines/default/engine/dialogs/ShowStore.lua 2 additions, 2 deletionsgame/engines/default/engine/dialogs/ShowStore.lua
- game/engines/default/engine/ui/Inventory.lua 1 addition, 1 deletiongame/engines/default/engine/ui/Inventory.lua
- game/engines/default/engine/utils.lua 14 additions, 5 deletionsgame/engines/default/engine/utils.lua
- game/modules/tome/class/Actor.lua 1 addition, 1 deletiongame/modules/tome/class/Actor.lua
- game/modules/tome/class/GameState.lua 1 addition, 1 deletiongame/modules/tome/class/GameState.lua
- game/modules/tome/class/Object.lua 3 additions, 3 deletionsgame/modules/tome/class/Object.lua
- game/modules/tome/class/Party.lua 1 addition, 1 deletiongame/modules/tome/class/Party.lua
- game/modules/tome/class/interface/Combat.lua 1 addition, 1 deletiongame/modules/tome/class/interface/Combat.lua
- game/modules/tome/class/uiset/ClassicPlayerDisplay.lua 1 addition, 1 deletiongame/modules/tome/class/uiset/ClassicPlayerDisplay.lua
- game/modules/tome/class/uiset/Minimalist.lua 1 addition, 1 deletiongame/modules/tome/class/uiset/Minimalist.lua
- game/modules/tome/data/calendar_allied.lua 12 additions, 12 deletionsgame/modules/tome/data/calendar_allied.lua
- game/modules/tome/data/calendar_dwarf.lua 11 additions, 11 deletionsgame/modules/tome/data/calendar_dwarf.lua
- game/modules/tome/data/damage_types.lua 1 addition, 1 deletiongame/modules/tome/data/damage_types.lua
Loading
Please register or sign in to comment