5367 Commits

Author SHA1 Message Date
Florian Nücke
7a0780f7e8 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-15 21:41:53 +02:00
Florian Nücke
522b507204 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-15 21:41:35 +02:00
Florian Nücke
c9e6ddcbd3 Merge branch 'install-nil-check' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-06-15 21:35:57 +02:00
Florian "Sangar" Nücke
0dfba9baf4 Merge pull request #1880 from payonel/plan9k-prop
plan9k .prop to guide openos install
2016-06-15 21:35:33 +02:00
payonel
76be38a710 plan9k .prop to guide openos install 2016-06-12 17:03:02 -07:00
payonel
203649a2dc install fix and cleanup, cp quality, network loot .prop
install was crashing if there were no options. Having no options is a perfectly valid case where install is trying to exit early (e.g. --help, or user cancelled) I forgot the check for nil.

During tests I found that cp was unnecessarily slow due to constant event pulling on every file. I introduced a 4 second gap between checking events. But his caused cp very hard (nearly impossible) to interrupt. Thus, it is preferrable to slow down copy so that the user could interrupt it.

Also, thanks to Inari, we have improved the text of the install prompts. Please review and comment if you feel the text still needs some revising. I'm not a technical writer, so I hope we are making this simple.

Also, if the user tries to run install with the network loot disk, the /data dir will be copied to /, and the user probably wants the data/. dir used. Using .prop's {fromDir="/data/"} fixes  this
2016-06-12 15:54:15 -07:00
Florian Nücke
c29c832695 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
2016-06-12 21:05:15 +02:00
Florian Nücke
6beec9cecc GLORIOUS HAX! FIXES #1873!
Because onChunkLoad now happens *before* writeToNBT, because whyever would we want to save *before* we're disposing?! lksdg';km\sd'g;km\sdglkn
2016-06-12 21:03:05 +02:00
Florian Nücke
3e55ca2de6 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-12 20:29:07 +02:00
Florian Nücke
c34395b879 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-12 20:28:46 +02:00
Florian Nücke
2cdc2b0df7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-06-12 20:28:28 +02:00
Florian Nücke
698f71d753 Shuffled some of the old loot disks file structure to work well with new install. Removed (most) .autoruns on old loot disks. 2016-06-12 20:27:28 +02:00
payonel
16dde2fc5b optimizations for install and cp and filesystem links fixes
optmized code and split up install to reduce memory costs. Can now install on 1x T1 RAM systems.

found old bug in filesystem:
touch a
ln a b
mkdir d
cd d
touch b
rm b

And the link in the parent dir would be lost. The reason is that the virtual nodes created for the link were being selected when removing the b file in d, as well as removing b from the real fs. The fix was to check that the node was the correct node, and not just remove the key from any node returned from findNode
2016-06-11 23:00:04 -07:00
Florian "Sangar" Nücke
68c0fa21c3 Merge pull request #1855 from cyber01/RU_doc
Added saveConfiguration to manual
2016-06-11 12:30:08 +02:00
payonel
80e25f7be7 1.6 rc version 2
advanced install features as well as simplified install for common usage
renamed .osprop to .prop
support for named installed
cp link copy fixes
fix /bin/less pgdown and space
package delay lookup no longer weak value
fixed regression in sh tab complete for first arg completion
2016-06-10 23:05:34 -07:00
payonel
3e86a32783 openos 1.6 release candidate
cat: default to stdin with no args

cp: support "contents of" /. paths, correct verbose output, prefer link copy over directory, error on missing source files

df: support relative paths

guid: correct guid format (8-4-4-4-12)

head: close stdin

install: support major rework to search for candidates filesystems and support .lootprop feature, new manual file

less: new pager option, supports scrollback and mouse scroll

ln: use source name when omitted

mv: report error when target path is read only, and report error when source path is a mount point

profile: remove less alias (we have /bin/less now)

rm: fix issue where links to dirs could not be removed

serialization: inline pairs in case of [C] boundary issue with delay loaded libraries

/lib/sh: support white space in tab completion with back slashes, emulate SIGPIPE on closed pipe writes,

shell: allow calls to getWorkingDirectory during boot before PWD is set (defaults to /)

term: fix to not consume(hide) hard interrupt in term.pull, and new method term.scroll for vertical scrolling

text: advanced internal tokenizer upgrade to more fully support whitespace metadata needs of the shell

transforms: new api, at(tbl, index), to return key-value pairs by index

other files: fix formatting and typos
2016-06-10 22:54:02 -07:00
Florian Nücke
cd47483b8a Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
# Conflicts:
#	src/main/scala/li/cil/oc/common/IMC.scala
2016-06-09 21:41:57 +02:00
Florian Nücke
79856a264c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
#	src/main/java/li/cil/oc/api/IMC.java
#	src/main/scala/li/cil/oc/common/IMC.scala
2016-06-09 21:37:17 +02:00
Florian Nücke
cf43ca1d86 Added computer.getProgramLocations and IMC message to populate the returned table. 2016-06-09 21:33:48 +02:00
Florian Nücke
e6487f7e14 Ohh, that actually changed. Welp. Fixes the other thing that popped up in #1854.
That being SimpleComponent *still* being broken >_> Go me.
2016-06-08 21:46:07 +02:00
Florian Nücke
52329d4afb Oh you sneaky little fucker. Should fix #1849 for good... 2016-06-08 21:46:02 +02:00
cyber01
694a630ad3 Added saveConfiguration to manual 2016-06-07 14:51:38 +03:00
Florian Nücke
186b0ca6b8 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-06 23:36:21 +02:00
Florian Nücke
c98dd518c2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-06 23:36:03 +02:00
Florian Nücke
2874f4720a Added IMC message to notify OC of a 3rd party power system. Closes #1784. 2016-06-06 20:52:54 +02:00
Florian Nücke
3c244c3044 Fixed blocks in off-hand being placed when opening the manual. Closes #1812. 2016-06-06 20:40:58 +02:00
Florian Nücke
218acbfb6b Typos \o/ Closes #1849. 2016-06-06 20:22:54 +02:00
Florian Nücke
bf8ffcbfb6 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-06 20:20:36 +02:00
Florian Nücke
ea845ac8dc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-06 20:20:21 +02:00
Florian "Sangar" Nücke
37249142af Merge pull request #1836 from LizzyTrickster/patch-5
link update
2016-06-06 20:13:50 +02:00
Florian Nücke
d931f19007 Added saveConfiguration to manual. 2016-06-06 20:12:58 +02:00
Florian Nücke
65a7c45223 Fix hover boots being transparent (at least in singleplayer ._.), closes #1834.
And some potential other GL state issues.
2016-06-05 12:11:14 +02:00
Florian Nücke
6417c232d4 Fixed drones not being placeable and not synching correctly. 2016-06-05 11:41:58 +02:00
Florian Nücke
296795e15f Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-05 11:05:49 +02:00
Florian Nücke
dda0900897 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-05 11:05:36 +02:00
Florian Nücke
8da15681bf Fixed CPU and memory not being neighbor only visible.
Fixed tier numbers being used 0-indexed in device info texts.
Fixed machine hosts' device info not being exposed.
2016-06-05 11:04:06 +02:00
Florian Nücke
735ed6b271 For example indeed... 2016-06-04 16:11:42 +02:00
Florian Nücke
1f13e40818 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
2016-06-04 13:56:30 +02:00
Florian Nücke
8ad233d037 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-04 13:55:47 +02:00
Florian Nücke
4626e1ca8e Moved attribute and class constants into API. 2016-06-04 13:55:22 +02:00
Florian Nücke
5f9cb0b7fc Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-04 02:14:13 +02:00
Florian Nücke
ef81b302bf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-04 02:13:53 +02:00
Florian Nücke
9fb8ad57f9 Avoid herpderps. 2016-06-04 02:13:31 +02:00
Florian Nücke
69e11f59ac Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
# Conflicts:
#	src/main/scala/li/cil/oc/common/item/data/NavigationUpgradeData.scala
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
#	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
2016-06-04 02:09:56 +02:00
Florian Nücke
9f9ee783cc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/Assembler.scala
#	src/main/scala/li/cil/oc/common/tileentity/Case.scala
#	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
#	src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
#	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
#	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
#	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
#	src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala
#	src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala
#	src/main/scala/li/cil/oc/common/tileentity/Printer.scala
#	src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala
#	src/main/scala/li/cil/oc/server/component/InternetCard.scala
#	src/main/scala/li/cil/oc/server/component/LinkedCard.scala
#	src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
#	src/main/scala/li/cil/oc/server/component/Server.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
#	src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala
#	src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
2016-06-04 01:59:48 +02:00
Florian Nücke
8531c22106 Added DeviceInfo API, allows environments to provide basic information even when they do not expose a component. Made available via computer.getDeviceInfo().
Must be implemented on Environments. Queried on environments of nodes reachable / visible (when a component / not) from a machine.
Added very *very* basic program for listing device info from shell, `lshw`.
2016-06-04 01:46:21 +02:00
Florian Nücke
52f5e54b7c Fixed drinking Grog being too strong for you. 2016-05-30 23:39:47 +02:00
Florian Nücke
b159bdb9c2 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-05-30 20:54:47 +02:00
Florian Nücke
305181874e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-30 20:54:34 +02:00
Florian Nücke
aa546dfce5 I think this should work. Closes #1839. 2016-05-30 20:46:53 +02:00