diff options
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 |