diff options
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build.properties b/build.properties index 3c6ef6e961..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 @@ -19,4 +23,4 @@ forestry.version=4.2.10.58 ic2.version=2.2.790-experimental nei.version=1.0.3.57 railcraft.cf=2219/321 -railcraft.version=1.7.10-9.4.0.0
\ No newline at end of file +railcraft.version=1.7.10-9.4.0.0 |