AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-08-03 19:17:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,320 Commits 29 Branches 143 Tags
Commit Graph

6320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vexatos
5fa171a3ea Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	build.properties
 2019-11-17 00:44:44 +01:00
Vexatos
4ce2bf203e Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10 2019-11-17 00:43:55 +01:00
Vexatos
343ce9687a Version and changelog bump. v1.7.5 2019-11-17 00:40:38 +01:00
payonel
ea27e2ecef Merge branch 'master-MC1.10' into master-MC1.11 2019-11-16 10:23:56 -08:00
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
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
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
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
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
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
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
a713ee9741 charger can now charge items in player inventory 
closes #1356
 2019-08-23 23:09:23 -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
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
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
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
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
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
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
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
de3e80456c Merge branch 'master-MC1.10' into master-MC1.11 2019-06-12 00:54:26 -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
6d86b50edf Merge branch 'master-MC1.10' into master-MC1.11 2019-06-11 17:11:12 -07:00
payonel
51fac50837 Merge branch 'master-MC1.10' into master-MC1.11 2019-06-11 17:06:04 -07:00