Florian Nücke
fa55a4462d
Beta? Beta!
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
Florian Nücke
0b7eb7a578
Using the loading plugin (used for class transformer) as core mod instead of the dummy one.
...
Also fixed typo in the url in the mod info... how long has that been there?
2014-10-14 15:13:25 +02:00
Florian Nücke
a768111886
One more little API change, passing the sending wireless endpoint when receiving a packet on another wireless endpoint.
2014-10-14 14:40:49 +02:00
Florian Nücke
509cb26e6f
Fixed crash in access point.
2014-10-14 14:07:26 +02:00
Florian Nücke
c170b2f09f
Fixed AE2 crafting status never switching to isDone/isCanceled.
2014-10-13 23:44:04 +02:00
Florian Nücke
5502838e84
Added general documentation for a bunch of blocks and items via an extra NEI usage handler.
2014-10-13 23:07:31 +02:00
Florian Nücke
cb2bec3227
Some more cleanup.
2014-10-13 16:51:58 +02:00
Florian Nücke
8e6c97efcb
Moved NEI integration.
...
Fixed potential derpery when robots use some vanilla blocks.
Removed unnecessary mod interaction classes.
2014-10-13 16:20:33 +02:00
Florian Nücke
1f08bbb345
Cleaned up wireless redstone integration logic, fixed SVE.
2014-10-13 15:46:25 +02:00
Florian Nücke
f0ec5ac0d4
Some minor fixes.
2014-10-13 13:19:52 +02:00
Florian "Sangar" Nücke
b2f50b3ac7
Merge pull request #598 from ViKaleidoscope/patch-2
...
Update zh_CN.lang
2014-10-12 19:02:24 +02:00
Franken·Fran
36908642d2
Update zh_CN.lang
...
:D
2014-10-13 00:43:14 +08:00
Florian Nücke
58ab83e772
Adapter now has an inventory (again) but this time around it's for upgrades.
...
Disabled inventory and tank drivers by default, can now place inventory and tank controller upgrades in adapter for a similar effect; the difference being that the inv/tank interop stuff isn't in the adjacent block's component but a separate component for all adjacent blocks.
2014-10-12 18:16:16 +02:00
Florian Nücke
1c2dea16c1
Bumped up limit for pattern matcher input... this one already fails for the motd >_>
...
Changed up RAM recipes a bit, making non .5 tiers more useful (by increasing the cost step to .5 a bit).
2014-10-12 17:26:44 +02:00
Florian Nücke
987de5ffa4
Sandboxed pattern matching methods (find, match, gsub, gmatch) by limiting the length of the input.
...
Added setting to change that limit.
Moved Lua specific settings into own sub-category in config.
2014-10-12 15:03:28 +02:00
Florian Nücke
41658031a2
Calling EnvironmentAware.providedEnvironment on block drivers for *all* stacks, after all, not filtering by ItemBlock - fails even for vanilla (comparator, sign, ...) so this certainly will be too restrictive for mods, after all.
...
Added EnvironmentAware to a bunch of third-party block drivers.
2014-10-12 14:04:15 +02:00
Florian Nücke
4f953d3277
Minor API change, added methods to query list of all block/item drivers. Mainly to allow third-party mods to make any use at all of the EnvironmentAware interface.
2014-10-12 13:25:45 +02:00
Florian Nücke
febcabdde9
Updated Thaumcraft API and, as per request, added converter for items including apsect info.
...
Keeping TC converters disabled by default, though, because this seems kind of cheaty to me (usually you'd have to research aspects to see them on items).
2014-10-11 20:20:50 +02:00
Florian Nücke
a1ec488588
Sorting numeric keys in serializer to avoid weird outputs.
2014-10-11 19:57:46 +02:00
Florian Nücke
14097bda5f
Added converter for MFR safari nets, adds name of contained entity.
2014-10-11 13:26:43 +02:00
Florian Nücke
48d8dbb2e4
Clarified wording in NamedBlock documentation.
2014-10-10 19:54:30 +02:00
Florian Nücke
155f61ce45
Added reference class to API to centralize version updating.
...
Pulled the fields with the API instances in there, so that the ID doesn't feel so alone.
Updated API readme.
2014-10-10 19:43:16 +02:00
Florian Nücke
1c6c4be7f1
Added class with slot names for reference to API.
2014-10-10 18:39:24 +02:00
Florian Nücke
99f2822888
Jdoc typos!
2014-10-10 18:01:09 +02:00
Florian Nücke
223f981ae6
Fixery of (partially weird) stuff.
2014-10-10 17:32:05 +02:00
Florian Nücke
92691ae318
Merge branch '1.4' into master-MC1.7.10
...
Conflicts:
build.properties
src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala
src/main/scala/li/cil/oc/util/mods/Mods.scala
2014-10-10 16:53:09 +02:00
Florian Nücke
20ac99fd02
Updated readme.
2014-10-10 16:45:25 +02:00
Florian Nücke
366c6fc476
Convert blocks in OC inventories on load, in particular to ensure screens in robots are converted.
2014-10-10 15:07:17 +02:00
Florian Nücke
a6da00f4a9
Added some block conversion logic.
...
It's not perfect (item blocks have to be in a player's inventory to get converted), but good enough to justify 1.4 again.
2014-10-10 14:37:32 +02:00
Florian Nücke
9805c0ba85
Should work fine with AE2 rv2 *and* rv1 now.
2014-10-10 12:59:09 +02:00
Florian Nücke
0bc799b979
Added the additions to the AppEng2 integration from OCC.
...
Fixed NamedBlock being implemented in drivers instead of environments.
2014-10-10 01:51:47 +02:00
Florian Nücke
06e9044b11
Screw it, this will be 2.0.0, too much breakage and world save incompatibility so the cut should be cleared in the version number.
...
Also: fixed templates.
2014-10-09 23:16:33 +02:00
Florian Nücke
34249f7131
API stuffs.
2014-10-09 18:59:48 +02:00
Florian Nücke
861a82eecf
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4
...
Conflicts:
build.properties
src/main/resources/assets/opencomputers/lang/fr_FR.lang
src/main/resources/assets/opencomputers/lang/zh_TW.lang
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
src/main/scala/li/cil/oc/util/mods/Mods.scala
2014-10-09 18:33:11 +02:00
Florian Nücke
e9ebe5d5c0
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
...
Conflicts:
build.properties
2014-10-09 18:12:24 +02:00
