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

6639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
payonel
2ead42ee72 Merge branch 'master-MC1.10' into master-MC1.11 2019-08-19 13:53:02 -07:00
payonel
6ff0f28c42 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-08-19 12:24:39 -07:00
payonel
a5ec1700db check dimensions on hologram copy 
closes #3127
 2019-08-19 12:14:47 -07:00
payonel
5f3d04fa15 use config for build gradle value for charset 2019-08-13 00:18:24 -07:00
payonel
a7f000b9d2 copied charset to our own maven 2019-07-26 02:17:32 -07:00
asie
38d688a7e7 add SimpleLogic support, close #3023 2019-07-26 02:15:37 -07:00
payonel
838de82df9 woops, meant to grab only 1 return from assert 2019-07-15 02:11:37 -07:00
payonel
9a1923f7f4 check tostring result for print 
closes #3125
 2019-07-14 14:11:15 -07:00
payonel
8592241802 Add limited support for Thaumcraft essentia containers 
Item stacks of Thaumcraft items, such as esssentia jars, are a
pain to work with if you can't see their contents. The contents
are not hidden by Thaumcraft, so showing them isn't cheaty.

Making these available makes it possible to use OC to sort
essentia jars by contents, which is SUPER USEFUL since everything
else I have which sorts inventory ignores them.

this work was adjusted from PR #2942 by user @seebs
 2019-06-29 18:47:44 -07:00
payonel
a50b237734 vt100 Hf position defaults to 1 2019-06-23 01:02:51 -07:00
payonel
bfd2ceed8f Merge branch 'master-MC1.11' into master-MC1.12 2019-06-23 00:52:19 -07:00
payonel
11c42d8d46 Merge branch 'master-MC1.10' into master-MC1.11 2019-06-23 00:52:08 -07:00
payonel
94a066e4dd compile error fix 2019-06-23 00:51:37 -07:00
payonel
70f6e3c477 Merge branch 'master-MC1.11' into master-MC1.12 2019-06-23 00:15:10 -07:00
payonel
eeadbd6a75 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/init/Items.scala
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
 2019-06-23 00:05:21 -07:00
payonel
2c61578a1a Merge branch 'master-MC1.7.10' into master-MC1.10 2019-06-22 22:21:52 -07:00
Amanda Cameron
e0174b973f Make it possible to insert an Analyzer inside a tablet. 
This makes it so that the tablet can accept the Analyzer, which makes
it possible to "scan" the component type, and address of the component,
making the data available as a table in the `tablet_use` event, under
`analyzed`.
 2019-06-15 01:56:08 -07:00
Kingsley Chanakira
920e66bafd More HTTP request methods #1938 
Adds the ability to specify the HTTP method used when sending a request with the internet card.

Fixes https://github.com/MightyPirates/OpenComputers/issues/1938
 2019-06-15 00:15:53 -07:00
svitoos
e122f0d3d2 fixes issue "itemDamageRate Do not Work" #3041 2019-06-14 22:11:21 -07:00
Wilma456 (Jakob0815)
91e913bbff Update robot.names 2019-06-14 21:01:51 -07:00