From 30e05b9c4fcba4b2c1f42498b086b1a7eabcb057 Mon Sep 17 00:00:00 2001
From: /Fox --develop <paul.liverman.iii@gmail.com>
Date: Thu, 10 Aug 2017 23:26:55 -0700
Subject: [PATCH 1/3] Updated link to Lua code conventions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 4fffcccd98445f974330a2d500b34b39502e1b04 Mon Sep 17 00:00:00 2001
From: Vexatos <Stuarzt@gmx.de>
Date: Sat, 14 Oct 2017 18:34:12 +0200
Subject: [PATCH 2/3] Version bump.

---
 build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.properties b/build.properties
index 5cce677fa..3fad09ffa 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1448-1.7.10
 
-oc.version=1.6.2
+oc.version=1.7.0
 oc.subversion=dev
 
 ae2.version=rv2-beta-26

From fd5fd98c84c0bb061523b0406735dfd0a09d903d Mon Sep 17 00:00:00 2001
From: Vexatos <Stuarzt@gmx.de>
Date: Sat, 14 Oct 2017 18:43:25 +0200
Subject: [PATCH 3/3] Subversion no more.

---
 build.gradle     | 3 ---
 build.properties | 1 -
 2 files changed, 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6cece660a..561dbacaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,9 +46,6 @@ def getGitRef() {
 if (System.getenv("BUILD_NUMBER") != null)
     version += ".${System.getenv("BUILD_NUMBER")}"
 
-if (config.oc.subversion != null && config.oc.subversion != "")
-    version += "-${config.oc.subversion}"
-
 if (System.getenv("BUILD_NUMBER") == null)
     version += "+" + getGitRef()
 
diff --git a/build.properties b/build.properties
index 3fad09ffa..c86b8512f 100644
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,6 @@ minecraft.version=1.7.10
 forge.version=10.13.4.1448-1.7.10
 
 oc.version=1.7.0
-oc.subversion=dev
 
 ae2.version=rv2-beta-26
 bc.version=7.0.9