Florian Nücke
a80a2b0f2b
Refactored text rendering a little to allow reusing it for status text display of drones.
2014-12-15 03:59:15 +01:00
Florian Nücke
6a4a03801e
Extracted some logic from robot component into traits for use in drones.
2014-12-15 02:16:43 +01:00
Florian Nücke
fdb834adc9
More work on drone GUI, shows up now, powering works via that, inventory works.
2014-12-14 23:02:08 +01:00
Florian Nücke
8c47a50070
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into drones
2014-12-14 19:41:11 +01:00
Florian "Sangar" Nücke
06f496b45a
Merge pull request #734 from Mazdallier/patch-3
...
Update fr_FR.lang
2014-12-14 18:17:32 +01:00
Florian Nücke
0271a98830
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2014-12-14 14:24:20 +01:00
Florian Nücke
860c609da2
Preprocessing clipboard data in edit.lua a bit, converting \r\n to \n and converting tabs to spaces. Closes #724 .
2014-12-14 14:22:26 +01:00
Florian Nücke
31f79dbc76
Removed hacky AE2 P2P tunnel as a proper one will likely be added to AE2 itself.
2014-12-14 14:09:37 +01:00
Florian Nücke
ab9bac51fa
Raid file systems can now be labeled.
2014-12-14 13:56:26 +01:00
Florian "Sangar" Nücke
b1bc3506af
Merge pull request #740 from Vexatos/patch-16
...
Added incredibly important text to oppm.lua
2014-12-14 13:25:58 +01:00
Vexatos
af13d5dc8b
Added incredibly important text to oppm.lua
2014-12-14 13:23:05 +01:00
Florian Nücke
d29dcb8a69
Started work on drone GUI.
2014-12-13 21:52:40 +01:00
Florian Nücke
f43de85167
Drone assembler template, recrafting for EEPROM change.
2014-12-13 16:57:52 +01:00
Florian Nücke
dc298fcff6
Added items for drone and drone case.
2014-12-13 14:20:09 +01:00
Yves
63e289caad
Update fr_FR.lang
2014-12-12 11:23:42 +01:00
Florian Nücke
1ffe1a3b30
And a bit of hovering, for good measure.
2014-12-12 03:48:10 +01:00
Florian Nücke
bea8ca4f0d
Tilt based on velocity.
2014-12-11 21:36:03 +01:00
Florian Nücke
f890089ce0
Less derpy flight-paths and way less jitter.
2014-12-11 21:20:45 +01:00
Florian Nücke
4c9bfc48a1
More droning.
2014-12-11 20:56:32 +01:00
Florian Nücke
3ca6bc28f6
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2014-12-11 18:28:54 +01:00
Florian "Sangar" Nücke
832276f2fa
Merge pull request #732 from Mazdallier/patch-3
...
Update fr_FR.lang
2014-12-11 18:27:11 +01:00
Florian Nücke
3868d582ed
Fixed potential term derps on very quick reconnections of screens (e.g. breaking a cable and replacing it really quickly).
2014-12-11 17:44:36 +01:00
Yves
1aac28bdf4
Update fr_FR.lang
2014-12-11 17:13:38 +01:00
Florian Nücke
b288a63e18
Fixed tablets not being properly un/reloaded on dimension changes, closes #727 .
2014-12-11 14:21:35 +01:00
Florian Nücke
58ab97142a
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2014-12-11 13:33:59 +01:00
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
