payonel
c704bdb6f3
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
2018-11-14 19:35:18 -08:00
payonel
bf58ac2a68
Fixes #2486
...
The added line fixes lightning issues with shaders, however at night the monitors will have a reddish tint
2018-11-14 19:26:15 -08:00
Pelicoon
30a7b23af7
Fixes #2486
...
The added line fixes lightning issues with shaders, however at night the monitors will have a reddish tint
2018-11-14 18:19:08 -08:00
payonel
87d358d814
Merge branch 'master-MC1.11' into master-MC1.12
2018-11-14 18:14:59 -08:00
payonel
9b861bd5c5
Merge branch 'master-MC1.10' into master-MC1.11
2018-11-14 18:14:52 -08:00
payonel
e7bb1fa5b5
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-11-14 18:14:41 -08:00
payonel
1e86c9f634
create a smart terminal server cache to drop dups
...
terminal servers were being added to the list before their address
had been loaded, causing connection issues when adding/removing
terminal server blades from racks, or when unloading/loading world
chunks
closes #2246
2018-11-14 18:14:14 -08:00
payonel
acf244034e
add sync calls for tablet state on client
...
only adding fix for 1.12 thanks to player inventory change count
closes #2696
2018-11-14 18:04:06 -08:00
Adrian Siekierka
01cec929a7
funscii update to d30ed629
2018-11-14 14:58:14 -08:00
payonel
71f54dd631
Remove World access from CableModel with extended props
...
tested, works great
credit to thiakil
closes #2828
2018-11-10 03:56:18 -08:00
payonel
9841e74c51
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/OpenComputers.scala
# src/main/scala/li/cil/oc/common/SaveHandler.scala
2018-11-09 18:39:21 -08:00
payonel
90ecef5f2b
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/OpenComputers.scala
# src/main/scala/li/cil/oc/common/SaveHandler.scala
# src/main/scala/li/cil/oc/server/fs/Buffered.scala
2018-11-09 18:25:05 -08:00
payonel
4475e6212a
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/OpenComputers.scala
# src/main/scala/li/cil/oc/common/SaveHandler.scala
2018-11-09 17:21:48 -08:00
Vexatos
4010927a3e
Offloading state saving into a separate thread.
...
(cherry picked from commit 0b256e0)
2018-11-09 16:51:22 -08:00
Vexatos
a8a421e25a
Implemented threaded filesystem saving.
...
(cherry picked from commit f129282)
2018-11-09 16:51:22 -08:00
Vexatos
db18c1df62
Only change date of directory modification if it actually changed.
...
(cherry picked from commit c463df0)
2018-11-09 16:51:22 -08:00
payonel
c7ec8b971c
keep frequency owner
2018-11-06 23:17:46 -08:00
payonel
2d3d95fadb
Merge branch 'master-MC1.11' into master-MC1.12
2018-11-06 22:37:12 -08:00
payonel
b511fdce9c
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/enderstorage/DriverFrequencyOwner.java
2018-11-06 22:35:15 -08:00
payonel
6f66d5272b
credit to amesgen, enderstorage setFrequency
...
apparently in 1.10 it is proper to call setFrequence a bit differently
closes #2802
closes #2803
2018-11-06 22:17:09 -08:00
payonel
7ef15e5b12
Merge branch 'master-MC1.11' into master-MC1.12
2018-11-06 20:16:54 -08:00
payonel
ad050fde4b
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/recipes/default.recipes
2018-11-06 20:16:37 -08:00
payonel
731b125d72
sensor lens item name in 1.10
...
closes #2446
2018-11-06 20:13:08 -08:00
payonel
89d305ca7b
Merge branch 'master-MC1.11' into master-MC1.12
2018-11-06 00:59:51 -08:00
payonel
538419e375
Merge branch 'master-MC1.10' into master-MC1.11
2018-11-06 00:59:42 -08:00
payonel
c36118c75f
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-11-06 00:58:15 -08:00
payonel
2256adf30c
protect lock data from being overwritten
2018-11-06 00:56:13 -08:00
payonel
3168deb974
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/common/item/traits/FileSystemLike.scala
2018-11-06 00:48:14 -08:00
payonel
9e910060e2
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/en_US.lang
# src/main/scala/li/cil/oc/Localization.scala
# src/main/scala/li/cil/oc/client/gui/Drive.scala
# src/main/scala/li/cil/oc/server/PacketHandler.scala
# src/main/scala/li/cil/oc/server/component/Drive.scala
2018-11-06 00:47:13 -08:00
payonel
4849ca425c
lock only with player, and stop lock overwrite
2018-11-06 00:13:33 -08:00
payonel
562ff0e30f
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/client/gui/Drive.scala
# src/main/scala/li/cil/oc/common/item/data/DriveData.scala
# src/main/scala/li/cil/oc/server/PacketHandler.scala
# src/main/scala/li/cil/oc/server/fs/FileSystem.scala
2018-11-06 00:06:35 -08:00
payonel
2611ecb265
new filesystem device feature, locked mode
...
A locked filesystem is readonly (in either managed or unmanaged modes)
It cannot be unlocked unless its mode is switched or it is recrafted -
both actions wipe the drive. The data is thus "locked" or protected
unless the drive is wiped. The player's displace name is also recorded
and shown in tooltips on the device to indicate who locked it. In this
manner, data authenticity can be trusted
closes #2138
2018-11-05 23:58:58 -08:00
Joseph C. Sible
b74a8037e7
Add "leashHolder" as a name
...
`field_110168_bw` was remapped from `leashedToEntity` to `leashHolder` as of the 20170919 mappings. Add this name so that the dev environments of other mods that use these mappings will work without "There were errors running the class transformer" messages.
2018-11-04 16:44:52 -08:00
payonel
eaf2738c00
Merge branch 'master-MC1.11' into master-MC1.12
2018-11-04 12:27:33 -08:00
payonel
4b8776f63b
Merge branch 'master-MC1.10' into master-MC1.11
2018-11-04 12:27:22 -08:00
payonel
8e31e73b09
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
2018-11-04 12:27:08 -08:00
payonel
ed99a18944
include internal components for adapter onAnalyze
...
closes #2977
2018-11-04 12:26:07 -08:00
payonel
80f6d592ab
apparently things change names when obfuscated
...
closes #2974
2018-11-03 21:13:17 -07:00
payonel
23500a50b7
Merge branch 'master-MC1.11' into master-MC1.12
2018-11-03 19:16:04 -07:00
payonel
b604e52a43
Merge branch 'master-MC1.10' into master-MC1.11
2018-11-03 19:08:45 -07:00
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
7b02269240
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
2018-11-03 15:28:32 -07:00
payonel
67c4ddde43
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/en_US.lang
# src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
# src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
# src/main/scala/li/cil/oc/integration/bluepower/BundledRedstoneDevice.scala
# src/main/scala/li/cil/oc/integration/bluepower/RedstoneDevice.scala
# src/main/scala/li/cil/oc/integration/computercraft/BundledRedstoneProvider.scala
# src/main/scala/li/cil/oc/integration/enderio/ProviderEnderIO.scala
# src/main/scala/li/cil/oc/integration/mcmp/PartPrint.scala
2018-11-03 15:21:21 -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
7faadb53ea
Merge branch 'master-MC1.11' into master-MC1.12
2018-10-31 03:12:10 -07:00
payonel
8612a1aa4f
Merge branch 'master-MC1.10' into master-MC1.11
2018-10-31 03:08:03 -07:00
