Florian Nücke
07c700ca8a
Fixed broken setmetatable with __gc.
2016-02-07 12:06:46 +01:00
Florian Nücke
9113fbbb02
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9
2016-01-31 20:20:31 +01:00
Florian Nücke
9530918afe
Updated to new Waila API, closes #1559 .
2016-01-31 20:19:52 +01:00
Soni L
d9f2900102
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:42:51 +01:00
Florian Nücke
7026f943e1
Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558 .
2016-01-31 18:42:50 +01:00
Florian Nücke
f90b38aa71
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:42:50 +01:00
Florian Nücke
ff727b9fee
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9
2016-01-16 13:48:26 +01:00
Florian Nücke
8470226874
Reenable IHasWork for BuildCraft, closes #1618 .
2016-01-16 13:45:07 +01:00
Florian Nücke
b683ac93f0
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9
...
# Conflicts:
# 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
2016-01-15 21:13:20 +01:00
Florian Nücke
811759314d
Version bump.
2016-01-15 21:12:04 +01:00
Florian Nücke
49fbe0eef1
Should fix #1589 .
2016-01-15 21:07:15 +01:00
Florian Nücke
fbd57de086
Patched Eris 5.3.
2016-01-15 21:04:53 +01:00
Florian Nücke
7341c20b55
Updated Forge, unfucked metadata on rotatables, yay me. Closes #1600 .
2016-01-15 21:00:36 +01:00
Florian Nücke
d335a77bc1
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9
2015-12-31 12:21:44 +01:00
Florian Nücke
3091240c9e
Update to MC1.8.9.
2015-12-31 12:16:13 +01:00
Florian Nücke
3f70b74d24
Merge branch 'master-MC1.8.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8
2015-12-30 21:32:14 +01:00
Florian Nücke
8cd3625d1a
Make coremod run in again -.-
2015-12-30 21:26:27 +01:00
Florian Nücke
b70c6cae3b
Updated Notch-names in ClassTransformer.
2015-12-30 20:27:33 +01:00
Florian Nücke
a4d3101626
Forgot to save the node, ack!
2015-12-30 00:01:13 +01:00
Florian Nücke
8ac09f0174
Forgot to save the node, ack!
2015-12-29 23:59:52 +01:00
Florian Nücke
fa2273acd0
Merge branch 'master-MC1.8.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8
...
# Conflicts:
# build.gradle
# build.properties
# src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
2015-12-29 23:52:48 +01:00
Florian Nücke
a020657bf0
Update to TIS-3D 0.7.1.
...
# Conflicts:
# build.properties
# src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
2015-12-29 23:50:16 +01:00
Florian Nücke
d60f6743fd
Fix messing with TIS-3D manual, closes #1588 .
2015-12-29 23:30:54 +01:00
Florian Nücke
b8b6d5329e
Updated TIS-3D dep.
2015-12-29 23:07:59 +01:00
Florian Nücke
90947436fe
Also version bump for consistency... ugh. Time to port 1.6 to 1.8 >_>
2015-12-29 23:04:02 +01:00
Florian Nücke
c873f15db2
Fix OpenGL derpiness in drone and robot item renderer. JEI integration (hiding some items, e.g. robot proxy block used while robots are moving).
2015-12-29 22:59:06 +01:00
Florian Nücke
6458e1b149
Cherry picking is hard, apparently.
2015-12-29 20:47:13 +01:00
Florian Nücke
4faf61976c
Added TIS-3D integration.
...
# Conflicts:
# build.gradle
# build.properties
# src/main/scala/li/cil/oc/integration/Mods.scala
# src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
2015-12-29 20:44:40 +01:00
Florian Nücke
02043ed83b
Re-enable TIS-3D integration.
...
# Conflicts:
# build.properties
# src/main/scala/li/cil/oc/integration/Mods.scala
# src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
2015-12-29 20:42:47 +01:00
Florian Nücke
a60f0cb202
Re-enable TIS-3D integration.
2015-12-29 13:58:51 +01:00
Florian Nücke
97d0242639
Merge branch 'OC1.5-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8
2015-12-29 13:05:10 +01:00
Florian Nücke
979f00d81d
Fixed a bunch of rendering glitches. Fixed NPE in hologram TESR.
2015-12-29 13:02:06 +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
99e89e5068
Again.
2015-12-22 00:46:19 +01:00
Florian Nücke
d43023952b
Updated forge and mappings.
2015-12-22 00:29:08 +01:00
Florian Nücke
550553c884
Add normals for custom item rendering.
2015-12-22 00:19:17 +01:00
Florian Nücke
105e38b85c
Oh come ON!
2015-12-21 22:24:03 +01:00
Florian Nücke
a5b1713358
Why does this even make a difference -.-
2015-12-21 22:23:45 +01:00
Florian Nücke
85a7a240e2
Welp, it compiles. And runs. But screens and cables don't render properly.
2015-12-11 16:21:42 +01:00
Florian Nücke
e0a6469bc3
Progress on porting to 1.8.8, generics in block state properties are killing my generic system :(
2015-12-09 21:21:42 +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
