AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 01:10:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,639 Commits 29 Branches 143 Tags
Commit Graph

6639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
6fd468b1d2 Merge branch 'master-MC1.11' into master-MC1.12 2019-02-06 21:11:19 -08:00
payonel
5773b48985 Merge branch 'master-MC1.10' into master-MC1.11 2019-02-06 21:11:12 -08:00
payonel
27d34a668b Merge branch 'master-MC1.7.10' into master-MC1.10 2019-02-06 21:11:04 -08:00
payonel
d9efb57bea more efficient buffer allocation 2019-02-06 21:10:52 -08:00
payonel
b392949b0d Merge branch 'master-MC1.11' into master-MC1.12 2019-02-06 21:07:35 -08:00
payonel
92b89c9b8f Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.properties
 2019-02-06 21:05:25 -08:00
payonel
57dd3d7b2b Merge branch 'master-MC1.7.10' into master-MC1.10 2019-02-06 20:58:33 -08:00
payonel
0d72b19d2e OC 1.7.4 patch changelog update 2019-02-06 20:52:39 -08:00
payonel
0cdaf8c87d fix motd without gpu 
hide some irrelavent luacheck warnings
 2019-02-06 18:42:14 -08:00
payonel
bf7636f533 fix io.dup for code that sets new keys 2019-02-04 19:02:30 -08:00
payonel
2e98e4f9bb motd doesn't need gpu 2019-02-04 19:02:20 -08:00
payonel
3004bcc94f kb event code reduc 2019-02-04 19:02:17 -08:00
payonel
9c6537ea7c stop using the gpu and kb addr 2019-02-04 19:02:07 -08:00
payonel
47455c1d43 another late fix 
computer.pullSignal needs to use closest event registrant
 2019-02-04 19:01:59 -08:00
payonel
aa963bfd26 tty may be a custom tty stream that didn't care about a cursor 2019-02-04 19:01:48 -08:00
TheCodex6824
1089a13235 Fixed some container names being unlocalized on 1.11+ 2019-02-04 17:34:11 -08:00
payonel
d8346988f9 start drones above a block if on non-full blocks 
closes #3029
 2019-02-04 17:33:27 -08:00
payonel
16253f39b7 Merge branch 'master-MC1.11' into master-MC1.12 2019-02-03 19:52:13 -08:00
payonel
0b05ae4314 Merge branch 'master-MC1.10' into master-MC1.11 2019-02-03 19:52:05 -08:00
payonel
c0812c25af Merge branch 'master-MC1.7.10' into master-MC1.10 2019-02-03 19:51:54 -08:00
payonel
c67f700fa9 use ByteBuffer to deal with transferFrom 
transferFrom giving us grief on some platforms (openjdk for arch and debian)
ByteBuffer appears to be more reliable

closes #3038
closes #3031
 2019-02-03 19:51:38 -08:00
payonel
d1b80719fa Merge branch 'master-MC1.11' into master-MC1.12 2019-02-02 00:54:19 -08:00
payonel
da30aa0b72 Merge branch 'master-MC1.10' into master-MC1.11 2019-02-02 00:52:25 -08:00
payonel
6cb67d3e6b check for nulls on waila integration 
closes #3017

# Conflicts:
#	src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
 2019-02-02 00:49:53 -08:00
payonel
d10ea01abf totally the wrong way to use Some 
Some(null) is still Some, which is not None. whoops

closes #3033
 2019-02-02 00:45:10 -08:00
TheCodex6824
04a1fb77c9 Fixed T1 wireless cards receiving wired messages 2019-02-02 00:34:54 -08:00
Anar Abdullayev
96a856c669 Update robot.names 2019-02-02 00:32:06 -08:00
Anar Abdullayev
9d03bd497f Update robot.names 2019-02-02 00:32:06 -08:00
Wilma456 (Jakob0815)
b1083980c4 Add \v escape sequenz 2019-02-02 00:31:36 -08:00
payonel
69c9240426 check ItemStack equals, not same object, for lock 
closes #2995
 2019-02-02 00:29:24 -08:00
payonel
170ce28ebe use transferBetweenInventoriesSlots for the slot 
closes #2988
 2019-02-01 22:46:36 -08:00
payonel
618323a701 dont pass null for EnumFacing, breaks stuff 
closes #3011
 2019-02-01 01:03:57 -08:00
payonel
01b9b623f3 make agent swing only work for canHarvestBlock 
closes #3035
 2019-02-01 00:54:41 -08:00
payonel
ef4f7417b3 totally the wrong way to use Some 
Some(null) is still Some, which is not None. whoops

closes #3033
 2019-02-01 00:22:45 -08:00
payonel
18461f37f8 reduce missing mappings warnings to oc only 
closes #3028
 2019-01-31 00:13:46 -08:00
payonel
25828c3b3d check for nulls on waila integration 
closes #3017
 2019-01-31 00:04:37 -08:00
Vexatos
7f4759f46c Merge remote-tracking branch 'origin/master-MC1.11' into master-MC1.12 2018-11-16 22:06:31 +01:00
Vexatos
a86f79eb71 Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11 2018-11-16 22:06:09 +01:00
Vexatos
7c0335f35e Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10 2018-11-16 22:05:31 +01:00
Vexatos
1190dbb809 Shuffled some changes around. v1.7.3 2018-11-16 22:03:17 +01:00
Vexatos
4233418588 Updated change log. 2018-11-16 20:13:27 +01:00
payonel
66f5a040ca Merge branch 'master-MC1.11' into master-MC1.12 2018-11-16 02:53:42 -08:00
payonel
680c09d9c6 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.properties
 2018-11-16 02:53:29 -08:00
payonel
07c237704d Merge branch 'master-MC1.7.10' into master-MC1.10 2018-11-16 02:52:49 -08:00
payonel
72e096e2c8 reduce some memory cost used by our default eeprom 2018-11-16 02:51:45 -08:00
payonel
c625978b06 official OC version bump to 1.7.3 2018-11-16 02:39:12 -08:00
payonel
ec64b50628 openos 1.7.3 version bump and final patch 2018-11-16 02:36:42 -08:00
payonel
106fa371c7 adding payo to pet list 2018-11-16 02:03:42 -08:00
payonel
54d8190275 Merge branch 'master-MC1.11' into master-MC1.12 2018-11-14 19:41:31 -08:00
payonel
941ceb2785 Merge branch 'master-MC1.10' into master-MC1.11 2018-11-14 19:35:54 -08:00