Fix all those stupid bugs.
Merge branch '1.6.1' of github.com:Minetweak/Minetweak into 1.6.1