AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-24 04:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,072 Commits 29 Branches 143 Tags
Commit Graph

2072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
e7c863a00d Merge https://github.com/Wuerfel21/OpenComputers 2014-07-02 19:14:55 +02:00
Florian Nücke
ce4316e91d Added another try-catch to the native lib version check in case rights settings get weird (reported on MCF). 2014-07-02 19:13:53 +02:00
Florian Nücke
922e88d4c6 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-29 20:57:13 +02:00
Florian Nücke
da264e3aca Switches can no longer loop on their own (i.e. they will ignore network messages they relayed themselves when they arrive on another side of the switch). 
Fixed a color bug.
 2014-06-29 20:56:49 +02:00
Florian Nücke
7262f31b48 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-29 17:47:33 +02:00
Florian Nücke
ce4786fbed Should fix #365. 2014-06-29 17:47:05 +02:00
Florian Nücke
785c7baca1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-28 18:52:30 +02:00
Florian Nücke
009e51b288 Prevent error loops in xpcall. 2014-06-28 18:52:11 +02:00
Florian Nücke
fcadb72299 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-28 15:50:52 +02:00
Florian Nücke
c4986eeb82 Screw nextGaussian, using nextDouble for the random direction when dropping stuff from robots (and other inventories) now, makes for no... outliers, leading to extreme values. Closes #347. 2014-06-28 15:50:34 +02:00
Florian Nücke
1fcdc341ec Removed Vec3Pool uses. No idea if I'm doing this right. 2014-06-28 01:05:06 +02:00
Florian Nücke
248c6bc6c3 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-27 17:48:58 +02:00
Florian Nücke
9f8d88a20a Removed forgotten debug println. *sigh* 2014-06-27 17:48:40 +02:00
Florian Nücke
ebac31b71a Eh? 2014-06-27 17:34:43 +02:00
Florian Nücke
835d32d3cb Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-27 16:56:07 +02:00
Florian Nücke
e4eb4ae8f6 Trying to fix some initialization order hiccups... 2014-06-27 16:55:43 +02:00
Florian Nücke
fcfa419038 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
 2014-06-27 01:31:35 +02:00
Florian Nücke
72969868f4 Added some noise to the geolyzer results. It'll still be able to tell air blocks with 100% accuracy, though. 2014-06-27 01:30:39 +02:00
Florian Nücke
d8da5671c2 Added the concurrent open port limit to network cards I could have sworn I had added on day one -.- 2014-06-27 01:07:52 +02:00
Florian Nücke
e7cfe9597a Fixed display glitch for robot power display when playing on servers. 2014-06-27 00:59:31 +02:00
Florian Nücke
ace242f7d0 More fewer AIOOBEs. 2014-06-26 23:57:23 +02:00
Florian Nücke
d6a65e49b2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-26 21:57:32 +02:00
Florian Nücke
3122942649 Removed potentially problematic GC call from host side. 
Fixed potential 'nullpointer' in file handle gc metamethod.
 2014-06-26 21:28:56 +02:00
Florian Nücke
618f37bb33 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-26 20:24:04 +02:00
Florian Nücke
12c1e74888 Fixed buffered file system allowing creation of files with names that could not be flushed to the host file system. 2014-06-26 20:22:27 +02:00
Florian Nücke
f54de9b06a Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-06-26 18:26:56 +02:00
Florian Nücke
b60bdb7c35 Should fix #362. 2014-06-26 18:26:06 +02:00
Florian Nücke
8450ead0c8 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-26 18:00:36 +02:00
Florian Nücke
2b801f2b4a Fixed damage handling for TC tools. 2014-06-26 18:00:12 +02:00
Florian Nücke
57b3d4fafc Updated ProjectRed API. 2014-06-26 17:54:14 +02:00
Florian Nücke
ce0462bd7a Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-26 17:43:19 +02:00
Florian Nücke
6694455c14 Removed the config for the 'greeting' again, instead wrapped the functionality in a motd file that can be a script. Delete it to disable the greeting. 2014-06-26 17:41:26 +02:00
Florian Nücke
8683f500c9 Made Lua accept an argument, the path to a script to execute, and an option, -i, to enter interactive mode after executing that script, anyway. 
Made process.load check for #!, running command instead of as Lua script directly. Let's see if things go horribly wrong, now.
 2014-06-26 17:35:23 +02:00
Florian Nücke
32979f3128 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-26 16:39:08 +02:00
Florian Nücke
65b3bc836a Fixed output of component.experience.level(). 2014-06-26 16:38:44 +02:00
Florian Nücke
858572183f Fixed ranges in experience upgrade event handler leading to no experience gain. 2014-06-26 16:33:02 +02:00
Florian Nücke
3fd4a42a32 Fixed robot item repair events passing the stacks in the wrong order, leading to items not being used up at the decreased rate they should be. 2014-06-26 16:21:29 +02:00
Florian Nücke
c2476ac5a9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/multipart/EventHandler.scala
 2014-06-26 15:07:55 +02:00
Florian Nücke
00e4f55026 Minor cleanup to more.lua, fixed single line advance to not exit when at end of file. 2014-06-26 15:05:19 +02:00
Florian Nücke
4f0665f2b6 Merge git://github.com/jamesb6626/OpenComputers 2014-06-26 14:52:09 +02:00
Florian Nücke
ef88008dd3 Added openos.conf, for now only with an option to disable the greetings. 2014-06-26 14:45:38 +02:00
Florian Nücke
c05d921529 Merge pull request #361 from JoshTheEnder/patch-1 
Update greetings.txt
 2014-06-26 14:28:53 +02:00
Josh
12b46336fb Update greetings.txt 2014-06-26 13:27:25 +01:00
Florian Nücke
45a9728b6d Made text.wrap not wrap at a couple more chars. 
Added text.wrappedLines to get an iterator over wrapped text.
Made OpenOS show a small info text after booting up.
 2014-06-26 14:21:39 +02:00
Florian Nücke
c96174d168 Yay random dependency resolving >_> 2014-06-26 13:36:35 +02:00
Florian Nücke
7c552fe060 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-25 22:10:54 +02:00
Florian Nücke
e3d3e3c7f9 Apparently gradle hates me. 2014-06-25 22:10:34 +02:00
Florian Nücke
99dc703a91 Porting to 1.7. 2014-06-25 21:24:15 +02:00
Florian Nücke
521757e50e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
 2014-06-25 21:19:28 +02:00
Florian Nücke
40dc7c5df0 Added T2 redstone card. Closes #340. 
T1 is now vanilla functionality (simple, analog redstone signals), T2 is for mod interop (bundled redstone, wireless redstone). Existing redstone cards are automatically converted to T2 cards, to avoid breaking things more than necessary. Redstone blocks behave like T2 cards, but without the wireless support.
 2014-06-25 21:14:06 +02:00