Vexatos
e596e61783
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-05-11 20:34:55 +02:00
Vexatos
d781eb3c62
Improved JEI recipe assembly.
...
Fixes #2375 . Not sure why it was never an issue before 1.11.
2017-05-11 20:33:47 +02:00
Vexatos
442d8feec3
Should fix #2370 .
2017-05-06 16:52:20 +02:00
Vexatos
2287b729d6
Updated a bunch of dependencies to make OC launch properly again.
2017-05-06 14:19:21 +02:00
Vexatos
833f13e507
Exclude duplicate modules in build.gradle.
2017-05-06 13:38:27 +02:00
Vexatos
7c761b586e
Re-add ComputerCraft integration.
2017-05-06 13:22:00 +02:00
Vexatos
67d5c2d504
Added support for forge energy.
2017-05-06 11:01:37 +02:00
Florian "Sangar" Nücke
c352585157
Merge pull request #2350 from gamax92/wrcbe-1.10
...
Re-add WR-CBE Integration
2017-04-22 17:56:38 +02:00
Xander
dd084247be
Pass Value objects through Registry.convert before back to Lua
2017-04-22 10:21:57 +08:00
Xander
1273968142
convert to userdata
2017-04-22 10:21:15 +08:00
Thiakil
37363127e8
Port getInventoryName from inventory driver
2017-04-19 19:20:29 +08:00
Thiakil
0d91c5360d
Port getAllStacks from Inventory driver
2017-04-19 19:20:29 +08:00
gamax92
5f3117ac16
Re-add WR-CBE Integration
2017-04-17 11:29:20 -06:00
Florian Nücke
f9883df457
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-04-02 16:28:02 +02:00
Florian Nücke
0bde788e9c
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-04-02 16:27:41 +02:00
Florian Nücke
af0225b31b
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-04-02 16:27:21 +02:00
payonel
bcadcdb21e
dont full load kb keys on boot, and accept numpad enter for term
2017-03-30 09:12:44 -07:00
payonel
f57e9be79b
relative loadfile, and less unicode
...
loadfile paths now respect relative paths from the working directory
/lib/shell had an abundance of unicode api calls which were mostly unncessary
2017-03-30 08:53:05 -07:00
payonel
400d7eed7e
ls defaults, event registration fixes, term keycode
...
.shrc -p: show dir slash by default
event registration was incorrectly calling timers and unregistering
term handler for enter key fixed to use code instead of sym
ls fixed to respect -p for all dirs
2017-03-30 08:53:05 -07:00
Florian "Sangar" Nücke
5fdfccf0d8
Merge pull request #2260 from Vexatos/projectred-1.10
...
Re-added ProjectRed integration.
2017-03-04 00:49:31 +01:00
Florian Nücke
6e0034fb82
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-25 01:53:26 +01:00
Florian Nücke
e707fa498e
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-02-25 01:48:05 +01:00
Florian Nücke
b80edd72a5
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-02-25 01:47:48 +01:00
Vexatos
d5cb5086e0
Update de_DE.lang
2017-02-19 09:09:44 +01:00
Florian Nücke
a04a4891f8
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-14 22:38:30 +01:00
Florian Nücke
9268d51039
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/entity/Drone.scala
2017-02-14 22:38:10 +01:00
Florian Nücke
b035cf91b4
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-02-14 22:36:54 +01:00
Florian Nücke
0654c76b82
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2017-02-14 22:36:14 +01:00
Florian Nücke
df548f8279
Update LuaJ and JNLua for better UTF-8 handling. Closes #2191 .
2017-02-14 22:35:55 +01:00
Vexatos
eaa6582cde
Made everything compile.
2017-02-12 13:01:29 +01:00
Vexatos
96179f3a51
Fix #2272 .
2017-02-12 12:56:18 +01:00
Vexatos
c32fbe7009
Added icons for JEI categories.
2017-02-12 12:40:04 +01:00
Vexatos
5b165ff95c
Fix event handler method parameters.
2017-02-07 07:58:45 +01:00
Florian Nücke
36f9dcfbd9
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-05 16:05:59 +01:00
Florian Nücke
43f3537e6d
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/item/DebugCard.scala
2017-02-05 16:05:42 +01:00
Florian Nücke
5f04b13f04
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-02-05 16:04:38 +01:00
Florian Nücke
10853f7a9a
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2017-02-05 16:01:51 +01:00
Florian Nücke
2751cec8c1
Fixed nodes able to reach an added node but not being reachable by the added node not being notified of the node being added.
...
This fixes screens stopping to respond *in some configurations* when their chunk is loaded. Closes #2225 .
2017-02-05 16:01:32 +01:00
Florian Nücke
60e10cbc32
Update Forge.
2017-02-05 14:17:24 +01:00
payonel
d8471278ba
require("internet").request now returns a function object
...
The function object can be called to read from the stream, same usage as before
But the object also exposes the request handle userdata, to allow calling close for example:
```
local request = require("internet").request("http://www.google.com ")
print(request()) -- same as before
request:close() -- clean up resources now, as opposed to waiting for gc
```
closes #2255
2017-02-04 14:50:15 -08:00
Vexatos
afff699dff
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.7.10
2017-02-04 22:11:37 +01:00
Vexatos
e8352fb07f
Use lower-case name for checking debug card access so that comparison with whitelist works properly.
...
Closes #2262 .
2017-02-04 22:11:08 +01:00
payonel
989f39b7c8
Merge pull request #2261 from payonel/1.6.1-update
...
term safe slow write, fix pastebin get, low mem loadfile fix
closes #2230
closes #1308
2017-02-04 11:53:45 -08:00
payonel
dbd2f3067f
term safe slow write, fix pastebin get, low mem loadfile fix
2017-02-04 11:26:21 -08:00
Vexatos
130084d931
Re-added ProjectRed integration.
...
Closes #2259 .
2017-02-04 18:00:33 +01:00
Florian Nücke
3920d25900
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 16:54:32 +01:00
Florian Nücke
8a76585694
Avoid Rotatable causing chunk loads when being accessed by, say, tiles's sidedNode() methods (to get the facing) called during dispose().
...
I think I handled all cases where this change would've caused NPEs now, but we'll see..
2017-02-04 16:54:08 +01:00
Florian Nücke
8a9bba2e3f
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 14:23:39 +01:00
Florian Nücke
330d71157f
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-02-04 14:23:23 +01:00
Florian Nücke
a564639804
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControl.scala
# src/main/scala/li/cil/oc/util/InventoryUtils.scala
2017-02-04 14:21:57 +01:00
