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

2043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
1c405630cc Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-11 17:07:14 +02:00
Florian Nücke
f9f47539bc Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-11 17:05:43 +02:00
Florian Nücke
739d0ab892 Fixed recursive recipe includes. Closes #387. 2014-07-11 17:05:22 +02:00
Florian Nücke
24b8875c5a Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-11 14:12:41 +02:00
Florian Nücke
b00a6fed0f Adjustments for 1.7. 2014-07-11 14:12:26 +02:00
Florian Nücke
4a2629a4d3 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-11 14:11:19 +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
68b8df0ef0 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-11 01:16:25 +02:00
Florian Nücke
02e72723ef Fixed side for Keyboard's canPlaceBlockOnSide check. 2014-07-11 01:15:33 +02:00
Florian Nücke
ddec69c5fd Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-10 11:26:54 +02:00
Florian Nücke
41c9d5e70f Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-10 11:25: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
1df13cc8d6 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-09 18:20:05 +02:00
Florian Nücke
b87e5b4346 Adjusted for 1.7. 2014-07-09 18:12:17 +02:00
Florian Nücke
57c98e4b0f Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-09 17:43:09 +02:00
Florian Nücke
4c70bb79c5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-09 17:42:40 +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
88aa162ad7 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 
Conflicts:
	build.properties
 2014-07-08 20:43:07 +02:00
Florian Nücke
24fccd0dfe Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-07-08 20:42:42 +02:00
Florian Nücke
908800df54 Removed lies. 2014-07-08 20:42:11 +02:00
Florian Nücke
e03e63323c Bumpitybump. v1.3.0 2014-07-08 20:40:19 +02:00
Florian Nücke
d71b37cc51 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 18:41:44 +02:00
Florian Nücke
8363c43d03 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-08 18:41:10 +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
ce1231ddde Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 16:54:28 +02:00
Florian Nücke
b1a1e4a64e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-07-08 16:52:57 +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
5910a169c4 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 04:32:23 +02:00
Florian Nücke
db3b71086d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-08 04:31:40 +02: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
2e93e190d1 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 04:01:20 +02:00
Florian Nücke
dc86bd774f Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-08 04:00:59 +02: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
6026b1a010 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-08 00:48:36 +02:00
Florian Nücke
8501e2f337 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-08 00:47:21 +02: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
d50f2a14fc Yay, typesafe config is provided now! 2014-07-07 18:23:48 +02:00