Merge pull request #33 from AssemblerManiac/master

Author manavortex <manavortex@gmail.com>
Author date 2018-03-22 16:58:04
Author local date 2018-03-22 17:58:04 +0100
Committer GitHub <noreply@github.com>
Committer date 2018-03-22 16:58:04
Committer local date 2018-03-22 17:58:04 +0100
Commit 9961eebbb694c78194ae56ebd01272bb33847f92
Tree 0aee1b7ed0d50509ed8d9c2b8747dded3badb2bc
Parent 39297f8690c815588c51b79670f221eef591d269
Parent 552dc6259ad828d5be499505337c9191088fd5a1
Merge pull request #33 from AssemblerManiac/master

filtering changes, trophy consumables now visible; filter icon change…