AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 19:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,816 Commits 29 Branches 143 Tags
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
378aa8f09b Should fix #1807. 2016-05-16 20:01:18 +02:00
Florian Nücke
a7a18e0488 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 2016-05-14 23:28:34 +02:00
Florian "Sangar" Nücke
feedf21757 Merge pull request #1806 from Vexatos/master-MC1.8.9 
Fixed hover boots texture
 2016-05-14 23:28:08 +02:00
Florian Nücke
1d240888c3 Updated MCMP integration. Closes #1803. 2016-05-14 23:27:50 +02:00
Vexatos
df5ea067c9 Fixed hover boots texture. 2016-05-14 17:49:06 +02:00
Florian Nücke
2db2a5a5f8 Pass along hand and heldItem in RackMountable.onActivate. Closes #1798. 2016-05-14 14:42:12 +02:00
Florian Nücke
c19451c77a Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Rack.scala
#	src/main/scala/li/cil/oc/common/component/TerminalServer.scala
 2016-05-14 14:28:29 +02:00
Florian Nücke
39a2372705 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/component/RackMountable.java
#	src/main/scala/li/cil/oc/common/block/Rack.scala
#	src/main/scala/li/cil/oc/common/component/TerminalServer.scala
#	src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala
#	src/main/scala/li/cil/oc/server/component/Server.scala
 2016-05-14 14:18:23 +02:00
Florian Nücke
a21bb1ce3b Might fix #1805. 2016-05-14 14:02:10 +02:00
Florian Nücke
cdd59cff05 Initialize components in client tile entities when loading / receiving description packet. Should fix #1801. 2016-05-14 13:59:31 +02:00
Florian Nücke
ca5d95cff5 Only pass X and Y to RackMountable.onActivate, adjusted to the actual surface area of the mountable (in [0, 1] for both, on the 14x3 pixel surface). Closes #1794. 2016-05-14 13:23:11 +02:00
Florian Nücke
42f6cbe50c Oh look, method name change. 2016-05-13 19:42:39 +02:00
Florian Nücke
34c5d02fd1 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 2016-05-13 19:40:39 +02:00
Florian Nücke
b8ac9976df Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2016-05-13 19:40:18 +02:00
Florian Nücke
af07508587 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-05-13 19:30:19 +02:00
Florian Nücke
6a40619696 Fix robots being able to drain from flowing liquid blocks... closes #1796. 
Seriously? Did flowing liquids always magically convert from BlockDynamicLiquid into BlockStaticLiquid after a while? Meta checks? Ugh...
 2016-05-13 19:27:59 +02:00
Florian Nücke
da1dbecae9 Should fix generator upgrade eating container items if they're not taken out in time. Closes #1779. 2016-05-13 18:39:07 +02:00
Florian Nücke
aed4d91840 Anti-null-pos-but-not-null-world-check? 2016-05-11 23:11:43 +02:00
Florian Nücke
ad9a446412 Update MC version for coremod. 2016-05-11 22:36:13 +02:00
Florian Nücke
238e75067a Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 2016-05-11 22:19:27 +02:00
Florian Nücke
8dbdd383e5 Fixed coloring recipe duping stuff. 2016-05-11 22:18:56 +02:00
Florian Nücke
c1b65f2100 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-11 22:18:40 +02:00
Florian "Sangar" Nücke
2949fdd276 Merge pull request #1787 from hsson/feature/additional-robot-name 
Adds three more names to the list
 2016-05-11 22:10:47 +02:00
Florian "Sangar" Nücke
d0f7fd7e3f Merge pull request #1786 from payonel/devfs-patch 
devfs should be rw
 2016-05-11 22:09:20 +02:00
Florian Nücke
200fd2d51e Fix IC2 NPE. Fixes #1771. 2016-05-11 21:50:45 +02:00
Florian Nücke
ef72d1a871 Made cable items be colored correctly. 2016-05-11 21:37:46 +02:00
Florian Nücke
f8fff3cba9 Made robots render properly again. 2016-05-11 21:30:31 +02:00
Florian Nücke
b6255435b7 Extract side-only interfaces from blocks and items. 2016-05-11 20:45:28 +02:00
Florian Nücke
45071082a1 Jenkins, y u so different :/ 2016-05-08 20:05:52 +02:00
Florian Nücke
0deee60d0e Bulk of the 1.9 port. 
A couple of issues remain:
- Robot rendering is borked as fudge.
- Colored cables don't really look colored in item form.
- Recoloring cables seems to dupe items.
Also, only barely tested the essentials (placed every block, spawned computer, 3d printed some stuff).
 2016-05-08 19:56:44 +02:00
Vexatos
60f403131b Made MFU respect sided environments. 2016-05-07 22:53:16 +02:00
Vexatos
4c665723dc Made block change listener handling a little more safe. 2016-05-07 15:21:00 +02:00
Vexatos
ca2a8ae371 Fixes to MFU. It actually works now. 2016-05-07 15:09:04 +02:00
Vexatos
c6578ff587 Merge remote-tracking branch 'origin/master-MC1.7.10' into mfu 2016-05-07 13:34:35 +02:00
Alexander Håkansson
26c4c0d33c Adds three more names to the list 2016-04-29 22:57:51 +02:00
payonel
2dd3efedc9 isReadOnly is in boot/, move return false to boot file 2016-04-28 16:43:57 -07:00
Florian Nücke
00bc7e2cee Added some missing methods to the devfs to avoid programs expecting them to be there breaking (such as df) and ordered them the same way as they are in the Scala filesystem component. 2016-04-27 23:47:46 +02:00
Florian Nücke
e9dac6e06c Merge branch 'unicode-mouse-clicks' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-04-27 23:30:38 +02:00
payonel
8d9c699ce0 fix onTouch for unicode support in shell (+backspace fix) 2016-04-26 21:34:10 -07:00
Vexatos
371a32e881 Added MFU. 
No Manual entry, no tooltip, no texture, not tested, recipe unfinished.
 2016-04-25 19:55:03 +02:00
payonel
ad33ec285a big awesome update for devfs, command substitution, and io redirection 
Added another 60 tests, now totalling 901 all-passing tests. This change also reduces memory cost for boot by about 1300 bytes.

This change should be fully compatible with any 1.6 user scripts. This makes no change to api, only improves shell support and makes important process handle cleanup (when pipes and redirection is used - we are not auto-closing user file handles).
 2016-04-24 21:59:22 -07:00
Florian Nücke
e23cff188f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-04-17 11:37:04 +02:00
Florian Nücke
5c03d0517a Gaah, right, that's 2016-04-17 11:35:55 +02:00
Florian Nücke
0ab516bd4a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-04-16 14:59:11 +02:00
Florian Nücke
5ba972f559 Bah, allright then. 2016-04-16 14:57:46 +02:00
Florian Nücke
25b6d214a7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-04-16 14:45:33 +02:00
Florian Nücke
b17c16064b Merge branch 'buffer-chomp' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-04-16 14:26:35 +02:00
Florian Nücke
5c602d42ad Merge branch 'cp-keep-links' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-04-16 14:26:21 +02:00
Florian Nücke
ae1cb3fe6e Fixed error in network node remapping when node gets removed during that remapping operation. 
E.g. file systems automatically connected together with the main component, as in the internet card.
This should fix a potential crash with OC conduits in EnderIO.
Also, unit tests \o/ You'll need ScalaTest and Mockito to run them.
 2016-04-16 14:21:45 +02:00
payonel
9ffc060205 Chomp \r and \r\n from lines, not just \n 2016-04-15 23:20:34 -07:00