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

.gitignore

game/engines/default/data/font/HigashiOme-Gothic-C.ttf

game/engines/default/data/font/packages/default.lua

game/engines/default/data/locales/engine/ja_JP.lua

game/engines/default/data/locales/engine/ko_KR.lua

game/engines/default/data/locales/engine/zh_hans.lua

game/engines/default/engine/DebugConsole.lua

game/engines/default/engine/dialogs/LanguageSelect.lua

game/engines/default/modules/boot/init.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/Trap.lua

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

game/modules/tome/data/chats/shertul-fortress-butler.lua

.../modules/tome/data/general/objects/egos/totems-powers.lua

game/modules/tome/data/general/objects/egos/wands-powers.lua

game/modules/tome/data/locales/ja_JP.lua

game/modules/tome/data/locales/ko_KR.lua

game/modules/tome/data/locales/zh_hans.lua

...les/tome/data/maps/vaults/auto/greater/living-weapons.lua