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,191 Commits 29 Branches 143 Tags
Commit Graph

5191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2cba7bc182 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2016-03-27 12:24:09 +02:00
Florian Nücke
91e8b461ef Merge branch 'about-time' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-03-27 12:09:15 +02:00
payonel
cbf676435c give /bin/time much better output using uptime, big thanks to gamax92 2016-03-26 21:05:26 -07:00
payonel
53d97fd21f make coroutine wrap create tracked coroutines, needed for process data 2016-03-26 19:54:05 -07:00
cyber01
cfa513088e Updates for 1.6 2016-03-26 23:06:45 +03:00
Florian Nücke
82b3eaf174 For those not checking for null... 2016-03-26 19:56:52 +01:00
Florian Nücke
8d38564a14 Because why not. 2016-03-26 17:06:06 +01:00
Florian Nücke
bd5acfaf99 Make blocks' Environment, SidedEnvironment and Colored interfaces accessible via the new capability system. 
Automatically generates a provider for tile entities implementing these interfaces.
Using capability system to access the interfaces instead of casting the tile entity.
Allow specifying whether coloring controls connectivity in interface.
 2016-03-26 17:05:57 +01:00
Florian Nücke
6bfe633141 Fixed Chamelium blocks (and others) to be schizophrenic about having a tile entity, leading to constant chunk re-renders. 2016-03-26 17:03:57 +01:00
Florian Nücke
a1d53df69c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-26 14:06:01 +01:00
Florian Nücke
8087d6523a Hardened unbuffered filesystems. Closes #1707. 2016-03-26 14:00:04 +01:00
Florian Nücke
0c0880d836 Properly erroring on ".." as path to FS methods. Closes #1708. 2016-03-26 13:28:25 +01:00
Florian Nücke
89bcfe4bba Adjustment for 1.8.9. 2016-03-24 22:38:47 +01:00
Florian Nücke
aaf047f75d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-24 22:38:03 +01:00
Urey.X
9bb3fae8d3 Update zh_CN.lang 2016-03-24 13:48:55 -04:00
Florian Nücke
21bcc410d4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-23 21:03:45 +01:00
Florian Nücke
93db1e1855 Updated LuaJ and passing along raw bytes from LuaJ strings for checkByteArray, leaving utf8 decoding to checkString. 2016-03-23 21:02:42 +01:00
Florian Nücke
ae4ec19bcb This may or may not work. 2016-03-21 21:06:11 +01:00
Vexatos
a2653e3ddb Fixed side-only method in hover boots not being side-only. 2016-03-20 22:36:47 +01:00
Florian Nücke
7bbf9d2d9d Mark rack block as changed to trigger re-rendering when mountable data changes. 2016-03-20 21:28:52 +01:00
Florian Nücke
fb51b88715 Update all the things to get Computronics to run in dev-env >_> 2016-03-20 21:28:09 +01:00
Florian Nücke
bc46d72ca9 Color migration. 2016-03-20 20:56:56 +01:00
Florian Nücke
93c3752430 More client side inventory update fixery, closes #1693. 2016-03-20 20:17:45 +01:00
Florian Nücke
b7e45c4a52 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-20 19:27:00 +01:00
Florian Nücke
399e0f44e6 This is now a one-way street. 2016-03-20 19:22:07 +01:00
Florian Nücke
7951b13325 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-20 19:03:27 +01:00
Florian Nücke
7c8b886527 Sided! 2016-03-20 18:04:21 +01:00
Florian Nücke
be17da8365 Merge branch 'master-MC1.7.10' of https://github.com/gdude2002/OpenComputers into master-MC1.7.10 2016-03-20 18:02:16 +01:00
Gareth Coles
c102f35ce0 Remove setEnabled as a block update will override it 2016-03-20 17:02:19 +00:00
Florian Nücke
e98465441f Colors remember their color when in item form now. This also means that dye is consumed when dyeing cables. They can also be recolored while in item form by crafting them with a dye. Closes #1529. 2016-03-20 17:54:39 +01:00
Gareth Coles
504d1394d2 Add integration with the IC2 redstone port 2016-03-20 16:45:45 +00:00
Florian Nücke
9099729c46 Wording. 2016-03-20 16:42:25 +01:00
Florian Nücke
fb7aa123ef Added setting to allow disabling nanomachine particle effects client side for people running MC on a toaster. Closes #1550. 2016-03-20 16:42:05 +01:00
Florian Nücke
72d8a13a8a Reworked some recipes in an attempt to reduce tedium by adjusting costs and introducing more multi-output (e.g. getting multiple raw circuit boards from one crafting operation). 
Also introduced a diamond chip item to reduce the massive ramp in cost for tier three stuff. The diamond prices were a little insane. Better late than never, right? Right!?
People yelling at me for the recipes being too cheap now in 3, 2, ... (hardmode hasn't changed!)
 2016-03-20 16:31:29 +01:00
Florian Nücke
8a5cdada39 Update manual for 1.6 changes, closes #1694. 2016-03-20 14:59:38 +01:00
Florian Nücke
f2d0ad409b Blacklist fake endstone from manual. 2016-03-20 14:58:38 +01:00
Florian Nücke
279a87e473 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-20 12:38:03 +01:00
gamax92
72903f731d Updated LuaJ to 3.0.1, closes #1699. 2016-03-20 10:50:34 +01:00
Florian Nücke
5deb8083c2 Added support for RotaryCraft power, closes #1695. 
Also fixed power conversion for a couple of other mods >_>
 2016-03-20 10:36:26 +01:00
Florian Nücke
9946bb0fa5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-19 21:54:58 +01:00
Florian Nücke
e5439df28d Hide access point and switch in NEI b/c they're deprecated. 2016-03-19 21:53:50 +01:00
Florian Nücke
1414f99b2d Updated JEI integration. 2016-03-19 21:48:22 +01:00
Florian Nücke
6b85923a96 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-19 21:31:46 +01:00
Florian Nücke
5b6bcab305 Whoops. 2016-03-19 21:14:09 +01:00
Florian Nücke
d5468bfa93 Switch *ALL THE THINGS* to SidedBlock .-. Closes #1674. Also added new prefabs and deprecated Block using ones, closes #1691. 2016-03-19 21:09:10 +01:00
Florian Nücke
755a77d6e4 Made cowfs in p9k not depend on handles being numbers, closes #1696. 2016-03-19 15:01:00 +01:00
Florian Nücke
cc02d69320 Fixed tostring on userdata in LuaJ. 2016-03-19 14:41:13 +01:00
Florian Nücke
8d0db7b629 Fixed userdata in LuaJ, closes #1692. 2016-03-19 14:13:37 +01:00
Florian Nücke
b4d7dd515f Beta time I guess. 2016-03-12 15:02:21 +01:00
Florian Nücke
2f14f09210 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-03-12 15:02:02 +01:00