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

5044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
a69c09e4be Merge branch 'architecture-memory-fix' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-04-05 20:57:19 +02:00
payonel
0dd3421d4a Continue tab complete on single hit results into result children 
Tab complete in the lua prompt shows . on tables, but can give the wrong impression that there are no keys. Consider that the user types =filesyste[tab] and then sees =filesystem. and presses tab again. The hint table has only one entry, "=filesystem." and is cycling through that one entry and not reconsidering children of filesystem .. which is what the prompt makes the user think. This change injects a metamethod lookup in the 2nd index of a single result to repop the hint list with new children.
 2016-04-04 22:05:21 -07:00
Florian Nücke
0082018de0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-04-04 21:46:25 +02:00
gamax92
5a43bfd4cb Update LuaJ, closes #1735. 2016-04-04 21:45:16 +02:00
Florian Nücke
41a5f8cfbb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-04-03 00:04:19 +02:00
payonel
b6326e87e8 delay load, term, and grep fixed 
Delayload is lighter weight now. Improving method reuse and reducing boot costs about about 1.5k

term had some crashes and improper behavior. This fixed tab complete for 5.3 lua archs, term palette use, and missing tab complete hints. Term blinking now also supports setCursorBlink(false).

grep had a bug where patterns looking for start-of-line text would find in-line matches as well.
 2016-04-02 13:07:03 -07:00
Florian Nücke
82edd9567d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/server/command/SpawnComputerCommand.scala
 2016-04-02 21:49:30 +02:00
Vexatos
eb8bd31b42 Improved rotation of computer spawning command. 2016-04-02 20:50:13 +02:00
Vexatos
8e54d5ef77 Made memory calculation a lot less hardcoded, finally allowing addons to define custom memory types. 2016-04-02 20:25:43 +02:00
Florian Nücke
eeec08e565 Fixed print multiparts not sending a change signal to other parts. 2016-04-02 16:40:51 +02:00
Florian Nücke
ed4451122b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-04-02 16:29:33 +02:00
Florian Nücke
876279aefb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-04-02 16:28:56 +02:00
Florian Nücke
88f3412f0c Backport switch achievement fix. 2016-04-02 16:28:43 +02:00
Florian Nücke
87290628e9 Redstone fixery and making lighted prints work in multiparts. 2016-04-02 16:20:07 +02:00
Florian Nücke
edcd8a1201 Fix potential NPE. 2016-04-02 16:17:05 +02:00
Florian Nücke
54eef9bb0c Enforce complexity limit for multiparts. 2016-04-02 14:47:21 +02:00
Florian Nücke
94eff66b34 Added multipart support for prints. 
Added delayed scheduling to EventHandler, used for button toggling in multiparts.
Also retry reverting when failing (possibly due to added other part in the meantime).
 2016-04-02 14:41:24 +02:00
Florian "Sangar" Nücke
641800f79c Merge pull request #1729 from new-sashok724/patch-1 
Typo in WirelessNetworkCard.setStrength?
 2016-04-01 09:42:17 +02:00
sashok724
fcf1c09b62 Typo in WirelessNetworkCard.setStrength? 2016-04-01 03:54:35 +00:00
Florian Nücke
31597ef446 Scale down preview in 3D printer to avoid clipping. 2016-03-28 21:12:34 +02:00
Florian Nücke
ae3bcdb5ff Fixed highlight on prints being white. 2016-03-28 21:12:15 +02:00
Florian Nücke
d114b00563 Moved a bunch of print logic from block to tile entity. 2016-03-28 21:11:56 +02:00
Florian Nücke
4d8d6f5073 Actually enabled CC compat .-. Fixes #1714. 2016-03-28 12:43:33 +02:00
Florian Nücke
9a8b037f88 Require 1.0.9 of MCMP. 2016-03-28 12:37:25 +02:00
Florian Nücke
5b9e03084d Better model handling! 2016-03-28 12:34:15 +02:00
Florian Nücke
2f83eebbab Cleanup! 2016-03-28 12:11:29 +02:00
Florian Nücke
f3354000fe Allow getting networking achievement via relay now that switch and access point are dead. Closes #1713. 2016-03-28 12:04:09 +02:00
Florian Nücke
ec907580ad Fixed collisions! 2016-03-28 12:03:23 +02:00
Florian Nücke
8b4a0281fe Move capabilities to cable part (not event injection). 
Properly handle multipart changes (newly occluded / no longer occluded).
Avoid network disconnects during conversion.
Properly kill off old nodes after conversion.
 2016-03-28 00:46:51 +02:00
Florian Nücke
4e806df7c4 Create cable items manually not via block type (since that's not set for dummy TEs in cable parts). 2016-03-28 00:44:41 +02:00
Florian Nücke
bea3bd11c3 Some utility methods for cable bounds lookup. 2016-03-28 00:44:05 +02:00
Florian Nücke
0b9ac95159 Bake color into quads instead of using tint index to support cable coloring in multiparts. 2016-03-28 00:43:37 +02:00
Florian Nücke
0d45083c43 Added overload to add world position to a network (still goes through the TE). 
Mainly for more comfortable delayed adding when previous TE at that location may now be invalid/replaced.
 2016-03-28 00:18:34 +02:00
Florian Nücke
e90c9ade09 Basic MCMP integration for cables. 2016-03-27 18:18:36 +02:00
Florian Nücke
f36e9b918d Or not? 2016-03-27 17:34:21 +02:00
Florian Nücke
933f51ccef Simple colored trait, don't consume dyes when in creative mode. 2016-03-27 17:33:34 +02:00
Florian Nücke
c7715c346e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-27 13:35:38 +02:00
Florian Nücke
2cba7bc182 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2016-03-27 12:24:09 +02:00
Florian Nücke
91e8b461ef Merge branch 'about-time' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-03-27 12:09:15 +02:00
payonel
cbf676435c give /bin/time much better output using uptime, big thanks to gamax92 2016-03-26 21:05:26 -07:00
payonel
53d97fd21f make coroutine wrap create tracked coroutines, needed for process data 2016-03-26 19:54:05 -07:00
cyber01
cfa513088e Updates for 1.6 2016-03-26 23:06:45 +03:00
Florian Nücke
82b3eaf174 For those not checking for null... 2016-03-26 19:56:52 +01:00
Florian Nücke
8d38564a14 Because why not. 2016-03-26 17:06:06 +01:00
Florian Nücke
bd5acfaf99 Make blocks' Environment, SidedEnvironment and Colored interfaces accessible via the new capability system. 
Automatically generates a provider for tile entities implementing these interfaces.
Using capability system to access the interfaces instead of casting the tile entity.
Allow specifying whether coloring controls connectivity in interface.
 2016-03-26 17:05:57 +01:00
Florian Nücke
6bfe633141 Fixed Chamelium blocks (and others) to be schizophrenic about having a tile entity, leading to constant chunk re-renders. 2016-03-26 17:03:57 +01:00
Florian Nücke
a1d53df69c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-26 14:06:01 +01:00
Florian Nücke
8087d6523a Hardened unbuffered filesystems. Closes #1707. 2016-03-26 14:00:04 +01:00
Florian Nücke
0c0880d836 Properly erroring on ".." as path to FS methods. Closes #1708. 2016-03-26 13:28:25 +01:00
Florian Nücke
89bcfe4bba Adjustment for 1.8.9. 2016-03-24 22:38:47 +01:00