Florian Nücke
70a0ec4043
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
2014-06-16 17:17:35 +02:00
Florian Nücke
8f1cac9f9a
Fixed variable expansion in shell.
2014-06-16 17:17:17 +02:00
Florian Nücke
807d8457b9
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
2014-06-16 17:02:23 +02:00
Florian Nücke
82d1a8a955
Merge pull request #330 from Vexatos/patch-6
...
Added OPPM loot disk.
2014-06-16 17:01:13 +02:00
Vexatos
eaafbcaf9d
Create oppm.cfg
2014-06-16 16:54:05 +02:00
Vexatos
ce982b15b5
Create autorun.lua
2014-06-16 16:51:37 +02:00
Vexatos
8a7b11b169
Create oppm.lua
2014-06-16 16:49:23 +02:00
Vexatos
e1add13ca1
Update loot.properties
2014-06-16 16:48:43 +02:00
Florian Nücke
1a9d86f610
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
build.properties
src/main/scala/li/cil/oc/Settings.scala
2014-06-16 14:53:57 +02:00
Florian Nücke
deac0eacb6
Added config file versioning for config updates.
2014-06-16 14:51:43 +02:00
Florian Nücke
af49a05437
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/client/PacketHandler.scala
src/main/scala/li/cil/oc/common/tileentity/Charger.scala
2014-06-16 00:18:20 +02:00
Florian Nücke
d2a7ac8ad5
Made the animation on the side of chargers only visible when there's actually enough power to charge.
2014-06-16 00:16:57 +02:00
Florian Nücke
1b48aed45c
Possibly resolve some screen/terminal related glitches.
2014-06-15 23:43:22 +02:00
Florian Nücke
ae8633d0be
Common mod presence check for CC since there's only the new API in 1.7 anyway.
2014-06-15 22:43:20 +02:00
Florian Nücke
2a5ae26163
Adjustments for 1.7.
2014-06-15 20:11:01 +02:00
Florian Nücke
965aafacbb
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
2014-06-15 20:08:56 +02:00
Florian Nücke
4be565ef38
Re-compiled Windows natives against Win7 SDK, possibly preventing issues like #321 .
...
Made it so that computers and robots can also be powered on by being shift-rightclicked when not holding an item.
2014-06-15 19:22:00 +02:00
Florian Nücke
53d5ef4423
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/server/component/machine/Machine.scala
2014-06-15 18:11:56 +02:00
Florian Nücke
1cd40f31f3
Minor reformatting, removing tabs and reducing indentation to 2 in maze program, to make it more readable on ingame computers.
2014-06-15 17:51:52 +02:00
Florian Nücke
f82c0a3b76
Merge branch 'patch-4' of git://github.com/ReTeYeZ/OpenComputers
2014-06-15 17:42:44 +02:00
Florian Nücke
4adee24d56
Merge branch 'patch-3' of git://github.com/ReTeYeZ/OpenComputers
2014-06-15 17:41:30 +02:00
Florian Nücke
42040e2da6
Added caching to component proxy lookups to make storing the component's address instead of its proxy in a variable more reasonable (and avoid creating multiple proxies for the same component).
...
Saving autorun setting in /etc/filesystem.cfg now.
2014-06-15 17:34:34 +02:00
ReTeYeZ
21d396012e
Small tweaks to the error output
2014-06-15 15:27:39 +02:00
ReTeYeZ
2b51bb2efe
Added maze.man
2014-06-15 15:19:06 +02:00
Florian Nücke
957f6c6e3f
Fixed bad fake player initialization in tile entity's validate().
2014-06-15 02:35:34 +02:00
Florian Nücke
5ba5c06d68
Fixed a sided error.
...
Some performance tweaks.
2014-06-15 02:16:05 +02:00
Florian Nücke
9124346567
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
2014-06-14 22:50:36 +02:00
Florian Nücke
e67b103a5d
Fixed screen gui not resizing on resolution change. I think.
2014-06-14 22:50:01 +02:00
Florian Nücke
81bc7274fd
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/util/RenderState.scala
2014-06-14 22:27:56 +02:00
Florian Nücke
832e0cd84b
Made OpenGL error logging configurable.
2014-06-14 22:26:21 +02:00
ReTeYeZ
f7d96cb67b
Added small info
...
Accessable by maze help
2014-06-14 19:23:17 +02:00
ReTeYeZ
f5326c987c
Small fix to the error output
2014-06-14 18:38:32 +02:00
Florian Nücke
1e702afa23
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala
2014-06-14 13:42:40 +02:00
Florian Nücke
8c4d2e2936
Added .lua file extension to maze program.
2014-06-14 13:39:19 +02:00
Florian Nücke
f38e7febbd
Merge branch 'patch-2' of git://github.com/ReTeYeZ/OpenComputers
2014-06-14 13:38:02 +02:00
Florian Nücke
af6dab30b1
Merge branch 'patch-1' of git://github.com/ReTeYeZ/OpenComputers
2014-06-14 13:37:46 +02:00
Florian Nücke
db6c815e7c
Fixed kernel for LuaJ, closes #324 .
...
Don't trigger GC in LuaJ to avoid lags.
Slightly raised worker thread priority from minimal to somwhere inbetween normal and minimal, to reduce the likelyhood of the worker threads starving during server starts.
2014-06-14 13:32:13 +02:00
Florian Nücke
06ad36c29b
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
2014-06-13 23:45:17 +02:00
Florian Nücke
a5ef9a6abe
Added primitive globbing to simple shell.
...
Exposing 'filesystem.segments' (splits path into its parts).
Fixed filesystem.path to keep leading slash if present.
Made cp program multi-source capable.
Added verbose option to rm program.
2014-06-13 23:43:55 +02:00
Florian Nücke
8ce9d5d620
Should fix #323 .
2014-06-13 23:41:59 +02:00
Florian Nücke
bff4669f9a
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
2014-06-13 14:12:15 +02:00
Florian Nücke
e89ba4238d
Added third parameter to Geolyzer to control whether to ignore 'replaceable' blocks (except fluids), such as grass or vines.
2014-06-13 14:10:41 +02:00
Florian Nücke
8030319ed3
AABB deprecation stuffs.
2014-06-13 13:50:52 +02:00
Florian Nücke
4ef39bae77
Updated to new recommended Forge build (1121) and fixed compilation error.
2014-06-13 13:38:22 +02:00
Florian Nücke
8eb5519297
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
2014-06-13 11:06:40 +02:00
Florian Nücke
ab355a283d
Should fix #322 .
2014-06-13 10:48:20 +02:00
Florian Nücke
87eb274576
Added check for native lib validity when failing to extract because it is read-only (e.g. opened in another process).
2014-06-13 10:36:17 +02:00
Florian Nücke
2e0c8378e6
Fixed #316 .
2014-06-12 21:55:00 +02:00
Florian Nücke
ef6f6ea017
Added creative tier robots, assembled (instantly) using a creative case.
2014-06-12 21:54:38 +02:00
Florian Nücke
babb256717
Added some warning so the assemble button tooltip, mentioning recommended parts (screen, keyboard, gpu, filesystem).
2014-06-12 21:52:00 +02:00
