Florian Nücke
40de62056b
Added methods for raw text and color setting to TextBuffer API.
2015-01-14 18:53:19 +01:00
Florian Nücke
90d0124cd5
Merge branch 'master-MC1.7.10' of https://github.com/AtomSponge/OpenComputers into master-MC1.7.10
2015-01-14 17:14:35 +01:00
Florian Nücke
b3c548388e
That field was totally a method when I looked. Honest. Maybe.
2015-01-14 17:14:14 +01:00
AtomSponge
837e213afe
Fix integration mod list .. which is apparently sorted alphabetically
2015-01-14 17:12:15 +01:00
AtomSponge
c058dc2781
Add BloodMagic integration (Blood Altars, Master Ritual Stones and Blood Orbs)
2015-01-14 16:59:11 +01:00
Florian Nücke
f01e69333b
Made some tooltips more generic to close #805 .
...
CBA to adjust German tooltips right now, @Vexatos, would you be so kind? :P
Also someone please check if I accidentally grammar somewhere.
2015-01-13 14:40:44 +01:00
Florian Nücke
b128709b77
Testing, one-two, one-two.
2015-01-13 13:47:55 +01:00
Florian "Sangar" Nücke
4ceb11da55
Merge pull request #806 from AtomSponge/master-MC1.7.10
...
Fix build.gradle for Gradle 2.x, copy over assets automatically
2015-01-12 20:03:45 +01:00
AtomSponge
7f29eb6ada
Fix build.gradle for Gradle 2.x, copy over assets automatically for IntelliJ
2015-01-12 19:19:54 +01:00
Florian Nücke
484fac6ecd
Bump.
2015-01-12 17:45:11 +01:00
Florian Nücke
d3884d90c3
Forgot marking IC2 as energy providing mod when making switch to requiring IC2 proper instead of its API a while back.
2015-01-12 17:27:08 +01:00
Florian Nücke
2643994271
doclint begone! Makes it compile using Java 1.8 JDK for me, closing #780 .
2015-01-12 16:53:51 +01:00
Florian Nücke
c52959258d
Gradle 2.
2015-01-12 07:44:17 +01:00
Florian Nücke
c88eac9d61
Nothing to see here, please keep moving right along.
2015-01-12 04:31:34 +01:00
Florian Nücke
61b26e17cb
Added backwards compatibility to inventory_controller.getStackInSlot, closes #803 .
2015-01-12 03:31:10 +01:00
Florian Nücke
bce4a60394
Fixed drones with an active leash causing leash items to be dropped when picked up (shift-rightclicked).
...
Fixed leash on drones not rendering centered on drone in obfed Minecraft.
2015-01-12 03:18:23 +01:00
Florian Nücke
5239eb3ab0
Fixed potential NPE in Waila handler.
2015-01-11 23:35:14 +01:00
Florian Nücke
7cfa7ac2a3
Missed one.
2015-01-11 16:38:19 +01:00
Florian Nücke
d03c7c94e6
Added Waila options for toggling energy, address and component name.
2015-01-11 16:17:33 +01:00
Florian Nücke
7bbed622f9
Coloring tooltips of devices according to their tier now (robots, mcus, drones).
...
Added creative drone and mcu case.
Added preconfigured robot, mcu and drone to creative tab (mcu and drone still need a programmed EEPROM to be put in).
2015-01-11 16:01:35 +01:00
Florian Nücke
b13f319018
Added EEPROM cloning recipe (EEPROM + EEPROM -> 2x EEPROM with same data). If one is empty, the one with data is preferred. If both have data, the first one gets copied onto the second. Closes #756 .
2015-01-11 14:27:29 +01:00
Florian Nücke
6bb2233cb8
Added debug.connectToBlock, allowing debug cards to connect their local network to a remote block. Closes #751 , closes #475 .
2015-01-11 14:08:55 +01:00
Florian Nücke
2b68ee8dbd
Added eeprom.getSize, eeprom.getChecksum and eeprom.makeReadonly(checksum). Closes #792 .
2015-01-11 13:25:48 +01:00
Florian Nücke
d091efc775
Added keyboard to list of recommended components in tablet.
2015-01-11 03:56:50 +01:00
Florian Nücke
5311ebff70
Fixed EEPROM being network visible.
2015-01-11 03:37:12 +01:00
Florian Nücke
79f3c7156c
Cleaned up legacy text buffer packet sending / handling code. Also fixed synching max res.
2015-01-11 02:24:52 +01:00
Florian Nücke
1ab0698ceb
Version bumpery.
2015-01-11 01:57:19 +01:00
Florian Nücke
0d1612c54d
Fixed NEI block hiding derp.
2015-01-11 01:56:15 +01:00
Florian Nücke
c768f931ae
Being a bit more open to underlying types other architectures may provide as arguments. Should fix #797 .
2015-01-11 01:31:47 +01:00
Florian Nücke
38c5f41069
Merge branch 'patch-2' of https://github.com/SoniEx2/OpenComputers into master-MC1.7.10
2015-01-11 01:11:03 +01:00
Florian Nücke
082326ed4b
Synching max res of screens to clients, for cases where it is set to something exceeding the default legal max size of the buffer (addons).
2015-01-11 01:04:43 +01:00
Florian Nücke
a16b042bc0
Server transition woes.
2015-01-11 00:17:13 +01:00
Florian Nücke
6d09841652
Fixed EEPROM component proxy being fetched too early when flashing, fixes #796 .
2015-01-10 22:41:35 +01:00
Florian Nücke
8e935a6950
Fixed NPE in AE2 controller driver usage screen when AE2 channels are disabled. Closes #793 .
2015-01-10 22:41:22 +01:00
Florian Nücke
d7d62254b3
Fixed inventory slot offset for tank controller upgrade.
...
Fixed drain and fill not always returning the amount transferred.
2015-01-10 22:41:00 +01:00
Florian Nücke
c760503aec
So I may have been a little too paranoid about gpu/screens' bandwidth usage.
2015-01-08 01:43:08 +01:00
Florian Nücke
2c6f0ee181
Added code to handle merges of networks containing nodes with identical addresses. Should do the trick for #790 , needs confirmation.
2015-01-07 13:32:23 +01:00
Florian Nücke
2852ba1591
Added internal.Tiered interface, implementing in most tiered things: screens, computer cases, microcontrollers, robots and drones. Closes #789 .
2015-01-07 13:12:36 +01:00
Florian Nücke
135472ea79
Made drone implement Context to make some components work properly (e.g. Chunkloader upgrade).
2015-01-05 23:36:14 +01:00
Florian Nücke
9b4298c695
Keeping relative target position for drones when travling to a different dimension, closes #784 .
2015-01-05 23:09:29 +01:00
Florian Nücke
27660d6d18
Brought a bit more structure into flash.lua.
2015-01-05 23:05:40 +01:00
Florian Nücke
ca02d428fb
Merge branch 'master-MC1.7.10' of https://github.com/skyem123/OpenComputers into master-MC1.7.10
2015-01-05 22:56:27 +01:00
Florian "Sangar" Nücke
6e4c617b70
Merge pull request #787 from magik6k/master
...
Fixed quiet mode in opl-flash
2015-01-05 22:55:23 +01:00
Florian Nücke
c738f0f5c1
Fixed charger not notifying its neighbors when changing its charging state (needed for comparators to update correctly).
...
Fixed drone showing up in NEI (pointless as it has to be built in assembler to work, so better to hide it like robots).
2015-01-05 22:49:01 +01:00
Florian Nücke
0deb955b4a
Implemented BC's IHasWork on a couple of blocks as discussed in #782 .
...
Also unified comparator logic with the new system (with a few exceptions, such as disk drive and raid).
Fixed raid's comparator output.
Fixed disassembler accepting items it shouldn't.
2015-01-05 22:32:43 +01:00
Florian Nücke
c95196df0e
Unified tooltips of items with builtin components a little.
2015-01-05 22:14:04 +01:00
Florian Nücke
b5183fb2d0
Fixed error in Waila handler when called with empty NBT data.
2015-01-05 22:13:21 +01:00
Florian Nücke
39fa8d9535
Fixed disassembler nomnoming robots. Closes #786 .
2015-01-05 20:42:05 +01:00
Łukasz Magiera
3bcb889d8a
Fixed quiet mode in opl-flash
2015-01-05 18:55:24 +01:00
Skye
ebb7ae5038
Fixed a typo in flash.lua
...
"Are you want to overwrite?"
2015-01-05 17:15:22 +00:00
