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

4997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
a95fa2049e Moved hacky variable to SaveHandler, which totally makes it not a hack anymore. 
Seriously though, the alternatives I see would not be better in the least, since passing that state along would be completely unnecessary in 99% of the cases, but would break *everything*. Literally. All. The. Things. So this one's here to stay.
 2016-01-04 14:20:23 +01:00
Negi Springfield
e6a97f046a Add trading upgrade icon 2016-01-03 17:30:03 +01:00
Inari
721bc9b9a2 Add trading card upgrade code, recipes, config options, and language names (for EN/DE) 2016-01-03 17:29:52 +01:00
Florian Nücke
db36d01032 Fixed all file system speeds being off by one, causing raid to be broken. 
Fixed potential NPE while loading, leading to raids losing their contents e.g.
 2016-01-03 12:22:24 +01:00
Florian Nücke
337fed7d9c Even hackier hacky hack fix for same issue with machine state. 2016-01-02 16:16:14 +01:00
Florian Nücke
fb88a19e10 Hacky hack to avoid filesystems flushing to real HDD when sending client descriptor packets. 2016-01-02 15:44:40 +01:00
Florian Nücke
5ca28b2d92 Switched to Java built-in Deflater/Inflater. 2016-01-02 14:53:36 +01:00
Florian Nücke
844cd9d334 Don't send init to non-origin screens, should reduce screen init packet spam a good bit for multi-block screens. 2016-01-02 14:26:55 +01:00
Florian Nücke
ebb60e3213 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-01-02 14:19:54 +01:00
Florian Nücke
c958ae5387 GZIP compression fix from BTM16. 2016-01-02 14:19:41 +01:00
Florian Nücke
8d995a8e28 Patched Lua 5.3.2. 2016-01-02 14:19:14 +01:00
Florian "Sangar" Nücke
7b9d8c19f7 Merge pull request #1591 from magik6k/plan9k 
Ninjafix unbootable plan9k floppy
 2015-12-31 11:40:19 +01:00
Łukasz Magiera
81aedd6152 Ninjafix the ninjafix 2015-12-31 03:03:11 +01:00
Łukasz Magiera
7b69bf4cab Ninjafix unbootable floppy 2015-12-31 02:48:44 +01:00
Florian "Sangar" Nücke
38ff08a242 Merge pull request #1590 from magik6k/plan9k 
Update Plan9k
 2015-12-30 19:06:45 +01:00
Łukasz Magiera
ceb79a5baf Update Plan9k 2015-12-30 19:01:52 +01:00
Florian Nücke
98beb8e003 Forgot to save the node, ack! 2015-12-30 00:25:01 +01:00
Florian Nücke
9dff887a7f Update to TIS-3D 0.7.1. 2015-12-30 00:25:01 +01:00
Florian Nücke
8af53583dd Fix messing with TIS-3D manual, closes #1588. 2015-12-30 00:25:01 +01:00
Florian Nücke
fd00e0dce6 Added oc_profileNetwork or oc_pn command to enable logging packets being sent by the server. 2015-12-29 17:15:57 +01:00
Florian Nücke
bfab896a28 Added TIS-3D integration. 2015-12-29 15:04:19 +01:00
Florian Nücke
2c672c497b Fixed GT recipes, closes #1542. 2015-12-27 15:00:23 +01:00
Florian Nücke
326bafca1d Lowercase errors masterrace. 2015-12-27 14:54:34 +01:00
Florian Nücke
7c2a0541e4 Merge branch 'request-headers' of https://github.com/invliD/OpenComputers into master-MC1.7.10 2015-12-27 14:52:34 +01:00
Florian Nücke
19144d2dc7 Don't disable grog in GT recipe set since it's needed for removing nanomachines now. Closes #1577. 2015-12-27 13:30:45 +01:00
Florian Nücke
9b45cf894a Handle disabled command blocks more gracefully in driver, closes #1575. 2015-12-27 13:25:10 +01:00
Florian Nücke
43d2fba5bf Also grant achievements when picking up related item, not just when assembling/crafting it, closes #1578. 2015-12-27 13:13:14 +01:00
Florian Nücke
178e0c026b Should fix #1574. 2015-12-27 13:04:16 +01:00
Sebastian Brückner
c2e379a757 Added support for HTTP request headers. 2015-12-25 21:14:14 +01:00
Florian Nücke
e1494e9224 Fixed rack internal connectable <-> connectable comms. 2015-12-25 20:28:03 +01:00
Florian Nücke
1bc4695933 Updated native Lua 5.3 to 5.3.2. 2015-12-25 16:09:05 +01:00
Florian Nücke
a3f2e5e31c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-12-24 14:54:50 +01:00
Florian Nücke
ff87273670 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/resources/assets/opencomputers/lang/ru_RU.lang
 2015-12-24 14:54:35 +01:00
Florian "Sangar" Nücke
03aab465e9 Merge pull request #1582 from PotatoTrumpet/patch-1 
Add 2 Robot Names
 2015-12-24 14:53:42 +01:00