Added crafting outcome handling, we can craft things now :D
Fixed conflicts
Bugfix
Updated TODO
Updated TODO
Merge commit '0ccab42e3ecf652fd0b9057721347a40638fccf9'