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

6115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
db39561abf Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
 2019-11-16 10:22:39 -08:00
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
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
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
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
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
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
7683a6cb2b Merge branch 'master-MC1.7.10' into master-MC1.10 2019-08-24 23:26:40 -07:00
payonel
a713ee9741 charger can now charge items in player inventory 
closes #1356
 2019-08-23 23:09:23 -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
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
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
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
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
a50b237734 vt100 Hf position defaults to 1 2019-06-23 01:02:51 -07:00
payonel
94a066e4dd compile error fix 2019-06-23 00:51:37 -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
Wilma456 (Jakob0815)
91e913bbff Update robot.names 2019-06-14 21:01:51 -07:00
Vladimir Kalinin
99902fd205 Explicit type conversion for hash map (#3080) 2019-06-12 01:19:39 -07:00
payonel
bed66723a7 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-06-12 00:51:02 -07:00
payonel
7737a64c79 fixed t2 wireless cards NOT getting wired msgs 
closes #3102
 2019-06-12 00:48:23 -07:00
payonel
529ace3151 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
 2019-06-11 17:01:43 -07:00
payonel
df1939cb0e rack send message to mountables immediately 
relay (hub) doesn't repeat message in reverse
relay shows actual packets/cycle

closes #3095
 2019-06-11 09:09:40 -07:00
payonel
16aff3b3a7 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-06-11 03:34:58 -07:00
payonel
fac5ecbe87 allow signals of tables of simple key value types 2019-06-11 03:30:09 -07:00
payonel
915a215cd7 use https for deps 2019-06-11 03:22:40 -07:00
payonel
88d4bcaa46 bind(false) doesn't need to sleep > 0, there is 
still a balanced context cost with this change, and each bind() action
behaves roughly the same from significant empirical testing

closes #3062
 2019-06-11 03:21:45 -07:00
payonel
bff1b2310a fix alias reset, the clear call was not needed 2019-06-11 03:21:14 -07:00
payonel
174e55aba5 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-06-05 21:34:46 -07:00
payonel
0de0bf2ca0 provide configuration option to set max signal queue size 
closes #3084
 2019-06-05 21:29:00 -07:00
payonel
986d4345d8 read ch from next byte 
closes #3085
 2019-06-04 13:19:29 -07:00
Vladimir Kalinin
3868f99798 https://github.com/MightyPirates/OpenComputers/issues/2928 
AE2 Cells don't have extra information they should
 2019-06-04 10:34:02 -07:00
Lizzy
2fd3bb4d3a Fixed "Dev jar" link in read-me 
OC forums hasn't had the "pages" module on it since I took ownership in late 2016 and therefore this link is invalid
 2019-06-04 10:30:07 -07:00
payonel
c29fe8ef33 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-03-06 21:19:46 -08:00
payonel
92426e33d2 call uptime instead of using cached time 
waiting timers are starved otherwise
Also increment timeouts without drift
closes #3058
 2019-02-28 12:45:18 -08:00
payonel
fdd0f8c554 check for etc before trying to install oppm 
closes #2875
 2019-02-07 14:24:40 -08:00
payonel
7e836e73f1 Merge branch 'master-MC1.7.10' into master-MC1.10 2019-02-06 21:32:58 -08:00
payonel
cd9a92fd41 update changelog for 1.7.4 v1.7.4 2019-02-06 21:30:32 -08:00
payonel
27d34a668b Merge branch 'master-MC1.7.10' into master-MC1.10 2019-02-06 21:11:04 -08:00