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

4611 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
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
e5439df28d Hide access point and switch in NEI b/c they're deprecated. 2016-03-19 21:53:50 +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
6b073bfa36 Trying to prevent #1684, #1685. 2016-03-12 13:34:22 +01:00
Florian Nücke
c3b5741cea Wording. 2016-03-09 22:28:19 +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
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
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
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
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
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
0613237fc6 Cleanup. 2016-02-24 20:22:19 +01:00
Florian Nücke
49a0f8560c Say no to sideonly fields! 2016-02-24 20:21:36 +01:00
Florian Nücke
f85c441a1a Merge branch 'master-MC1.7.10' of https://github.com/tim4242/OpenComputers into master-MC1.7.10 2016-02-24 20:13:19 +01:00
Florian Nücke
593ae97a6f Merge branch 'cp-x' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-02-24 20:07:34 +01:00
Florian Nücke
6c050032a3 Organize imports. 2016-02-24 19:59:35 +01:00
Florian Nücke
bb3b9fd4cd Merge branch 'dyeable-hoverboots' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-02-24 19:30:30 +01:00
Florian Nücke
94721f03ea Super minor cleanup. 2016-02-24 19:30:04 +01:00
Vexatos
b2105d9963 Added information on dyeing to the manual. 2016-02-22 22:44:08 +01:00
Vexatos
1f13395dcc Made hover boots lose their colour when tossed into a cauldron. 2016-02-22 22:14:36 +01:00
Vexatos
726ceae91f Made Hover Boots dyeable. 2016-02-22 14:36:03 +01:00
tim4242
f5d347e2e2 Modernized PetRenderer 
- Made player checking UUID based
- Made in inventory detection better
 2016-02-20 17:51:04 +01:00
DrummerMC
f76f2448c7 Disable ThaumicEnergistics by default 2016-02-14 13:06:24 +01:00
DrummerMC
590ecebc33 Add ThaumicEnergistics support 2016-02-14 00:07:40 +01:00
payonel
d9bd0096be fixing cp -x 2016-02-11 23:52:30 -08:00
Florian Nücke
54de3fe89d Merge branch 'text-split-perf' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-02-11 14:55:27 +01:00
payonel
c3a391d558 fix cp one file system option 
one file system check allows recursive copy where the path is the parent of the destination but said paths are on different file systems
 2016-02-10 20:05:46 -08:00
payonel
a59859b225 severe text split inefficiency found and fixed 2016-02-10 13:01:46 -08:00
Florian Nücke
c7f959d4ec Merge branch 'openos-upgrade-merge' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-02-07 12:47:21 +01:00
Florian Nücke
2d28a6e000 Remove __gc from pipes and rename table in guid lib to match lib name. 2016-02-07 12:47:00 +01:00
Florian Nücke
181ddc2019 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-02-07 12:46:27 +01:00
Florian Nücke
55b9809493 Oredictify diamonds in recipes. Closes #1637. 2016-02-07 12:46:04 +01:00
Florian "Sangar" Nücke
ab0587b216 Merge pull request #1640 from ItsTheKais/master-MC1.7.10 
Mystcraft converters look for correct NBT tag for book name
 2016-02-07 12:27:07 +01:00