3543 Commits

Author SHA1 Message Date
Florian Nücke
2c34bca1c1 Added permission check when changing sign value, closes #636. Tested with Cauldron and WorldGuard. 2014-11-02 14:29:59 +01:00
Florian Nücke
5cd58c6180 Resetting CPUs to use the default architecture if the set one doesn't exist anymore, closes #643. 2014-11-01 22:03:25 +01:00
Florian Nücke
3f60769059 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-11-01 21:06:35 +01:00
Florian Nücke
82f5452f07 Should fix some recipes being broken since a few commits back. 2014-11-01 21:06:18 +01:00
Florian "Sangar" Nücke
bd6c9f55c4 Merge pull request #638 from MCGamer20000/master-MC1.7.10
Added Watson to robot names list
2014-10-31 16:06:48 +01:00
Ethan Shaughnessy
a497bd324e Added Watson to robot names list
Watson is an artificially intelligent computer system capable of answering questions posed in natural language. In 2011, Watson competed on Jeopardy! against former winners Brad Rutter and Ken Jennings. Watson received the first place prize of $1 million.
2014-10-30 19:06:36 -06:00
Florian Nücke
b64a32eaea Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-10-31 00:44:42 +01:00
Florian Nücke
9dc67fbe60 Adjusted abstract bus card recipe, not tested yet. 2014-10-31 00:44:28 +01:00
Florian Nücke
a5ec87701c Finally applied long forgotten addition of lookup of blocks and items by namespaced name (e.g. minecraft:dirt). 2014-10-31 00:42:08 +01:00
Florian Nücke
24e81bf2be Updated SGT2 API. 2014-10-31 00:17:01 +01:00
Florian Nücke
342b4f7f14 "Updated" SGT2 API. 2014-10-31 00:10:25 +01:00
Florian "Sangar" Nücke
e8f28ebbda Merge pull request #635 from FrostLee/italian
Added italian translation
2014-10-29 13:01:22 +01:00
Andrea B.
d3d33384cf Added italian translation
Also added two robots names from Asimov's Robot Series
2014-10-28 16:38:49 +01:00
Florian Nücke
56c008fa59 Should fix #625. 2014-10-25 19:46:23 +02:00
Florian Nücke
aa55f1fc1d Added runlevel information, mainly to allow rc scripts to tell if they're run during startup (where primaries may not be set, yet, so they'll have to wait for the init event) or not. 2014-10-25 12:36:25 +02:00
Florian Nücke
c31b74f811 A few fixes and some OCD satisfaction. 2014-10-24 21:04:57 +02:00
Florian Nücke
b276a958a9 Merge branch 'master' of https://github.com/rmellema/OpenComputers into master-MC1.7.10 2014-10-24 20:21:06 +02:00
Florian Nücke
b8866b4a25 Cleaned up and slightly extended mod drivers (less reflection). 2014-10-24 20:16:08 +02:00
Florian Nücke
b99ad117bd Goodbye MJ, it was nice knowing you. 2014-10-24 19:47:12 +02:00
Wobbo
b9d58997a7 Added the rc script system.
This sytem allows an user to call functions from a file at startup and
easily disable them. Scripts require a start function to be ran at
startup.

Included is a simple example script. To run it, add it to the `enabled`
table in `/etc/rc.cfg`
2014-10-24 17:59:42 +02:00
Florian Nücke
e5944894e6 Gave the monster a pacifier. Fixes #619. 2014-10-23 18:09:38 +02:00
Florian Nücke
15c455fbed Should fix derpy tables returned from ME controller driver. 2014-10-23 15:55:23 +02:00
Florian Nücke
508a25d2b2 Added a check for the presence of OpenComponents and warning if it is found. 2014-10-23 14:43:17 +02:00
Florian Nücke
84b6148464 Fixes #615. 2014-10-23 12:13:49 +02:00
Florian Nücke
a191e8b29a Should fix #614. 2014-10-23 01:16:50 +02:00
Florian Nücke
7a31ef1edd Converted geolyzer logic to use an event for gathering its data to make sure it's easily extendable in the future.
Wraps up geolyzer improvement implementation, closing #611.
2014-10-22 14:49:07 +02:00
Florian Nücke
239462bf55 Added geolyzer.analyze, which can be used to get more detailed information on an adjacent (!) block.
I totally hadn't finished this yesterday and forgot to commit. Nope. No way.
2014-10-22 13:31:45 +02:00
Florian Nücke
2687bbc3aa Added helper class to centralize some env host coord -> block coord stuff. 2014-10-22 00:55:50 +02:00
Florian Nücke
86e0014248 Some cleanup. 2014-10-21 15:14:47 +02:00
Florian Nücke
a43d2f51e3 Merge branch 'master-MC1.7.10' into Achievements
Conflicts:
	src/api/java/thaumcraft/api
2014-10-21 14:12:49 +02:00
Florian Nücke
c942ba198e Update to new Forge recommended.
[ci skip]
2014-10-20 13:50:06 +02:00
Florian Nücke
0fbd8bf77b Fixed component buses not being installable in servers. 2014-10-19 19:37:44 +02:00
Florian Nücke
54413b8526 Fixed tablets, closes #606. 2014-10-19 18:51:29 +02:00
Florian Nücke
fa55a4462d Beta? Beta! v1.4.0-beta.1 2014-10-18 13:40:29 +02:00
Florian "Sangar" Nücke
13cd48dd8d Merge pull request #602 from natedogith1/master-MC1.7.10
Fixed doc in Tablet.scala
2014-10-17 19:52:43 +02:00
natedogith1
2d1f42fe6c Fixed doc in Tablet.scala 2014-10-17 13:33:42 -04:00
natedogith1
b8d50b2e1d Merge pull request #1 from MightyPirates/master-MC1.7.10
Merged official master into local fork
2014-10-17 13:30:11 -04:00
Florian Nücke
f5c19e9e7e Updated Callback.limit documentation.
[ci skip]
2014-10-17 19:23:51 +02:00
Florian Nücke
f82669e3df Cleanup and fixery. 2014-10-17 19:06:14 +02:00
Florian Nücke
f61d159b28 Adjusted a bunch of callbacks to use the new optXYZ getters for arguments.
Added a plain Lua implementation for string pattern matching when input strings are long. This allows timeouts for "evil" patterns. Short strings are still processed natively for performance.
2014-10-17 19:00:57 +02:00
Florian Nücke
9b974ced17 Also generating a -sources.jar, should allow IDEs to automatically download them. 2014-10-15 15:04:52 +02:00
Florian Nücke
5d28ef0336 Removed derpy sided annotation, should fix #600 - assuming that was on OC1.4, otherwise... this shouldn't really have happened. 2014-10-15 14:49:28 +02:00
Florian Nücke
67a4d8b89e And another one. 2014-10-15 14:35:19 +02:00
Florian Nücke
70c6e4d34f Yet moar deps, fewer foreign source files. 2014-10-15 14:21:36 +02:00
Florian Nücke
94a9afa5ab Step two of making Thaumcraft API a submodule. 2014-10-15 13:58:42 +02:00
Florian Nücke
cc130e34bf Step one of making Thaumcraft API a submodule. 2014-10-15 13:57:40 +02:00
Florian Nücke
de88328529 Externalized all the dependencies! Well. Not quite. But many. Also updated a few drivers for newer APIs. 2014-10-15 13:56:24 +02:00
Florian Nücke
bd0ae24a32 API ADDITION: added check/opt/isItemStack to Arguments interface. This is for convenience when converting tables representing item stacks in the format they are pushed by the built-in item stack converter.
Finished AE2 export bus driver. Can now be used to get and set the configuration (i.e. the stacks configured in the bus), and to trigger an export operation into a specific slot of the target inventory. This behaves as closely to a normal export operation as possible, i.e. it tries all configurations, exports as many items as defined by the number of speed upgrades in the bus, and respects the fuzzy configuration of the bus. It also uses energy like a normal export operation would, drawing energy from the ME network the export bus is in.
2014-10-14 22:25:08 +02:00
Florian Nücke
8a1435c167 Updated JNLua.
Pushing compressed NBT tag with item stacks in converter if enabled in the config (default: true).
Started work on AE2 export bus driver, configuring works.
2014-10-14 19:01:51 +02:00
Johannes Lohrer
c04f4951f9 Created some Achievements 2014-10-14 16:12:23 +02:00