payonel
243b0aa910
Merge branch 'master-MC1.11' into master-MC1.12
2018-10-10 17:16:59 -07:00
payonel
e0ebfed999
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/GuiHandler.scala
2018-10-10 17:16:41 -07:00
payonel
0c4d10ee1f
main hand mountable disk drive open gui fix
2018-10-10 17:15:39 -07:00
payonel
10420b3a4f
Merge branch 'master-MC1.11' into master-MC1.12
2018-10-10 01:41:39 -07:00
payonel
af9bdbef15
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
# src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
2018-10-10 01:41:14 -07:00
payonel
454e091959
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala
# src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
# src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
2018-10-10 01:35:29 -07:00
payonel
a5b6e3fec3
honor enableNanomachinePfx when false
...
also the distance check for nanomachine wireless comm was perhaps
not as intended. this change increases the range by correctly computing
the distance
closes #2505
2018-10-10 00:38:26 -07:00
payonel
1301ed8c3d
meant to name it net_splitter
2018-10-09 22:36:00 -07:00
payonel
4142e09671
new net_splitter component with api
...
getSides, setSides, open, and close
closes #2531
2018-10-09 22:34:51 -07:00
payonel
2f27a5cc36
provide more ItemStack data for draconic evolution
...
closes #2621
2018-10-07 10:49:08 -07:00
payonel
64bcbff3b3
Merge branch 'master-MC1.11' into master-MC1.12
2018-10-06 19:13:03 -07:00
payonel
6864b2c4f1
Merge branch 'master-MC1.10' into master-MC1.11
2018-10-06 19:08:36 -07:00
payonel
3968301277
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/DebugCard.scala
2018-10-06 18:56:34 -07:00
payonel
fd3ba6a55e
add scanContentsAt debug card method
2018-10-06 18:32:10 -07:00
payonel
f5f3042e32
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala
2018-10-06 11:56:52 -07:00
payonel
8d31c3df77
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/resources/mcmod.info
2018-10-06 11:56:09 -07:00
payonel
837edf6029
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/Trade.scala
# src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala
2018-10-06 11:53:40 -07:00
payonel
80a742c304
change variable case to match others
2018-10-06 11:48:45 -07:00
payonel
93d72aaa59
check for null on node connections
...
closes #2952
2018-10-06 11:32:48 -07:00
payonel
59d663a2ed
fix llama crash
...
closes #2954
2018-10-05 20:21:57 -07:00
payonel
6e28385897
remove some compiler warnings
2018-10-05 20:21:28 -07:00
payonel
f38de55699
change http to https for oc sites
2018-10-05 19:11:17 -07:00
payonel
6ea4536bc6
reintroduce ae2 power
...
closes #2955
2018-10-05 00:31:54 -07:00
payonel
894bedee70
ae2 fixes
...
- update to rv6
- remove dependency on private (non api) platform code
- make slot parameter option on exportToSlot
- fix item meta data conversion in getItems and related calls
closes #2950
closes #2779
2018-10-04 09:48:37 -07:00
payonel
6d045c106c
change getSortIndex to more popular getMerchantId
2018-10-01 14:53:45 -07:00
payonel
cf5e23e1f1
clean up new trade code slightly
2018-10-01 02:47:55 -07:00
payonel
4e24b36cd4
add getSortIndex to trading recipe
...
Trades can be grouped by the merchant offering them
The index is the sort order placement of a merchant in the list of
available merchants offering trades within range. Because it is merely a
sort index, it can change between calls to getTrades if merchants leave
or enter the range, or any previous merchant stops offering any trades
closes #2383
2018-10-01 02:12:48 -07:00
payonel
fea780f1dd
Merge branch 'master-MC1.11' into master-MC1.12
2018-10-01 00:36:12 -07:00
payonel
9310da6e33
Merge branch 'master-MC1.10' into master-MC1.11
2018-10-01 00:35:58 -07:00
payonel
e31c1addab
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-10-01 00:35:45 -07:00
payonel
52c55e3db6
split the eeprom crafting stack to 1
...
drones, mcus, robots, and tablets can be crafted with an eeprom
the code was erroneously inserting an entire eeprom stack into the
device, while leaving the crafting grid with n-1 of the stack, thus
duplicating a lot of eeproms :)
closes #2800
2018-10-01 00:35:20 -07:00
payonel
51f78e0dad
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControl.scala
2018-09-30 23:40:41 -07:00
payonel
699acc6b7e
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControl.scala
# src/main/scala/li/cil/oc/util/InventoryUtils.scala
2018-09-30 23:37:15 -07:00
payonel
9332aa1708
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/InventoryTransfer.scala
# src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControl.scala
# src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControlMk2.scala
# src/main/scala/li/cil/oc/util/InventoryUtils.scala
2018-09-30 23:18:19 -07:00
payonel
d080eab1c2
return extracted counts for suck and transferItem
...
this modifies the return value for 3 component methods
robot.suck
robot.suckFromSlot
transposer.transferItem
These methods used to return true or false. They continue to return
false for failed transfers, but return the transfered item count instead
of true (which in lua environments is still truethy)
closes #2807
2018-09-30 22:27:30 -07:00
payonel
497714b50b
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-29 17:39:11 -07:00
payonel
98a1eb7875
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/entity/Drone.scala
2018-09-29 17:38:50 -07:00
payonel
c0e5fd03c5
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
2018-09-29 17:36:37 -07:00
payonel
0b7d8bfd92
copy the simulated stack before using it
...
The simulated stack from inventories may not be a copy, and we modify it
thus, we should copy it before using it. This fixes our interaction with
ae interfaces
closes #2845
2018-09-29 17:32:41 -07:00
payonel
8a9740b641
funnel wake-on-lan start through host, not direct
...
The network card's wake-on-lan previously was sending a computer.start
message directly to the machine. But some hosts, specifically the Drone
need to make certain start actions before the machine starts. For
instance, the drone zeros its velocity (technically, it rises by .5m)
closes #2866
2018-09-28 17:30:42 -07:00
payonel
505a36602b
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-28 00:40:33 -07:00
payonel
83d954ccde
set modified fluid stack after fill
2018-09-28 00:40:23 -07:00
payonel
8282774247
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-28 00:26:47 -07:00
payonel
6ca46e564a
set modified fluid container after drain
...
fluid was duplicating because >1.11 fluid drain modified copies
thus, we need to set the slot in the internal inventory with the new
stack
closes #2894
2018-09-28 00:25:46 -07:00
payonel
9cd56fd77d
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-27 18:27:24 -07:00
payonel
0eb316127c
Merge branch 'master-MC1.10' into master-MC1.11
2018-09-27 18:27:13 -07:00
payonel
b6acea0d8a
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-09-27 18:27:01 -07:00
payonel
d350b30e9c
make line reads safer
...
closes #2934
2018-09-27 18:26:14 -07:00
payonel
8ea2acad29
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
2018-09-27 15:10:42 -07:00
payonel
2158aac5d1
fix typo in in-game manual
...
closes #2805
2018-09-27 15:07:27 -07:00
