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
Florian Nücke
efa4b77572
Fixed IMC, lowercased API IDs.
2017-04-01 11:44:37 +02:00
Florian Nücke
ec6356bbc3
Fixed recipes. Removed iron nugget, yay vanilla. Removed deprecated blocks.
2017-04-01 11:32:41 +02:00
Florian Nücke
80eba76d57
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
...
# Conflicts:
# build.gradle
# build.properties
# src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
# src/main/scala/li/cil/oc/integration/Mods.scala
# src/main/scala/li/cil/oc/integration/projectred/EventHandlerProjectRed.scala
# src/main/scala/li/cil/oc/integration/projectred/ModProjectRed.scala
2017-04-01 09:40:40 +02:00
Florian Nücke
fbc681271a
Server not crashing immediately when client enters it. Pretty great feature if I do say so myself.
2017-04-01 02:15:42 +02:00
Florian Nücke
c28b984ffe
Even more bloody lowercasing...
2017-04-01 02:01:55 +02:00
Florian Nücke
46c06bff23
All the bloody lowercasing .-.
2017-04-01 01:00:42 +02:00
Florian Nücke
ad72f1e16c
Oh look, it's a booting computer.
2017-03-31 21:40:47 +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
5521526510
Compile.
2017-02-25 18:13:12 +01:00
Florian Nücke
200a49d3bf
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
...
# Conflicts:
# build.properties
# src/main/scala/li/cil/oc/common/entity/Drone.scala
# src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
2017-02-25 18:11:57 +01:00
Florian Nücke
b01d88c552
Temporarily disable recipes to get into the world.
2017-02-25 18:10:07 +01:00
Florian Nücke
5e83cf3d11
U wot.
2017-02-25 18:01:57 +01:00
Florian Nücke
6cb4604c8e
Lowercased mod id.
2017-02-25 18:00:44 +01:00
Florian Nücke
beff30111e
IT COMPILES! More fixes. Kicked BloodMagic integration because things changed and I have no idea how to fix it. Also kicked out the tests. Who needs tests anyway.
2017-02-25 17:48:45 +01:00
Florian Nücke
b48c2098ab
Fixed a couple more compile errors; hackjob of an implementation of new IFluidHandler stuff. Kickd MCMP for now, too much other stuff to fix first.
2017-02-25 17:10:27 +01:00
Florian Nücke
43fe39edd1
More cleanup.
2017-02-25 16:11:02 +01:00
Florian Nücke
86ed7d1229
Et tu.
2017-02-25 16:06:19 +01:00
Florian Nücke
aaf1b23440
Ripping out a whole bunch of old integration code. Bye bye, see you when you come back!
2017-02-25 16:05:47 +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
3b29bcd977
Update to 1.11. Fixed most compile errors.
2017-02-09 12:38:08 +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
