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

5367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
0cba7a5872 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 20:35:28 +02:00
Florian Nücke
68c144c8c0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-03 20:34:34 +02:00
Florian "Sangar" Nücke
3e49ca4d58 Merge pull request #1931 from hws689/master-MC1.7.10 
pt_BR's Translation
 2016-07-03 20:31:55 +02:00
Florian Nücke
8fc5539505 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 20:28:42 +02:00
Florian Nücke
01c4c6f375 Fixed hologram rotation not working. 2016-07-03 20:27:57 +02:00
Florian Nücke
d86411c4a0 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 20:03:36 +02:00
Florian Nücke
66a04e5406 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-03 20:03:19 +02:00
Florian Nücke
a3c6c4c14b Making an exception. One. 2016-07-03 20:02:47 +02:00
Florian Nücke
7955ca5884 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-03 19:59:11 +02:00
Florian Nücke
2e6298f39d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-03 19:58:51 +02:00
Florian Nücke
32ab472370 Fix potential division by zero in loot disk cycling recipe. 2016-07-03 19:58:27 +02:00
hws689
9d30864478 pt_BR's Translation 2016-07-02 21:04:01 -03:00
Florian Nücke
2257e61b49 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-02 22:47:48 +02:00
Florian Nücke
0d76284260 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-02 22:47:26 +02:00
Florian Nücke
650ee2c45d Merge branch 'openos-1.6-cleanup' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-07-02 13:39:40 +02:00
Florian Nücke
7f55ceabe5 Merge branch 'install-and-shell' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-07-02 13:38:23 +02:00
Florian Nücke
3bf0a6434e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-02 13:36:55 +02:00
Florian Nücke
02698f3d6e Might fix #1924. 2016-07-02 13:36:13 +02:00
Florian Nücke
8c3ab29ef4 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-02 13:33:06 +02:00
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
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
bcf19ed1e2 Updated Forge. 2016-06-25 22:01:46 +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