AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-25 14:05:39 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,977 Commits 29 Branches 143 Tags
Commit Graph

1977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
4edb16577b Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
 2014-07-06 22:42:29 +02:00
Florian Nücke
a53503abcb Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
 2014-07-06 22:41:20 +02:00
Florian Nücke
4b4885b65c Fixed computers crashing when mods cause computers to pause (context.pause(...)) in a direct callback (@Callback(direct = true)). 2014-07-06 22:38:56 +02:00
Florian Nücke
6c133be58f Updated CC API. 2014-07-06 21:52:26 +02:00
Florian Nücke
0e7c6ecd9f Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-06 21:07:31 +02:00
Florian Nücke
7441d43f2d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-06 21:06:45 +02:00
Florian Nücke
39704f9532 Merge pull request #376 from Sodiet/patch-3 
Update ru_RU.lang
 2014-07-06 18:15:36 +02:00
Florian Nücke
127aee1c45 Merge pull request #377 from Kilobyte22/nobreak 
Make io.read() support support not breaking
 2014-07-06 18:14:58 +02:00
Kilobyte22
6441ce9e28 Small variable name change 2014-07-06 18:13:13 +02:00
Kilobyte22
d8ee287c96 Make io.read() support support not breaking 
If false is passed as second param to io.read() it now will
not perform a line break after hitting return
 2014-07-06 18:05:16 +02:00
Rostislav
722f5d4361 Update ru_RU.lang 2014-07-06 20:10:26 +06:00
Rostislav
2aabea32e6 Update ru_RU.lang 
Translation updated to latest version of en_US.lang.
 2014-07-06 20:08:31 +06:00
Florian Nücke
cd2c5b5977 Merge pull request #374 from Vexatos/patch-7 
Be consistent. (Updated de_DE.lang and fixed en_US)
 2014-07-06 12:29:24 +02:00
Vexatos
92080a5e7b Update en_US.lang 2014-07-06 09:52:22 +02:00
Vexatos
e12fcc8e88 Be consistent. (Updated de_DE.lang) 2014-07-06 09:51:21 +02:00
Florian Nücke
1c19b62560 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-05 22:58:36 +02:00
Florian Nücke
7b61e60fa7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-05 22:58:19 +02:00
Florian Nücke
7c5a8d961d Attempt at fixing an NPE, take two. 2014-07-05 22:58:01 +02:00
Florian Nücke
f138f98cf0 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-05 22:11:48 +02:00
Florian Nücke
7944f28a26 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-05 22:11:28 +02:00
Florian Nücke
0e5f320a47 Should fix a reported NPE in server racks. 2014-07-05 22:06:14 +02:00
Florian Nücke
3a7d08fa37 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-05 15:58:26 +02:00
Florian Nücke
95cbed073d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-05 15:57:17 +02:00
Florian Nücke
fc16ceb935 Avoid potential assertion error. v1.3.0-rc.1 2014-07-05 15:03:56 +02:00
Florian Nücke
e4ebcbb6a4 Merge branch 'patch-2' of https://github.com/istasi/OpenComputers 2014-07-05 13:46:54 +02:00
Florian Nücke
3d6efb642c Merge https://github.com/gamax92/OpenComputers 2014-07-05 13:45:26 +02:00
istasi
9c587bd317 Adds support for the environment variable _ 
http://istasi.dk/printenv.png yes, this clearly editted, due to my heighten paranoid level
 2014-07-05 12:37:43 +02:00
Florian Nücke
9fc4cceb8a Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-05 01:46:01 +02:00
Florian Nücke
6168c03c4d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala
 2014-07-05 01:45:45 +02:00
Florian Nücke
495d083dd9 Made LuaJ kernel error checking more robust. 2014-07-05 01:45:02 +02:00
gamax92
6616de2947 Forgot an import 
import java.util.Arrays
 2014-07-04 17:16:47 -06:00
gamax92
6164a9f769 Fix some LuaJ bugs (Not tested for LuaJ 3) 
LuaDouble:
Do not try Long.toString
Do not cast to float

LuaString:
Do not scan as a long
Add another check in scandouble (was scanlong)
Have substring create new bytes to work with
 2014-07-04 17:10:25 -06:00
Florian Nücke
1c78f46f86 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 
Conflicts:
	build.properties
	gradle/forge.gradle
 2014-07-05 00:11:42 +02:00
Florian Nücke
671a55f66f Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-05 00:09:17 +02:00
Florian Nücke
029027fadb Updated Mac natives. 2014-07-05 00:02:21 +02:00
Florian Nücke
9e59bda886 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2014-07-04 23:27:38 +02:00
Florian Nücke
7a2e327ee3 Added a null check in ItemCost comparison method to avoid potential NPEs for weird recipes. 2014-07-04 23:26:46 +02:00
Florian Nücke
ac5f1fee8f Switched to maven for Waila API. 2014-07-04 22:18:07 +02:00
Florian Nücke
08242201f0 Undo the undo. 2014-07-04 20:36:42 +02:00
Florian Nücke
0147f4d462 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
 2014-07-04 17:02:56 +02:00
Florian Nücke
794f3384ec Little bit of cleanup and fixed case sensitivity detection being inverted. 2014-07-04 16:58:55 +02:00
Kilobyte22
d544f9748d Fixed a stupid oversight 
Creation of directories now checks filename validity again
 2014-07-04 15:35:48 +02:00
Kilobyte22
e62895e901 Made FS support case insensitivety 
The Buffered File System now supports case insensitive behaviour when the
underlaying FS is case insensitive
 2014-07-04 15:33:46 +02:00
Florian Nücke
b89498b429 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-04 14:00:22 +02:00
Florian Nücke
d2e0b22230 Updated Eris, should get rid of the potential native crash when saving. 2014-07-04 13:59:53 +02:00
Florian Nücke
12035cd4bc Revert "Updated to MC 1.7.10." 
This reverts commit 41dbe8f4e7fd6e00bbc3c602d063ba70263b934f.
 2014-07-04 00:07:18 +02:00
Florian Nücke
349fbef83c Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-03 18:39:03 +02:00
Florian Nücke
7d80fbcb60 Re-throwing UnsupportedOperationExceptions as Lua errors when thrown in callbacks (usually in OpenComponents' CC wrapper stuff). 2014-07-03 18:38:42 +02:00
Florian Nücke
a35c630ef9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala
 2014-07-03 18:29:48 +02:00
Florian Nücke
0c96d38afb Fixed another userdata related persistence issue (discrepancy in callback name after load leading to userdata failing to be saved again). 2014-07-03 18:28:22 +02:00