Florian Nücke
3920d25900
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 16:54:32 +01:00
Florian Nücke
8a76585694
Avoid Rotatable causing chunk loads when being accessed by, say, tiles's sidedNode() methods (to get the facing) called during dispose().
...
I think I handled all cases where this change would've caused NPEs now, but we'll see..
2017-02-04 16:54:08 +01:00
Florian Nücke
8a9bba2e3f
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 14:23:39 +01:00
Florian Nücke
330d71157f
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-02-04 14:23:23 +01:00
Florian Nücke
a564639804
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/traits/InventoryWorldControl.scala
# src/main/scala/li/cil/oc/util/InventoryUtils.scala
2017-02-04 14:21:57 +01:00
Florian Nücke
81c34e0c14
Fire item toss event when agents try to drop items into the world.
2017-02-04 14:11:48 +01:00
Florian Nücke
13cd17e3e7
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 13:53:07 +01:00
Florian Nücke
94cbcb38b7
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-02-04 13:52:42 +01:00
Florian Nücke
45507d84ef
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-02-04 13:52:26 +01:00
Florian Nücke
706905603d
Waila's back to calling server methods on the client apparently \o/
2017-02-04 13:52:08 +01:00
Florian Nücke
5c7b55e208
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-02-04 00:37:43 +01:00
Florian Nücke
f611a22f92
Gah, wrong IDE window.
2017-02-04 00:36:19 +01:00
Florian Nücke
416b5a9fdd
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# build.properties
2017-02-04 00:19:06 +01:00
Florian Nücke
b196224775
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/common/init/Items.scala
2017-02-04 00:18:18 +01:00
Florian Nücke
5105266f90
Merge branch 'mfu' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/en_US.lang
2017-02-03 23:37:49 +01:00
Florian Nücke
a84b557e93
Renderer to indicate block held MFU is bound to (and the face).
2017-02-03 23:37:09 +01:00
Florian Nücke
330745055f
Tooltip for MFU.
2017-02-03 23:36:49 +01:00
Vexatos
645ca3e448
Added manual entry for MFU.
2017-02-03 23:36:14 +01:00
Florian Nücke
32c383ea11
Item icons for MFU.
2017-02-03 23:26:41 +01:00
Vexatos
0c64dd30fd
Added device info to MFU.
2017-02-03 23:03:42 +01:00
Vexatos
56ced10215
Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/DebugCard.scala
2017-02-03 22:27:48 +01:00
Vexatos
0901589ebd
Merge remote-tracking branch 'origin/master-MC1.8.9' into master-MC1.9.4
2017-02-03 22:24:22 +01:00
Vexatos
2e77561081
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/DebugCard.scala
2017-02-03 22:22:01 +01:00
Florian Nücke
0286b76b53
Merge branch 'mfu' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
2017-02-03 22:16:59 +01:00
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
