Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

99ec2b56

Commit 99ec2b56 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'more_fixes' into 'master'

More fixes

for electronicRU, asked me to add an end

parents 5ec835fe 83f7c295

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Entity.lua 1 addition, 1 deletion

game/engines/default/engine/Entity.lua
game/modules/tome/data/talents/chronomancy/matter.lua 1 addition, 1 deletion

game/modules/tome/data/talents/chronomancy/matter.lua
game/modules/tome/data/timed_effects/magical.lua 5 additions, 3 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