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

8503ee68

Commit 8503ee68 authored 5 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'Misc' into 'master'

Misc



See merge request !611

parents 4dee7ddf f74cb75e

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 4 additions, 3 deletions

game/modules/tome/data/damage_types.lua
game/modules/tome/data/general/objects/random-artifacts/generic.lua 2 additions, 2 deletions

...es/tome/data/general/objects/random-artifacts/generic.lua
game/modules/tome/data/timed_effects/magical.lua 1 addition, 0 deletions

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

with 7 additions and 5 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