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

5892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vexatos
9fd7adc341 Added device info to MFU. 2017-02-03 22:16:50 +01:00
Florian Nücke
709bfb7f4f So I'm told we're at 1.6.2 already. Waddaya know. 2017-02-03 22:16:40 +01:00
Florian Nücke
a9615de2f3 Merge branch 'mfu' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2017-02-03 22:15:37 +01:00
Vexatos
4c3b7d03d8 Added device info to MFU. 2017-02-03 22:13:16 +01:00
Vexatos
f00b828332 Merge branch 'master-MC1.7.10' into mfu 2017-02-03 21:46:27 +01:00
Florian Nücke
5209f57239 Merge branch 'debug-messages' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2017-02-03 21:43:09 +01:00
Vexatos
a5e718bb16 Allow debug cards to send messages to one another and text to a player's clipboard. Also added a command for sending messages to a debug card. 
Closes #2253.
 2017-02-03 17:45:44 +01:00
Vexatos
f59faf6e88 Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.10 2017-02-03 15:09:00 +01:00
Vexatos
3681324d00 Add loot disks to JEI once they are available. 2017-02-03 15:08:50 +01:00
payonel
c86ce4d28c 1.6.1 update: memory, performance, devfs, relative links 
reduced memory cost to boot to shell!
READONLY mount option added: `mount -r ...`
os.execute (and shell.execute) now correctly spawn child shells with isolated shell environment (i.e. shell env vars such as PWD do not proprogate to the parent shell) Note that require("sh").execute(env, command, ...) is an option for direct command execution if dirtying the current shell is desired. Note that /bin/source uses sh.execute for this purpose
/dev/components added with smart adapters and links
supported devfs components at this time:
computer, internet, filesystem, screen, gpu, modem, eeprom
components can be labeled with /bin/label
/dev/components/by-label respects component labels
/etc/udev/rules.d/ supports boot labels
* component labeling and udev rules should be considered experiemental
links can now be relative
devfs significantly simplified, api reduced to single create method
various code cleanup
/bin/cp and /bin/mv hardened and now share common code
multiple fs mount point now share appropriate meta data (e.g. links)
hardened fs library
fs now detects and appropriately handles link cycles (a->b->a)
grep fix: show multiple matches with -o
install .prop added support for "ignore" key, for floppies to NOT be detected as an install source candidate. If you have a floppy and you don't want install to list it for install options, add {ignore=true} in a .prop file
less and more call cat when there is no tty (e.g. piped via |)
ln can create relative links
pwd -P option added to show real path
a messy term gpu resize issue fixed where the gpu can change resolution before the terminal is able to handle the resize event
smart hinting (where single hint results can extend to the next set) has been improved and put in shared code: now shell has it not just lua shell
text stream reader/writer now supports unicode as well as binary mode, e.g. writing binary data to /dev/eeprom now fixed
 2017-02-01 23:56:08 -08:00
Vexatos
85a6c5b8c7 Fix missing potion effects in nanomachines. 
Closes #1885.
 2017-01-29 11:46:22 +01:00
Florian Nücke
c30b3c09ef Oh great, so now onChunkUnload is called before writeToNBT again .-. 
Could guys *please* decide on one?
 2017-01-29 01:02:15 +01:00
Vexatos
9332bc70cd Properly send the cycling disk list to the client. 2017-01-28 13:59:53 +01:00
Vexatos
823b938ee5 Merge branch 'master-MC1.9.4' into master-MC1.10 2017-01-27 20:01:51 +01:00
Vexatos
723883b9d9 Fix #2238. 2017-01-27 19:59:50 +01:00
Vexatos
666436c313 Merge branch 'master-MC1.9.4' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/jei/LootDiskCyclingRecipeHandler.scala
 2017-01-27 19:02:13 +01:00
Vexatos
6f84e8e899 Merge branch 'master-MC1.8.9' into master-MC1.9.4 2017-01-27 18:58:29 +01:00
Vexatos
de2cede4ff Merge branch 'master-MC1.7.10' into master-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/Items.java
#	src/main/java/li/cil/oc/api/detail/ItemAPI.java
#	src/main/scala/li/cil/oc/common/Loot.scala
#	src/main/scala/li/cil/oc/common/init/Items.scala
 2017-01-27 18:58:18 +01:00
Vexatos
02add30920 Merge pull request #2209 from Vexatos/addon-disk-cycling 
Allow addons to register their floppies for loot disk cycling.
 2017-01-27 18:48:41 +01:00
Vexatos
06cc11ffdb Merge branch 'master-MC1.9.4' into master-MC1.10 2017-01-27 17:15:36 +01:00
Vexatos
143700086e Merge branch 'master-MC1.8.9' into master-MC1.9.4 2017-01-27 17:14:52 +01:00
Vexatos
8f66922f26 Fix #2243. 2017-01-27 17:14:22 +01:00
Vexatos
0525940cf4 Merge branch 'master-MC1.7.10' into master-MC1.8.9 2017-01-27 17:13:51 +01:00
Vexatos
ce304ea248 Allow nil to be passed to optional type-specific arguments, making them return their default value. 
For #2232.
 2017-01-22 15:12:38 +01:00
Vexatos
5c76be7fc5 Just making sure on the paths on OPPM installation. 2017-01-12 20:14:04 +01:00
Vexatos
790f5976b9 Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.7.10 2017-01-12 20:12:03 +01:00
Vexatos
fa3fff4148 Update OPPM floppy to use new install features. 
Also updated OPPM.
 2017-01-12 20:11:46 +01:00
Vexatos
a68ce390ba Merge branch 'master-MC1.9.4' into master-MC1.10 2017-01-10 14:23:30 +01:00
Vexatos
19933fb7bb Merge branch 'master-MC1.8.9' into master-MC1.9.4 2017-01-10 14:23:05 +01:00
Vexatos
52a032ff63 Fix #2220. 2017-01-10 14:21:03 +01:00
Vexatos
17f3fbb7fe Merged branch master-MC1.9.4 into master-MC1.10 2016-12-30 16:26:08 +01:00
Vexatos
a624a468f0 Merged branch master-MC1.8.9 into master-MC1.9.4 2016-12-30 16:25:29 +01:00
Vexatos
cdd0a05f58 Merged branch master-MC1.7.10 into master-MC1.8.9 2016-12-30 16:24:51 +01:00
Vexatos
dcdf8346f3 Merge pull request #2210 from magik6k/master-MC1.7.10 
Update Plan9k(Fixed PR)
 2016-12-30 16:19:58 +01:00
Łukasz Magiera
742c8eecb6 Fixed plan9k 2016-12-30 16:16:04 +01:00
Łukasz Magiera
337ecbb1f2 Update Plan9k 2016-12-30 16:15:53 +01:00
Vexatos
42519e8af3 Allow addons to register their floppies for loot disk cycling. 2016-12-30 12:49:40 +01:00
Vexatos
20af9c8cbf Merge branch 'master-MC1.9.4' into master-MC1.10 2016-12-29 18:41:52 +01:00
Vexatos
fee56b284b Merge branch 'master-MC1.8.9' into master-MC1.9.4 2016-12-29 18:41:26 +01:00
Vexatos
094b48c5a1 Merge branch 'master-MC1.7.10' into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/item/Tablet.scala
 2016-12-29 18:40:48 +01:00
Vexatos
16fc8a9113 May fix #2192. 2016-12-29 18:37:36 +01:00
Vexatos
b6cc64218e Merge branch 'master-MC1.9.4' into master-MC1.10 2016-12-29 11:49:43 +01:00
Vexatos
7a8b07dcac Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.9.4 2016-12-29 11:48:11 +01:00
Vexatos
bb8661a218 Fix #2155 and #2207. 2016-12-29 11:48:02 +01:00
Florian Nücke
ef10dbc921 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-12-17 23:50:19 +01:00
Florian Nücke
368ddb8369 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 23:49:33 +01:00
Florian Nücke
21e1890bb4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-12-17 23:49:04 +01:00
Florian Nücke
94efa8d17e Don't close all sides for adapters placed before the last update. I hope you didn't update if you used adapters to control anything... sensitive. You didn't, right? Right?! 2016-12-17 23:48:11 +01:00
Florian Nücke
a856f87eb1 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-12-17 22:29:10 +01:00
Florian Nücke
cf300f4fdf Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 22:28:52 +01:00