diff --git a/README.md b/README.md
index be597a98a..593ce7f96 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ In the case you wish to use Eclipse rather than IntelliJ IDEA, the process is mo
 
 
 [api]: https://github.com/MightyPirates/OpenComputers/tree/master-MC1.7.10/src/main/java/li/cil/oc/api
-[code conventions]: https://github.com/MightyPirates/OpenComputers/wiki/CodeConventions
+[code conventions]: http://ocdoc.cil.li/lua_conventions
 [dev-jar]: http://oc.cil.li/index.php?/page/latest.php?repo=OpenComputers-dev-MC1.7.10&type=dev
 [forums]: http://oc.cil.li/
 [irc]: http://webchat.esper.net/?channels=#oc
diff --git a/build.properties b/build.properties
index 64268d64f..34e4b0e13 100644
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,7 @@ minecraft.version=1.10.2
 minecraft.mappings=snapshot_20160720
 forge.version=12.18.3.2221
 
-oc.version=1.6.2
+oc.version=1.7.0
 oc.subversion=dev
 
 ae2.version=rv4-alpha-11