Florian Nücke
ad72f1e16c
Oh look, it's a booting computer.
2017-03-31 21:40:47 +02: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
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
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
Florian Nücke
81c34e0c14
Fire item toss event when agents try to drop items into the world.
2017-02-04 14:11:48 +01:00
Florian Nücke
13cd17e3e7
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 13:53:07 +01:00
Florian Nücke
94cbcb38b7
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-02-04 13:52:42 +01:00
Florian Nücke
45507d84ef
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-02-04 13:52:26 +01:00
Florian Nücke
706905603d
Waila's back to calling server methods on the client apparently \o/
2017-02-04 13:52:08 +01:00
Florian Nücke
5c7b55e208
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 00:37:43 +01:00
Florian Nücke
f611a22f92
Gah, wrong IDE window.
2017-02-04 00:36:19 +01:00
Florian Nücke
416b5a9fdd
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# build.properties
2017-02-04 00:19:06 +01:00
Florian Nücke
b196224775
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/common/init/Items.scala
2017-02-04 00:18:18 +01:00
Florian Nücke
5105266f90
Merge branch 'mfu' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/en_US.lang
2017-02-03 23:37:49 +01:00
