AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 02:39:48 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,233 Commits 29 Branches 143 Tags
Commit Graph

6233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
payonel
07c237704d Merge branch 'master-MC1.7.10' into master-MC1.10 2018-11-16 02:52:49 -08:00
payonel
72e096e2c8 reduce some memory cost used by our default eeprom 2018-11-16 02:51:45 -08:00
payonel
c625978b06 official OC version bump to 1.7.3 2018-11-16 02:39:12 -08:00
payonel
ec64b50628 openos 1.7.3 version bump and final patch 2018-11-16 02:36:42 -08:00
payonel
106fa371c7 adding payo to pet list 2018-11-16 02:03:42 -08:00
payonel
941ceb2785 Merge branch 'master-MC1.10' into master-MC1.11 2018-11-14 19:35:54 -08:00
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
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
Adrian Siekierka
01cec929a7 funscii update to d30ed629 2018-11-14 14:58:14 -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
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
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
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
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
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
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
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