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
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
modmuss50
2a31b71800
Clean up block and item registry a little.
2017-07-18 21:26:21 +01:00
modmuss50
9248db382f
Update forge version
2017-07-18 20:38:34 +01:00
Xander
c4fde0dbd2
Fix renderLeash patch signature.
2017-07-15 12:08:57 +08:00
cyber01
9fbef39829
Upgrading to the current state (compared to the original OS), translated the missing parts. Merged with @MoonlightOwl changes
2017-07-13 11:31:30 +03:00
Vexatos
3b9c5634f6
Merge branch '1.11-playerequipment' into master-MC1.11
2017-07-11 23:46:22 +02:00
payonel
3d6e77f879
fix gsub issue: lua 5.3 changed from lua 5.2
2017-07-08 00:47:19 -07:00
payonel
d753d83bb4
reverting read handler weirdness, it didn't work right
...
Users shouldn't use tty read nor write directly, they should always use io or term. But...it is messy to try to hide these methods as private methods in the io library, so I'll just have to check the io tty-ness just in case
2017-07-07 22:47:03 -07:00
gamax92
fabbb630d4
Make wtrunc count missing glyphs as 1
...
otherwise this function has odd behavior when compared with wlen
2017-07-07 21:22:47 -07:00
payonel
e1e2e3c800
ansi code LS_COLORS, blinking, cyan, and multicolor codes
...
LS_COLORS now respects linux style ansi code list, and /bin/ls has been updated to respect that
cursor blinking ws being reset too often that has been fixed
cyan ideally should be 0x00ffff, but that colors becomes green when switching bit depths. Thus, openos will use 0x00B6FF for ansi code for cyan
fixed some vt100 color list parsing
2017-07-07 10:11:59 -07:00
payonel
a5613353a3
Merge branch 'master-MC1.10' into master-MC1.11
2017-07-04 19:16:33 -07:00
payonel
82dadb0fa0
Merge branch 'master-MC1.9.4' into master-MC1.10
2017-07-04 19:16:23 -07:00
payonel
ac1360f038
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-07-04 19:16:13 -07:00
