AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 17:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,674 Commits 29 Branches 143 Tags
Commit Graph

3674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
25aab07368 Fixed Mekanism energy acceptor method returning inverted value, leading to non-stop power acceptance. 2015-01-18 21:59:02 +01:00
mpmxyz
6079f0e0f5 Fixed filesystem.list returning a list with duplicate values 
The error was caused by increasing the index i after removing its value: The value after the removed one was ignored.
To see an effect you need two directories being neighbors in the list.
Both also have to have a symbolic link or a mounting point inside.
-> That's a rare but possible combination.

Here an example:
 bugdir/
  a/
   link1 -> link somewhere
  b/
   link2 -> link somewhere
#ls bugdir
a  b  b (!)
 2015-01-18 18:55:56 +01:00
Florian Nücke
83fdee38f3 Added comparator override to capacitor, based on its (local!) buffer fill rate. 
Note that this updates its neighbor blocks only using block ticks, which are random (because I do not want capacitors to be ticking tile entities). So don't expect this to update *immediately*.
 2015-01-18 14:30:50 +01:00
Florian Nücke
da410fc13e Added timeout to item cost computation, just to be on the safe side. 
Had that lock up in dev mode a few times, pretty sure the synchronization should be enough, but hey.
 2015-01-18 14:28:04 +01:00
Florian Nücke
13a8dde8a6 Fixed highly unlikely, non-critical NPE in machine (could happen in the very rare case that an executor thread started while the machine was being removed from the network, leading it to run while the machine is unconnected - that's still possible, but non-critical; it'll just stop/silently error and stop now). 2015-01-18 14:27:23 +01:00
Florian Nücke
db05a22430 Completely fitched the beep. MVP gamax92 ^ 0x80. 2015-01-18 04:15:45 +01:00
Florian Nücke
cc640134f5 Rendering fixes. 2015-01-17 20:01:21 +01:00
Florian Nücke
d869ba4df9 Bumped default sample rate for generating computer speaker beeps to avoid artifacts and made it a setting. 2015-01-17 14:54:53 +01:00
Florian Nücke
6f9f27fe02 Fixed EEPROM with data (even if just an address) not being usable for crafting a Lua BIOS. Closes #828. 2015-01-17 13:36:21 +01:00
Florian Nücke
3157eb4f36 Fixed logic for handling nodes with duplicate addresses when merging networks. Closes #824. 2015-01-17 00:44:35 +01:00
Florian Nücke
45fc2b8b6c Fix potential NPE in redstone block. 2015-01-16 15:40:47 +01:00
Florian Nücke
4b52e39df5 Made wireless redstone work in drones and tablets. 2015-01-16 14:57:47 +01:00
Florian Nücke
095b34f46b Removed requirement for first achievement in the OC achievement tree, mostly because it's annoying when testing. 2015-01-16 14:37:26 +01:00
Florian Nücke
eccff606e7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into Achievements 
Conflicts:
	src/main/resources/assets/opencomputers/lang/en_US.lang
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
 2015-01-16 14:33:59 +01:00
Florian Nücke
e3526d3888 Corrected comment in config. 2015-01-16 12:26:04 +01:00
Florian Nücke
a7f2cc9229 Added callback for T3 screens to allow entering precision mode, allowing sub-"pixel" precision in mouse events. Closes #816. 2015-01-16 01:34:33 +01:00
Florian Nücke
9a49ca4244 Avoid premature re-initialization of primary component via component.isAvailable, fixes #818. 2015-01-15 23:48:01 +01:00
Florian Nücke
bc51937f59 Updated year in license. 2015-01-15 23:29:28 +01:00
Florian Nücke
f454a17c33 Version bump. 2015-01-15 20:09:58 +01:00
Florian Nücke
4e33221e98 Added modem.get/setWakeMessage for wake-on-lan. Closes #781, #700. 2015-01-15 20:03:04 +01:00
Florian Nücke
f981a05c0f Added redstone.get/setWakeThreshold, allows setting a redstone signal threshold that, when crossed from low to high causes connect computers to start. 2015-01-15 19:39:43 +01:00
Florian Nücke
42d5d997a3 Yet more redstone refactoring, also passing along old and new max signal values for convenience. 2015-01-15 19:16:22 +01:00
Florian Nücke
0db6028ecd Prevent potential NPEs in client log-in event handler. 2015-01-15 17:10:51 +01:00
Florian Nücke
0ad8c13176 Minor refactoring to new term.read param to fit with other param handling and make it more homogenous to use. 
Also fixed flipped string pattern matching (was `pattern:match(line)` where it should be `line:match(pattern)`).
 2015-01-15 16:58:21 +01:00
Florian Nücke
17a4394ba4 Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-01-15 16:41:19 +01:00
Florian Nücke
f8277fefb5 Highlighting items in the NEI item panel matching the hovered slot now, too. 
Also fixed some derps in the process.
 2015-01-15 16:37:28 +01:00
Łukasz Magiera
3c62599d8d Added match check to term.read 
It can be ethier string or function. If it's string user can confirm only when entered text matches the string. If thes param is function, the function gets called when user clicks enter key, first parameter for it is entered text, it should return a value that decides if given text should is accepted(true), or not(false/nil)
 2015-01-15 15:13:09 +00:00
Florian Nücke
3dec0b24eb Reworked redstone logic a little. 
Moved computer signal generation to component (i.e. redstone cards) and only sending an internal message from blocks (e.g. computer cases).
Pulled wireless trait out of other component logic which allows creating it on its own, e.g. for tablets and drones.
 2015-01-15 12:59:22 +01:00
Florian Nücke
b13e72fd1b Unified GUI handling in blocks a little. 2015-01-15 07:05:04 +01:00
Florian Nücke
c99750f88e Fixed robots not dropping the contents of their tool and container slots. I'm so sorry! 2015-01-14 23:56:33 +01:00
Florian Nücke
f1a054e6e0 Fixed manually set max resolution on text buffers not saving. 2015-01-14 23:27:32 +01:00
Florian Nücke
a24154e3c3 Properly checking if a liquid block is a still block when draining, fixes #810. 
Reworked world draining (via tank upgrades e.g.) to also respect `IFluidBlock`.
 2015-01-14 20:53:04 +01:00
Florian Nücke
77c9a44b03 ... faster, stronger... no wait. Just sorting. 2015-01-14 20:18:45 +01:00
Florian Nücke
68ce35f136 Better. 2015-01-14 20:11:20 +01:00
Florian Nücke
8ec145e149 Should fix potential AIOOBE in server rack's analyzer logic. 2015-01-14 19:25:25 +01:00
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
e5ff144a1c Fixed cables and keyboards trying to push the player out of their blockspace. 2015-01-13 17:45:49 +01:00
Florian Nücke
5aa042d3e1 1.8 adjustments. 
Also: merging externally with the IDE open is not such a good idea.
 2015-01-13 15:46:30 +01:00
Florian Nücke
39c43367e8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	build.properties
	gradle/wrapper/gradle-wrapper.properties
	src/main/resources/assets/opencomputers/lang/en_US.lang
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/block/Microcontroller.scala
	src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
	src/main/scala/li/cil/oc/common/item/Drone.scala
	src/main/scala/li/cil/oc/common/item/Server.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
 2015-01-13 15:01:12 +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