diff --git a/build.gradle b/build.gradle
index 73079fe8e..a93cc786a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,12 +29,17 @@ configurations.all {
     resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours'
 }
 
+sourceCompatibility = JavaVersion.VERSION_1_6
 targetCompatibility = JavaVersion.VERSION_1_6
 
 version = config.version + "-" + config.aechannel + "-" + config.build
 group = config.group
 archivesBaseName = config.archivesBaseName
 
+if (hasProperty("teamcity")) {
+    version = teamcity["build.number"]
+}
+
 // Add Coremod Manifest
 jar {
     manifest {
diff --git a/build.properties b/build.properties
index 9b4538669..a722f6adb 100644
--- a/build.properties
+++ b/build.properties
@@ -1,14 +1,41 @@
 version=rv2
 aechannel=alpha
-build=_
+build=0
 group=appeng
 archivesBaseName=appliedenergistics2
+
+#########################################################
+# Versions                                              #
+#########################################################
 minecraft_version=1.7.10
 forge_version=10.13.1.1217
+
+#########################################################
+# APIs used for development                             #
+#########################################################
 cb_minecraft_version=1.7.10
 fmp_version=1.1.0.306
 code_chicken_lib_version=1.1.1.104
 code_chicken_core_version=1.0.3.26
 nei_version=1.0.3.56
-ic2_version=2.2.643
-waila_version=1.5.3a_1.7.10
\ No newline at end of file
+waila_version=1.5.3a_1.7.10
+
+#########################################################
+# API Stubs                                             #
+# Note: Do not edit these version numbers as they are   #
+# not the version of the mod, but stub code for AE2 to  #
+# compile                                               #
+#########################################################
+api_betterstorage_version=1
+api_coloredlightscore_version=1
+api_craftguide_version=1
+api_ic2_version=1
+api_immibis_version=1
+api_invtweaks_version=1
+api_mekansim_version=1
+api_mfr_version=1
+api_railcraft_version=1
+api_rblocks_version=1
+api_rf_version=1
+api_rotarycraft_version=1
+dev_buildcraft_version=1
\ No newline at end of file
diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle
index 00c7eb358..10dcbdcd9 100644
--- a/gradle/scripts/dependencies.gradle
+++ b/gradle/scripts/dependencies.gradle
@@ -11,7 +11,7 @@ repositories {
     }
 
     maven {
-        name "FireBall API Depo"
+        name "FireBall API Depot"
         url "http://dl.tsr.me/artifactory/libs-release-local"
     }
 }
@@ -25,19 +25,19 @@ dependencies {
 
     compile "mcp.mobius.waila:Waila:${config.waila_version}"
 	
-    compile(group: 'api', name: 'betterstorage', version: '1')
-    compile(group: 'api', name: 'coloredlightscore', version: '1')
-    compile(group: 'api', name: 'craftguide', version: '1')
-    compile(group: 'api', name: 'ic2', version: '1')
-    compile(group: 'api', name: 'immibis', version: '1')
-    compile(group: 'api', name: 'invtweaks', version: '1')
-    compile(group: 'api', name: 'mekansim', version: '1')
-    compile(group: 'api', name: 'mfr', version: '1')
-    compile(group: 'api', name: 'railcraft', version: '1')
-    compile(group: 'api', name: 'rblocks', version: '1')
-    compile(group: 'api', name: 'rf', version: '1')
-    compile(group: 'api', name: 'rotarycraft', version: '1')
-    compile(group: 'dev', name: 'buildcraft', version: '1')
+    compile(group: 'api', name: 'betterstorage', version: "${config.api_betterstorage_version}")
+    compile(group: 'api', name: 'coloredlightscore', version: "${config.api_coloredlightscore_version}")
+    compile(group: 'api', name: 'craftguide', version: "${config.api_craftguide_version}")
+    compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
+    compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
+    compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
+    compile(group: 'api', name: 'mekansim', version: "${config.api_mekansim_version}")
+    compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
+    compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
+    compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
+    compile(group: 'api', name: 'rf', version: "${config.api_rf_version}")
+    compile(group: 'api', name: 'rotarycraft', version: "${config.api_rotarycraft_version}")
+    compile(group: 'dev', name: 'buildcraft', version: "${config.dev_buildcraft_version}")
 
     // add hacked buildcraft jar to compile time (for facades)
     compile fileTree(dir: 'libs', include: '*.jar')