Merge branch 'master' into otowakotori/t-engine4-i18n-aggro

.gitignore

game/modules/tome/class/NicerTiles.lua

game/modules/tome/data/general/encounters/maj-eyal.lua

game/modules/tome/data/general/grids/sanddunes.lua

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

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

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

game/modules/tome/data/general/objects/egos/wizard-hat.lua

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

.../modules/tome/data/gfx/shockbolt/terrain/dunes/dunes1.png

...modules/tome/data/gfx/shockbolt/terrain/dunes/dunes1i.png

.../modules/tome/data/gfx/shockbolt/terrain/dunes/dunes2.png

.../modules/tome/data/gfx/shockbolt/terrain/dunes/dunes3.png

...modules/tome/data/gfx/shockbolt/terrain/dunes/dunes3i.png

.../modules/tome/data/gfx/shockbolt/terrain/dunes/dunes4.png

.../modules/tome/data/gfx/shockbolt/terrain/dunes/dunes5.png

...odules/tome/data/gfx/shockbolt/terrain/dunes/dunes5_1.png

...odules/tome/data/gfx/shockbolt/terrain/dunes/dunes5_2.png

...odules/tome/data/gfx/shockbolt/terrain/dunes/dunes5_3.png

...odules/tome/data/gfx/shockbolt/terrain/dunes/dunes5_4.png