diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-17 01:02:38 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-17 01:02:38 +0200 |
| commit | de42d1da4264bc0dd339020374b45138d8ddb691 (patch) | |
| tree | da598e6f87b136199542263f5c471934f9f2649b /src/main/java/gregtech | |
| parent | fcaefe2d2853651f05d83105ee1c7deba104bb9c (diff) | |
| parent | 34474480f73ca5ab1c711d73bdb4bd809673e063 (diff) | |
| download | GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.tar.gz GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.tar.bz2 GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.zip | |
Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
BrickedBlastFurnace
Conflicts:
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech')