Vexatos
a98019bac9
Fixed SimpleComponent injection not working.
2017-09-01 16:15:42 +02:00
Vexatos
c6e43d3031
Merge pull request #2496 from asiekierka/master-MC1.12
...
fix ClassTransformer crash
2017-08-18 17:27:57 +02:00
Adrian Siekierka
e4899cee2f
fix ClassTransformer crash
2017-08-18 17:22:14 +02:00
Vexatos
ccf2d96646
Merge branch 'master-MC1.11' into master-MC1.12
2017-08-15 13:07:29 +02:00
Vexatos
e43bb76d6b
Merge remote-tracking branch 'origin/master-MC1.11' into master-MC1.11
2017-08-15 13:04:45 +02:00
Vexatos
f3490663ef
Added some madness to simulate block placing as an offhand action to make equipment slot actions work properly again.
2017-08-15 13:04:35 +02:00
Vexatos
69a2a1df41
Fixed leash method patching in coremod.
...
See #2490 .
2017-08-13 10:22:05 +02:00
Vexatos
a537e72340
Merge pull request #2490 from asiekierka/master-MC1.12
...
update to Minecraft 1.12.1, various fixes
2017-08-12 13:45:06 +02:00
Adrian Siekierka
431e3b5c42
update to Minecraft 1.12.1, various fixes
2017-08-12 12:53:55 +02:00
payonel
e39cf55c6d
Merge remote-tracking branch 'upstream/master-MC1.10' into master-MC1.11
2017-08-08 18:48:22 -07:00
payonel
064d9bd55a
Merge remote-tracking branch 'upstream/master-MC1.9.4' into master-MC1.10
2017-08-08 18:48:04 -07:00
payonel
a4b470e166
Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4
2017-08-08 18:47:44 -07:00
payonel
cc4cc2d5e9
Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9
2017-08-08 18:47:00 -07:00
payonel
2a178f6d41
fix quiet /bin/source
...
quiet mode in /bin/source was a mess -- making .shrc scripts not able to print. Also, a lot of the /bin/sh arg parsing code has traditionally been over complicated. cleaned that up as well thanks to old code that expected strings in the args having been removed some time ago
2017-08-08 18:45:36 -07:00
payonel
f00c2dd6a2
simplify tty check slightly and add comment that tty should not be used directly by user code
...
maybe i should just move tty to /lib/core
2017-08-08 18:45:36 -07:00
Florian Nücke
01ada77717
Merge branch 'master-MC1.11' of github.com:MightyPirates/OpenComputers into master-MC1.12
2017-07-23 20:24:29 +02:00
Florian Nücke
9486454036
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
2017-07-23 20:24:19 +02:00
Florian Nücke
21d5b21e7f
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-07-23 20:23:42 +02:00
Florian Nücke
d974b52dbf
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-07-23 20:23:21 +02:00
Florian Nücke
1d72eebc12
Update TIS-3D dependency.
2017-07-23 15:01:02 +02:00
Florian Nücke
01f69b93e1
Merge branch 'master-MC1.12' of https://github.com/modmuss50/OpenComputers into master-MC1.12
2017-07-23 14:08:45 +02:00
Vexatos
927b1d7a26
Fix colorize recipe.
2017-07-23 13:37:30 +02:00
Florian Nücke
67895541c6
Fix adapter bottom texture.
2017-07-22 18:15:16 +02:00
Florian Nücke
70f8eeb275
1.12 adjustments.
2017-07-22 15:57:03 +02:00
Florian Nücke
958c677320
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/WorldInventoryAnalytics.scala
2017-07-22 15:54:04 +02:00
Florian Nücke
beb4a57bcc
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/ru_RU.lang
2017-07-22 15:53:15 +02:00
Florian Nücke
f989cff704
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-07-22 15:49:21 +02:00
Florian Nücke
9f9041c580
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-07-22 15:49:12 +02:00
Florian Nücke
9d9251a67c
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-07-22 15:48:59 +02:00
Florian "Sangar" Nücke
40ca104a75
Merge pull request #2402 from loveyanbei/master-MC1.7.10
...
Add zh_CN localization of manual .and tried to fix the infinite loop bug
2017-07-22 15:47:52 +02:00
Florian "Sangar" Nücke
fb77e0ed24
Merge branch 'master-MC1.7.10' into master-MC1.7.10
2017-07-22 15:47:17 +02:00
Florian "Sangar" Nücke
d316e2ca4c
Merge pull request #2075 from thiakil/WorldInventoryAnalytics-updates-pr
...
World Inventory Analytics Improvements
2017-07-22 15:19:05 +02:00
Florian Nücke
22cdfeb2cc
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-07-22 15:15:55 +02:00
Florian Nücke
0ad515451e
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-07-22 15:14:20 +02:00
Florian Nücke
d43e6530de
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-07-22 15:14:06 +02:00
Florian "Sangar" Nücke
e045f7c3e0
Merge pull request #2460 from cyber01/RU_doc
...
Upgrading Russian translation to the current state
2017-07-22 15:12:35 +02:00
Florian "Sangar" Nücke
4023d3f4af
Merge branch 'master-MC1.7.10' into RU_doc
2017-07-22 15:12:03 +02:00
Florian Nücke
8e4b7bfcc1
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
2017-07-22 14:53:22 +02:00
Florian Nücke
627a7c3fe4
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-07-22 14:53:08 +02:00
Florian Nücke
42c8e07bc1
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-07-22 14:52:54 +02:00
Florian Nücke
66b6fbb7fa
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-07-22 14:52:39 +02:00
Florian Nücke
cdc8b2d792
Fix for infinite loop in manual, closes #2395 .
2017-07-22 14:50:56 +02:00
Florian "Sangar" Nücke
6eb12f6784
Merge pull request #2462 from thiakil/ClassTransformer-1.11-fix
...
Fix renderLeash patch signature.
2017-07-22 14:22:13 +02:00
payonel
de080b28ef
Add SHODAN to list of robot names
...
Adds a recognizable AI not on this list, SHODAN from the System Shock games.
2017-07-19 22:33:54 -07:00
payonel
e4c0df8bfa
Add tree utility
2017-07-19 22:33:41 -07:00
modmuss50
35d11a5c4b
Update 3rd party dependencies
2017-07-18 23:02:33 +01:00
modmuss50
72e216f9f6
Update obf names in core mod.
2017-07-18 22:37:11 +01:00
modmuss50
121ed5bdd8
Fix Missing Mappings Event
2017-07-18 21:44:20 +01:00
modmuss50
63440b47df
Fix item tool tips not rendering in GUI's
2017-07-18 21:35:17 +01:00
modmuss50
6e5d1aae83
Fix Items spilling over into other creative tabs
2017-07-18 21:32:01 +01:00
