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,459 Commits 29 Branches 143 Tags
Commit Graph

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
ae49538af5 Started working on drones. 2014-12-11 13:33:34 +01:00
Florian "Sangar" Nücke
fa8f803b79 Merge pull request #726 from Mazdallier/patch-3 
Update fr_FR.lang
 2014-12-11 01:49:08 +01:00
Yves
2293cce173 Update fr_FR.lang 
Blocks and items only
 2014-12-10 17:08:56 +01:00
Florian Nücke
2eef0fe17c Updated remark on robot names. 2014-12-10 15:52:38 +01:00
Florian Nücke
8a9ae4b53e Made getDrops implementation more specific as discussed as it could cause issues otherwise as discussed here http://git.io/IcNAyg 2014-12-10 15:32:06 +01:00
Florian Nücke
6f788e0b14 Added driver for analyzer block from Forestry for #723. 
Slightly improved bee house driver (avoid duplicates in returned tables).
 2014-12-10 15:20:15 +01:00
Florian Nücke
060990e977 Fixed conversion of nested tables containing exact duplicate entries (memoization was a bit broken). 2014-12-10 15:13:59 +01:00
Florian Nücke
8747dfc609 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-10 01:41:17 +01:00
Florian Nücke
94a14ed8db Fixed robots vanishing when broken by AE2 annihilation planes. Closes #722. 
Fixed potential NPE in robot use logic (if robot.use() resulted in a new stack appearing in the robot's tool slot).
Added extra check to robots' setInventorySlotContents, drop into world if slot is invalid for item.
 2014-12-10 01:40:57 +01:00
Florian Nücke
441e11d5b2 Updated Project Red dependency because old maven is apparently not used anymore. 2014-12-10 01:17:03 +01:00
Florian "Sangar" Nücke
f60b07de88 Merge pull request #721 from magik6k/master 
Add new tools to Network floppy
 2014-12-09 23:54:59 +01:00
Łukasz Magiera
62ed17f6e4 Update Network stack floppy 2014-12-09 23:06:58 +01:00
Florian Nücke
df86ebdf38 Added flash.lua program to make programming EEPROMs a little more comfortable. 2014-12-09 13:49:33 +01:00
Florian Nücke
3e1af107cc Hmm, don't know something actually changed since I saved earlier... oh well. 2014-12-09 00:38:12 +01:00
Florian Nücke
e585b13b10 Made file systems count as 1/4th component instead of being completely free. Just to avoid unhealthy numbers of raids/disk drives being connected to one computer. 2014-12-08 23:37:28 +01:00
Florian Nücke
e37bf65f3f Cables shouldn't connect to the front of MCUs. Because I say so. 2014-12-08 23:26:53 +01:00
Florian Nücke
57548d30de Hiding microcontroller block from creative tab and NEI (given one makes no sense since it has no components in it). 2014-12-08 23:15:19 +01:00
Florian Nücke
c3234b65b4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-08 22:24:35 +01:00
Florian Nücke
6168825043 Added line to network boot script as requested by Magik6k. 2014-12-08 22:23:55 +01:00
Florian Nücke
5635fe3e88 Disabling RE integration for now, as it's officially unstable/in-dev. 2014-12-08 22:21:34 +01:00
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