diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-05-22 01:26:18 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-05-22 01:26:18 +0200 |
| commit | cbd6ba66511f50c9999b557d9ae19beb4f28dc4c (patch) | |
| tree | e8c1a17560d117703951b6001beffcdb2deb6f0d /build.properties | |
| parent | 7e4aecb65f584d75babc3c20a84c671f0a1cdda3 (diff) | |
| parent | 2d582f300eefc37425b31b0cb2b295492c9d12a0 (diff) | |
| download | GT5-Unofficial-cbd6ba66511f50c9999b557d9ae19beb4f28dc4c.tar.gz GT5-Unofficial-cbd6ba66511f50c9999b557d9ae19beb4f28dc4c.tar.bz2 GT5-Unofficial-cbd6ba66511f50c9999b557d9ae19beb4f28dc4c.zip | |
Merge branch 'Scan-termals-of-EBF'
Conflicts:
build.properties
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build.properties b/build.properties index bff2c8c909..a7c9db9b21 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,11 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 +<<<<<<< HEAD gt.version=5.08.33.17 +======= +gt.version=5.08.33.18 +>>>>>>> Scan-termals-of-EBF ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 |