payonel
df7825dcf2
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala
2018-11-03 18:54:51 -07:00
payonel
8149f0eb8e
build fix (https for forge) and AnyRef fix
2018-11-03 18:53:58 -07:00
payonel
ade302d15c
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/client/PacketHandler.scala
# src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
# src/main/scala/li/cil/oc/common/tileentity/Charger.scala
# src/main/scala/li/cil/oc/common/tileentity/Print.scala
# src/main/scala/li/cil/oc/common/tileentity/Rack.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
# src/main/scala/li/cil/oc/integration/computercraft/BundledRedstoneProvider.scala
# src/main/scala/li/cil/oc/server/PacketSender.scala
2018-11-03 14:12:12 -07:00
payonel
e67d00221b
redstone api overrides, backwards compatible
...
Providing the following overrides:
getInput(side: number): number
getInput(): table
setOutput(side, number): number
setOutput(values: table): table
getBundledInput(side: number, color: number): number
getBundledInput(side: number): table
getBundledInput(): table
getBundledOutput(side: number, color: number): number
getBundledOutput(side: number): table
getBundledOutput(): table
setBundledOutput(side: number, color: number, value: number): number
setBundledOutput(side: number, values: table): table
setBundledOutput(values: table): table
closes #2539
2018-11-03 11:06:59 -07:00
payonel
a8336f2d69
thanatos corrected a typo
2018-10-31 11:35:00 -07:00
AntiBlueQuirk
03c24eff01
Adding Cut/Uncut operations
2018-10-31 11:09:35 -07:00
payonel
904990f294
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-10-31 03:07:46 -07:00
payonel
d249367ee9
fix: a.onDisconnect(a) isn't called on components by microcontroller
2018-10-31 02:43:35 -07:00
svitoos
e85f3e1f83
Improved chunkloader upgrade by svitoos
...
change reduced by payonel
Namely:
- moving setting for chunkloaders, svitoos choice was cleaner
- allowing chunkloaders in microcontrollers
Closes #2499 .
2018-10-31 02:42:57 -07:00
payonel
82c486ffba
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-10-29 23:16:14 -07:00
payonel
9b7d125ebb
add disk_drive.media(), get floppy disk address
...
closes #2972
2018-10-29 23:03:13 -07:00
payonel
e7eddad588
add proper support for \b and \r. ignore \15
...
closes #2971
2018-10-29 21:59:58 -07:00
payonel
dc0f187a83
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
2018-10-28 00:23:27 -07:00
payonel
ad8218a2ea
fix the chunkloader upgrade i just broke
2018-10-28 00:22:15 -07:00
payonel
3be48ae4d5
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
2018-10-27 23:03:33 -07:00
payonel
a0821f1493
add white/blacklist option for chunkloading
...
new settings options: misc.chunkloaderDimensionBlacklist and
misc.chunkloaderDimensionWhitelist
closes #2768
2018-10-27 22:55:12 -07:00
payonel
e967432627
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-10-21 23:18:48 -07:00
payonel
1e35f8e49a
connect internal nodes created from side effects
...
it has been found that a screen placed below a case can be connected
the the case before the case's internal components have been added to
a network. This causes the screen to miss its chance to connect to the
gpu, causing the gpu's bound screen to be unavailable, and gpu api
calls will error
This is likely the root cause for many "stalled" or crashed when
restarting servers, or chunks loading
closes #2962
2018-10-21 23:15:56 -07:00
payonel
4fd0399ad5
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
# src/main/scala/li/cil/oc/common/tileentity/Waypoint.scala
# src/main/scala/li/cil/oc/integration/enderstorage/DriverFrequencyOwner.java
# src/main/scala/li/cil/oc/server/component/LinkedCard.scala
# src/main/scala/li/cil/oc/server/component/NetworkCard.scala
2018-10-12 17:38:24 -07:00
payonel
6d5dd948b5
add wake message support to link cards
...
same api as network card
closes #2753
2018-10-12 14:05:33 -07:00
payonel
cc0fddb914
allow setFrequency on owned ender storage chests
...
ender storage, the mod itself, lets players change frequency of owned
chests without any type of owner check
closes #2775
2018-10-12 12:24:36 -07:00
payonel
4731cb1b01
add recrafting option to link 2 link cards
...
also, clean up the net_splitter.getSides() return, it should use the
exact same index values you need to use in setSides.
added getChannel() on link cards. Link cards of the same channel are
linked in the same network. Also inventory controllers can read this as
the `linkChannel` from the item
closes #2400
2018-10-12 10:07:30 -07:00
payonel
6182fde957
allow waypoints to face UP or DOWN
...
the block faces up or down, depending on the pitch of your cross-hair
when you place the block down, just like screens
closes #2364
2018-10-12 01:13:29 -07:00
payonel
904db35be2
platter size an even factor for unmanaged disks
...
closes #2305
2018-10-11 23:46:13 -07:00
payonel
0c4d10ee1f
main hand mountable disk drive open gui fix
2018-10-10 17:15:39 -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
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
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
f38de55699
change http to https for oc sites
2018-10-05 19:11:17 -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
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
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
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
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
payonel
8bbbeefc3b
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
2018-09-27 12:20:41 -07:00
