Vladimir Kalinin
|
99902fd205
|
Explicit type conversion for hash map (#3080)
|
2019-06-12 01:19:39 -07:00 |
|
payonel
|
b437a3c2a7
|
fix build, missed aeutil syntax mistake
|
2019-06-12 01:00:11 -07:00 |
|
payonel
|
ef9ed30413
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-06-12 00:54:47 -07:00 |
|
payonel
|
de3e80456c
|
Merge branch 'master-MC1.10' into master-MC1.11
|
2019-06-12 00:54:26 -07:00 |
|
payonel
|
bed66723a7
|
Merge branch 'master-MC1.7.10' into master-MC1.10
|
2019-06-12 00:51:02 -07:00 |
|
payonel
|
7737a64c79
|
fixed t2 wireless cards NOT getting wired msgs
closes #3102
|
2019-06-12 00:48:23 -07:00 |
|
payonel
|
e660aecedd
|
remove requirement for ae channels
closes #3090
|
2019-06-11 21:27:18 -07:00 |
|
payonel
|
d901f74716
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-06-11 17:11:23 -07:00 |
|
payonel
|
6d86b50edf
|
Merge branch 'master-MC1.10' into master-MC1.11
|
2019-06-11 17:11:12 -07:00 |
|
payonel
|
42fa189475
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-06-11 17:07:08 -07:00 |
|
payonel
|
51fac50837
|
Merge branch 'master-MC1.10' into master-MC1.11
|
2019-06-11 17:06:04 -07:00 |
|
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
|
1981e1bd44
|
Merge branch 'master-MC1.11' into master-MC1.12
# Conflicts:
# build.gradle
|
2019-06-11 03:39:39 -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
|
486b40c9a1
|
apparently it is not legal to create an EnumSet from an empty collection
also, cherry pick 3868f997987b534ea4269392653582506667cdcb
closes #3103
|
2019-06-05 23:21:33 -07:00 |
|
payonel
|
776df12376
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-06-05 21:35:47 -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
|
2e314998c9
|
allow signals of tables of simple key value types
closes #3074
|
2019-06-04 01:01:56 -07:00 |
|
payonel
|
5313e98ce3
|
use https for deps
closes #3048
|
2019-06-02 17:27:57 -07:00 |
|
payonel
|
a593d748dc
|
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-02 01:55:44 -07:00 |
|
payonel
|
c5553bb5cc
|
fix alias reset, the clear call was not needed
|
2019-06-02 01:54:03 -07:00 |
|
payonel
|
1bd33f4540
|
fix up some config wording
closes #3064
|
2019-05-29 23:34:38 -07:00 |
|
payonel
|
c97a985fc1
|
return non-zero when block breaks to air too fast
closes #3050
|
2019-05-29 00:30:05 -07:00 |
|
payonel
|
a5bad54c23
|
following fantastic suggestion from community to
hide bounding box wireframe while not sneaking on
screens
closes #3072
|
2019-05-28 23:29:58 -07:00 |
|
payonel
|
9e756912c2
|
update forge to recommended version 14.23.5.2768
|
2019-05-25 19:15:48 -07:00 |
|
payonel
|
7ceb846b5e
|
add NetworkControl support to ae interface parts
closes #3055
|
2019-03-09 20:01:55 -08:00 |
|
payonel
|
5e983f01a9
|
ItemStack.EMPTY and not null for ae integration
closes #3054
|
2019-03-08 20:59:59 -08:00 |
|
payonel
|
396399a91a
|
put updated stack in offhand for robot.use
the offhand on the robot is only used for internal action handling,
so the result of item use can simply be in the offhand
also found that using vanilla buckets was broken
so embarrassing. i need to pay my qa team more
resolves: https://oc.cil.li/index.php?/topic/1838-robotuse-not-working-with-water-bucket/#comment-8584
closes #3051
|
2019-03-08 15:19:01 -08:00 |
|
payonel
|
48fab37b83
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-03-06 21:20:16 -08: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
|
7b43e9c447
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-02-06 21:33:25 -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
|
e782d738ac
|
Merge branch 'master-MC1.11' into master-MC1.12
|
2019-02-06 21:28:51 -08:00 |
|
payonel
|
ff087b8df9
|
Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
# build.properties
|
2019-02-06 21:26:59 -08:00 |
|