AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-22 11:52:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,320 Commits 29 Branches 143 Tags
Commit Graph

6320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
529ace3151 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
 2019-06-11 17:01:43 -07:00
payonel
df1939cb0e rack send message to mountables immediately 
relay (hub) doesn't repeat message in reverse
relay shows actual packets/cycle

closes #3095
 2019-06-11 09:09:40 -07:00
payonel
1f310e2d8c Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.gradle
 2019-06-11 03:39:21 -07:00
payonel
16aff3b3a7 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-06-11 03:34:58 -07:00
payonel
fac5ecbe87 allow signals of tables of simple key value types 2019-06-11 03:30:09 -07:00
payonel
915a215cd7 use https for deps 2019-06-11 03:22:40 -07:00
payonel
88d4bcaa46 bind(false) doesn't need to sleep > 0, there is 
still a balanced context cost with this change, and each bind() action
behaves roughly the same from significant empirical testing

closes #3062
 2019-06-11 03:21:45 -07:00
payonel
bff1b2310a fix alias reset, the clear call was not needed 2019-06-11 03:21:14 -07:00
payonel
22d902afd3 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/appeng/ConverterCellInventory.java
 2019-06-05 21:35:37 -07:00
payonel
174e55aba5 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-06-05 21:34:46 -07:00
payonel
0de0bf2ca0 provide configuration option to set max signal queue size 
closes #3084
 2019-06-05 21:29:00 -07:00
payonel
986d4345d8 read ch from next byte 
closes #3085
 2019-06-04 13:19:29 -07:00
Vladimir Kalinin
3868f99798 https://github.com/MightyPirates/OpenComputers/issues/2928 
AE2 Cells don't have extra information they should
 2019-06-04 10:34:02 -07:00
Lizzy
2fd3bb4d3a Fixed "Dev jar" link in read-me 
OC forums hasn't had the "pages" module on it since I took ownership in late 2016 and therefore this link is invalid
 2019-06-04 10:30:07 -07:00
payonel
e568249098 Merge branch 'master-MC1.10' into master-MC1.11 2019-03-06 21:20:00 -08:00
payonel
c29fe8ef33 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-03-06 21:19:46 -08:00
payonel
92426e33d2 call uptime instead of using cached time 
waiting timers are starved otherwise
Also increment timeouts without drift
closes #3058
 2019-02-28 12:45:18 -08:00
payonel
fdd0f8c554 check for etc before trying to install oppm 
closes #2875
 2019-02-07 14:24:40 -08:00
payonel
ebb745a35b Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.properties
 2019-02-06 21:33:18 -08:00
payonel
7e836e73f1 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-02-06 21:32:58 -08:00
payonel
cd9a92fd41 update changelog for 1.7.4 v1.7.4 2019-02-06 21:30:32 -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
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
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
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
170ce28ebe use transferBetweenInventoriesSlots for the slot 
closes #2988
 2019-02-01 22:46:36 -08: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
680c09d9c6 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.properties
 2018-11-16 02:53:29 -08:00