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

5304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f334f97d48 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-02 13:32:46 +02:00
Florian Nücke
d3841d1c8e Another one of those "why the hell did it work in 1.7" cases... closes #1923. 2016-07-02 13:32:28 +02:00
Florian Nücke
c5ccf22ada Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-02 10:20:37 +02:00
Florian Nücke
41e8db2488 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/Microcontroller.scala
 2016-07-02 10:20:22 +02:00
Florian Nücke
e1d6b10041 Updated Forge. 2016-07-02 10:15:07 +02:00
Florian Nücke
7ae2d741d9 Fixed MCUs passing out messages other than network messages, closes #1926. 2016-07-02 09:49:41 +02:00
Florian Nücke
fc9a092259 So I hear special thingers made people glow in the dark. 2016-07-02 09:35:41 +02:00
Florian Nücke
558776941c Updated IC2 integration (fixed special electric item handling). 2016-07-02 09:02:40 +02:00
payonel
462b264f31 improve /mnt and PS1 conformity 
filesystem: don't mount tmpfs in /mnt
shell: remove trailing slash for pwd
ps1: make the default prompt easier to interpret
 2016-06-30 22:05:50 -07:00
payonel
031f9079c3 fixes for install, cp, ln, and shell parsing 
fix install stdin read defaults
fix cp over links to update links
fixed ''| parse error (it isn't)
better os.exit for customer installer
 2016-06-30 21:47:32 -07:00
Florian Nücke
4877970640 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-06-26 11:46:45 +02:00
Florian Nücke
ec64dc9eb3 Port. 2016-06-26 11:46:28 +02:00
Florian Nücke
cf61e52d19 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-26 11:38:02 +02:00
Florian Nücke
b3de8de44f Oh wait, it's only half a pixel indent here? Huh. Oh well. 2016-06-26 11:37:41 +02:00
Florian Nücke
be22661e8d Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Rack.scala
 2016-06-26 11:32:11 +02:00
Florian Nücke
4ffdede8da Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Rack.scala
 2016-06-26 11:30:32 +02:00
Florian Nücke
1279537f8d Added custom intersect check for racks to take into account the mountables being inset by one. 
Avoid floating point inaccuracies leading to incorrect local coordinates for mountable onActivate.
 2016-06-26 11:21:59 +02:00
Florian Nücke
4f576bdad4 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 
# Conflicts:
#	build.properties
 2016-06-25 22:03:07 +02:00
Florian Nücke
bcf19ed1e2 Updated Forge. 2016-06-25 22:01:46 +02:00
Florian Nücke
ba5bcbe4cb Starting to get annoyed... 2016-06-25 21:53:35 +02:00
Florian Nücke
e493c21de2 Pretty please? 2016-06-25 21:48:00 +02:00
Florian Nücke
6128a92386 Jenkins y u fail .-. PC y u no fail .-. 2016-06-25 21:44:34 +02:00
Florian Nücke
aa996ca28f Initial MC 1.10 port. 2016-06-25 21:25:16 +02:00
Florian Nücke
c92e30442a Updated for CoFH API changes in IToolHammer. 
Also added support for unofficial CoFH API... because apparently some people are *still* shipping that crap. Fixes #1889.
Silver lining: made me aware of isUsable/toolUsed on Entity targets :P
 2016-06-25 20:20:37 +02:00
Florian Nücke
eb73a86a53 Fixed/reenabled IC2 integration. Closes #1892. 2016-06-25 20:14:07 +02:00
Florian Nücke
222a96a792 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-25 14:27:09 +02:00
Florian Nücke
6d681464c6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-06-25 14:26:51 +02:00
Florian Nücke
9a3fd0feb2 Explicit null checks to avoid it trickling down into code where it's harder to tell. 2016-06-25 14:26:28 +02:00
Florian Nücke
cc0ae6ab8a Make wrapper for writeToNBT also return NBTTagCompound. Has to have same signature after all, because when wrapping existing one is just renamed. Fixes #1898. 2016-06-25 14:01:23 +02:00
Florian Nücke
385eb149e8 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-06-25 13:20:19 +02:00
Florian Nücke
ba0145c5b7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/InternetCard.scala
 2016-06-25 13:19:57 +02:00
Łukasz Magiera
422592d84e Send internet events when ready to read. 2016-06-25 13:17:06 +02:00
Florian Nücke
a9f2c6d77b Readonly logger. 2016-06-25 12:50:44 +02:00
payonel
ecda757ee3 fixes for buffer, install, ls, package, profile, rc, sh 
buffer: don't allow reading zero bytes from a stream, and fix libraries that should be allowed to set zero size buffer
install: report setting boot address, ^d should not accept prompts
ls: use shell to get working dir, not PWD
package: remove clutter for library keys and _G
rc: add unload to lib methods and fix typo in source
sh: remove clutter from _G and use zero sized buffer for piping
 2016-06-23 07:09:30 -07:00
Florian Nücke
9f41a35674 Fixes screen walk events, closes #1884. 
There and back again... I wonder if it'll be merged with onEntityCollidedWithBlock again in 1.10 :P
 2016-06-15 22:42:14 +02:00
Florian Nücke
0b5e74b31e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/mcmp/MCMultiPart.scala
#	src/main/scala/li/cil/oc/integration/mcmp/MCMultiPartClient.scala
#	src/main/scala/li/cil/oc/integration/mcmp/PartCable.scala
#	src/main/scala/li/cil/oc/integration/mcmp/PartPrint.scala
 2016-06-15 22:15:42 +02:00
Florian Nücke
0510985305 Fixed server side initialization of MCMP integration. Closes #1864. 2016-06-15 22:12:37 +02:00
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