AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-27 06:53:08 -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
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
Florian Nücke
07c700ca8a Fixed broken setmetatable with __gc. 2016-02-07 12:06:46 +01:00
Florian Nücke
ce081cfc73 Fixed broken setmetatable with __gc. 2016-02-07 12:04:00 +01:00
Florian Nücke
d74c767fca Sync level of experience upgrade when level changes, closes #1639. 2016-02-07 11:50:40 +01:00
Florian Nücke
f6d8f08b34 Update BC IToolWrench implementation to new API (#1636). 2016-02-07 11:31:08 +01:00
payonel
7555a9598d fix cp one file system option and fix no args to time command 2016-02-05 20:36:24 -08:00
ItsTheKais
be45ceda34 Fixes Mystcraft integration looking for wrong name tag 2016-02-05 21:20:18 -07:00
payonel
c414f7428d openos 1.6 upgrade: new bin utils, memory optimizations, and bug fixes 2016-02-02 00:19:42 -08:00
Florian Nücke
9113fbbb02 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 2016-01-31 20:20:31 +01:00
Florian Nücke
9530918afe Updated to new Waila API, closes #1559. 2016-01-31 20:19:52 +01:00
Soni L
d9f2900102 Fix __gc and use raw metatable when it's disabled 
This fixes a small __gc abuse I found, and also uses the raw metatable in a safe way when __gc is disabled. Both were tested.
# Conflicts:
#	src/main/resources/assets/opencomputers/lua/machine.lua
 2016-01-31 18:42:51 +01:00
Florian Nücke
7026f943e1 Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558. 2016-01-31 18:42:50 +01:00
Florian Nücke
f90b38aa71 Get rid of usages of __gc. Closes #1606. 
Wrapping file handles with userdata that has a `dispose` closing the handle.
Internet card already closed via userdata, so nothing to do there.
Removed cleanup logic from term, deal with it.
Added setting to re-enable it, if you really really need it.

# Conflicts:
#	src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua
#	src/main/scala/li/cil/oc/server/component/FileSystem.scala
 2016-01-31 18:42:50 +01:00
Soni L
d4addfd8e4 Fix __gc and use raw metatable when it's disabled 
This fixes a small __gc abuse I found, and also uses the raw metatable in a safe way when __gc is disabled. Both were tested.
# Conflicts:
#	src/main/resources/assets/opencomputers/lua/machine.lua
v1.5.22 		2016-01-31 18:28:08 +01:00
Florian Nücke
0f01f6d424 Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558. 2016-01-31 18:27:42 +01:00
Florian Nücke
82cc648248 Get rid of usages of __gc. Closes #1606. 
Wrapping file handles with userdata that has a `dispose` closing the handle.
Internet card already closed via userdata, so nothing to do there.
Removed cleanup logic from term, deal with it.
Added setting to re-enable it, if you really really need it.

# Conflicts:
#	src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua
#	src/main/scala/li/cil/oc/server/component/FileSystem.scala
 2016-01-31 18:27:41 +01:00
Florian Nücke
55dd320b2a Merge branch 'patch-2' of https://github.com/SoniEx2/OpenComputers into master-MC1.7.10 2016-01-31 17:58:48 +01:00
Florian Nücke
c1749efb2d Log restored chunk loader ticket locations, closes #1616. 2016-01-31 17:58:13 +01:00
Florian Nücke
6ef92b9ef5 Better screen fixery. I hope. 2016-01-31 17:56:37 +01:00
Soni L
07f452125c Fix __gc and use raw metatable when it's disabled 
This fixes a small __gc abuse I found, and also uses the raw metatable in a safe way when __gc is disabled. Both were tested.
 2016-01-31 14:46:52 -02:00
Florian Nücke
ac64edd1c7 Properly send viewport size in text buffer init, should fix #1609. 2016-01-31 17:13:35 +01:00
Florian Nücke
969e6ebf94 Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558. 2016-01-31 16:58:52 +01:00
Florian Nücke
c7621294d3 Get rid of usages of __gc. Closes #1606. 
Wrapping file handles with userdata that has a `dispose` closing the handle.
Internet card already closed via userdata, so nothing to do there.
Removed cleanup logic from term, deal with it.
Added setting to re-enable it, if you really really need it.
 2016-01-31 15:58:40 +01:00
Florian Nücke
3b0082303e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-01-31 14:46:11 +01:00
Florian Nücke
45d8a20118 Fix potentially unexpected behavior when using custom __pairs for metatables. Closes #1625. 2016-01-31 14:45:48 +01:00
Florian "Sangar" Nücke
a14c7cf973 Merge pull request #1628 from habnabit/ae2-cpu-selection 
Allow specifying AE2 CPU when crafting
 2016-01-31 14:09:23 +01:00
Florian "Sangar" Nücke
bc100426bc Merge pull request #1622 from Landrash/patch-1 
Mycroft Holmes
 2016-01-31 13:57:21 +01:00
Florian "Sangar" Nücke
ef2c70a77b Merge pull request #1617 from gamax92/debug-playSoundAt 
Added `playSoundAt` to debug card.
 2016-01-31 13:53:12 +01:00
Aaron Gallagher
c1181babd6 Allow specifying AE2 CPU when crafting. 2016-01-24 09:12:37 -08:00
Landrash
0cbd75be0a Mycroft Holmes 
Suggestion to add Mycroft Holmes to the List of robot names.
From the book The Moon Is a Harsh Mistress.

Qoute from Wikipedia - https://en.wikipedia.org/wiki/The_Moon_Is_a_Harsh_Mistress
Mike, alias 'Adam Selene', alias 'Simon Jester', alias 'Mycroft Holmes', officially an augmented HOLMES IV system, is a supercomputer empowered to take control of Lunar society, who achieved self-awareness when his complement of "neuristors" exceeded the number of neurons in the human brain.
 2016-01-19 17:55:01 +07:00
Florian Nücke
ff727b9fee Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 2016-01-16 13:48:26 +01:00
Florian Nücke
8470226874 Reenable IHasWork for BuildCraft, closes #1618. 2016-01-16 13:45:07 +01:00
gamax92
457e18be64 Added playSoundAt to debug card. 2016-01-15 15:00:56 -07:00
Florian "Sangar" Nücke
96ee1ec6e6 Merge pull request #1612 from magik6k/deps 
Use coloredlightscore jenkins
 2016-01-15 21:23:15 +01:00
Florian Nücke
b683ac93f0 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 
# Conflicts:
#	build.properties
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.bsd.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.dll
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.dylib
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.bsd.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.dll
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.dylib
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.so
 2016-01-15 21:13:20 +01:00
Florian Nücke
811759314d Version bump. 2016-01-15 21:12:04 +01:00
Florian Nücke
851d869c83 Should fix #1589. 2016-01-15 21:11:13 +01:00
Florian Nücke
f2c35eeb98 Version bump. 2016-01-15 21:10:53 +01:00
Florian Nücke
986b4ae9d6 Updated Lua 5.3 natives. 2016-01-15 21:10:38 +01:00
Florian Nücke
0ba31b7be0 Less copy-pasta-y doc for viewport. 2016-01-15 21:09:54 +01:00
Florian Nücke
49fbe0eef1 Should fix #1589. 2016-01-15 21:07:15 +01:00
Florian Nücke
fbd57de086 Patched Eris 5.3. 2016-01-15 21:04:53 +01:00