Commit ec98a8f0d38f9c37e943ddbca50f335d30b5c692

Authored by Tawny Harte
2 parents 9c457f6e e69ac88c

Merge branch 'master' into the-death-of-consumables---alchemist-edition

* master: (331 commits)
  When a yeek exits the tunnels to the halfling complex and sees subject Z; a warning comes up from the wayist, urging you to flee
  useless commit is useless
  When a shader is missing, it'll use a default fallback (prevents loading game with missing DLCs/addons)
  Classic UI can now cancel buffs by right-click
  simple way for mtx shimmer packs to be reinstalled
  fix old file
  correctly name the moons
  Load quickhotkeys prior to loading the game to fix hotkey ordering for "restart the same character".
  Summons shouldn't hate their master
  Fix merge conflict eating }
  Fix minor glyph bugs
  Greatly revise Glyphs
  Revise Sunburst

# Conflicts:
#	game/modules/tome/data/general/objects/world-artifacts.lua
0 builds
.gitlab-ci.yml not found in this commit
Status Build ID Ref Stage Name Duration Finished at