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
Florian Nücke
874f577890
API CHANGE: Added name getter to item descriptor, in case they're obtained via api.Items.get(ItemStack) an that's of interest.
2014-06-12 21:49:19 +02:00
ReTeYeZ
0223faa34e
Update loot.properties
2014-06-12 18:28:16 +02:00
ReTeYeZ
e360a68282
Dynamic Maze Generator
2014-06-12 18:22:08 +02:00
Florian Nücke
e540e3f95c
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
2014-06-12 01:00:17 +02:00
Florian Nücke
ac9446b334
Merge branch 'master' of github.com:MightyPirates/OpenComputers
2014-06-12 00:59:43 +02:00
Florian Nücke
c9db547031
Patched native libraries for Linux.
2014-06-12 00:59:11 +02:00
Florian Nücke
78b40a57dd
Updated FreeBSD native library.
2014-06-12 00:24:17 +02:00
Florian Nücke
a64b84f21f
Merge pull request #313 from rmellema/master
...
Added fixed native libraries for Mac.
2014-06-11 21:59:30 +02:00
Wobbo
573ab5968a
Added new dylibs for mac
2014-06-11 21:55:40 +02:00
Florian Nücke
0041ca2a1f
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/common/tileentity/Rack.scala
2014-06-11 17:47:26 +02:00
Florian Nücke
1078cd9548
More formatting and organize imports.
2014-06-11 17:46:10 +02:00
Florian Nücke
149ade42ff
Fixed remote terminals potentially breaking when relogging into a single player world.
2014-06-11 17:43:35 +02:00
Florian Nücke
a8de31b577
Formatting.
2014-06-11 14:08:56 +02:00
Florian Nücke
a04732e5f0
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
...
Conflicts:
src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
src/main/scala/li/cil/oc/common/block/Screen.scala
2014-06-11 14:05:52 +02:00
Florian Nücke
41b4321b99
Yet more OpenGL error checks.
2014-06-11 14:04:37 +02:00
Florian Nücke
faade8b79f
Removed debug println in hologram renderer (oops).
...
Fixed screen clicking via arrows a bit.
Caching shells for reduced memory consumption for nested os.executes.
2014-06-11 13:47:05 +02:00
Florian Nücke
ed2707097c
Reduced hologram memory usage by only pushing indexes of visible faces.
...
Clearing buffer when hologram isn't visible at all.
2014-06-10 23:56:08 +02:00
evg-zhabotinsky
4157109b2e
Made dataBuffer be common for all holograms.
2014-06-10 23:52:11 +04:00
Florian Nücke
c46230e796
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
2014-06-10 18:17:50 +02:00
Florian Nücke
29cbfb529e
Properly closing HTTP requests on errors in iterator.
2014-06-10 18:15:21 +02:00
