temporary commit to merge code from base
basic functionality done
Added an advanced inventory management function
fix a bug that crash the game when moving items in empty list
fix bug, inverted the numbering
fix ui
bug fix: item do not disappear when using [e]
bug fixes
Merge branch 'base'
allow 2 different square to be view side by side
Merge remote-tracking branch 'dda/pr/441' into dda-master
Cleanup trailing whitespace.
Remove a warning by fully parenthesizing a logic operation.