Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

This commit is contained in:
Florian Nücke 2015-02-20 01:53:55 +01:00
commit 4f1e18b3a8
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@ import li.cil.oc.api.detail.NetworkAPI;
*/ */
public class API { public class API {
public static final String ID_OWNER = "OpenComputers|Core"; public static final String ID_OWNER = "OpenComputers|Core";
public static final String VERSION = "5.0.0-alpha"; public static final String VERSION = "5.0.0";
public static DriverAPI driver = null; public static DriverAPI driver = null;
public static FileSystemAPI fileSystem = null; public static FileSystemAPI fileSystem = null;

View File

@ -1,5 +1,5 @@
do do
_G._OSVERSION = "OpenOS 1.4" _G._OSVERSION = "OpenOS 1.5"
local component = component local component = component
local computer = computer local computer = computer