Florian Nücke
|
f436528571
|
some more cleaning up, fixed some warnings and suppressing some unchecked ones where appropriate (recipes)
|
2014-01-23 02:22:23 +01:00 |
|
Florian Nücke
|
540a5cf7c5
|
major clean up, clearing up separation of "core" and additional stuff a little by introducing an interface that allows getting the orientation of the container for item components; little bit of refactoring; killed the util.Persistable trait, since it was only confusing and unneeded (I just didn't realize traits could extend classes back then)
|
2014-01-22 18:53:50 +01:00 |
|
Florian Nücke
|
1ec08922b4
|
defaulting strength on wireless cards to max, because it's way too likely to forget setting the strength; also returning foreground and background color from gpu.get
|
2014-01-21 21:22:28 +01:00 |
|
Florian Nücke
|
53e96153f0
|
extra validation for pitch and yaw of rotatable blocks
|
2014-01-21 19:07:22 +01:00 |
|
Florian Nücke
|
568bd7b873
|
added license info for luaj; returning actual memory value for totalMemory to luaj, freeMemory is arbitrarily just half of that, since there's no way to actually track how much memory luaj uses itself.
|
2014-01-21 18:18:42 +01:00 |
|
Florian Nücke
|
74a53be2a9
|
got luaj fallback working, still needs some more in depth testing
|
2014-01-21 18:00:54 +01:00 |
|
Florian Nücke
|
42d80f6ff8
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into luaj-fallback
|
2014-01-21 13:23:13 +01:00 |
|
Florian Nücke
|
268df98940
|
fixed crash when project red isn't present (damn you autocomplete)
|
2014-01-21 13:08:51 +01:00 |
|
Florian Nücke
|
c1a7514b66
|
forgot to sort the boot scripts
|
2014-01-21 12:21:33 +01:00 |
|
Florian Nücke
|
7f8f216682
|
added basic support for symbolic links, pretty untested as of yet, though. they're kind of like mounts in that they have to be re-created after a reboot.
|
2014-01-21 01:40:28 +01:00 |
|
Florian Nücke
|
9d5f44919b
|
bumped kernel version number (since there were massive changes, after all) and moved the actual string declaration to kernel (out of the shell program, totally forgot about that before)
|
2014-01-20 23:49:27 +01:00 |
|
Florian Nücke
|
3607da2433
|
implemented settings for tcp part of internet cards, renamed the http section to internet and renamed to contained settings to make it cleared they belong to the http part of the card; added missing require to pastebin program
|
2014-01-20 23:25:15 +01:00 |
|
Florian Nücke
|
47396a24c8
|
taught edit to insert two spaces when tab is pressed. finally.
|
2014-01-20 22:49:37 +01:00 |
|
Florian Nücke
|
1ec60b9202
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers
|
2014-01-20 22:48:36 +01:00 |
|
Florian Nücke
|
9f5736b714
|
Merge pull request #86 from SpiritedDusty/patch-1
Updated site URL
|
2014-01-20 13:48:00 -08:00 |
|
SpiritedDusty
|
4810b35ab6
|
Updated site URL
|
2014-01-20 13:47:15 -08:00 |
|
Florian Nücke
|
0181ed3922
|
making all already loaded modules available in Lua interpreter since that is meant for quick testing anyway, so the convenience is justified; cleaned up some
|
2014-01-20 22:26:43 +01:00 |
|
Florian Nücke
|
4abc4b3367
|
fixed possible NPE in computer stop; adjusted comments in kernel
|
2014-01-20 22:09:17 +01:00 |
|
Florian Nücke
|
959e5676cc
|
tcp connections for the internet card; reworked Lua bootstrapping a lot, now using package module where possible, and not injecting our custom modules into the global namespace by default. this WILL BREAK STUFF but if so it should be relatively simple to fix - just put a local <x> = require("<x>") on top of the borked script; renamed http lib to internet since it now also contains util methods for working on tcp sockets (wraps them as a [buffered] stream). more breaking. just rename all http references to internet and you're good.
|
2014-01-20 19:31:12 +01:00 |
|
Florian Nücke
|
92f42035ab
|
added explicit check for project red to avoid crashes when its version is too old and showing a message on login instead; also showing a message on login if native libraries aren't available
|
2014-01-19 18:56:13 +01:00 |
|
Florian Nücke
|
03ed617de8
|
moved http stuff to new extra card, the internet card
|
2014-01-19 18:13:30 +01:00 |
|
Florian Nücke
|
51b2f05ed9
|
added gui elements to server rack gui to adjust wireless range of server racks; server racks now draw energy each tick, depending on the strength of the set wireless signal, for each running server in the rack. cost computes based on the wireless cost settings of wireless cards; changed rack recipe a little to include a wireless network card
|
2014-01-18 18:17:41 +01:00 |
|
Florian Nücke
|
1335536c5d
|
fgsfds
|
2014-01-18 16:54:12 +01:00 |
|
Florian Nücke
|
14f7037e46
|
basic abstraction for lua stuff for luaj, but... it'll probably be easier to copy paste the api stuff after all, jnlua and luaj's interfacing is just too different
|
2014-01-18 16:34:49 +01:00 |
|
Florian Nücke
|
c12a59270d
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2
Conflicts:
li/cil/oc/common/block/Delegator.scala
mcmod.info
|
2014-01-18 14:17:55 +01:00 |
|
Florian Nücke
|
e042d16f68
|
using oc specific parameter checking function in package lib and adjusted error messages to be more consistent with vanilla Lua
v1.1.3
|
2014-01-18 14:13:58 +01:00 |
|
Florian Nücke
|
aba968f6d7
|
converted package lib indentation to spaces to be consistent with other libs
|
2014-01-18 13:51:08 +01:00 |
|
Florian Nücke
|
8b9a243581
|
Merge pull request #83 from Wobbo/master
Added package module to /lib
|
2014-01-18 04:10:47 -08:00 |
|
Florian Nücke
|
428161562e
|
added a robot with max xp and full energy to creative tab for easier testing; fixed robot.level() value's post decimal value
|
2014-01-18 00:46:15 +01:00 |
|
Florian Nücke
|
62b704ae69
|
fixed robot movement glitch when their tile entity was queried during their break/invalidate phase (e.g. from SGT2's network scan)
|
2014-01-17 23:45:26 +01:00 |
|
Wobbo
|
695ec80a30
|
Added package module to /lib
|
2014-01-17 21:44:11 +01:00 |
|
Florian Nücke
|
0c464a7801
|
better check for which terminal is allowed to talk to which server; added basic range check (range not yet configurable); some localization stuff
|
2014-01-17 20:04:33 +01:00 |
|
Florian Nücke
|
0f067e37c4
|
remote terminal basic stuff. can be bound and used to control servers. servers simply have a neighbor visible built-in screen and keyboard for which the gui can be opened using the terminal item once bound. still missing a couple of checks.
|
2014-01-17 17:34:19 +01:00 |
|
Florian Nücke
|
125cedeadc
|
made server rack a power distributor; added buffer to distributor sides and setting for buffer size. this allow directly connecting two distributors without additional storage capacity in the network between them (such as capacitors); added recipes for new ram, cpus rack and server; renamed oredict entries to follow a NameTierX pattern instead of NameBasic...NameElite; minor recipe adjustments
|
2014-01-17 12:47:14 +01:00 |
|
Florian Nücke
|
dcc6a97302
|
sorting items in creative tab by their unlocalized name now
|
2014-01-16 18:15:29 +01:00 |
|
Florian Nücke
|
65d951d50c
|
added cpu slot to computer cases, computer cases now also require a cpu to define the number of components they support
|
2014-01-16 18:04:29 +01:00 |
|
Florian Nücke
|
87f5192724
|
locking server item that is currently being edited to avoid duping
|
2014-01-16 17:18:55 +01:00 |
|
Florian Nücke
|
39d9b4e598
|
the side servers allow component connections from is now configurable via the gui (allows individual servers to control individual component subnetworks)
|
2014-01-16 16:28:17 +01:00 |
|
Florian Nücke
|
e94dd03df5
|
extracted router into parent trait and implementing that in the server rack
|
2014-01-16 14:39:51 +01:00 |
|
Florian Nücke
|
b07c3e202f
|
added hard component count limit, computers can now only be connected to a limited number of components or they won't start/crash. this number increases with the tier, and can be increased in servers by adding cpus.
|
2014-01-16 02:25:37 +01:00 |
|
Florian Nücke
|
e560a9ee47
|
refactored computer class to extract any language specific logic (Lua) from the main running logic. this makes it a little less massive and should make it easier to add other language implementations, such as a Java implementation of Lua, or even altogether different languages such as an assembly emulator, for example
|
2014-01-15 19:30:24 +01:00 |
|
Florian Nücke
|
775236dc9d
|
fixed localization names for server rack
|
2014-01-15 17:08:12 +01:00 |
|
Florian Nücke
|
35f904d8ff
|
tile entity renderer for server rack for power indication; manual synchronization of server presence for rendering
|
2014-01-15 16:47:27 +01:00 |
|
Florian Nücke
|
0377cc53f1
|
block renderer for server rack
|
2014-01-15 16:07:41 +01:00 |
|
Florian Nücke
|
9128e82741
|
made racks save and load properly; made the rack block a redstone aware block; some more fixes; renamed the computer component to Machine
|
2014-01-15 13:09:45 +01:00 |
|
Florian Nücke
|
f0a900a014
|
Merge branch '1.2' into servers
Conflicts:
li/cil/oc/common/tileentity/Computer.scala
|
2014-01-14 17:08:20 +01:00 |
|
Florian Nücke
|
206e188a31
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2
|
2014-01-14 17:07:00 +01:00 |
|
Florian Nücke
|
7e803cdb8e
|
fixes optional interface derp making the mod crash if stargatetech 2 isn't present. this is actually a hacky workaround because I have no clue why IBusDevice cannot be implemented by AbstractBusAware, after all the same pattern works for redstone and cc's peripheral interface... the mysteries of class loading. fixes #81
v1.1.2a
|
2014-01-14 16:43:53 +01:00 |
|
Florian Nücke
|
3aac30b8ae
|
Merge branch '1.2' into servers
Conflicts:
li/cil/oc/Items.scala
li/cil/oc/common/Proxy.scala
li/cil/oc/common/tileentity/Computer.scala
|
2014-01-14 00:36:48 +01:00 |
|
Florian Nücke
|
48da13c51d
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2
Conflicts:
li/cil/oc/Items.scala
|
2014-01-14 00:25:15 +01:00 |
|