AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 02:39:48 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,681 Commits 29 Branches 143 Tags
Commit Graph

4681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f85c441a1a Merge branch 'master-MC1.7.10' of https://github.com/tim4242/OpenComputers into master-MC1.7.10 2016-02-24 20:13:19 +01:00
Florian Nücke
593ae97a6f Merge branch 'cp-x' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-02-24 20:07:34 +01:00
Florian Nücke
6c050032a3 Organize imports. 2016-02-24 19:59:35 +01:00
Florian Nücke
bb3b9fd4cd Merge branch 'dyeable-hoverboots' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-02-24 19:30:30 +01:00
Florian Nücke
94721f03ea Super minor cleanup. 2016-02-24 19:30:04 +01:00
Vexatos
b2105d9963 Added information on dyeing to the manual. 2016-02-22 22:44:08 +01:00
Vexatos
1f13395dcc Made hover boots lose their colour when tossed into a cauldron. 2016-02-22 22:14:36 +01:00
Vexatos
726ceae91f Made Hover Boots dyeable. 2016-02-22 14:36:03 +01:00
tim4242
f5d347e2e2 Modernized PetRenderer 
- Made player checking UUID based
- Made in inventory detection better
 2016-02-20 17:51:04 +01:00
DrummerMC
f76f2448c7 Disable ThaumicEnergistics by default 2016-02-14 13:06:24 +01:00
DrummerMC
590ecebc33 Add ThaumicEnergistics support 2016-02-14 00:07:40 +01:00
payonel
d9bd0096be fixing cp -x 2016-02-11 23:52:30 -08:00
Florian Nücke
54de3fe89d Merge branch 'text-split-perf' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-02-11 14:55:27 +01:00
payonel
c3a391d558 fix cp one file system option 
one file system check allows recursive copy where the path is the parent of the destination but said paths are on different file systems
 2016-02-10 20:05:46 -08:00
payonel
a59859b225 severe text split inefficiency found and fixed 2016-02-10 13:01:46 -08:00
Florian Nücke
c7f959d4ec Merge branch 'openos-upgrade-merge' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-02-07 12:47:21 +01:00
Florian Nücke
2d28a6e000 Remove __gc from pipes and rename table in guid lib to match lib name. 2016-02-07 12:47:00 +01:00
Florian Nücke
181ddc2019 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-02-07 12:46:27 +01:00
Florian Nücke
55b9809493 Oredictify diamonds in recipes. Closes #1637. 2016-02-07 12:46:04 +01:00
Florian "Sangar" Nücke
ab0587b216 Merge pull request #1640 from ItsTheKais/master-MC1.7.10 
Mystcraft converters look for correct NBT tag for book name
 2016-02-07 12:27:07 +01:00
payonel
7555a9598d fix cp one file system option and fix no args to time command 2016-02-05 20:36:24 -08:00
ItsTheKais
be45ceda34 Fixes Mystcraft integration looking for wrong name tag 2016-02-05 21:20:18 -07:00
payonel
c414f7428d openos 1.6 upgrade: new bin utils, memory optimizations, and bug fixes 2016-02-02 00:19:42 -08:00
Florian Nücke
55dd320b2a Merge branch 'patch-2' of https://github.com/SoniEx2/OpenComputers into master-MC1.7.10 2016-01-31 17:58:48 +01:00
Florian Nücke
c1749efb2d Log restored chunk loader ticket locations, closes #1616. 2016-01-31 17:58:13 +01:00
Florian Nücke
6ef92b9ef5 Better screen fixery. I hope. 2016-01-31 17:56:37 +01:00
Soni L
07f452125c Fix __gc and use raw metatable when it's disabled 
This fixes a small __gc abuse I found, and also uses the raw metatable in a safe way when __gc is disabled. Both were tested.
 2016-01-31 14:46:52 -02:00
Florian Nücke
ac64edd1c7 Properly send viewport size in text buffer init, should fix #1609. 2016-01-31 17:13:35 +01:00
Florian Nücke
969e6ebf94 Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558. 2016-01-31 16:58:52 +01:00
Florian Nücke
c7621294d3 Get rid of usages of __gc. Closes #1606. 
Wrapping file handles with userdata that has a `dispose` closing the handle.
Internet card already closed via userdata, so nothing to do there.
Removed cleanup logic from term, deal with it.
Added setting to re-enable it, if you really really need it.
 2016-01-31 15:58:40 +01:00
Florian Nücke
3b0082303e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-01-31 14:46:11 +01:00
Florian Nücke
45d8a20118 Fix potentially unexpected behavior when using custom __pairs for metatables. Closes #1625. 2016-01-31 14:45:48 +01:00
Florian "Sangar" Nücke
a14c7cf973 Merge pull request #1628 from habnabit/ae2-cpu-selection 
Allow specifying AE2 CPU when crafting
 2016-01-31 14:09:23 +01:00
Florian "Sangar" Nücke
bc100426bc Merge pull request #1622 from Landrash/patch-1 
Mycroft Holmes
 2016-01-31 13:57:21 +01:00
Florian "Sangar" Nücke
ef2c70a77b Merge pull request #1617 from gamax92/debug-playSoundAt 
Added `playSoundAt` to debug card.
 2016-01-31 13:53:12 +01:00
Aaron Gallagher
c1181babd6 Allow specifying AE2 CPU when crafting. 2016-01-24 09:12:37 -08:00
Landrash
0cbd75be0a Mycroft Holmes 
Suggestion to add Mycroft Holmes to the List of robot names.
From the book The Moon Is a Harsh Mistress.

Qoute from Wikipedia - https://en.wikipedia.org/wiki/The_Moon_Is_a_Harsh_Mistress
Mike, alias 'Adam Selene', alias 'Simon Jester', alias 'Mycroft Holmes', officially an augmented HOLMES IV system, is a supercomputer empowered to take control of Lunar society, who achieved self-awareness when his complement of "neuristors" exceeded the number of neurons in the human brain.
 2016-01-19 17:55:01 +07:00
gamax92
457e18be64 Added playSoundAt to debug card. 2016-01-15 15:00:56 -07:00
Florian "Sangar" Nücke
96ee1ec6e6 Merge pull request #1612 from magik6k/deps 
Use coloredlightscore jenkins
 2016-01-15 21:23:15 +01:00
Florian Nücke
0ba31b7be0 Less copy-pasta-y doc for viewport. 2016-01-15 21:09:54 +01:00
Łukasz Magiera
734a80875d Use coloredlightscore jenkins 2016-01-14 15:36:00 +01:00
Florian "Sangar" Nücke
11606c7be6 Merge pull request #1603 from cyber01/RU_doc 
Russian translation for Trading Upgrade/TIS-3D integration.
 2016-01-12 19:25:57 +01:00
cyber01
9976b64100 Trading Upgrade/TIS3d 2016-01-06 19:47:57 +03:00
Florian Nücke
e7f0384666 Added Rack.indexOfMountable. 2016-01-06 13:24:18 +01:00
Florian Nücke
fe99d6867c Should fix #1589. 2016-01-06 13:13:38 +01:00
Florian Nücke
bbedc984bb Closes #1602. 2016-01-06 12:52:11 +01:00
Florian Nücke
58899fb82e Implemented gpu.setViewport. 2016-01-05 15:41:18 +01:00
Florian Nücke
c3e44af3f6 Take into account NBT when trying to extract item of specified stack type from inventory. 2016-01-04 18:44:52 +01:00
Florian Nücke
58de9015c3 Refactored a few things out of the trading upgrade into InventoryUtils, making things a little more consistent, added manual entry for trade upgrade, tweaked the texture for the trade upgrade a bit. 2016-01-04 18:41:40 +01:00
Florian Nücke
7af4b41b1e Merge branch 'UpgradeTrading' of https://github.com/Inari-Whitebear/OpenComputers-TradingUpgrade into master-MC1.7.10 2016-01-04 15:03:47 +01:00