Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

Conflicts: build.properties
2025-09-18 03:36:47 -04:00 · 2014-09-06 01:19:12 +02:00 · 2014-09-06 01:19:12 +02:00 · d6b248edac
commit d6b248edac
parent 1b4d42b480 32cd6fa61e
5 changed files with 1 additions and 1 deletions
--- a/build.properties
+++ b/build.properties
@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.0.1180
 oc.version=1.3.4
-oc.subversion=dev
+oc.subversion=
 ccl.version=1.1.1.95
 fmp.version=1.1.0.299
 ic2.version=2.2.616-experimental
--- a/src/main/resources/assets/opencomputers/lib/native.32.dll
+++ b/src/main/resources/assets/opencomputers/lib/native.32.dll
--- a/src/main/resources/assets/opencomputers/lib/native.32.so
+++ b/src/main/resources/assets/opencomputers/lib/native.32.so
--- a/src/main/resources/assets/opencomputers/lib/native.64.dll
+++ b/src/main/resources/assets/opencomputers/lib/native.64.dll
--- a/src/main/resources/assets/opencomputers/lib/native.64.so
+++ b/src/main/resources/assets/opencomputers/lib/native.64.so