4997 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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