Florian Nücke
344958d53e
Merge branch 'master-MC1.11' of github.com:MightyPirates/OpenComputers into master-MC1.11
2017-05-15 22:49:34 +02:00
Florian Nücke
e203ab4d33
Darn you MCPBot_Reborn!
2017-05-15 22:45:30 +02:00
payonel
80213eed8b
Merge remote-tracking branch 'upstream/master-MC1.10' into master-MC1.11
2017-05-15 07:20:22 -07:00
payonel
59e268c849
Merge remote-tracking branch 'upstream/master-MC1.9.4' into master-MC1.10-upstream
2017-05-15 07:20:00 -07:00
payonel
4b551f8fc4
Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4
2017-05-15 07:19:20 -07:00
payonel
dd15d6c7fb
Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9
2017-05-15 07:18:04 -07:00
payonel
e9680ec0e8
tab complete fix for nil hints
2017-05-14 23:53:00 -07:00
payonel
807dfb7224
bad timer bug fix: event timers should default to once
2017-05-14 23:39:14 -07:00
Vexatos
ef103be3c5
I knew I had to do this during the port, but then I forgot.
...
Fixes #2382 .
2017-05-15 07:24:33 +02:00
payonel
8f9eabc84e
hostname to PS1 fix
...
hostname in PS1 cannot be set by the init signal as that occurs before /etc/profile, which overrides PS1
Also, clean up some code to not try to change PS1, but just change HOSTNAME
Added `hostname --update` to update $HOSTNAME by reading /etc/hostname again
2017-05-14 20:49:01 -07:00
payonel
7f1739614d
improve error message for hostname
2017-05-14 17:18:31 -07:00
payonel
56cf8964f8
rewording some new man pages
2017-05-14 17:10:34 -07:00
payonel
b868a90389
correct man set wording
2017-05-14 17:00:08 -07:00
payonel
6a634e018a
clean up TERM value with floor for lua 5.3
2017-05-14 16:59:00 -07:00
payonel
defe8c21dd
setenv and getenv fixes and cleanup
2017-05-14 16:59:00 -07:00
Wilma456
ff2dbc8064
Add Manpages ( #2363 )
...
* Create set
* Create lshw
* Create less
* Create rmdir
* Create unset
2017-05-14 16:56:17 -07:00
Vexatos
e3743d1cb0
Use generic events properly.
2017-05-14 23:19:03 +02:00
Vexatos
2740b81cc0
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/java/li/cil/oc/api/IMC.java
# src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
# src/main/scala/li/cil/oc/common/EventHandler.scala
# src/main/scala/li/cil/oc/common/IMC.scala
# src/main/scala/li/cil/oc/common/block/DiskDrive.scala
# src/main/scala/li/cil/oc/common/block/PowerConverter.scala
# src/main/scala/li/cil/oc/common/block/Redstone.scala
# src/main/scala/li/cil/oc/common/init/Items.scala
# src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala
# src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
# src/main/scala/li/cil/oc/common/item/WorldSensorCard.scala
# src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
# src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala
# src/main/scala/li/cil/oc/common/tileentity/Relay.scala
# src/main/scala/li/cil/oc/common/tileentity/Switch.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala
# src/main/scala/li/cil/oc/integration/Mods.scala
# src/main/scala/li/cil/oc/integration/coloredlights/ModColoredLights.scala
# src/main/scala/li/cil/oc/integration/util/BundledRedstone.scala
# src/main/scala/li/cil/oc/integration/util/PortalGun.scala
# src/main/scala/li/cil/oc/integration/util/Waila.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
# src/main/scala/li/cil/oc/util/InventoryUtils.scala
# src/main/scala/li/cil/oc/util/ItemCosts.scala
2017-05-14 23:02:13 +02:00
Vexatos
88e6a5ff4e
Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.10
2017-05-14 22:45:10 +02:00
Vexatos
d1b105d0a3
1.9.4 adjustments.
2017-05-14 22:41:47 +02:00
Vexatos
741de6e6a2
Merge remote-tracking branch 'origin/master-MC1.8.9' into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala
2017-05-14 22:38:15 +02:00
Florian Nücke
5f5a63203a
1.8.9 adjustments.
2017-05-14 22:26:25 +02:00
Florian Nücke
3f41a0a7d0
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2017-05-14 22:25:38 +02:00
Florian Nücke
f947f8da60
Allright, I give up, can't reproduce. Best guess I have is that it's a rendering-before-init thing...
2017-05-14 21:33:54 +02:00
Florian Nücke
6a97c012a6
Rip out power auto detection.
2017-05-14 18:53:47 +02:00
Florian "Sangar" Nücke
e54ae25f89
Merge pull request #2369 from Vexatos/forge-energy
...
Added support for forge energy.
2017-05-14 16:00:49 +02:00
Florian "Sangar" Nücke
56d3d6db1d
Merge pull request #2381 from payonel/openos-1.6.2
...
code cleanup, memory optimizations, slim term code, and file renaming
2017-05-14 15:59:40 +02:00
Florian "Sangar" Nücke
a2a30f7786
Merge pull request #2379 from Vexatos/trade-fix
...
Update the input itemstack in insertIntoInventorySlot even during simulation.
2017-05-14 15:38:35 +02:00
Florian Nücke
4bf6467083
Updated class transformer.
2017-05-14 15:34:52 +02:00
Vexatos
b49353018b
Turned Motion Sensor into an upgrade.
...
Closes #2241 .
2017-05-14 15:33:31 +02:00
Vexatos
0b43ece099
Do not hardcode the mod ID in the update check.
...
Closes #2357 .
2017-05-14 15:17:40 +02:00
Vexatos
6400b1fae2
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
2017-05-14 14:55:30 +02:00
Vexatos
6acdc7aac5
Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.10
2017-05-14 14:55:11 +02:00
Vexatos
b8db395bbb
Fix robot being unable to place buckets.
...
Probably also fixes a lot of similar issues.
2017-05-14 14:54:54 +02:00
Vexatos
4814f4a190
Merge pull request #2380 from stone3311/master-MC1.7.10
...
Fixed headings in README.md
2017-05-14 09:22:18 +02:00
payonel
79e8f863ea
code cleanup, memory optimizations, slim term code, and system file organization
...
notable changes
### TTY
New /lib/tty library that provides the core readKeyboard and drawText functionality. /lib/term should still be used by user code and the tty api should be considered alpha. The intent in this separation of the code is to allow term api to remain unchanged and allow tty to adapt as improvements are made.
### delayloaded and now splitting
The delayloaded packaging system has been removed. The delayload system allowed for library object to appear loaded when in fact they were not. But this significantly increased boot time. The code now imploys "library splitting", saves tremendous memory, shortens boot time, and all libraries are fully usable even when partially loaded. In other words, it is all transparent to the user.
### boot memory cost
Numerous micro optimizations have been made. "boot to shell prompt" now idles at 156k allocated, or 40k free, up from ~26k free before this change. Yes, that's 14k less in this update.
2017-05-13 23:44:09 -07:00
stone3311
cc19a82e8e
Fixed headings in README.md
2017-05-13 19:30:48 +02:00
Vexatos
f01cde3906
Update the input itemstack in insertIntoInventorySlot even during simulation.
...
Only the Trade Upgrade is using this right now.
2017-05-13 17:13:20 +02:00
Vexatos
a8bca1c1bb
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.gradle
# build.properties
# src/main/scala/li/cil/oc/common/tileentity/Relay.scala
# src/main/scala/li/cil/oc/common/tileentity/Switch.scala
# src/main/scala/li/cil/oc/integration/Mods.scala
# src/main/scala/li/cil/oc/integration/computercraft/PeripheralProvider.scala
# src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
# src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
# src/main/scala/li/cil/oc/integration/wrcbe/WirelessRedstoneCBE.scala
# src/main/scala/li/cil/oc/server/agent/Inventory.scala
# src/main/scala/li/cil/oc/server/agent/Player.scala
# src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
2017-05-11 20:38:54 +02:00
Vexatos
2de949c6a8
Merge branch 'master-MC1.9.4' into master-MC1.10
2017-05-11 20:35:20 +02:00
Vexatos
e596e61783
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-05-11 20:34:55 +02:00
Vexatos
d781eb3c62
Improved JEI recipe assembly.
...
Fixes #2375 . Not sure why it was never an issue before 1.11.
2017-05-11 20:33:47 +02:00
Vexatos
442d8feec3
Should fix #2370 .
2017-05-06 16:52:20 +02:00
Vexatos
2287b729d6
Updated a bunch of dependencies to make OC launch properly again.
2017-05-06 14:19:21 +02:00
Vexatos
833f13e507
Exclude duplicate modules in build.gradle.
2017-05-06 13:38:27 +02:00
Vexatos
7c761b586e
Re-add ComputerCraft integration.
2017-05-06 13:22:00 +02:00
Vexatos
ed21dafb7b
Fix #2368 .
2017-05-06 11:41:48 +02:00
Vexatos
67d5c2d504
Added support for forge energy.
2017-05-06 11:01:37 +02:00
Vexatos
41599b0c10
Made robot not send null to the client when its inventory changes.
...
Closes #2360 .
2017-04-23 17:35:31 +02:00
Vexatos
30e3e129c8
I don't trust ItemStack Options. Let's get rid of them.
2017-04-22 20:23:07 +02:00
