AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,997 Commits 29 Branches 143 Tags
Commit Graph

4997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Florian Nücke
31e4c3c53a Power button in server GUI when in rack. Fixed sided connections. 2015-11-07 15:32:53 +01:00
Florian Nücke
bc90a35a7b Updated / adjusted some localizations, server booting in rack again. 2015-11-07 14:03:05 +01:00
Florian Nücke
8fe2b8a9a6 Connection mapping in racks via GUI \o/ 2015-11-07 12:51:08 +01:00
Florian Nücke
7e80b27e70 Started work on new rack GUI. 2015-11-07 09:11:25 +01:00
Florian Nücke
c674b5b448 Stuff, I guess? (forgot to commit again >_>) 2015-11-05 21:08:21 +01:00
Florian Nücke
de1114b0f4 Added RackBusConnectable interface to mark environments in servers (or other mountables) to be connectible to buses in racks. 
Shuffled some stuff in API around, deprecating them.
 2015-11-01 22:47:28 +01:00
Florian Nücke
14c9180f4a Tons of refactoring for server racks, added mechanics and API for sending custom data per mountable and event based rendering hooks for both block and tile entity rendering stage. 
After ripping out pretty much everything it seems to compile for the time being... now to re-implement all the things...
 2015-11-01 19:34:33 +01:00
Florian Nücke
c1772cbfdb Merge branch 'onesix' into rack-overhaul 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverCPU.scala
	src/main/scala/li/cil/oc/server/PacketSender.scala
 2015-10-30 18:37:19 +01:00
Florian Nücke
d1563e10b0 Merge branch 'master-MC1.7.10' into onesix 
Conflicts:
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
 2015-10-30 18:33:25 +01:00
Florian Nücke
6118211b22 Should avoid issue with silly people touching config files. Closes #1500. 2015-10-28 20:04:58 +01:00
Florian Nücke
0eefb26b44 Updated to Forestry 4.x API. Closes #1508. 2015-10-28 19:55:06 +01:00
Florian Nücke
528f2ee05e Version bump. 2015-10-28 18:58:28 +01:00
Florian Nücke
8bd423548a Glorious bugfix. Closes #1504. 2015-10-28 18:57:51 +01:00
Florian Nücke
7588d922e4 Generalized callBudget setting description since it now also applies to memory. 2015-10-25 17:12:43 +01:00
Florian Nücke
f46c22ba77 Change GeolyzerEvent.Scan to define a bounding box instead of a column. Closes #1149. 
`geolyzer.scan` can now alternatively be called with `x, z, y, width, depth, height` as first arguments to define custom bounds (old parameters still work and will continue to return columns).
Layout of returned table will be such that `index = x + z*w + y*w*d`.
 2015-10-25 17:11:40 +01:00
Florian Nücke
d6838a9455 Actually implemented call budget in memory. 2015-10-25 16:39:28 +01:00
Florian Nücke
16be5bb64c Added Architecture.onSignal. Closes #1202. 2015-10-25 14:37:05 +01:00
Florian Nücke
521b868185 Move call budget definition to new item driver interface (instead of hardcoded by tier in Machine). Closes #1165. 
Implemented by processors and memory in OC by default. Average of all budget specifying components is used, or 1.0 if none are present.
 2015-10-25 14:30:08 +01:00
Florian Nücke
33ac0f6dda Reworked dynamic callback cost logic by popular demand. 2015-10-25 12:26:20 +01:00
Florian Nücke
fc23602624 Untested fix for #1496. 2015-10-21 20:06:46 +02:00
Florian Nücke
6a895a72f7 Fixes #1498. 2015-10-21 19:54:18 +02:00
Florian Nücke
b0d0fa09a7 Made disk drive expose a component, allows checking for disk presence and programmatic ejection of disks. Closes #1144. 2015-10-21 19:48:28 +02:00
Florian Nücke
bf7bb9b204 Made filesystems and drives make use of the dynamic call cost system. 2015-10-21 19:09:41 +02:00
Florian Nücke
97527cf808 Doing some black magic to avoid reflection for component callbacks. 
Might throw that out again, though; it's not the actual bottleneck.
 2015-10-18 18:02:17 +02:00
Florian Nücke
5c92706152 Make GPU use new dynamic cost computation. 2015-10-18 12:49:17 +02:00
Florian Nücke
4f9cd74ef1 First attempt dynamic call cost computation. 
Not going through API for now, because meh.
 2015-10-18 12:14:22 +02:00
Florian Nücke
99f9794351 Version bump. 2015-10-17 14:47:18 +02:00
Florian Nücke
142e705e91 Merge branch 'alias' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2015-10-17 13:55:22 +02:00
Florian Nücke
f0ff3796c1 Homogeneity, ho! 2015-10-17 13:42:51 +02:00
Florian Nücke
1928cb3704 Emit signal when internal tank of an agent changes. Closes #1487. 2015-10-17 13:13:31 +02:00
Florian Nücke
ffecc8347f Lesson learned: structural typing and obfuscation don't play nice. Fixes #1492. 2015-10-17 12:29:41 +02:00
Florian Nücke
e47cc37d38 Properly send error state to newly connected clients. 2015-10-16 20:48:37 +02:00
Florian Nücke
34eab8a5e0 Using power-led to indicate error when computer did not shut down cleanly by making it flash red. Closes #1416. 2015-10-16 20:09:58 +02:00