AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-26 06:25:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,279 Commits 29 Branches 143 Tags
Commit Graph

5279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
repo-alt
8006f33b04
Merge pull request #9 from repo-alt/master-MC1.7.10 
null check & a bit cleanup
 2020-04-15 00:42:04 +03:00
repo_alt
c462e6075b null check & a bit cleanup 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5919
 2020-04-14 23:37:11 +03:00
Dream-Master
50ce35628e bump version 2020-03-30 11:43:55 +02:00
Martin Robertz
1695dfc284
Merge pull request #8 from repo-alt/feature/MultTtankSupport 
Added source tank parameter to the transposer.transferFluid
 2020-03-30 00:47:44 +02:00
repo_alt
14537b2009 Added source tank parameter to the transposer.transferFluid 2020-03-30 00:26:53 +03:00
repo-alt
afb7f650e7
Merge pull request #7 from repo-alt/ic2-crop-integration 
Ic2 crop integration fix & upstream update
 2020-02-26 20:01:22 +03:00
repo-alt
72680f6725
Merge branch 'master-MC1.7.10' into ic2-crop-integration 2020-02-26 19:37:17 +03:00
repo_alt
dbf4dfdc1d geolyzer should also update scan level, acting as crop scanner 
add 'maxSize' to the scan output to better decide harvest time
 2020-02-26 19:15:39 +03:00
repo_alt
0aeca03d6c updated ic2 version for the new crops interface 2020-02-26 17:34:18 +03:00
repo_alt
065ab066db Added IC2 crop breeding integration. 
Updated IC2 API version reference (old api is deprecated)
 2020-02-26 17:15:49 +03:00
repo_alt
9ae594dc7c Merge branch 'master-MC1.7.10' of https://github.com/MightyPirates/OpenComputers into master-MC1.7.10 2020-02-26 17:09:42 +03:00
hohserg
b9cc1663b2 Added waypoints addresses to navigation#findWaypoints 
Like
{
  redstone = <power>,
  position={<x>,<y>,<z>},
  label = "<label>",
  address = "<waypoint address uuid>"
}
 2020-01-30 19:22:52 -08:00
payonel
a19bb2b692 fix for setGameType, asie and BrisingrAerowing were right 
closes #2911
 2020-01-30 19:17:25 -08:00
payonel
67c375391b whoops, forgot color 
#closes 3184 again
 2020-01-28 00:07:59 -08:00
JakobDev
d03b217115 Update de_DE.lang 2020-01-26 23:07:26 -08:00
JakobDev
142ffdcf4c Fix Comment 2020-01-26 23:07:26 -08:00
JakobDev
4cc148778a Update German Translation 2020-01-26 23:07:26 -08:00
payonel
e911f8af60 rotate side arg for redstone signal to relative side for rack and computer 
closes #3184
 2020-01-26 22:16:57 -08:00
payonel
bec3b09fc0 fix wireless card behavior for tier 1 and tier 2 
closes #3195
 2020-01-25 21:08:04 -08:00
payonel
5b1c60f5ed simplify io stream argument options 
also, fix mistake in text streams

closes: #3201
 2020-01-25 16:12:00 -08:00
payonel
8fe92ee191 fix text stream writer and clean up reader code along with this 2020-01-25 15:28:54 -08:00
Cruor
004ada9ae8 Fixed typo 2020-01-24 23:13:37 -08:00
Cruor
6e242128ee Added binary support to 'text.internal.reader' 2020-01-24 23:13:37 -08:00
Vexatos
e452b1fb5e Switched to Gradle 5 version on Minecraft 1.7.10 
Using a fork of ForgeGradle for that which updates it to that version.
 2019-12-30 19:54:45 -08:00
Vexatos
36b9ba06d7
Downgraded Ubuntu version on travis to hopefully fix #3144. (#3198) 2019-12-26 00:10:03 +01:00
Smollet777
0a65a5a83b Update ru_RU.lang 2019-12-19 09:08:17 -08:00
Fingercomp
808d140b5f Use rawequal for comparison to avoid invoking __eq 2019-11-21 08:32:58 -08:00
Martin Robertz
4f95ff4fa6
Merge pull request #6 from GTNewHorizons/test 
Test
 2019-11-17 16:02:54 +01:00
Dream-Master
22658251e9 Merge branch 'master-MC1.7.10' into test 
# Conflicts:
#	build.properties
 2019-11-17 16:00:20 +01:00
Vexatos
343ce9687a Version and changelog bump. v1.7.5 2019-11-17 00:40:38 +01: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
dd63789b81 fix available archs based on configurations 
closes #2986
 2019-11-15 23:00:34 -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
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
84525eba7d throw custom too-long-without-yielding 
closes #3150
 2019-11-10 23:51:40 -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
a713ee9741 charger can now charge items in player inventory 
closes #1356
 2019-08-23 23:09:23 -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
a7aad36ed5 changing tooltip for APU tiers to match cpu tier 
closes #3141
 2019-08-19 23:25:20 -07:00
payonel
a5ec1700db check dimensions on hologram copy 
closes #3127
 2019-08-19 12:14:47 -07:00
Dream-Master
48e18d75ba bump version 
add files to gitignore
 2019-07-22 19:41:43 +02:00
Martin Robertz
d41ad02161
Merge pull request #5 from repo-alt/ic2-crop-integration 
Ic2 crop integration
 2019-07-21 22:18:19 +02:00
repo_alt
f846726b46 Added IC2 crop breeding integration. 
Updated IC2 API version reference (old api is deprecated)
 2019-07-21 22:06:26 +03:00
repo_alt
d82e06f83f Merge branch 'master-MC1.7.10' of https://github.com/MightyPirates/OpenComputers into master-MC1.7.10 2019-07-21 17:05:20 +03: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
Martin Robertz
620d360b46
Merge pull request #4 from MightyPirates/master-MC1.7.10 
pull from main fork
 2019-06-23 22:13:21 +02:00
repo_alt
53e18856b1 Merge branch 'master-MC1.7.10' of https://github.com/MightyPirates/OpenComputers into master-MC1.7.10 2019-06-23 18:31:19 +03:00
payonel
a50b237734 vt100 Hf position defaults to 1 2019-06-23 01:02:51 -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