AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 17:28:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,611 Commits 29 Branches 143 Tags
Commit Graph

4611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
bfab896a28 Added TIS-3D integration. 2015-12-29 15:04:19 +01:00
Florian Nücke
2c672c497b Fixed GT recipes, closes #1542. 2015-12-27 15:00:23 +01:00
Florian Nücke
326bafca1d Lowercase errors masterrace. 2015-12-27 14:54:34 +01:00
Florian Nücke
7c2a0541e4 Merge branch 'request-headers' of https://github.com/invliD/OpenComputers into master-MC1.7.10 2015-12-27 14:52:34 +01:00
Florian Nücke
19144d2dc7 Don't disable grog in GT recipe set since it's needed for removing nanomachines now. Closes #1577. 2015-12-27 13:30:45 +01:00
Florian Nücke
9b45cf894a Handle disabled command blocks more gracefully in driver, closes #1575. 2015-12-27 13:25:10 +01:00
Florian Nücke
43d2fba5bf Also grant achievements when picking up related item, not just when assembling/crafting it, closes #1578. 2015-12-27 13:13:14 +01:00
Florian Nücke
178e0c026b Should fix #1574. 2015-12-27 13:04:16 +01:00
Sebastian Brückner
c2e379a757 Added support for HTTP request headers. 2015-12-25 21:14:14 +01:00
Florian Nücke
e1494e9224 Fixed rack internal connectable <-> connectable comms. 2015-12-25 20:28:03 +01:00
Florian Nücke
1bc4695933 Updated native Lua 5.3 to 5.3.2. 2015-12-25 16:09:05 +01:00
Florian Nücke
a3f2e5e31c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-12-24 14:54:50 +01:00
Florian Nücke
ff87273670 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/resources/assets/opencomputers/lang/ru_RU.lang
 2015-12-24 14:54:35 +01:00
Florian "Sangar" Nücke
03aab465e9 Merge pull request #1582 from PotatoTrumpet/patch-1 
Add 2 Robot Names
 2015-12-24 14:53:42 +01:00
Florian Nücke
6a6c5f6843 Fixed the \0 replacement. 2015-12-24 14:51:50 +01:00
Florian Nücke
6330ab928e Merge branch 'master-MC1.7.10' of https://github.com/mpmxyz/OpenComputers into master-MC1.7.10 2015-12-24 14:39:13 +01:00
mpmxyz
29c49e0cf7 Added term windows and multiscreen support to OpenOS. (no multithreading though) 
Also added wide character support to edit.lua
 2015-12-24 14:34:06 +01:00
Potato
67cc14cc36 Add two new names 
BB-8 : Star Wars: The Force Awakens
Codsworth : Fallout 4
 2015-12-23 23:49:11 -06:00
Florian Nücke
1fc9e8f294 Fixed setPaletteColor using hardcoded 2 for all tiers. 2015-12-23 23:28:31 +01:00
Florian Nücke
b96411c40b Don't create node / remove node in SimpleComponents when getComponentName returns null or an empty string. 
Merry Christmas, Vic.
 2015-12-23 21:27:17 +01:00
cyber01
7d0204d609 Added rack disk drive 2015-12-23 05:23:47 +03:00
Florian Nücke
c83434c533 Fix server eth leds always being on. 2015-12-22 23:59:31 +01:00
Florian "Sangar" Nücke
56035ddf0c Merge pull request #1576 from magik6k/plan9k 
Update Plan9k
 2015-12-20 23:35:33 +01:00
Łukasz Magiera
8271ede0f8 Update Plan9k 2015-12-20 23:02:02 +01:00
Florian "Sangar" Nücke
117219fb0a Merge pull request #1573 from magik6k/patch-embedslot 
Fixed embedSlot in GuiType
 2015-12-19 11:33:57 +01:00
Łukasz Magiera
c58b8f5fe3 Fixed embedSlot in GuiType 2015-12-18 15:05:38 +01:00
Florian "Sangar" Nücke
16ef4a28c3 Merge pull request #1570 from Pwootage/master-MC1.7.10 
Add filename to FileNotFoundExceptions thrown in various filesystem implementations
 2015-12-18 10:18:06 +01:00
Pwootage
dbdc813fad Add filename to FileNotFoundExceptions thrown in various filesystem implementations 2015-12-17 15:34:50 -07:00
Florian "Sangar" Nücke
99baeabdf7 Merge pull request #1572 from magik6k/patch-netcards 
Network activity LED for servers.
 2015-12-17 23:13:19 +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