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

6759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
bfed64fa2d reducing some cost to calling ae getCraftables when no filter is given 
this delays calling ae.getItemStack until user code calls it for individual
items. this is vey helpful for servers with huge numbers of craftables
otherwise, all serializing calls happen on the main thread
closes #2964
 2019-11-16 10:17:47 -08:00
payonel
359f1c138d Merge branch 'master-MC1.11' into master-MC1.12 2019-11-15 23:07:52 -08:00
payonel
982dab9f70 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/EventHandler.scala
 2019-11-15 23:06:14 -08:00
payonel
751471905e Merge branch 'master-MC1.7.10' into master-MC1.10 2019-11-15 23:02:56 -08:00
payonel
dd63789b81 fix available archs based on configurations 
closes #2986
 2019-11-15 23:00:34 -08:00
payonel
73733dc7ad Merge branch 'master-MC1.11' into master-MC1.12 2019-11-14 22:47:42 -08:00
payonel
ba7e110c5f Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2019-11-14 22:46:48 -08:00
payonel
d47915fece Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2019-11-14 22:44:47 -08:00
payonel
063418a297 require minimum of 1000 mb to place fluid source block 
closes #3116
 2019-11-14 22:41:29 -08:00
payonel
4334aa0053 Merge branch 'master-MC1.11' into master-MC1.12 2019-11-14 00:58:55 -08:00
payonel
f5f8f8e0b2 Merge branch 'master-MC1.10' into master-MC1.11 2019-11-14 00:54:37 -08:00
payonel
569829ee69 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-11-14 00:37:43 -08:00
payonel
fb2340baa3 raids are unlocked managed only devices 
hard disk drives put in raids are wiped
and wiping a disk should reset it to managed and unlocked
resolves #2874
 2019-11-14 00:32:07 -08:00
payonel
7cbbf132cf bring back wireless redstone (cbe) support 
closes #2987
 2019-11-12 23:57:25 -08:00
payonel
fb1ba7472f verify block is still at location changing state 
closes #3175
 2019-11-12 22:50:23 -08:00
payonel
e5370b5aec update codechickenlib 2019-11-11 19:35:35 -08:00
payonel
177542577c wip: wr-cbe 2019-11-11 19:08:31 -08:00
payonel
242ae9510b Merge branch 'master-MC1.11' into master-MC1.12 2019-11-10 23:52:29 -08:00
payonel
93034c4ca0 Merge branch 'master-MC1.10' into master-MC1.11 2019-11-10 23:52:19 -08:00
payonel
7d5f10a600 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-11-10 23:52:01 -08:00
payonel
84525eba7d throw custom too-long-without-yielding 
closes #3150
 2019-11-10 23:51:40 -08:00
payonel
552d41060b Merge branch 'master-MC1.11' into master-MC1.12 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/Agent.scala
 2019-11-09 23:15:39 -08:00
payonel
b3f33c92e8 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2019-11-09 23:08:09 -08:00
payonel
83e0dd3d73 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/server/agent/Player.scala
#	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2019-11-09 22:58:51 -08:00
payonel
56f8fdbaa9 Fixes an issue where a robot without an inventory was deleting the 
drops. The core problem here actually is that OC agents try to
pull items directly out of killed/destroyed blocks via capturedDrops,
and the robots also pick up items from collision.
The collision code was written to always destroy the drops.
The code that tries to pull items out of capturedDrops spawns items in
world when there is no room in the robot.
Mob drops cause collision pickup AND run the capturedDrops code. When
collision doesn't take anything, and kills the drops, the items are lost.

The best fix would be to stop taking items directly from capturedDrops,
but this code has been here for some time, and we'll leave it for now.

The next best fix is to not always destroy drops on collision, but let
mc code handle collision cleanup as it was designed. Then, when taking
capturedDrops directly, first check if there is an inventory.

This solution leaves one last loop hole, collision doesn't find a place
in inventory and thus has valid world drops.

We can't ignore collision for attacks because the mobs are putting items
in the world. But instead, we need to stop capturedDrops action from
spawning in the world.

closes #3172
 2019-11-09 22:46:31 -08:00
payonel
c0417c171a update gradle 2019-11-08 22:54:45 -08:00
payonel
8ec5323268 check for nulls on remote terminals 
could not repro the crash, but just adding some null checks to be sure
closes #2994
 2019-08-25 00:34:35 -07:00
payonel
5b7aa252f5 Merge branch 'master-MC1.11' into master-MC1.12 2019-08-24 23:27:05 -07:00
payonel
a5a7a11b8a Merge branch 'master-MC1.10' into master-MC1.11 2019-08-24 23:26:55 -07:00
payonel
7683a6cb2b Merge branch 'master-MC1.7.10' into master-MC1.10 2019-08-24 23:26:40 -07:00
payonel
6e737dad97 fix isSunVisisble, needs better parens 2019-08-24 23:08:03 -07:00
3TUSK
cd88968517 Update the S. Chi. translation of manual 
Co-authored-by: ZeroAurora <zeroaurora@qq.com>
Co-authored-by: JackyWangMislantiaJnirvana <wmjwld@live.cn>
 2019-08-24 22:25:44 -07:00
3TUSK
3fdbba0561 Update zh_CN.lang 2019-08-24 22:25:44 -07:00
payonel
eb3e6d8727 add experience upgrade tooltip to show level 
closes #2664
 2019-08-24 22:23:08 -07:00
payonel
a713ee9741 charger can now charge items in player inventory 
closes #1356
 2019-08-23 23:09:23 -07:00
payonel
b7c7ed8221 Merge branch 'master-MC1.11' into master-MC1.12 2019-08-23 22:51:53 -07:00
payonel
c6ddca1084 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
 2019-08-23 22:51:38 -07:00
payonel
1bacda455c Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
 2019-08-23 22:14:35 -07:00
payonel
ce1b7010f4 charger can now charge items in player inventory 
closes #1356
 2019-08-23 22:07:56 -07:00
payonel
3f2757ad93 adding angle upgrade support to drones 
closes #985
only for 1.12
 2019-08-23 15:07:23 -07:00
payonel
c892929325 add angel support to drones 2019-08-22 22:16:29 -07:00
RafaGnious
9de3ee9dbc Added Ordis (Warframe) 
In the wiki: https://warframe.fandom.com/wiki/Ordis
Ordis is a cephalon which is the name for the forms of artificial intelligence in Warframe ( https://warframe.fandom.com/wiki/Cephalon ).
 2019-08-22 19:59:38 -07:00
payonel
ca15f90526 dont die without channels 
apparently, without channels enabled, there is no controller block loaded
closes #3055
 2019-08-20 14:54:47 -07:00
payonel
ef3e863be3 ae2 fix: probably protects from stackoverflow 
closes #3123
 2019-08-20 10:47:24 -07:00
payonel
315a45225c Merge branch 'master-MC1.11' into master-MC1.12 2019-08-19 23:28:02 -07:00
payonel
ad0193688f Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
 2019-08-19 23:27:51 -07:00
payonel
e7d7855142 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-08-19 23:26:23 -07:00
payonel
a7aad36ed5 changing tooltip for APU tiers to match cpu tier 
closes #3141
 2019-08-19 23:25:20 -07:00
payonel
a9b7f4ac72 guard against missing classes in ic2 classic 
closes #3137
 2019-08-19 16:27:02 -07:00
payonel
44e6a3a056 Merge branch 'master-MC1.11' into master-MC1.12 2019-08-19 13:53:12 -07:00