AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,333 Commits 29 Branches 143 Tags
Commit Graph

4333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Łukasz Magiera
c58b8f5fe3 Fixed embedSlot in GuiType 2015-12-18 15:05:38 +01:00
Łukasz Magiera
ce2117dd6b Network activity LED for servers 2015-12-17 23:03:49 +01:00
Florian Nücke
214a0c2c30 Ohwaitididntbumptheversionyet. 2015-12-16 21:39:11 +01:00
Florian Nücke
ee255c90ff Corrected EEPROM docstring. Closes #1553. 2015-12-16 21:30:56 +01:00
Florian Nücke
fc750e153e Also apply linear filtering setting (textLinearFiltering) to unifont renderer. Closes #1548. 2015-12-16 21:29:54 +01:00
Florian Nücke
dbb710b708 Rudimentary system for interacting with item inventories (via inv controller in robots and drones). 
Very basic for now, partially because I can't come up with non-terrible names for the methods.
 2015-12-16 21:17:38 +01:00
Florian Nücke
8433f0e446 Merge branch 'onesix' of github.com:MightyPirates/OpenComputers into onesix 
Conflicts:
	src/main/scala/li/cil/oc/server/component/Server.scala
 2015-12-16 20:35:51 +01:00
Florian "Sangar" Nücke
aa2a46cbfa Merge pull request #1569 from magik6k/patch-netcards 
Fix network card visibility in rack
 2015-12-16 20:18:12 +01:00
Łukasz Magiera
0ad1e777d5 Fix network card visibility in rack 2015-12-16 18:44:47 +01:00
Florian "Sangar" Nücke
19c286c84f Merge pull request #1562 from magik6k/patch-netcards 
[1.6] Fixed network card message target for servers
 2015-12-16 08:43:49 +01:00
Łukasz Magiera
1f30b74fb2 Fixed network card message target 2015-12-15 23:24:09 +01:00
Florian "Sangar" Nücke
b63416fe0b Merge pull request #1561 from magik6k/patch-racks 
[1.6] Fixed rack power crash
 2015-12-15 15:00:57 +01:00
Łukasz Magiera
9165bc99b9 Fix rack crash, creative server power 2015-12-15 14:38:16 +01:00
Florian "Sangar" Nücke
6b740fe6aa Merge pull request #1560 from magik6k/patch-uc 
Fix uC crash
 2015-12-14 22:48:27 +01:00
Łukasz Magiera
1972f804ab Fix uC crash 2015-12-14 22:39:00 +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
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
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
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
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
90087b2448 Fixes #1522. 2015-11-11 21:20:15 +01:00