Prevent random NEI errors caused by invalid tinker tools (commit: b6c5e65)
Make consistency-check aware of vanilla tcon diamond modifier, if applicable (commit: 810b3ac)