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

1695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
15125cc4b6 More mysterious NPEs! 2014-07-17 17:51:34 +02:00
Florian Nücke
81bdce12be Fix potential NPE. 2014-07-17 17:07:53 +02:00
Florian Nücke
78c6d01051 Fix for version injection into config after file name change. 2014-07-17 17:01:27 +02:00
Florian Nücke
738bcb5954 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-17 16:22:06 +02:00
Florian Nücke
20443f54e9 Fixes for the adjusted side checks. 2014-07-17 16:16:31 +02:00
Florian Nücke
93218f4ff7 The Optional.Method annotation seems to not work in dev-env in some cases... trying to work around that to fix absence of FMP and Waila related crashes in dev-env. 2014-07-17 16:02:36 +02:00
Florian Nücke
b3813bc4f5 Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios. 2014-07-17 15:15:26 +02:00
Florian Nücke
c1d5371738 Ugly workaround for IC2+Racks, closes #404. 2014-07-14 20:24:11 +02:00
Florian Nücke
9a3049ed84 Fixed the fix for getKeyboards(), gah. 2014-07-14 18:30:09 +02:00
Florian Nücke
e7d64fa6d0 Version bump. v1.3.1 2014-07-14 14:08:12 +02:00
Florian Nücke
0321a7816c Fixed math.random, closes #400. 2014-07-13 23:19:15 +02:00
Florian Nücke
da5f2590aa Shuffling lib load order a bit to see if it avoids the arm lib being sorta-kinda loaded on non-arm Linux. 2014-07-12 23:04:15 +02:00
Florian Nücke
739d0ab892 Fixed recursive recipe includes. Closes #387. 2014-07-11 17:05:22 +02:00
Florian Nücke
5e268af84b Added safety try-catch to machine loading code, to avoid crashes for unexpected states. 
Added callback doc for experience upgrade and chunkloader upgrades.
 2014-07-11 14:10:54 +02:00
Florian Nücke
d24907b7ab Fixed keyboard behavior some. 
I'm not really happy with this fix, because it adds special behavior for multiblock screens where it shouldn't be, but meh.
 2014-07-10 11:25:11 +02:00
Florian Nücke
139ffc9f4a Making sure paths used for file system data storage (hdds, floppies) are directories or don't exist by trying to delete them if they're files, instead of just giving up - since apparently these can appear in some obscure scenario that can't be reproduced anymore. 2014-07-09 23:05:50 +02:00
Florian Nücke
4e8a48a56f Catching potential errors in __gc methods when persisting computers. 2014-07-09 17:37:36 +02:00
Florian Nücke
bf9de41a7b Fixed a potential (non-crashing) NPE. 2014-07-09 17:21:32 +02:00
Florian Nücke
5274cb8da0 Corrected mistake in onConnect/onDisconnect examples in JDoc of Environment interface in API. 2014-07-09 17:05:04 +02:00
Florian Nücke
c124a650df Improved performance of component callbacks. 
Enforcing tighter time limit on user __gc methods.
 2014-07-09 17:00:06 +02:00
Florian Nücke
e03e63323c Bumpitybump. v1.3.0 2014-07-08 20:40:19 +02:00
Florian Nücke
b9d1a37b28 Merge pull request #383 from gamax92/LuaJSucks 
Fix More LuaJ things.
 2014-07-08 18:40:27 +02:00
Florian Nücke
972b12500a Fixed 'screen.getAspectRatio' value being recomputed incorrectly. 2014-07-08 16:37:45 +02:00
Florian Nücke
4095c0eda8 Made native library loading less... special-case-laden. Just try each and every shipped library until one works. 2014-07-08 15:10:58 +02:00
Florian Nücke
6b7120607a Fixed derp in OpenIRC's /lua command. 2014-07-08 13:13:21 +02:00
gamax92
cf51cd2591 Just a little note 2014-07-07 21:51:40 -06:00
gamax92
d38e08f102 fix txtToken, lexerror 2014-07-07 21:42:53 -06:00
Florian Nücke
a81fc4431d Merge pull request #381 from gamax92/LuaJSucks 
Make two error messages more useful
 2014-07-08 04:30:40 +02:00
gamax92
ea4c3c754b Make two error messages more useful 2014-07-07 20:28:40 -06:00
Florian Nücke
6c68e1a97f Merge pull request #380 from gamax92/LuaJSucks 
Error on invalid escape sequences
 2014-07-08 03:31:52 +02:00
gamax92
0f6a405d12 Why are there braces? 2014-07-07 19:30:36 -06:00
gamax92
87f6262230 Error on invalid escape sequences 
Also reformatting
 2014-07-07 19:24:11 -06:00
Florian Nücke
3576e76544 Merge pull request #379 from gamax92/LuaJSucks 
Fix string.rep crashing
 2014-07-08 02:42:06 +02:00
gamax92
f2a9e3fafa Fix string.rep crashing 2014-07-07 18:36:46 -06:00
Florian Nücke
39a03afc11 Fixed file handles not being manually closed in process.load (but relying on __gc, which fails in LuaJ). 2014-07-08 00:47:00 +02:00
Florian Nücke
ab7cc5d4ba Pleasedontbreakpleasedontbreakpleasedontbreak. 2014-07-07 18:16:56 +02:00
Florian Nücke
b4639cceb1 Fixed Geolyzer docstring. 
Potential fix for config parse error.
 2014-07-07 16:31:46 +02:00
Florian Nücke
caacec21bd LuaJ 3 Final. I'm not sure this is a good idea, but nothing seems to break (immediately). 2014-07-07 04:37:19 +02:00
Florian Nücke
e8384b67e0 Fixed userdata not being properly unwrapped when passed to direct callbacks. 2014-07-07 04:08:27 +02:00
Florian Nücke
a9e3cd907c Made it so that robots can also send and receive wired network messages. 2014-07-07 01:34:41 +02:00
Florian Nücke
26c4fa4161 Made userdata delegate tostring to the object's toString method (i.e. tostring(userdata) == Value.toString()). 2014-07-06 23:36:31 +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
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