Merge branch 'master' of git.net-core.org:tome/t-engine4

game/modules/tome/class/Game.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/interface/Combat.lua

game/modules/tome/data/general/npcs/thieve.lua

...les/tome/data/general/objects/boss-artifacts-maj-eyal.lua

game/modules/tome/data/general/objects/egos/rings.lua

game/modules/tome/data/general/objects/egos/weapon.lua

...es/tome/data/general/objects/random-artifacts/generic.lua

game/modules/tome/data/general/objects/world-artifacts.lua

game/modules/tome/data/talents/techniques/battle-tactics.lua

game/modules/tome/data/talents/techniques/weaponshield.lua

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

game/modules/tome/data/zones/thieves-tunnels/npcs.lua