Summary | Shortlog | Commit | Commitdiff | Tree |

Merge pull request #55 from AssemblerManiac/master

Author	AM <AssemblerManiac@users.noreply.github.com>
Author date	2018-06-25 14:20:54
Author local date	2018-06-25 10:20:54 -0400
Committer	GitHub <noreply@github.com>
Committer date	2018-06-25 14:20:54
Committer local date	2018-06-25 10:20:54 -0400
Commit	526d4a0f144dea41fdc61c5f2f22f5376cfc3bb3
Tree	6d90dc529be1b2b0490ce6c32db3eefdc725d20f
Parent	575e3fc1a1f2959f728c14e6b26c6317b19beb7d
Parent	550994e45518347e713b384f06782423be06a175

Merge pull request #55 from AssemblerManiac/master

quickslots now has it's own settings, so it can be turned on/off (default: off) independent of the rest of inventory
moved some debug code
var relocation (debug code)
libAsync updated to v1.6
minor fix to last merge (split an "endfunction" into proper 2 lines)