aboutsummaryrefslogtreecommitdiff
path: root/build.properties
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-05-22 01:28:37 +0200
committerDream-Master <dream-master@gmx.net>2016-05-22 01:28:37 +0200
commit71790e521495c8df87714cba48bed2460ea266e4 (patch)
tree01754be7abd25e273a29cc42289405145676604e /build.properties
parentcbd6ba66511f50c9999b557d9ae19beb4f28dc4c (diff)
downloadGT5-Unofficial-71790e521495c8df87714cba48bed2460ea266e4.tar.gz
GT5-Unofficial-71790e521495c8df87714cba48bed2460ea266e4.tar.bz2
GT5-Unofficial-71790e521495c8df87714cba48bed2460ea266e4.zip
fix
Diffstat (limited to 'build.properties')
-rw-r--r--build.properties6
1 files changed, 1 insertions, 5 deletions
diff --git a/build.properties b/build.properties
index a7c9db9b21..fb37ebdd2a 100644
--- a/build.properties
+++ b/build.properties
@@ -1,12 +1,8 @@
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
+gt.version=5.08.33.18
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407
buildcraft.version=7.1.11