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,072 Commits 29 Branches 143 Tags
Commit Graph

2072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
b234bd80a1 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-07 18:19:46 +02:00
Florian Nücke
a516e2c13b Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-07 18:17:42 +02:00
Florian Nücke
ab7cc5d4ba Pleasedontbreakpleasedontbreakpleasedontbreak. 2014-07-07 18:16:56 +02:00
Florian Nücke
0a264b651d Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-07 16:32:24 +02:00
Florian Nücke
8b7db65091 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-07 16:32:05 +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
1b31ea4704 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-07 14:22:13 +02:00
Florian Nücke
33e3c81cc4 Updated to latest Forge. 
Fixed Scala compilation errors by updating to new Gradle version.
Took care of some deprecations.
 2014-07-07 14:19:43 +02:00
Florian Nücke
b8fe84ac07 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-07 04:37:39 +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
6eca872ff7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-07 04:08:52 +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
a937ef4e94 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10 2014-07-07 01:35:51 +02:00
Florian Nücke
9f348c11dc Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-07 01:34:59 +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
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