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
ed18a71b2f
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-03-12 13:34:42 +01:00
Florian Nücke
6b073bfa36
Trying to prevent #1684 , #1685 .
2016-03-12 13:34:22 +01:00
Florian Nücke
8d45fc41c6
Re-enabled CC integration (untested), closes #1653 .
2016-03-12 13:04:02 +01:00
Florian Nücke
4c5806eb1a
Re-enable Thaumcraft integration (untested).
2016-03-12 12:40:17 +01:00
Florian Nücke
959ef97a9c
Update Thaumcraft API.
2016-03-12 12:35:10 +01:00
Florian Nücke
c3b5741cea
Wording.
2016-03-09 22:28:19 +01:00
Florian Nücke
f4ac128388
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-03-09 21:11:10 +01:00
Florian Nücke
166df967ac
OK, OK, I'll stop being lazy already.
2016-03-09 21:08:45 +01:00
Florian Nücke
0bdf3afc94
Goodbye unifont, hello unscii (thanks to @asiekierka).
2016-03-09 20:55:37 +01:00
Florian Nücke
4cfbf128e0
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2016-03-09 20:17:29 +01:00
Florian "Sangar" Nücke
2e4e337f78
Merge pull request #1680 from cyber01/RU_doc
...
Updated hoverBoots description
2016-03-09 20:14:33 +01:00
payonel
c7715382fd
term crash guard for writes before binding, and resize support
2016-03-08 14:46:22 -08:00
payonel
cfe97d8327
fix term ctrl key (regression), fix grep display
2016-03-03 15:47:33 -08:00
cyber01
c89246a8ad
Updated hoverBoots description
2016-03-03 00:15:46 +03:00
Florian Nücke
dbd82e40ad
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-03-02 19:03:04 +01:00
