![[Jenkins]](/jenkins/static/200642ef/images/svgs/logo.svg){kind=logo}
Summary
- fix merge derps (details)
| The file was added | resources/TConstruct_at.cfg |
| The file was modified | src/main/java/tconstruct/preloader/TConstructLoaderContainer.java (diff) |
| The file was modified | src/main/java/tconstruct/common/TContent.java (diff) |
| The file was modified | resources/assets/tinker/manuals/materials.xml (diff) |
| The file was modified | src/main/java/tconstruct/client/TProxyClient.java (diff) |