Changes

Summary

1. fix manual merge derps (details)

Commit faedd83413c4463271ee6940650a671c00d7f37e by progwml6 fix manual merge derps
	src/main/java/tconstruct/common/TContent.java (diff)
	src/main/java/tconstruct/common/TRecipes.java (diff)