[Jenkins]Jenkins

Changes

Summary

  1. fix merge derps (details)
The file was modifiedresources/assets/tinker/manuals/materials.xml (diff)
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)
The file was modifiedsrc/main/java/tconstruct/preloader/TConstructLoaderContainer.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/TProxyClient.java (diff)
The file was addedresources/TConstruct_at.cfg