AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-12 16:57:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,089 Commits 29 Branches 143 Tags
Commit Graph

4089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2886fdcd4d Reworked redstone logic to make it more modular. 2015-04-27 21:16:41 +02:00
Florian Nücke
4956271d62 Added support for BluePower's bundled redstone system. Closes #1103. 2015-04-27 20:34:47 +02:00
cyber01
a30f2d1295 Corrected mistakes 2015-04-27 19:04:05 +03:00
cyber01
6c85fd8e10 Added waypoint. Corrected mistakes 2015-04-27 19:01:39 +03:00
Florian Nücke
e547c877d2 Closing waypoint GUI when confirming new label. 2015-04-26 17:56:35 +02:00
Florian Nücke
0e995faa8a Mentioning waypoint in nav upgrade's manual entry. 2015-04-26 17:54:09 +02:00
Florian Nücke
5672cf8dc8 Added waypoint block, can be queried using navigation upgrades. 
Fixed drones losing their name when changing their EEPROM.
 2015-04-26 16:24:40 +02:00
Florian Nücke
226fa52315 Blacklisting hover upgrade in non-robot devices. 2015-04-25 23:42:19 +02:00
Florian Nücke
e6fca46ccc Merge branch 'patch-1' of https://github.com/Mstrodl/OpenComputers into master-MC1.7.10 2015-04-25 23:39:42 +02:00
Florian Nücke
01f63f7e90 Added hover upgrade to allow increasing robot flight height (tier two allows unlimited flight height, like it was in the olden days). 2015-04-25 23:39:04 +02:00
Florian Nücke
da7a5c6eb8 Fixed charger if power use is disabled. 2015-04-24 17:38:18 +02:00
Florian Nücke
69ee8263e5 Spawning OpenOS floppy in creative tablets in its container upgrade now. 2015-04-24 17:22:58 +02:00
Florian Nücke
62e54377b6 Made charger more generic to allow charging addon items. Also allow charging battery upgrades in the charger now. 
Specifically, added `Chargeable` interface that can be implemented on items. This is what's used to actually charge items. This way the charger is also to (very slowly) charge items from other mods; built-in integration for now is for IEnergyContainerItem (CoFH) and IElectricItem (IC2).
Addon items can also provide an environment to be connected to the charger's network by providing an item driver that generates such an environment and has the slot type `Tablet`.
 2015-04-24 17:22:24 +02:00
Florian Nücke
043548e78e Removed broken workaround for not progressing robot hover animation when game is paused. Closes #1101. 
Because the bug in Mystcraft the workaround was required for in the first place has been fixed. \o/
 2015-04-23 21:37:49 +02:00
Florian Nücke
d52ed578b7 Add mount point name to mount point class. 
Allow template's assemble to return a `Number`, not only `Double`s.
 2015-04-23 18:54:12 +02:00
Florian Nücke
fef2784141 Seems like implementing a SideOnly interface makes the whole class SideOnly, instead of just stripping the interface... oh well. Closes #1098. 2015-04-23 10:15:24 +02:00
Florian Nücke
1528a6ee24 Scratch that and let's do it again. Might silence the voices in my head (aka @Vexatos). 
Changed robot upgrade rendering to allow being picky. A bit more overhead, but hey, what's a few sets among friends?
 2015-04-22 23:26:41 +02:00
Florian Nücke
fda54f2f6f All right then, have a few methods to allow influencing which mount point to render your upgrades in. 2015-04-22 18:42:50 +02:00
Florian Nücke
9ac38ad1b2 Changed the way upgrades on robots are rendered, now using an interface on items instead of item renderer. Closes #1038. 
More flexible and should also work in MC1.8...
 2015-04-22 17:47:34 +02:00
Florian Nücke
20239780e1 Extended file system API to allow specifying a speed multiplier for file systems. 
For now, valid range is [1,6]. Floppies use 1, HDDs use 2-4, Raid is 6.
Deprecated some internal FileSystem interface methods to allow simplifying the interface a bit when the time comes.
Let's hope nobody is shipping the API \o/
 2015-04-22 15:21:43 +02:00
Florian Nücke
fa36908170 Allow using glowstone block to increase prints light level faster. 
Block increases light level by 4, dust by 1 as before.
 2015-04-22 12:58:58 +02:00
Florian Nücke
7207606960 Merge remote-tracking branch 'remotes/origin/updated_recipes' into master-MC1.7.10 2015-04-22 12:53:09 +02:00
Florian Nücke
57714dad27 Fixed ls -l in pure io mode. 2015-04-22 11:38:09 +02:00
Florian Nücke
4f70ea4152 Bump version number. 2015-04-22 11:22:33 +02:00
Florian Nücke
76172d0dfb Made env variables local (i.e. os.getenv/setenv will operate per process now), to avoid programs running in parallel (via piping) to interfere. 
Copying env vars from last process to shell's env to avoid breaking compat. (cd.lua will still work that way, e.g.)
Closes #634.
 2015-04-22 11:22:14 +02:00
Florian Nücke
6377a5824f sh.lua absorbed besh.lua's piping mechanics. RIP besh. 2015-04-22 10:43:34 +02:00
Florian Nücke
33bf52ae94 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-21 14:03:49 +02:00
Florian Nücke
6a811b6471 Fix oc_at.cfg in obf environment. 2015-04-21 14:03:15 +02:00
Florian "Sangar" Nücke
0b000b75bf Merge pull request #1095 from mpmxyz/patch-2 
Fix: standard io streams being closable
 2015-04-21 13:31:52 +02:00
Florian Nücke
886ebaae5e Fixed rebooting computers via Java API not working (i.e. calling stop() and start() in succession). 
This also fixes LuaJ computers not rebooting when loaded again.
 2015-04-21 12:32:35 +02:00
Florian Nücke
ce552ff99d Should avoid unexpected error if trying to tostring a method that's now filtered out. 
Clearing out callback cache when a world is unloaded.
 2015-04-21 12:02:02 +02:00
Florian Nücke
8a31eba5c3 Removed use of a few remaining reflection thingers, since we have an oc_at.cfg now anyway. 2015-04-21 11:36:23 +02:00
mpmxyz
690d664003 Fix: standard io streams being closable 
To be exact: Not the streams themselves but the buffers on top of them can be closed.
I noticed that because "ls" didn't display anything after some experiments involving an "stdout" file.
 2015-04-20 19:03:35 +02:00
Florian Nücke
a8389f7056 Documented GT recipe handlers in recipe set. 
Renamed a few things, simplified a few things, scalafied a few things.
 2015-04-20 12:44:34 +02:00
Florian "Sangar" Nücke
61ff63257b Merge pull request #1093 from natedogith1/master-MC1.7.10 
Fixed use of setRawDelay config option
 2015-04-20 10:34:16 +02:00
natedogith1
64dce8c4ba Fixed use of setRawDelay config option 2015-04-19 20:30:09 -04:00
Johannes Lohrer
b78c446c22 Merge branch 'updated_recipes' of github.com:MightyPirates/OpenComputers into updated_recipes 
Conflicts:
	src/main/scala/li/cil/oc/integration/gregtech/RecipeRegistry.scala
 2015-04-19 20:53:13 +02:00
Johannes Lohrer
7a248833b7 made additional outputs a sequence to allow additional machines 
so these commits should basically close #760
 2015-04-19 20:52:12 +02:00
Johannes Lohrer
f534e1b3b6 made additional outputs a sequence to allow additional machines 
so these commits should basically close #760
 2015-04-19 20:50:13 +02:00
Florian Nücke
05e4c07907 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 16:43:37 +02:00
Florian Nücke
40bf4a31a3 Improved handling of tracking of changes to holograms to reduce bandwidth in certain cases some more. 
Slightly more bookkeeping, but that's relatively cheap.
 2015-04-19 16:42:55 +02:00
cyber01
346daf9e96 Fix #1086 in russian manual 2015-04-19 17:33:07 +03:00
Florian Nücke
2cf672807a Fixed a few issues with drones moving through portals. 
For one, they won't also drop themselves as items anymore.
For two, they won't shut down after moving through the portal anymore.
Also corrected the target position relocation.
 2015-04-19 14:55:47 +02:00
Florian Nücke
78ddda0426 Homogenized indentation in config. 2015-04-19 13:07:06 +02:00
Florian Nücke
30d722e19d Limit speed of hologram.setRaw a bit, to lower worst-case bandwidth use, but made it configurable. 
Also moved hologram server-side settings to extra category in config.
 2015-04-19 13:05:33 +02:00
Florian Nücke
7fc4d67dee Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 11:32:34 +02:00
Florian Nücke
dd975cc034 Merge branch 'patch-1' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10 2015-04-19 11:32:07 +02:00
Florian Nücke
662ef4722b Fixed a few links in manual, closes #1086. 
Thanks @rashdanml.
 2015-04-19 11:21:28 +02:00
Caitlyn
1dc12b54a5 fixed typo for Ink Cartridge 
<Kodos> Can you go PR into the proper branch of OC's en_US file to fix 'Ink Cartidge' to say Ink Cartridge
 2015-04-18 23:06:25 -05:00
cyber01
3fc9e96438 Updated russian translation 2015-04-19 04:11:44 +03:00