Thiakil
81840790ab
fix Extracells & mekanism deps. Fixes #2855
2018-07-04 16:12:33 -07:00
Adrian Siekierka
088964b168
fix #2858 ( #2882 )
2018-07-04 20:51:46 +02:00
payonel
ac67d8ba37
Merge branch 'master-MC1.11' into master-MC1.12
2018-03-20 14:17:56 -07:00
payonel
d3abf39e94
item stack usage changes fix
...
NonNullList::get(index) instead of array syntax (index)
and shrink(count) instead of directly adjusting the stackSize field
fixes build errors
2018-03-20 14:17:33 -07:00
payonel
74041d2d6e
Merge branch 'master-MC1.11' into master-MC1.12
2018-03-20 13:24:38 -07:00
payonel
aaa6b0d012
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/GuiHandler.scala
2018-03-20 12:58:59 -07:00
payonel
ba725c03b5
Merge branch 'master-MC1.11' into master-MC1.12
2018-03-20 12:36:03 -07:00
payonel
648cdf78aa
use ItemStack.EMPTY since 1.11 and not nulls
...
robot.use() was using a null pointer when not holding any item
closes #2786
2018-03-20 12:34:32 -07:00
payonel
23507d5c77
fix offhand actions
...
with tablets, databases, server racks, and disk drives
closes #1897
2018-03-19 21:29:13 -07:00
payonel
c79d9042cc
Merge branch 'master-MC1.11' into master-MC1.12
2018-03-18 23:21:08 -07:00
payonel
9543ac8168
remove file accidentally added back by merge
2018-03-18 23:19:41 -07:00
payonel
ac400a5485
Merge branch 'master-MC1.11' into master-MC1.12
2018-03-18 23:07:27 -07:00
payonel
5c116c5ccf
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/container/Player.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/server/component/Geolyzer.scala
# src/main/scala/li/cil/oc/server/component/RedstoneSignaller.scala
# src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
2018-03-18 23:06:52 -07:00
payonel
6130d0adc6
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/container/Player.scala
# src/main/scala/li/cil/oc/common/tileentity/NetSplitter.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/Redstone.scala
# src/main/scala/li/cil/oc/common/tileentity/Screen.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/server/component/Geolyzer.scala
# src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala
# src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
2018-03-18 23:06:08 -07:00
payonel
abe18ad535
add detect to geolyzer
...
this commit also fixes some positional issues with geolyzer and canSeeSky when used as an internal component with tablets and drones
this commit also adds the hover tier 2 upgrade to the creatix robot
closes #1863
2018-03-18 01:09:45 -07:00
payonel
8cac5dfcd3
add isSunVisible and canSeeSky to the geolyzer
...
this is a potential solution to robots that need to know if their solar panels are able to charge
if a geolyzer is also added to a robot, it can use the geolyzer component to check for charge options
issue #1778 specifically asked for similar api on the solar upgrade, but we didn't want to make the solar upgrade a component. Doing so would increase the component load of existing robots, which could cause existing robots to simply fail.
thus this is a compromise to that request
closes #1778
2018-03-17 20:46:30 -07:00
payonel
4a83d4426d
allow the robot to swing at anything that would block its movement
...
closes #1840
2018-03-17 19:58:23 -07:00
payonel
0095f33522
cleanup
2018-03-16 19:45:45 -07:00
payonel
37c3ddaf91
slot tier weighted fill
...
closes #1658
2018-03-16 19:45:39 -07:00
payonel
c69c9e6748
returning just the first value of debug getlocal and getupvalue
...
the suggested access was to return nil always as the value, but these values aren't nil, and I felt it reasonable to return at least the variable name and not mislead that the value was nil
closes #1607
2018-03-14 23:31:43 -07:00
payonel
d020e0d941
add new redstone_changed color parameter for bundled input
...
bundled inputs now include the color of the input that changed
also, the redstone_change signal for bundled input no longer sends the MAX old and MAX new values, but instead, only the old and new values of the specific color that changed
closes #1385
2018-03-14 17:29:36 -07:00
payonel
f6f067ef29
protect from missing nodes in hub plugs
...
closes #2445
2018-03-11 22:40:55 -07:00
payonel
54bf2c21e5
check slot index is in bounds
...
closes #1991 in some cases, the other cases are undefined/no repro
2018-03-11 22:36:49 -07:00
payonel
a28d16f5d9
close handles on process exit
2018-03-11 22:19:34 -07:00
Vexatos
abee0abda3
Merge remote-tracking branch 'origin/master-MC1.11' into master-MC1.12
...
# Conflicts:
# changelog.md
2018-03-11 20:53:20 +01:00
Vexatos
b7467c53f9
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.properties
# changelog.md
2018-03-11 20:52:01 +01:00
Vexatos
067d91f473
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# changelog.md
2018-03-11 20:50:30 +01:00
Vexatos
7b966cfdf6
Bump version for release.
2018-03-11 20:47:01 +01:00
payonel
c3f8d39307
Merge branch master-MC1.11 into master-MC1.12
2018-03-11 12:10:18 -07:00
payonel
d242ab442e
Merge branch master-MC1.10 into master-MC1.11
2018-03-11 12:10:13 -07:00
payonel
e77866f00a
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/java/li/cil/oc/api/prefab/ItemStackArrayValue.java
# src/main/scala/li/cil/oc/server/component/traits/WorldInventoryAnalytics.scala
2018-03-11 12:10:04 -07:00
payonel
352aaefbc5
Merge pull request #2075 from thiakil/WorldInventoryAnalytics-updates-pr
...
World Inventory Analytics Improvements
closes #2771
2018-03-11 12:07:53 -07:00
payonel
817fbb719e
fix eeprom recrafting
...
1.12 added more complexity in recipe matching for named items, which affects our drones and robots
Also while doing this work I found that our 1.12 crafting upgrade for robots was not adding the surplus objects from crafts - so I fixed that as well
closes #2685
2018-03-11 11:09:52 -07:00
payonel
05c0f074aa
fix merge
2018-03-09 00:24:49 -08:00
payonel
5c99f29641
Merge remote-tracking branch 'payo/master-MC1.11' into master-MC1.12-payo
2018-03-09 00:02:26 -08:00
payonel
73a217d69a
Merge remote-tracking branch 'payo/master-MC1.10' into master-MC1.11-payo
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
2018-03-09 00:01:30 -08:00
payonel
e8faf698b3
merge and compile fixes
2018-03-08 23:34:43 -08:00
payonel
1e05efc7e9
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
2018-03-08 22:53:17 -08:00
payonel
0df9a42904
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/client/PacketHandler.scala
# src/main/scala/li/cil/oc/common/init/Items.scala
# src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
# src/main/scala/li/cil/oc/server/agent/Inventory.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
# src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
2018-03-08 22:52:27 -08:00
payonel
d9a1767bc1
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/Proxy.scala
# src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
# src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
2018-03-08 22:43:46 -08:00
payonel
aac94d7f22
only use inv sync for item use
...
closes #2769
closes #2766
2018-03-08 21:47:09 -08:00
payonel
659af9e845
add setName and getName to robot component
...
The robot component is only loaded(connected) on computer cases and server racks
closes #2760
2018-03-04 20:12:54 -08:00
payonel
0341b1d0a3
share default arch code
2018-03-02 23:09:24 -08:00
payonel
60e706dcb2
use helper method to set default cpu
2018-03-02 22:13:56 -08:00
payonel
aba2225fa5
add config option to craft lua 5.3 cpu by default
...
only affects cpus and apus when crafted
also, /oc_spawnComputer (/oc_sc) will use the default lua setting
closes #2761
2018-03-02 18:53:21 -08:00
payonel
d17be6909b
small code cleanup
2018-02-27 17:17:13 -08:00
payonel
68c02b4c46
protect kernel _G from shell user programs
...
closes #2759
2018-02-27 17:17:13 -08:00
payonel
7d57408b69
Merge branch 'agent-use-item-1.11' into agent-use-item-1.12
2018-02-26 16:11:17 -08:00
payonel
e0da9589b0
Merge branch 'agent-use-item-1.10' into agent-use-item-1.11
...
# Conflicts:
# build.properties
# src/main/scala/li/cil/oc/server/agent/Inventory.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
2018-02-26 16:10:35 -08:00
payonel
63012c7580
Merge branch 'agent-use-item' into agent-use-item-1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/agent/Inventory.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
2018-02-26 16:07:24 -08:00
