Florian Nücke
|
2bc84f49a5
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 13:52:59 +01:00 |
|
Florian Nücke
|
110d15ff50
|
fixed match error; adding a tiny delay when switching primary components. this is mainly required for term.read, sh and lua to react to screens/gpu disappearing and reappearing
|
2014-02-08 13:51:34 +01:00 |
|
Florian Nücke
|
d1d9a79bc9
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 03:27:10 +01:00 |
|
Florian Nücke
|
3097d7657b
|
fixed shell.running
|
2014-02-08 03:26:45 +01:00 |
|
Florian Nücke
|
97d2c8ad88
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 03:22:34 +01:00 |
|
Florian Nücke
|
dbdfcdba5d
|
fixed loading files into memory for file systems with a limited capacity backed by a folder in the save folder: if the real files were too big, an out of space exception was thrown, which in bad cases could even bubble and crash. we now allow exceeding the capacity of file systems, when loaded from disk; added try-catch around component load and save code, just in case
|
2014-02-08 03:20:41 +01:00 |
|
Florian Nücke
|
40e17dc493
|
fixed robot gui, too
|
2014-02-08 02:45:11 +01:00 |
|
Florian Nücke
|
e39bb6ab6b
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 01:48:59 +01:00 |
|
Florian Nücke
|
5b67f9b693
|
patched up gui a little, slots now render correctly (mostly, tier numbers are a tad too dark)
|
2014-02-08 01:47:18 +01:00 |
|
Florian Nücke
|
e2f1172daf
|
added an interface to the api that allows custom declarations of methods (aside from the callback annotation), meant to make wrapping cc peripherals easier
|
2014-02-08 00:54:21 +01:00 |
|
Johannes Lohrer
|
a2b3eb98bc
|
Merge branch 'MC1.7' of cil.li:oc into MC1.7
|
2014-02-08 00:00:38 +01:00 |
|
Johannes Lohrer
|
092fea907d
|
fixed somewhat item rendering
|
2014-02-08 00:00:29 +01:00 |
|
Florian Nücke
|
d227c59c01
|
merged some of the event classes; fixed crash in keyboard event handler by moving it directly into the class
|
2014-02-07 23:09:50 +01:00 |
|
Johannes Lohrer
|
b39e550e15
|
forgot unregister
|
2014-02-07 22:31:26 +01:00 |
|
Johannes Lohrer
|
e63d1340b5
|
changed event registers to the correct type
|
2014-02-07 21:48:17 +01:00 |
|
Florian Nücke
|
4d99c28ee9
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
src/main/java/li/cil/oc/api/prefab/DriverBlock.java
Adjusted DriverTileEntity.java for 1.7
|
2014-02-07 17:09:28 +01:00 |
|
Florian Nücke
|
11b34f6e8a
|
killed item based block driver and added tile entity type based prefab
|
2014-02-07 15:17:53 +01:00 |
|
Florian Nücke
|
bb3f66b970
|
autoversioning mcmod.info
|
2014-02-07 15:06:02 +01:00 |
|
Florian Nücke
|
ebe88a082e
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala
|
2014-02-07 14:49:48 +01:00 |
|
Florian Nücke
|
3badd67d4c
|
missed some
|
2014-02-07 14:47:47 +01:00 |
|
Florian Nücke
|
c3d4c11d86
|
moved stuff around to be where gradle needs it
|
2014-02-07 14:45:53 +01:00 |
|
Florian Nücke
|
9910456dcc
|
network changes
|
2014-02-07 14:19:54 +01:00 |
|
Florian Nücke
|
55861d349f
|
nbt changes
|
2014-02-07 14:18:50 +01:00 |
|
Florian Nücke
|
28da97e629
|
item and block ids begone!
|
2014-02-07 14:17:05 +01:00 |
|
Florian Nücke
|
4fc03a6ca7
|
icon -> iicon, iconregster -> iiconregister
|
2014-02-07 14:13:05 +01:00 |
|
Florian Nücke
|
fb0b4e0d5d
|
ForgeDirection, event and other renames / moves; transition to event system for some removed interfaces (crafting handler, e.g.)
|
2014-02-07 14:11:53 +01:00 |
|
Florian Nücke
|
9ad9f3571c
|
all dem missing overrides; some minor cleanup
|
2014-02-07 13:44:38 +01:00 |
|
Florian Nücke
|
a685c22499
|
added check in block break callback of robots to avoid having them break themselves (e.g. with tools that break multiple blocks at once)
|
2014-02-06 16:19:06 +01:00 |
|
Florian Nücke
|
16e9aead60
|
removed block drivers for command block, note block and rim carriage controller, they have been moved to the OpenComponents addon
|
2014-02-06 15:10:27 +01:00 |
|
Florian Nücke
|
1a536d1df1
|
multiple servers now can no longer connect to the same side in a rack as discussed on irc, which makes it less likely for people to run into issues - they can still be connected directly by cables next to the rack, for example; remote terminal texture in inventory no longer blinks. when held in the player's hand it will be blank if unbound and blink if bound to a server
|
2014-02-06 13:13:14 +01:00 |
|
Florian Nücke
|
af1e76ca8c
|
making slots in server racks default to different sides; ensuring virtual keyboards of servers are only visible locally
|
2014-02-06 01:13:05 +01:00 |
|
Florian Nücke
|
3ff43ce1f5
|
always wrapping block drivers now; tried improving name finder a little more
|
2014-02-06 00:53:44 +01:00 |
|
Florian Nücke
|
690ea2777e
|
cleanup after adapter simplification
|
2014-02-05 23:34:35 +01:00 |
|
Florian Nücke
|
0a6a2693ef
|
adapter block no longer needs to be configured. this was meant to keep the 'power' of the block in check, and that isn't really necessary anymore now that components per computer are limited. and it makes things so much easier!
|
2014-02-05 23:15:20 +01:00 |
|
Florian Nücke
|
c743b89571
|
trying to generate better names for compound drivers
|
2014-02-05 22:59:45 +01:00 |
|
Florian Nücke
|
05a0e327b1
|
updated typesafe config
|
2014-02-05 21:28:15 +01:00 |
|
Florian Nücke
|
f5cb63fa12
|
better direct item equality check for stack support in block driver prefab
|
2014-02-05 16:56:37 +01:00 |
|
Florian Nücke
|
3fef6ee9f8
|
updated project red api; minor refactoring
|
2014-02-05 16:27:39 +01:00 |
|
Florian Nücke
|
4c4cf0bba6
|
not caching callbacks for multiblock driver's environment, since those can change; multi-driver makes block-stack comparison via driver infeasible, using manual check in adapter again; got so used to scala i forgot final; extended sides lib with the 'unknown' forgedir enum
|
2014-02-05 13:48:24 +01:00 |
|
Florian Nücke
|
5316092573
|
displaying robot's level in addition to its xp in analyzer result; mention that kb = 1024 in config
|
2014-02-05 02:44:31 +01:00 |
|
Florian Nücke
|
a98550a6c5
|
LAST MINUTE API CHANGE. don't sue me. it's still in prerelease mode :P Block.worksWith now also takes a world object. yes, there is a reason for this; added a dynamically created "multi driver" that joins multiple block drivers fro the requested block. this is useful for creating interface driven drivers, e.g. for the IInventory interface
|
2014-02-05 02:44:17 +01:00 |
|
Florian Nücke
|
60d60aa5e7
|
made remote terminals non-stacking to avoid binding multiple terminals to the same server
|
2014-02-04 19:36:59 +01:00 |
|
Florian Nücke
|
6aa72939b8
|
added setting for number of components for the different cpu tiers, closes #113
|
2014-02-04 17:26:47 +01:00 |
|
Florian Nücke
|
b462f1f606
|
support metadata wildcard in block driver prefab
|
2014-02-04 16:58:22 +01:00 |
|
Florian Nücke
|
620c4ccb9c
|
computer itself no longer counts towards component limit; forcing a refresh of the component list when trying to start the computer, should fix potential issues of "too many components" messages when there really aren't (the report may have been a false positive, but it can't hurt anyway); checking if callbacks are public; also logging bad callback annotations instead of erroring now, and specifying the class and method name in the message
|
2014-02-04 15:15:44 +01:00 |
|
Florian Nücke
|
a1dbbe1ec9
|
also extracting the hardmode recipes set now... herp derp
|
2014-02-04 03:23:04 +01:00 |
|
Florian Nücke
|
3d326821b3
|
stripped away most of ue api, only shipping with the UniversalClass annotation now to avoid issues with other mods that seem to use an unobfuscated version of the api
v1.2.0-pre2a
|
2014-02-04 01:34:24 +01:00 |
|
Florian Nücke
|
6d2b3ec56b
|
fixed robots hitting themselves with potions and bows, and possibly other stuff as well, by offsetting the position when using an item always now; fixed use of item with duration on servers
v1.2.0-pre2
|
2014-02-03 23:40:57 +01:00 |
|
Florian Nücke
|
41dd77c960
|
added patch for config to be written in a sorted fashion
|
2014-02-03 20:33:39 +01:00 |
|
Florian Nücke
|
3567b28e47
|
updated typesafe config
|
2014-02-03 18:23:26 +01:00 |
|