Łukasz Magiera
1972f804ab
Fix uC crash
2015-12-14 22:39:00 +01:00
Florian Nücke
85a7a240e2
Welp, it compiles. And runs. But screens and cables don't render properly.
2015-12-11 16:21:42 +01:00
Florian Nücke
e0a6469bc3
Progress on porting to 1.8.8, generics in block state properties are killing my generic system :(
2015-12-09 21:21:42 +01:00
Florian Nücke
5ee0332cb6
Oh right, that's why that was separate... >_>
2015-11-23 00:17:08 +01:00
Florian Nücke
951e8b6180
Updated to ForgeGradle 2 and latest Forge, adjusted build scripts.
...
Let's see if this works...
2015-11-22 22:31:34 +01:00
Florian Nücke
d13fa8c857
Added API for generically interfacing item inventories.
2015-11-22 11:16:16 +01:00
Florian Nücke
ebd487a358
Implemented explicit API for item stack based environment type lookup and deprecated EnvironmentAware. Closes #1530 .
2015-11-22 01:03:40 +01:00
Florian Nücke
cb7f7821c7
Added a rack mountable version of the disk drive.
2015-11-21 19:39:24 +01:00
Florian Nücke
98e71bdc14
Merge branch 'master-MC1.7.10' into onesix
...
Conflicts:
src/main/java/li/cil/oc/api/API.java
2015-11-21 15:38:29 +01:00
Florian Nücke
189ccdf4f9
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/common/Proxy.scala
2015-11-21 12:55:18 +01:00
Florian Nücke
f19dd57a0c
Tracking previous dimension in nanomachine controller to robustly handle dimension changes to update wireless network association, fixes #1535 .
...
Added `api.Network.leaveWirelessNetwork(WirelessEndpoint endpoint, int dimension)` to API.
2015-11-21 12:47:05 +01:00
Florian Nücke
eb8074097e
Added compareStackToDatabase(side, slot, dbAddress, dbSlot) method to transposer and inventory controller. Closes #1534 .
...
Also added optional parameter `checkNBT=false` to all existing item comparing methods (I hope) as well as `compareStackToDatabase`.
2015-11-21 11:37:45 +01:00
Florian Nücke
9257159e5b
Removed ender chest chest oredict entry backported from MC 1.8 again because Chisel. Closes #1528 .
2015-11-21 10:37:02 +01:00
Florian Nücke
8ce901bb1c
Re-saved French localization files sans BOM.
2015-11-20 20:49:28 +01:00
Florian Nücke
69e6fdbd38
Merge branch 'master-MC1.7.10' of https://github.com/Pyeroh/OpenComputers into master-MC1.7.10
2015-11-20 19:23:00 +01:00
Pyeroh
ff4d185e30
Adding french translation for assets/opencomputers/doc
2015-11-20 10:38:49 +11:00
Florian Nücke
02b64f872e
Hello person reading the commit logs. Congratulations, you won a free iPad.
...
(No you didn't.)
2015-11-17 19:56:06 +01:00
Florian Nücke
a8726ddb37
Oops.
2015-11-16 00:26:15 +01:00
Florian Nücke
962e6fdb64
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/common/block/Hologram.scala
2015-11-15 22:55:54 +01:00
Florian Nücke
be8d7a7258
Added API.isPowerEnabled. Closes #1217 .
2015-11-15 22:34:00 +01:00
Florian Nücke
8f60dc8a19
Add setting to allow disabling holograms emitting light. Closes #979 .
2015-11-15 22:21:05 +01:00
Florian Nücke
5c0a4f7b82
Magic.
2015-11-15 21:08:21 +01:00
Florian Nücke
bee560c9ab
Merge branch 'master-MC1.7.10' into onesix
2015-11-15 21:04:38 +01:00
Florian Nücke
058ee1b6d9
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/server/agent/Inventory.scala
2015-11-15 21:01:52 +01:00
Florian Nücke
b9be02b71a
Fixed NBT being ignored when agents picked up drops after breaking blocks, potentially merging stacks incorrectly. Closes #1526 .
2015-11-15 20:59:42 +01:00
Florian Nücke
f7debf50ac
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
2015-11-15 15:03:15 +01:00
Florian Nücke
17d7880034
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/Settings.scala
src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala
2015-11-15 15:01:15 +01:00
Florian Nücke
fe759d0462
Fixed datacard entry in German manual.
2015-11-15 14:56:27 +01:00
Florian Nücke
9c4c1976c0
Some housekeeping, removing old code, resolving some old TODOs.
2015-11-15 14:45:23 +01:00
Florian Nücke
856effd58c
Some fixing to compatibility code for transitioning racks and servers.
2015-11-15 14:14:33 +01:00
Florian Nücke
96d11210ee
Merge branch 'master-MC1.7.10' into onesix
...
Conflicts:
src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
2015-11-15 12:36:25 +01:00
Florian Nücke
de75a6b120
Fixed cycling side in server rack to 'none' not properly disconnecting from that side.
2015-11-15 12:35:19 +01:00
Florian Nücke
6ebd5ab9eb
Merge branch 'master-MC1.7.10' into onesix
...
Conflicts:
src/main/scala/li/cil/oc/common/component/TextBuffer.scala
2015-11-14 20:28:42 +01:00
Florian Nücke
d861552431
Fix screens occasionally not rendering anything until the first update to what they're displaying.
2015-11-14 20:27:13 +01:00
Florian Nücke
adf4de6838
Terminal server item texture, fixed saving/loading of terminal data, fixed coordinate flippery, visually indenting rack mountables one (like it's already in MC 1.8).
2015-11-14 20:13:43 +01:00
Florian Nücke
f579524ca6
Textures for terminal server.
2015-11-14 18:24:57 +01:00
Florian Nücke
39db1438d3
Tons of hacking to allow components client side, specifically allow component inventories in server racks to host their own components.
...
For one, components will now also be created on the client side, always. That means drivers should check whether they need to create their component if they don't need a client side representation.
For two, component inventories now track changes to the inventory on the client side and only apply changes at the end of the tick. This is needed because MC clears out the inventory and then re-populates it client side when a player opens the GUI for example, to ensure it's in sync with the server; this way components are not destroyed and re-created in those cases.
Lastly, remote terminals will now work via a separate mountable. *Seems* to at least partially work again.
2015-11-14 16:29:07 +01:00
Florian Nücke
d919b64d70
Merge branch 'onesix' into rack-overhaul
...
Conflicts:
src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
2015-11-14 13:57:53 +01:00
Florian Nücke
2361c898c9
Merge branch 'master-MC1.7.10' into onesix
2015-11-14 13:55:49 +01:00
Florian Nücke
bc97331b0d
Fixed potential infinite loop in manual when splitting text.
2015-11-14 13:47:56 +01:00
Florian Nücke
08287b5f35
Fixed a bunch of links in German manual, killed deprecated switch and access point entries and added relay one.
2015-11-14 13:42:19 +01:00
Florian Nücke
a515a3357a
Merge branch 'master-MC1.7.10' of https://github.com/Shadow1Raven/OpenComputers into master-MC1.7.10
2015-11-14 12:47:27 +01:00
Florian Nücke
7f1287f142
Added command to allow dumping current nanomachine configuration for debugging (oc_nanomachines / oc_nm).
...
Also made sure nodes don't connect to the same parent twice.
2015-11-14 12:46:34 +01:00
Florian Nücke
9455e430c9
Add enchantment information in item stack converter. Closes #1523 .
2015-11-14 11:40:10 +01:00
Florian Nücke
4b49cc6d2a
Fix fully upgraded relays being slower than they should be. Closes #1525 .
2015-11-14 10:57:52 +01:00
Florian Nücke
1dec6d1ecd
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
2015-11-11 21:21:29 +01:00
Florian Nücke
90087b2448
Fixes #1522 .
2015-11-11 21:20:15 +01:00
Shadow1Raven
5fcca8a471
Adding German trenslation.
2015-11-08 12:46:15 +01:00
Florian Nücke
c51f96dcc1
Update links in manual; updated recipes.
2015-11-07 18:23:48 +01:00
Florian Nücke
88eae3bfe5
Two-way forwarding of network messages for mountable sub-nodes.
...
Avoid errors when calling load on machines multiple times.
2015-11-07 18:17:18 +01:00
