Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

87d85ea9

Commit 87d85ea9 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'no-no-martyr' into 'master'

No no martyr

parents 0c15e04e 16c8ad08

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/data/damage_types.lua 267 additions, 263 deletions

game/modules/tome/data/damage_types.lua
game/modules/tome/data/talents/chronomancy/energy.lua 8 additions, 8 deletions

game/modules/tome/data/talents/chronomancy/energy.lua
game/modules/tome/data/talents/chronomancy/fate-weaving.lua 13 additions, 13 deletions

game/modules/tome/data/talents/chronomancy/fate-weaving.lua
game/modules/tome/data/talents/chronomancy/other.lua 36 additions, 36 deletions

game/modules/tome/data/talents/chronomancy/other.lua
game/modules/tome/data/talents/corruptions/vile-life.lua 3 additions, 3 deletions

game/modules/tome/data/talents/corruptions/vile-life.lua
game/modules/tome/data/talents/psionic/absorption.lua 4 additions, 4 deletions

game/modules/tome/data/talents/psionic/absorption.lua

with 331 additions and 327 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment