Florian "Sangar" Nücke
fbd4f85d78
Merge pull request #585 from ViKaleidoscope/patch-2
...
Update zh_CN.lang
2014-10-02 12:11:11 +02:00
Saku
73196affa7
Update zh_CN.lang
2014-10-02 17:25:40 +08:00
Florian Nücke
860130cff2
Fixed check for whether used item has been 'used up' in robots for cases where the stack is replaced by the interact function. Fixes #583 .
2014-10-01 18:36:14 +02:00
Florian Nücke
2d9cdfac72
Added icons for tank upgrade and tank controller upgrade.
...
Added localizations for the same.
Added the tank controller upgrade.
Added recipes for the two.
Some fixery.
2014-10-01 17:40:52 +02:00
Florian Nücke
21488bc6f2
Some cleanup.
...
Added a few more methods for fluid interaction (compare tank contents, transfer contents).
Made fluids properly flow when placed into the world.
Sending neighbor update info when adding / removing components, allows pipes connected to robots to refresh.
Added tooltip showing contents for tank upgrades.
Undid changes to the API.
2014-10-01 14:35:21 +02:00
Florian Nücke
d6e2736229
Merge branch 'master' of github.com:MightyPirates/OpenComputers into robot-fluids
...
Conflicts:
src/main/scala/li/cil/oc/Items.scala
2014-10-01 10:40:41 +02:00
Florian Nücke
a526b0efc4
Print startup errors from tablets to chat as is done for computers.
2014-09-30 22:34:28 +02:00
Florian Nücke
df461d1185
Fixed floppy disks losing their contents when recolored.
2014-09-30 21:36:50 +02:00
Johannes Lohrer
544f030c38
store methods
2014-09-30 20:00:50 +02:00
Florian Nücke
2cdedab170
Made the loaded chunks a set, because I don't trust it to not be dynamically re-generated each time it's accessed by contains.
2014-09-28 12:06:14 +02:00
Jesse Ward
32ebe03ace
ChunkLoader Upgrade now loads a 3x3 chunk area centered on the robot.
2014-09-28 12:01:27 +02:00
Florian Nücke
c8358ce31f
Force stopping tablets when placed into charger now, to force flushing buffered file systems.
...
Fixed incorrect addressing of HDDs in tablets when in charger.
Some stabilization of tracked components in machines (checking if component's type remained the same since saving).
2014-09-26 17:11:34 +02:00
Florian Nücke
b610f33726
Made tablets a separate (internal until API change) slot type, allows rendering icon background in charger GUI.
...
Tablets cannot be placed into disk drives any longer; this functionality is now achieved by placing them into chargers, making things a little less... all over the place.
2014-09-25 17:02:41 +02:00
Florian Nücke
190d57bf45
Fixed a bunch of *potentially* derpy coordinate computations.
...
Made sign upgrade in tablet also work when standing "inside" the sign.
2014-09-25 12:22:49 +02:00
Florian Nücke
9f7f22cfa1
Tablets can now be disassembled.
2014-09-24 09:46:03 +02:00
Florian Nücke
b2df4a4910
Fixed load order in tablet.
...
Added recipe for tablet case.
Tablets are now precharged when assembled (like robots) and cost energy to build.
2014-09-24 09:33:09 +02:00
Florian Nücke
238ef544d5
Added one-slot inventory to charger, can be used to charge tablets.
2014-09-23 20:54:17 +02:00
Florian Nücke
e4db950a17
Tablets now consume energy.
...
Cleaned up and stabilized tablets some more.
Tablets now do *not* keep running across saves (unload/reload). This was causing too many issues when they were left in running state in inventories / lying around, and would have failed anyway if the world was saved while the owning player was not in the game (which happens all the time on servers, after all).
2014-09-23 17:38:47 +02:00
Johannes Lohrer
0fafd58c12
sucking and ejecting of fluids
2014-09-21 21:46:42 +02:00
Florian Nücke
65a0327695
Merge branch 'master' of github.com:MightyPirates/OpenComputers
2014-09-21 18:13:57 +02:00
Florian Nücke
9d9d3f1639
Returning failure reason of first attempt in robot.swing(), closes #555 .
2014-09-21 18:05:39 +02:00
Florian "Sangar" Nücke
b96f93cfdf
Merge pull request #572 from natedogith1/master
...
Fixed some docstrings on debug card callbacks.
2014-09-18 04:01:39 +02:00
natedogith1
48bfa71c31
Update DebugCard.scala
...
Fixed a few of the Callback docs
2014-09-17 21:00:56 -04:00
Florian Nücke
e75b25c06e
Made tractor beam upgrade work in tablets and added pfx.
2014-09-17 18:53:12 +02:00
Florian Nücke
4c379bdc37
Merge branch 'master' of github.com:MightyPirates/OpenComputers
2014-09-17 17:44:23 +02:00
Florian Nücke
ec08847b79
Added some basic player querying to the debug card.
2014-09-17 17:42:15 +02:00
Florian "Sangar" Nücke
6ec9b641ba
Merge pull request #569 from ViKaleidoscope/patch-2
...
Update zh_CN.lang
2014-09-17 13:04:04 +02:00
∑( ° △ °|||)
17a97216aa
Update zh_CN.lang
...
Add translations for piston upgrade.
2014-09-17 18:46:18 +08:00
Florian Nücke
5a27e601c4
Allow passing a table to redstone.setBundledOutput containing multiple color values for quickly setting multiple channels.
2014-09-17 09:47:00 +02:00
Florian Nücke
ffc62381f1
Added delay for screen multiblock check on clients, to make it less likely that some tile entities don't have their data when the check is performed; hopefully fixes #560 .
2014-09-17 07:27:03 +02:00
Florian Nücke
0a58af6d84
Fixed validation of saved resolutions to avoid clamping down vertical resolution (see #560 ).
2014-09-17 06:09:09 +02:00
Florian Nücke
211034bbde
Allow inserting tablets into disk drives to access their first internal drive.
2014-09-16 18:55:46 +02:00
Florian Nücke
cbb08e3b1c
Piston upgrade. Seems to work. For the most part.
2014-09-16 16:50:40 +02:00
Florian Nücke
59b6b95a3a
Made values used for converting different power types configurable.
...
Made geolyzer also act as an upgrade.
2014-09-16 14:46:46 +02:00
Florian Nücke
5e4758079f
Made the thing Java 1.6 compatible again (at least it works on openjdk6). Should close #565 for good.
2014-09-16 13:49:10 +02:00
Florian Nücke
8511c836fa
Doubled max y translation for holograms.
2014-09-16 13:13:03 +02:00
Johannes Lohrer
ac9ec775e4
basic liquid interaction appears to work...
2014-09-15 23:40:48 +02:00
Florian Nücke
a12a14b192
Reorganzied dependencies, moving JNLua and LuaJ code to extra repo and including jar here for a cleaner separation of mod and third-party code.
2014-09-15 21:57:52 +02:00
Florian Nücke
de192111d4
Cleanup.
2014-09-14 01:46:37 +02:00
Florian Nücke
1a2badf6eb
Hmm.
2014-09-14 01:30:15 +02:00
Florian Nücke
2fbbd11d54
Let's see how horribly this will fail.
2014-09-14 01:22:19 +02:00
Florian Nücke
5561952391
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
2014-09-13 23:30:45 +02:00
Florian Nücke
33397ec310
Fixed broken Java 1.7 runtime check.
2014-09-13 23:29:36 +02:00
Johannes Lohrer
4aab9c1f14
Merge branch 'master' of github.com:MightyPirates/OpenComputers into ExperimentalUpgrades
2014-09-13 16:21:49 +02:00
Florian Nücke
1494438efe
Fixed a potential error in io lib when no screen was attached.
...
Made sign and nav upgrades work in tablets.
2014-09-13 12:41:43 +02:00
Florian Nücke
3b3b872187
Fixed a massive game-breaking bug of epic proportions [/sarcasm].
2014-09-11 16:38:22 +02:00
Florian Nücke
4e8971111b
Returning number of crafted items from crafting upgrade's craft() as second result (this is the stack size of the result). Closes #561 .
2014-09-11 16:22:41 +02:00
Florian Nücke
e3649a3887
Tweaked and cleaned up slot highlighting a bit, also made it available in robot GUI.
2014-09-11 16:19:36 +02:00
Florian Nücke
f0ebe7b0ee
Renamed 'offset' to 'translation' to mirror general 3d/ogl terminology.
...
Added x/z translation for hologram.
Added setting for max translation based on tier.
Made max translation a relative value based on the actual hologram's size (1 = 1x hologram size).
Fixed GUIs being very dark / black sometimes.
Closes #546 .
2014-09-10 20:53:26 +02:00
Florian Nücke
84de6b61ee
Merge branch 'master' of https://github.com/ingie/OpenComputers
2014-09-10 19:49:29 +02:00
