Vexatos
|
19933fb7bb
|
Merge branch 'master-MC1.8.9' into master-MC1.9.4
|
2017-01-10 14:23:05 +01:00 |
|
Vexatos
|
52a032ff63
|
Fix #2220.
|
2017-01-10 14:21:03 +01:00 |
|
Vexatos
|
17f3fbb7fe
|
Merged branch master-MC1.9.4 into master-MC1.10
|
2016-12-30 16:26:08 +01:00 |
|
Vexatos
|
a624a468f0
|
Merged branch master-MC1.8.9 into master-MC1.9.4
|
2016-12-30 16:25:29 +01:00 |
|
Vexatos
|
cdd0a05f58
|
Merged branch master-MC1.7.10 into master-MC1.8.9
|
2016-12-30 16:24:51 +01:00 |
|
Vexatos
|
dcdf8346f3
|
Merge pull request #2210 from magik6k/master-MC1.7.10
Update Plan9k(Fixed PR)
|
2016-12-30 16:19:58 +01:00 |
|
Łukasz Magiera
|
742c8eecb6
|
Fixed plan9k
|
2016-12-30 16:16:04 +01:00 |
|
Łukasz Magiera
|
337ecbb1f2
|
Update Plan9k
|
2016-12-30 16:15:53 +01:00 |
|
Vexatos
|
42519e8af3
|
Allow addons to register their floppies for loot disk cycling.
|
2016-12-30 12:49:40 +01:00 |
|
Vexatos
|
20af9c8cbf
|
Merge branch 'master-MC1.9.4' into master-MC1.10
|
2016-12-29 18:41:52 +01:00 |
|
Vexatos
|
fee56b284b
|
Merge branch 'master-MC1.8.9' into master-MC1.9.4
|
2016-12-29 18:41:26 +01:00 |
|
Vexatos
|
094b48c5a1
|
Merge branch 'master-MC1.7.10' into master-MC1.8.9
# Conflicts:
# src/main/scala/li/cil/oc/common/item/Tablet.scala
|
2016-12-29 18:40:48 +01:00 |
|
Vexatos
|
16fc8a9113
|
May fix #2192.
|
2016-12-29 18:37:36 +01:00 |
|
Vexatos
|
b6cc64218e
|
Merge branch 'master-MC1.9.4' into master-MC1.10
|
2016-12-29 11:49:43 +01:00 |
|
Vexatos
|
7a8b07dcac
|
Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.9.4
|
2016-12-29 11:48:11 +01:00 |
|
Vexatos
|
bb8661a218
|
Fix #2155 and #2207.
|
2016-12-29 11:48:02 +01:00 |
|
Florian Nücke
|
ef10dbc921
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 23:50:19 +01:00 |
|
Florian Nücke
|
368ddb8369
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
|
2016-12-17 23:49:33 +01:00 |
|
Florian Nücke
|
21e1890bb4
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-12-17 23:49:04 +01:00 |
|
Florian Nücke
|
94efa8d17e
|
Don't close all sides for adapters placed before the last update. I hope you didn't update if you used adapters to control anything... sensitive. You didn't, right? Right?!
|
2016-12-17 23:48:11 +01:00 |
|
Florian Nücke
|
a856f87eb1
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 22:29:10 +01:00 |
|
Florian Nücke
|
cf300f4fdf
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
|
2016-12-17 22:28:52 +01:00 |
|
Florian Nücke
|
941a1aa1f6
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-12-17 22:28:35 +01:00 |
|
Florian Nücke
|
008f55f6bb
|
Version bump.
|
2016-12-17 22:28:16 +01:00 |
|
Florian Nücke
|
a221ba7325
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 22:13:53 +01:00 |
|
Florian Nücke
|
d735fb4926
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
|
2016-12-17 22:13:33 +01:00 |
|
Vexatos
|
e265579a24
|
Made JEI handlers use the new environmentsFor.
See #2136.
|
2016-12-17 22:01:26 +01:00 |
|
Florian Nücke
|
30d938a033
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 21:50:23 +01:00 |
|
Florian Nücke
|
7320934bdb
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
|
2016-12-17 21:49:29 +01:00 |
|
Florian Nücke
|
deb98924bf
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-12-17 21:49:09 +01:00 |
|
Florian "Sangar" Nücke
|
9441679dbb
|
Merge pull request #2113 from MoonlightOwl/patch-1
Update ru_RU.lang
|
2016-12-17 21:48:46 +01:00 |
|
Florian Nücke
|
6c098e799c
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 21:47:20 +01:00 |
|
Florian Nücke
|
a84febeb67
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
|
2016-12-17 21:46:45 +01:00 |
|
Florian Nücke
|
bdacc6ba3a
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
# src/main/java/li/cil/oc/api/Driver.java
# src/main/java/li/cil/oc/api/detail/DriverAPI.java
# src/main/scala/li/cil/oc/server/driver/Registry.scala
|
2016-12-17 21:45:35 +01:00 |
|
Florian Nücke
|
3548062e82
|
Merge branch 'multi-environment-providers' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
|
2016-12-17 21:37:02 +01:00 |
|
Florian Nücke
|
446b388386
|
Fixed incomplete EnderI/O tool implementation on wrench.
|
2016-12-17 21:27:39 +01:00 |
|
Florian Nücke
|
70a7d0be5f
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 21:17:55 +01:00 |
|
Florian Nücke
|
3cf5e7fc87
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
# Conflicts:
# src/main/scala/li/cil/oc/common/block/Adapter.scala
# src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
|
2016-12-17 21:17:29 +01:00 |
|
Florian Nücke
|
9ddfcb664c
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
# src/main/scala/li/cil/oc/client/PacketHandler.scala
# src/main/scala/li/cil/oc/client/Textures.scala
# src/main/scala/li/cil/oc/common/PacketType.scala
# src/main/scala/li/cil/oc/common/block/Adapter.scala
# src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
# src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
# src/main/scala/li/cil/oc/server/PacketSender.scala
|
2016-12-17 21:05:40 +01:00 |
|
Florian Nücke
|
00132337de
|
Added overlay for adapter to indicate open sides. Using same graphic for all adapter sides. Fixed match error when side is closed, homogenized removal logic.
|
2016-12-17 20:35:18 +01:00 |
|
Florian Nücke
|
15f7524837
|
Merge branch 'adapter-sides' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
|
2016-12-17 19:58:40 +01:00 |
|
Florian Nücke
|
ab46830b50
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
|
2016-12-17 15:00:12 +01:00 |
|
Florian Nücke
|
d1df3e1f24
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
|
2016-12-17 14:59:58 +01:00 |
|
Florian Nücke
|
809c87558c
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-12-17 14:59:42 +01:00 |
|
Florian Nücke
|
cca50d7c7a
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
|
2016-12-17 14:53:14 +01:00 |
|
Florian Nücke
|
0148ccff26
|
Make Machine.signal less picky about the types of maps it accepts.
|
2016-12-17 14:49:05 +01:00 |
|
Florian Nücke
|
608f0c6b29
|
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
# Conflicts:
# src/main/scala/li/cil/oc/server/component/DebugCard.scala
# src/main/scala/li/cil/oc/util/ExtendedArguments.scala
|
2016-12-17 14:47:48 +01:00 |
|
Vexatos
|
97ee3f3ac7
|
Added Useability check for wrapped inventories.
|
2016-12-17 14:47:09 +01:00 |
|
Florian Nücke
|
3a8132a60e
|
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
# Conflicts:
# src/main/scala/li/cil/oc/server/agent/Inventory.scala
# src/main/scala/li/cil/oc/server/component/Drone.scala
|
2016-12-17 14:35:07 +01:00 |
|
Florian Nücke
|
74353cc2d7
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControl.scala
|
2016-12-17 14:34:30 +01:00 |
|