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
payonel
44234814ad
detect fake player inventory changes
...
some mods may modify player inventory item arrays directly instead of through the container
also, this fixes other potential mods trying to update the inventory during actions
though unlikely, it would be supported now
closes #2751
2018-02-26 15:58:55 -08:00
payonel
ed1cedbc9d
Merge branch master-MC1.11 into master-MC1.12
2018-02-21 20:31:46 -08:00
payonel
6f1c913a90
fix compile error of merge
2018-02-21 20:27:02 -08:00
payonel
f73da4553a
fix merge compiler errors
...
(cherry picked from commit a1cd9349e8b15b5bf45c02c9bfa696ac954f514a)
2018-02-21 20:20:11 -08:00
payonel
6e0d51fbe4
Merge branch master-MC1.11 into master-MC1.12
2018-02-21 20:11:22 -08:00
payonel
edd4143f83
Merge branch master-MC1.10 into master-MC1.11
2018-02-21 20:08:23 -08:00
payonel
44daa2d3ed
Merge branch master-MC1.7.10 into master-MC1.10
2018-02-21 20:07:55 -08:00
payonel
615b2d496b
make no-recipe failure more obvious in code
2018-02-21 20:01:49 -08:00
payonel
a1cd9349e8
fix merge compiler errors
2018-02-21 19:50:15 -08:00
payonel
a38a920903
Merge branch master-MC1.11 into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
2018-02-21 11:49:26 -08:00
payonel
aeae7417d8
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
2018-02-21 11:44:25 -08:00
payonel
c054a0e598
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/block/Cable.scala
2018-02-21 11:41:24 -08:00
payonel
add65a0f65
stop crafting when craft result changes
...
closes #2054
2018-02-21 11:36:31 -08:00
SquidDev
9c00fcfc28
Make cable collision box closer to cable shape
2018-02-20 08:12:48 -08:00
SquidDev
2e5cca8dbf
Make cable collision box closer to cable shape
2018-02-20 08:03:02 -08:00
payonel
f11d384b51
follow fail pattern for addUser: throw on bad arg, nil on bad result
...
closes #2156
2018-02-20 07:44:41 -08:00
payonel
f90dcaaf32
Merge branch master-MC1.11 into master-MC1.12
...
fix appeng export bus exportIntoSlot
fix appeng export bus setExportConfiguration
fix appeng interface set configuration
closes #2658 for 1.12
2018-02-20 00:26:09 -08:00
payonel
3b627076f5
Merge branch master-MC1.11 into master-MC1.12
2018-02-20 00:22:28 -08:00
payonel
8958019f66
Merge branch master-MC1.10 into master-MC1.11
2018-02-20 00:22:22 -08:00
payonel
105e26b499
fix appeng export bus exportIntoSlot
...
closes #2658 for 1.10
2018-02-20 00:19:41 -08:00
payonel
4dff124cb4
use 1.12.2 versions
...
updating old function names to 1.12.2
2018-02-19 00:08:35 -08:00
payonel
142a4e2c07
Merge branch master-MC1.11 into master-MC1.12
2018-02-18 23:56:22 -08:00
payonel
7a9b9d7595
Merge branch master-MC1.10 into master-MC1.11
2018-02-18 23:50:11 -08:00
payonel
8b949bd563
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-02-18 23:49:39 -08:00
payonel
e91b8c0971
add isCraftable to ae item data returned to the machine
2018-02-18 23:38:08 -08:00
payonel
8387b847b4
Merge branch 'master-MC1.11' into master-MC1.12
2018-02-18 13:37:38 -08:00
payonel
1285c03861
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
2018-02-18 13:37:10 -08:00
payonel
245dac86a2
Merge branch master-MC1.11 into master-MC1.12
2018-02-18 13:30:54 -08:00
payonel
c23482f80e
Merge branch master-MC1.11 into master-MC1.12
2018-02-18 13:24:15 -08:00
payonel
166114dcc1
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# build.properties
# src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-02-18 13:23:19 -08:00
payonel
4cffec4548
update forge for 1.7.10
2018-02-18 13:01:50 -08:00
payonel
b24e3e6f6b
buffer mapped elements in cpu list so as to not lose equivalent cpus
...
closes #1921
2018-02-18 13:01:19 -08:00
payonel
17d5355c00
lowercase aliases for >= 1.11
...
closes #2737
2018-02-18 10:03:44 -08:00
payonel
07911b6c01
refactor ae get/set filter integration code
...
ae filtering now works on the exact same fields as returned to the lua state
closes #2718
2018-02-18 02:05:16 -08:00
payonel
b4e9682d57
Merge branch master-MC1.11 into master-MC1.12
2018-02-18 02:03:56 -08:00
