Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments

Snippets Groups Projects

24adc1b0

Commit 24adc1b0 authored 6 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'master' into microtxn

parents 339dc2f0 bb762661

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/data/damage_types.lua 5 additions, 0 deletions

game/modules/tome/data/damage_types.lua
game/modules/tome/data/talents/undeads/ghoul.lua 1 addition, 0 deletions

game/modules/tome/data/talents/undeads/ghoul.lua
game/modules/tome/data/timed_effects/magical.lua 16 additions, 1 deletion

game/modules/tome/data/timed_effects/magical.lua

with 22 additions and 1 deletion

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