AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,189 Commits 29 Branches 143 Tags
Commit Graph

3189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
451ab1b4d4 Added microcontrollers, closes #711. 
Solar generator is now tier two to allow better balance of microcontroller.
 2014-12-08 22:17:52 +01:00
Florian "Sangar" Nücke
6909326c7e Merge pull request #717 from Kubuxu/patch-1 
Fixed typo in network loot disk documentation.
 2014-12-08 12:34:26 +01:00
Kubuxu
fd79526679 Typo. 
Sorry I had to.
 2014-12-08 11:55:01 +01:00
Florian Nücke
981d2ffb6f Some minor tweaks to some block textures (had gradient in border). 2014-12-08 02:10:07 +01:00
Florian Nücke
b1e368f283 Bye UE, hi RE. Completely untested. 2014-12-08 01:06:30 +01:00
Florian Nücke
b583139f43 Re-tested all upgrade paths I could think of, looks like EEPROM is injected everywhere it should be and nowhere it shouldn't. This means implementation of EEPROM is pretty much done, closing #425. 
Little bit of cleanup.
 2014-12-07 18:29:11 +01:00
Florian Nücke
c93449ad7b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into eeprom 2014-12-07 16:16:40 +01:00
Florian Nücke
a1f11a1d01 Fixed message relaying between multiple unconnected in server rack in internal mode. Again. 2014-12-07 16:15:57 +01:00
Florian Nücke
78cc73bdbb Added EEPROM item, holds byte array representing BIOS, interpretation left to architecture. 
Added slot to cases, servers and tablets, replaced floppy slot in robot template with EEPROM slot.
For existing cases, servers, robots and tablets automatically populate the eeprom slot to avoid breaking stuff when upgrading.
Fixed result of floppy recolor recipes not being colored in NEI.
 2014-12-07 15:16:26 +01:00
Florian Nücke
b324dc300b Added NEI option to show items' ore dictionary names in their tooltips. 2014-12-06 18:24:45 +01:00
Florian Nücke
5f62b15bf2 Registering regular obsidian as obsidian in OreDict to avoid issues with other mods registering that without adding it (Extra Utilities). Closes #712. 2014-12-06 00:53:41 +01:00
Florian Nücke
d7da489ba3 More AE2 integration! Added part that acts as OC P2P tunnel via ME networks. 
Fixed issue when AE2 was the only power providing mod.
 2014-12-05 23:57:24 +01:00
Florian Nücke
da98ffea88 Less ugly. 2014-12-05 14:21:35 +01:00
Florian Nücke
8cccc17ace Added robot.uuidFormat setting to control UUIDs assigned to robots' fake players. See comment in config for usage. Disclaimer: relatively untested. 2014-12-05 14:12:11 +01:00
Florian Nücke
2947ded770 Added try-catch to suppress errors when trying to release a ticket for a world that's currently being unloaded. Closes #710. 2014-12-05 00:31:44 +01:00
Florian Nücke
0ae0d5d67e Avoid install.lua erroring when installing to a writable fs with a readonly label. 
Computers also emit beeps when they error on startup (and a short beep on success).
 2014-12-03 16:30:16 +01:00
Florian Nücke
36b40a83a3 Fixed derp in previous commit. 2014-12-03 14:49:01 +01:00
Florian Nücke
b8e189cacd Preparation for #634. 
Won't go through with it yet because it requires some more adjustments, e.g. set can't remain a program, will need to be a shell builtin; in general, programs relying on setenv being global will break.
 2014-12-03 14:23:17 +01:00
Florian Nücke
e285c5875e Extended process lib to allow storing data per process, using it for io lib to store processes' stdin and stdout instead of the local hackaround. 2014-12-03 14:05:53 +01:00
Florian Nücke
d326e98714 Fixed more.lua's behavior for long lines. Closes #491. 2014-12-03 13:24:41 +01:00
Florian Nücke
06d2e657bc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-03 00:55:33 +01:00
Florian Nücke
347d10b02e Wrapping up raid block. Seems to work. Closes #179. 2014-12-03 00:55:20 +01:00
Florian "Sangar" Nücke
47f2abb0ee Merge pull request #708 from Vexatos/patch-15 
Fixed internet card's `isTcpEnabled` returning whether HTTP was enabled instead.
 2014-12-02 21:23:51 +01:00
Vexatos
4199f12124 Update InternetCard.scala 2014-12-02 21:18:13 +01:00
Florian Nücke
4adf4e190c Started work on raid block. 
Reworked extended NBT foreach and map after finding remove.
Fixed / broke inventories? (onRemoved was dispatched before slot was cleared, now it's after; didn't find anything that relied on it happening before, but we'll see...)
 2014-12-02 18:52:57 +01:00
Florian Nücke
6ec65509e0 Previous merge closes #703. 
Minor formatting.
 2014-11-30 14:23:51 +01:00
Florian Nücke
5800590995 Merge branch 'patch-14' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2014-11-30 14:20:11 +01:00
Vexatos
3574c405de Update DriverPeripheral.java 2014-11-30 13:26:26 +01:00
Vexatos
f485ad74bd Update DriverPeripheral.java 
Should fix #703.
 2014-11-30 13:23:26 +01:00
Florian Nücke
42f5fb7c6b Fixed bounding box weirdness for blocks with stateful bounds (keyboards and cables, most notably). Closes #699. 2014-11-29 21:42:11 +01:00
Florian Nücke
3966def5d3 Updated native Linux libs with ones built on yet an older system (CentOS5) to make them work there... quickly tested again on Ubuntu 14, and that still worked, so. Closes #701. 2014-11-29 18:44:57 +01:00
Florian Nücke
e04298b8e1 Revert "Switched to more specific IEnergyReceiver from IEnergyHandler." 
This reverts commit 779599bb3c331028b4c35d9649badd869a5370f6.
 2014-11-27 23:06:33 +01:00
Florian Nücke
af7d4ff507 Screw it. 2014-11-27 22:44:02 +01:00
Florian Nücke
779599bb3c Switched to more specific IEnergyReceiver from IEnergyHandler. 2014-11-27 21:40:43 +01:00
Florian Nücke
2abfdeaa3c Added IMC to allow blacklisting CC peripherals from being wrapped. 2014-11-27 21:40:13 +01:00
Florian Nücke
95d6baaa48 Added debug.runCommand, which uses the global OC fake player for executing commands. Closes #697. 2014-11-27 19:54:09 +01:00
Florian Nücke
dc83623ac1 Added geolyzer.store to save item stack representations of blocks in database components. Closes #654. 
Expect this to not work for all blocks in existence. In particular blocks that have custom drop logic (e.g. to spawn stacks with NBT tags) will fail to be stored correctly. I'm afraid there's just no way to handle all cases introduced by all the mods out there. So this is good enough.
 2014-11-27 19:07:16 +01:00
Florian Nücke
273c871412 Added a store method to inventory controller, to allow configuring databases this way. Closes #695. 2014-11-27 18:32:56 +01:00
Florian Nücke
0ac27fd0e0 Fixed screens rendering their orientation overlay when *any* OC item is held in hand; should only be the case when a screen is held (or a wrench tool). 2014-11-27 18:31:47 +01:00
Florian Nücke
62e669ec9d Added some more utility methods for database component to allow manipulating slots (copy and clear). 2014-11-27 18:04:34 +01:00
Florian Nücke
ef5e6e0b5b Fixed crafting upgrade a bit to prevent linked cards being batch crafted with the same channel. 2014-11-27 17:45:00 +01:00
Florian Nücke
a01dc9dd04 Leaving container item of fuel items inserted into the generator in its inventory (e.g. buckets can be retrieved with generator.remove). Closes #698. 2014-11-27 17:05:07 +01:00
Florian Nücke
ece65d8961 Added check to prevent linked card being autocrafted by AE2 to avoid more than two cards sharing the same channel. 2014-11-27 17:03:20 +01:00
Florian Nücke
39dc3964ba Fixes network messages not being relayed to other servers in a server rack when sent by an unsided server in internal mode. Closes #692. 2014-11-27 16:26:16 +01:00
Florian Nücke
814b4ed5bc Added support for railcraft crowbars. 2014-11-27 14:42:54 +01:00
Florian Nücke
4af6961f7f Added support for IC2 wrenches and TE hammers as tools for rotating blocks. 
Added a new IMC callback for this, registerWrenchTool. Takes a string parameter being the FQN name of a static method with the signature `public static boolean(EntityPlayer player, Int x, Int y, Int z, boolean changeDurability)`. Returns true if item stack held by player is supported.
Split up BC integration into parts for each API package. Just in case someone decides to ship parts of the BC API.
Cleaned up a little.
 2014-11-27 14:35:56 +01:00
Florian Nücke
25e340279b Version bump. 2014-11-27 13:01:20 +01:00
Florian Nücke
649be5d890 Fixed left and right sides being inverted in geolyzer.analyze when used in robots or tablets. Closes #693. 2014-11-27 13:00:56 +01:00
Florian Nücke
7b7423c9f6 Should fix incorrect caching of screen render state if it was rendered before the first init packet. Fixes #694. 2014-11-27 12:58:08 +01:00
Florian Nücke
1158e0b5b2 Added IMC message to allow mods to query OC's config. 
Name: requestSettings, string value: name of method to call, required method signature: public static void(com.typesafe.config.Config).
Moved IMC stuff to its own object removing some redundancy.
 2014-11-26 19:18:49 +01:00