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

1140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Lohrer
2fa6632ba9 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-02-27 16:31:14 +01:00
Johannes Lohrer
eba0834244 added update check 2014-02-27 16:31:02 +01:00
Florian Nücke
b6092d0d1e Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-27 16:20:18 +01:00
Florian Nücke
87b5b3a412 fixed wrong sub-api in bc tool check potentially leading to crashes if some other mod provided partial bc api 2014-02-27 14:04:52 +01:00
Florian Nücke
d8543daf5a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-27 13:05:59 +01:00
Florian Nücke
7938a04fd8 these are necessary in 1.7 and don't hurt here (might even prevent issues for some contexts, I guess) 2014-02-27 12:14:42 +01:00
Florian Nücke
504fb31ab8 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-27 11:46:35 +01:00
Florian Nücke
aa474f3425 fixed some power related things in hologram projector 2014-02-27 11:45:49 +01:00
Florian Nücke
44798834c1 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
	src/main/scala/li/cil/oc/common/PacketHandler.scala
 2014-02-27 11:41:02 +01:00
Florian Nücke
65fb648cf9 reduced hologram network footprint and sending updates to clients more frequently 2014-02-27 11:11:47 +01:00
Florian Nücke
9dbe225623 fixed possibility of math.random pushing a LuaError (userdata); fixed shell immediately restarting after errors if there were pending signals 2014-02-27 04:21:21 +01:00
Florian Nücke
c3e9ed1e97 added power consumption for hologram projector; added scale setting, so hologram can be from 1x1x1 up to 9x6x9, higher scale consumes more energy 2014-02-27 03:25:27 +01:00
Florian Nücke
e04a8767d6 textures for hologram projector block; caching display list for hologram; fixed item bounds; added localization; added clear and fill callbacks; fixed pcall and xpcall being exploitable to avoid timeout enforcement 2014-02-26 20:57:36 +01:00
Florian Nücke
eb09bdc0ba Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into holo 2014-02-26 17:04:06 +01:00
Florian Nücke
794590399d fixed stupid stupid bug that made term.write fail horribly when writing multiline strings in non-wrapping mode 2014-02-26 17:03:29 +01:00
Florian Nücke
8072a50fd2 basics for hologram projector 2014-02-26 17:02:34 +01:00
Florian Nücke
6f8bb90f24 fixed a bug in LuaJ's string.match. hopefully. closes #138 2014-02-26 01:13:53 +01:00
Florian Nücke
55a90f8b63 fixed iron nugget recipe registration (stupid initialization order mix-up) 2014-02-26 00:34:01 +01:00
Florian Nücke
a9faf1c477 nil checks for whois stuffs 2014-02-25 00:06:11 +01:00
Florian Nücke
6116ef3942 not sending nil results from lua 2014-02-24 23:26:56 +01:00
Florian Nücke
cd490f7ae2 dem spaces before brackets 2014-02-24 22:58:24 +01:00
Florian Nücke
c5cb7287c2 simplified autocreate method; added nil check for timer cleanup 2014-02-24 22:52:35 +01:00
Florian Nücke
33e30ed5d2 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-24 22:07:42 +01:00
Florian Nücke
97716c9d47 fixed LuaJ fallback breaking when booting computers, closes #137 2014-02-24 22:05:43 +01:00
Florian Nücke
9d83cbb0de primitive irc client as example for socket connections using the internet card 2014-02-24 21:41:10 +01:00
Florian Nücke
05f6fcfebf fixed output rendering in term.write a bit; cleaned up shell execution logic a little (shell.execute now loads the $SHELL directly and runs it with the command that should be performed); added option for a read timeout to buffer:read; primitive variable expansion for default shell (no support for escaped quotes/brackets) 2014-02-24 11:17:05 +01:00
Florian Nücke
c71646569b reworked file system abstraction layer to support seekable files that were opened in write mode where possible 2014-02-24 01:43:45 +01:00
Florian Nücke
83e43f32fc also displaying the more specific 'no cpu' error message for servers 2014-02-23 17:27:57 +01:00
Florian Nücke
f9fa303f90 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-02-23 15:14:46 +01:00
Florian Nücke
3ecf471ed0 generalized approach to collecting item drops after robot actions, so item drops from actions other than block breaks are collected (e.g. wrench on ic2 machines), closes #131; now also applying robot tool efficiency to electric items (via ue3) v1.2.1 v2.0.1 2014-02-23 14:15:01 +01:00
Florian Nücke
dfe856a954 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/resources/mcmod.info
 2014-02-23 01:39:17 +01:00
Florian Nücke
a6cc344fcc moved text wrapping to utility method in text module; properly wrapping text in more now; fixed rendering bug in term.read 2014-02-23 01:29:38 +01:00
Florian Nücke
7ef0d3efbe added PAGER env var and using it in man 2014-02-23 01:23:43 +01:00
Florian Nücke
e1c80cbdc8 make man also look for files ending with .man 2014-02-22 21:32:42 +01:00
Florian Nücke
65a1c58bcf fixed os.setenv 2014-02-22 17:56:42 +01:00
Florian Nücke
0d83803e2c Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-22 17:53:47 +01:00
Florian Nücke
95bca5ced5 mostly memory consumption optimization of built-in stuff: moved serialization code to extra module so they only get loaded when necessary, drastically reduced memory consumption of component proxies, moved advanced shell stuff (redirects, pipes, variable expansion) to an extra program (besh.lua) to reduce memory footprint of shell module; shell uses $PS1 for the prompt now 2014-02-22 17:53:22 +01:00
Florian Nücke
7e7ec844e5 Merge pull request #130 from Wobbo/master 
Added positional parameters groundwork
 2014-02-22 15:53:10 +01:00
René Mellema
e950336d14 Made unsetting of variables possible again 
Before, unsetting a variable would result in "nil" in the environment :/
 2014-02-22 15:32:26 +01:00
Wobbo
36f93eae9e Merge remote-tracking branch 'upstream/master' 2014-02-22 15:28:25 +01:00
Wobbo
a7371c1c34 Merge remote-tracking branch 'origin/master' 2014-02-22 15:22:10 +01:00
Florian Nücke
5576abdb73 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-02-22 14:06:25 +01:00
Florian Nücke
b5bd97807c fixed file system labels not being saved. oops. 2014-02-22 13:45:43 +01:00
Wobbo
c7bd5fa05e Added positional parameters 2014-02-20 22:16:39 +01:00
Florian Nücke
6d54fffdbe some cleanup; moved language specific file system (lua/rom) to lua architecture 2014-02-20 09:48:12 +01:00
Florian Nücke
83860523a7 synchronizing filesystem component and making open/read/seek/close limited direct calls, reduced default max read buffer in turn. this should give better performance when reading many small files; made fs.close direct without limit to get rid of the ugly file handle gc workaround involving a timer 2014-02-20 09:22:42 +01:00
Florian Nücke
02827f69b7 moved process management from shell to kernel and exposing it via new process api, removes some nasty cross dependencies 2014-02-20 09:18:06 +01:00
Florian Nücke
93ad467490 fixed flipped doc in screen 2014-02-20 09:11:02 +01:00
Florian Nücke
900e08af8a copied license files to repo root for visibility 2014-02-19 23:38:09 +01:00
Florian Nücke
235acf922d checking for changes in tool slot in all activation cases now, fixes #124 2014-02-19 13:54:57 +01:00