diff options
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 6 |
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 |