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

5096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
payonel
a4dc3e3517 fix click cursor, add ctrl+move to jump words, and fix 1st tab 2016-03-02 08:06:31 -08:00
Florian Nücke
e7a802c3ae Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-01 22:19:07 +01:00
Florian Nücke
add0b6f936 More stable network merging of networks containing nodes with duplicate addresses. 
Specifically when the duplicate node being re-addressed was a "bridge" node.
 2016-03-01 22:18:52 +01:00
Florian Nücke
f3932b6336 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-03-01 21:58:06 +01:00
Florian Nücke
27a06a3490 Fixed server rack not properly re-rendering when adding/removing mountables. 2016-03-01 21:57:56 +01:00
Florian Nücke
c7931a76ab Merge branch 'next-term' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-03-01 20:23:05 +01:00
payonel
02531670d9 new term library, faster, light-weight, better widechars 2016-02-29 17:43:26 -08:00
Florian Nücke
3b64c413cf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/driver/MethodWhitelist.java
#	src/main/java/li/cil/oc/api/driver/NamedBlock.java
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
 2016-02-27 19:33:16 +01:00
Florian Nücke
22495b9e50 Make adapter use new SidedBlock drivers. Updated some more JDoc. 2016-02-27 19:30:59 +01:00
Florian Nücke
4780e86b96 Call Architecture.onSignal outside all locks. Closes #1672. 2016-02-27 19:24:21 +01:00
Florian Nücke
45da10c8f1 Fix terminal server texture in non-dev. 2016-02-27 13:43:55 +01:00
Florian Nücke
62497680b8 Nope. 2016-02-27 13:39:02 +01:00
Florian Nücke
338666235b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/java/li/cil/oc/api/Driver.java
#	src/main/java/li/cil/oc/api/detail/DriverAPI.java
#	src/main/scala/li/cil/oc/client/Textures.scala
#	src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala
#	src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala
#	src/main/scala/li/cil/oc/common/item/HoverBoots.scala
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
#	src/main/scala/li/cil/oc/server/driver/Registry.scala
 2016-02-27 13:38:18 +01:00
Florian Nücke
d2f574775c Don't force using atlas for mountable overlays. 2016-02-27 12:27:00 +01:00
Florian Nücke
44e771cb75 Limit max number of items crafted in one command to one stack, closes #1651. 
Prevents semi-infinite loops for identity-crafting (i.e. input == output).
 2016-02-27 11:33:12 +01:00
Florian Nücke
13cff88dc1 Fixed recipe sorting. 2016-02-27 11:29:57 +01:00
Florian Nücke
df269a5bbe Added driver.SidedBlock interface, deprecated old driver.Block interface, closes #1650. 
Made CompoundBlockDriver support both kinds.
 2016-02-27 11:23:11 +01:00
Florian Nücke
80825b3e60 Potential fix for #1648. 2016-02-27 10:42:05 +01:00