Florian Nücke
177617a176
Forgot to remove JAR again after noticing the maven dep.
2015-01-03 15:52:45 +01:00
Florian Nücke
cc839cb326
Added world sensor card, closes #770 .
2015-01-03 15:08:56 +01: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
a6a96c4e27
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
...
Conflicts:
src/main/scala/li/cil/oc/server/component/robot/Robot.scala
2014-10-02 20:01:37 +02:00
Florian Nücke
eb94965142
Repackaging LuaJ and JNLua to avoid conflicts with other mods. Closes #586 .
2014-10-02 19:55:19 +02:00
Florian Nücke
88e6f00b67
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
...
Conflicts:
build.gradle
src/main/scala/li/cil/oc/Settings.scala
src/main/scala/li/cil/oc/common/SaveHandler.scala
src/main/scala/li/cil/oc/common/block/PowerConverter.scala
src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
2014-09-16 17:32:06 +02:00
Florian Nücke
5e4758079f
Made the thing Java 1.6 compatible again (at least it works on openjdk6). Should close #565 for good.
2014-09-16 13:49:10 +02:00
Florian Nücke
a12a14b192
Reorganzied dependencies, moving JNLua and LuaJ code to extra repo and including jar here for a cleaner separation of mod and third-party code.
2014-09-15 21:57:52 +02:00
Florian Nücke
9b2cfcbf31
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
...
Conflicts:
src/main/scala/li/cil/oc/Settings.scala
src/main/scala/li/cil/oc/common/EventHandler.scala
src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
src/main/scala/li/cil/oc/util/mods/Mods.scala
2014-08-02 19:49:53 +02:00
Florian Nücke
d5012a6873
Added IC2 classic power support.
...
Switched things around a bit, power traits don't implement their interfaces by default now, instead they get injected by the class transformer if the power mod is present to avoid class not found errors in conjunction with interface stripping seemingly getting confused by Scala's synthetic classes.
2014-08-02 19:32:45 +02:00
Florian Nücke
5d38ec8369
Messing around with the Factorization API.
2014-08-02 16:08:30 +02:00
