AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-01 00:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,191 Commits 29 Branches 143 Tags
Commit Graph

5191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
7341c20b55 Updated Forge, unfucked metadata on rotatables, yay me. Closes #1600. 2016-01-15 21:00:36 +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 Nücke
d335a77bc1 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 2015-12-31 12:21:44 +01:00
Florian Nücke
3091240c9e Update to MC1.8.9. 2015-12-31 12:16:13 +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 Nücke
3f70b74d24 Merge branch 'master-MC1.8.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8 2015-12-30 21:32:14 +01:00
Florian Nücke
8cd3625d1a Make coremod run in again -.- 2015-12-30 21:26:27 +01:00
Florian Nücke
b70c6cae3b Updated Notch-names in ClassTransformer. 2015-12-30 20:27:33 +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
a4d3101626 Forgot to save the node, ack! 2015-12-30 00:01:13 +01:00
Florian Nücke
8ac09f0174 Forgot to save the node, ack! 2015-12-29 23:59:52 +01:00
Florian Nücke
5721ef45ac Forgot to save the node, ack! v1.5.21-hotfix.1 2015-12-29 23:59:22 +01:00
Florian Nücke
fa2273acd0 Merge branch 'master-MC1.8.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 23:52:48 +01:00
Florian Nücke
a020657bf0 Update to TIS-3D 0.7.1. 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 23:50:16 +01:00
Florian Nücke
2739eae972 Update to TIS-3D 0.7.1. 2015-12-29 23:45:32 +01:00
Florian Nücke
88c1876122 Fix messing with TIS-3D manual, closes #1588. 2015-12-29 23:34:19 +01:00
Florian Nücke
d60f6743fd Fix messing with TIS-3D manual, closes #1588. 2015-12-29 23:30:54 +01:00
Florian Nücke
b8b6d5329e Updated TIS-3D dep. 2015-12-29 23:07:59 +01:00
Florian Nücke
90947436fe Also version bump for consistency... ugh. Time to port 1.6 to 1.8 >_> 2015-12-29 23:04:02 +01:00
Florian Nücke
c873f15db2 Fix OpenGL derpiness in drone and robot item renderer. JEI integration (hiding some items, e.g. robot proxy block used while robots are moving). 2015-12-29 22:59:06 +01:00
Florian Nücke
6458e1b149 Cherry picking is hard, apparently. 2015-12-29 20:47:13 +01:00
Florian Nücke
4faf61976c Added TIS-3D integration. 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 20:44:40 +01:00
Florian Nücke
02043ed83b Re-enable TIS-3D integration. 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 20:42:47 +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