Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

2fa08eed

There was a problem fetching the pipeline summary.

Commit 2fa08eed authored 5 years ago by DarkGod

Downloads
- Plain Diff

Merge branch '1.6.bun' into 'master'

1.6.1 misc



See merge request !576

parents e50f8a08 0cfbaf59

No related branches found

No related tags found

Loading

Pipeline #

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/data/birth/races/elf.lua 2 additions, 2 deletions

game/modules/tome/data/birth/races/elf.lua
game/modules/tome/data/birth/races/giant.lua 2 additions, 2 deletions

game/modules/tome/data/birth/races/giant.lua
game/modules/tome/data/general/objects/egos/ammo.lua 2 additions, 2 deletions

game/modules/tome/data/general/objects/egos/ammo.lua
game/modules/tome/data/general/objects/egos/ranged.lua 1 addition, 1 deletion

game/modules/tome/data/general/objects/egos/ranged.lua
game/modules/tome/data/general/objects/egos/shield.lua 1 addition, 1 deletion

game/modules/tome/data/general/objects/egos/shield.lua
game/modules/tome/data/general/objects/egos/weapon.lua 1 addition, 1 deletion

game/modules/tome/data/general/objects/egos/weapon.lua
game/modules/tome/data/general/objects/world-artifacts.lua 1 addition, 0 deletions

game/modules/tome/data/general/objects/world-artifacts.lua
game/modules/tome/data/talents/uber/mag.lua 6 additions, 6 deletions

game/modules/tome/data/talents/uber/mag.lua
game/modules/tome/data/texts/unlock-mage_cryomancer.lua 3 additions, 3 deletions

game/modules/tome/data/texts/unlock-mage_cryomancer.lua

with 19 additions and 18 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