diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-07-27 17:23:49 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-27 17:23:49 +0200 |
| commit | 9418bc09549d7e104b8000083b171d65ae5b3f3c (patch) | |
| tree | 39c1c4943bbba01710db6662a21aeb656d5a0039 /src/main/java/speiger | |
| parent | 36825da8842e152682449aad95f076095c921395 (diff) | |
| parent | be79f288a8e058677d09c40e11524282d27dc313 (diff) | |
| download | GT5-Unofficial-9418bc09549d7e104b8000083b171d65ae5b3f3c.tar.gz GT5-Unofficial-9418bc09549d7e104b8000083b171d65ae5b3f3c.tar.bz2 GT5-Unofficial-9418bc09549d7e104b8000083b171d65ae5b3f3c.zip | |
Merge remote-tracking branch 'upstream/SmoothTransition' into experimental
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
Diffstat (limited to 'src/main/java/speiger')
0 files changed, 0 insertions, 0 deletions