stone3311
cc19a82e8e
Fixed headings in README.md
2017-05-13 19:30:48 +02:00
Vexatos
f01cde3906
Update the input itemstack in insertIntoInventorySlot even during simulation.
...
Only the Trade Upgrade is using this right now.
2017-05-13 17:13:20 +02:00
Vexatos
a8bca1c1bb
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.gradle
# build.properties
# src/main/scala/li/cil/oc/common/tileentity/Relay.scala
# src/main/scala/li/cil/oc/common/tileentity/Switch.scala
# src/main/scala/li/cil/oc/integration/Mods.scala
# src/main/scala/li/cil/oc/integration/computercraft/PeripheralProvider.scala
# src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
# src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
# src/main/scala/li/cil/oc/integration/wrcbe/WirelessRedstoneCBE.scala
# src/main/scala/li/cil/oc/server/agent/Inventory.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
# src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
2017-05-11 20:38:54 +02:00
Vexatos
2de949c6a8
Merge branch 'master-MC1.9.4' into master-MC1.10
2017-05-11 20:35:20 +02:00
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
ed21dafb7b
Fix #2368 .
2017-05-06 11:41:48 +02:00
Vexatos
67d5c2d504
Added support for forge energy.
2017-05-06 11:01:37 +02:00
Vexatos
41599b0c10
Made robot not send null to the client when its inventory changes.
...
Closes #2360 .
2017-04-23 17:35:31 +02:00
Vexatos
30e3e129c8
I don't trust ItemStack Options. Let's get rid of them.
2017-04-22 20:23:07 +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
Vexatos
5c3b5634c4
Fix Disk Drive eating disks.
...
Actually closes #2345 .
2017-04-22 15:35:59 +02:00
Vexatos
31668c204d
Fix loot disk and other recipes.
...
Closes #2345 .
2017-04-22 15:28:20 +02:00
Vexatos
a2791ae8a6
Fixed assembler breaking its own inventory. Also fixed Disassembler crashing on creative-tier components and a few more potential null stacks.
...
Fixes #2339 .
Fixes #2348 .
2017-04-22 15:03:03 +02:00
Vexatos
20b59d6cd5
Re-add JEI highlighting.
2017-04-22 11:36:58 +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
bcd2fd7707
Little bit of cleanup, API refactoring.
2017-04-02 16:58:02 +02:00
Florian Nücke
44e3b0ee46
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
2017-04-02 16:28:48 +02: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
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
