Florian Nücke
16b137b40c
Updated to new Waila API, closes #1559 .
2016-01-31 20:13:20 +01:00
Florian Nücke
69b5a895ee
Version bump.
2016-01-31 18:41:39 +01:00
Soni L
1e96eb20bd
Fix __gc and use raw metatable when it's disabled
...
This fixes a small __gc abuse I found, and also uses the raw metatable in a safe way when __gc is disabled. Both were tested.
# Conflicts:
# src/main/resources/assets/opencomputers/lua/machine.lua
2016-01-31 18:40:55 +01:00
Florian Nücke
9a1a8daefb
Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558 .
2016-01-31 18:40:54 +01:00
Florian Nücke
6022834bb5
Get rid of usages of __gc. Closes #1606 .
...
Wrapping file handles with userdata that has a `dispose` closing the handle.
Internet card already closed via userdata, so nothing to do there.
Removed cleanup logic from term, deal with it.
Added setting to re-enable it, if you really really need it.
# Conflicts:
# src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua
# src/main/scala/li/cil/oc/server/component/FileSystem.scala
2016-01-31 18:40:54 +01:00
Florian Nücke
2311894682
Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8
2016-01-16 13:45:42 +01:00
Florian Nücke
62bad45220
Reenable IHasWork for BuildCraft, closes #1618 .
2016-01-16 13:44:51 +01:00
Florian Nücke
2a7876cb2b
Merge branch 'OC1.5-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8
...
# Conflicts:
# build.gradle
# build.properties
# src/main/resources/assets/opencomputers/lib/lua53/native.32.bsd.so
# src/main/resources/assets/opencomputers/lib/lua53/native.32.dll
# src/main/resources/assets/opencomputers/lib/lua53/native.32.dylib
# src/main/resources/assets/opencomputers/lib/lua53/native.32.so
# src/main/resources/assets/opencomputers/lib/lua53/native.64.bsd.so
# src/main/resources/assets/opencomputers/lib/lua53/native.64.dll
# src/main/resources/assets/opencomputers/lib/lua53/native.64.dylib
# src/main/resources/assets/opencomputers/lib/lua53/native.64.so
# src/main/scala/li/cil/oc/integration/Mods.scala
2015-12-29 09:30:21 +01:00
Florian Nücke
10cd502557
Version bump.
2015-12-29 09:23:04 +01:00
Florian Nücke
473783fafa
Updated Eris.
2015-12-29 09:22:31 +01:00
Florian Nücke
aa04ed1d07
Added TIS-3D integration.
2015-12-29 09:22:12 +01:00
Florian Nücke
5ee0332cb6
Oh right, that's why that was separate... >_>
2015-11-23 00:17:08 +01:00
Florian Nücke
951e8b6180
Updated to ForgeGradle 2 and latest Forge, adjusted build scripts.
...
Let's see if this works...
2015-11-22 22:31:34 +01:00
Florian Nücke
5406a45673
Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8
...
Conflicts:
build.properties
2015-11-21 13:02:10 +01:00
Florian Nücke
57caa897b4
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10
...
Conflicts:
build.properties
2015-11-21 13:01:37 +01:00
Florian Nücke
189ccdf4f9
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/common/Proxy.scala
2015-11-21 12:55:18 +01:00
Florian Nücke
f19dd57a0c
Tracking previous dimension in nanomachine controller to robustly handle dimension changes to update wireless network association, fixes #1535 .
...
Added `api.Network.leaveWirelessNetwork(WirelessEndpoint endpoint, int dimension)` to API.
2015-11-21 12:47:05 +01:00
Florian Nücke
eb8074097e
Added compareStackToDatabase(side, slot, dbAddress, dbSlot) method to transposer and inventory controller. Closes #1534 .
...
Also added optional parameter `checkNBT=false` to all existing item comparing methods (I hope) as well as `compareStackToDatabase`.
2015-11-21 11:37:45 +01:00
Florian Nücke
9257159e5b
Removed ender chest chest oredict entry backported from MC 1.8 again because Chisel. Closes #1528 .
2015-11-21 10:37:02 +01:00
Florian Nücke
8ce901bb1c
Re-saved French localization files sans BOM.
2015-11-20 20:49:28 +01:00
Florian Nücke
69e6fdbd38
Merge branch 'master-MC1.7.10' of https://github.com/Pyeroh/OpenComputers into master-MC1.7.10
2015-11-20 19:23:00 +01:00
Pyeroh
ff4d185e30
Adding french translation for assets/opencomputers/doc
2015-11-20 10:38:49 +11:00
Florian Nücke
a8726ddb37
Oops.
2015-11-16 00:26:15 +01:00
Florian Nücke
962e6fdb64
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/common/block/Hologram.scala
2015-11-15 22:55:54 +01:00
Florian Nücke
be8d7a7258
Added API.isPowerEnabled. Closes #1217 .
2015-11-15 22:34:00 +01:00
Florian Nücke
8f60dc8a19
Add setting to allow disabling holograms emitting light. Closes #979 .
2015-11-15 22:21:05 +01:00
Florian Nücke
058ee1b6d9
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/server/agent/Inventory.scala
2015-11-15 21:01:52 +01:00
Florian Nücke
b9be02b71a
Fixed NBT being ignored when agents picked up drops after breaking blocks, potentially merging stacks incorrectly. Closes #1526 .
2015-11-15 20:59:42 +01:00
Florian Nücke
f7debf50ac
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
2015-11-15 15:03:15 +01:00
Florian Nücke
17d7880034
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/Settings.scala
src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala
2015-11-15 15:01:15 +01:00
Florian Nücke
fe759d0462
Fixed datacard entry in German manual.
2015-11-15 14:56:27 +01:00
Florian Nücke
de75a6b120
Fixed cycling side in server rack to 'none' not properly disconnecting from that side.
2015-11-15 12:35:19 +01:00
Florian Nücke
d861552431
Fix screens occasionally not rendering anything until the first update to what they're displaying.
2015-11-14 20:27:13 +01:00
Florian Nücke
bc97331b0d
Fixed potential infinite loop in manual when splitting text.
2015-11-14 13:47:56 +01:00
Florian Nücke
08287b5f35
Fixed a bunch of links in German manual, killed deprecated switch and access point entries and added relay one.
2015-11-14 13:42:19 +01:00
Florian Nücke
a515a3357a
Merge branch 'master-MC1.7.10' of https://github.com/Shadow1Raven/OpenComputers into master-MC1.7.10
2015-11-14 12:47:27 +01:00
Florian Nücke
7f1287f142
Added command to allow dumping current nanomachine configuration for debugging (oc_nanomachines / oc_nm).
...
Also made sure nodes don't connect to the same parent twice.
2015-11-14 12:46:34 +01:00
Florian Nücke
9455e430c9
Add enchantment information in item stack converter. Closes #1523 .
2015-11-14 11:40:10 +01:00
Florian Nücke
4b49cc6d2a
Fix fully upgraded relays being slower than they should be. Closes #1525 .
2015-11-14 10:57:52 +01:00
Florian Nücke
1dec6d1ecd
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
2015-11-11 21:21:29 +01:00
Florian Nücke
90087b2448
Fixes #1522 .
2015-11-11 21:20:15 +01:00
Shadow1Raven
5fcca8a471
Adding German trenslation.
2015-11-08 12:46:15 +01:00
Florian Nücke
a09c38b18b
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
...
Conflicts:
src/main/scala/li/cil/oc/common/command/SimpleCommand.scala
2015-10-28 20:07:06 +01:00
Florian Nücke
6118211b22
Should avoid issue with silly people touching config files. Closes #1500 .
2015-10-28 20:04:58 +01:00
Florian Nücke
0eefb26b44
Updated to Forestry 4.x API. Closes #1508 .
2015-10-28 19:55:06 +01:00
Florian Nücke
528f2ee05e
Version bump.
2015-10-28 18:58:28 +01:00
Florian Nücke
8bd423548a
Glorious bugfix. Closes #1504 .
2015-10-28 18:57:51 +01:00
Florian Nücke
fc23602624
Untested fix for #1496 .
2015-10-21 20:06:46 +02:00
Florian Nücke
6a895a72f7
Fixes #1498 .
2015-10-21 19:54:18 +02:00
Florian Nücke
ea0f13e24f
Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8
...
Conflicts:
build.properties
2015-10-17 14:48:56 +02:00
