Johannes Lohrer
|
125224241c
|
graphics cards recipes
|
2013-12-01 02:32:21 +01:00 |
|
Johannes Lohrer
|
379947a251
|
card recipe
|
2013-12-01 02:19:40 +01:00 |
|
Johannes Lohrer
|
da9d0c3556
|
recipe changes
|
2013-12-01 02:01:06 +01:00 |
|
Florian Nücke
|
432c20f6b4
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/item/Card.scala
|
2013-12-01 01:49:13 +01:00 |
|
Florian Nücke
|
15c178cdf8
|
card graphic, minor touch-up to existing cards
|
2013-12-01 01:48:25 +01:00 |
|
Johannes Lohrer
|
770658dd22
|
removed tiers from cards
|
2013-12-01 01:48:24 +01:00 |
|
Johannes Lohrer
|
21fa5ba6a1
|
Merge branch 'master' of cil.li:oc
|
2013-12-01 01:40:18 +01:00 |
|
Johannes Lohrer
|
0b0579b776
|
added sticks to cutting wire
|
2013-12-01 01:40:10 +01:00 |
|
Florian Nücke
|
585f316da1
|
graphics for printed circuit board; sorted localizations and fixed a small typo
|
2013-12-01 01:39:39 +01:00 |
|
Florian Nücke
|
3d24c36fa9
|
circuit board graphics
|
2013-12-01 01:28:18 +01:00 |
|
Florian Nücke
|
ea4332fc2f
|
Merge branch 'master' of cil.li:oc
|
2013-12-01 01:26:59 +01:00 |
|
Johannes Lohrer
|
96629ece3a
|
ore dictionary for poison
|
2013-12-01 01:27:00 +01:00 |
|
Florian Nücke
|
10ee625c80
|
cutting wire image
|
2013-12-01 01:09:17 +01:00 |
|
Johannes Lohrer
|
012a4bd12b
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/item/Card.scala
|
2013-12-01 00:59:13 +01:00 |
|
Johannes Lohrer
|
c97440dba4
|
renamed cards
|
2013-12-01 00:58:22 +01:00 |
|
Florian Nücke
|
1a021cae07
|
formatting
|
2013-12-01 00:57:42 +01:00 |
|
Florian Nücke
|
05408976d4
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/item/ButtonGroup.scala
li/cil/oc/common/item/IronCutter.scala
li/cil/oc/common/item/Platine.scala
li/cil/oc/common/item/PlatineBody.scala
|
2013-12-01 00:56:05 +01:00 |
|
Johannes Lohrer
|
a077cca654
|
Merge branch 'master' of cil.li:oc
|
2013-12-01 00:55:11 +01:00 |
|
Florian Nücke
|
2d4d9b30bb
|
keyboard part graphics
|
2013-12-01 00:54:34 +01:00 |
|
Johannes Lohrer
|
27743d4961
|
more localization
|
2013-12-01 00:31:39 +01:00 |
|
Florian Nücke
|
91d91ef2ad
|
reworked graphics for alu, cu and cpu
|
2013-12-01 00:26:10 +01:00 |
|
Johannes Lohrer
|
6d34cc79a4
|
Merge branch 'master' of cil.li:oc
|
2013-12-01 00:17:22 +01:00 |
|
Florian Nücke
|
15ce4d4552
|
preliminary cpu, alu and cu graphics; refactored alu class
|
2013-12-01 00:16:58 +01:00 |
|
Johannes Lohrer
|
ac79b3c696
|
circuit board names
|
2013-12-01 00:16:55 +01:00 |
|
Johannes Lohrer
|
e4dadbae26
|
Iron Nugget
|
2013-12-01 00:05:17 +01:00 |
|
Florian Nücke
|
0f55bd047a
|
transistor and chipset graphics
|
2013-11-30 23:29:57 +01:00 |
|
Johannes Lohrer
|
41084dc703
|
better recipes
|
2013-11-30 23:26:46 +01:00 |
|
Johannes Lohrer
|
9513b1e4db
|
moar recipes
|
2013-11-30 22:16:27 +01:00 |
|
Johannes Lohrer
|
8212cd145c
|
Merge branch 'master' of cil.li:oc
|
2013-11-30 21:39:55 +01:00 |
|
Johannes Lohrer
|
70d62f1d71
|
removed unnecessary spaces in recipes
|
2013-11-30 21:39:48 +01:00 |
|
Florian Nücke
|
bf1beb558d
|
minor formatting
|
2013-11-30 21:11:13 +01:00 |
|
Florian Nücke
|
9fef877746
|
Merge branch 'master' of cil.li:oc
|
2013-11-30 21:07:55 +01:00 |
|
Florian Nücke
|
afd383dc9b
|
it clicks! screens of tier 2 and 3 now support "clicks", either via gui or by right-clicking on a screen without a keyboard ingame
|
2013-11-30 21:07:44 +01:00 |
|
Johannes Lohrer
|
36f771d6f5
|
more recipes
|
2013-11-30 21:03:03 +01:00 |
|
Johannes Lohrer
|
073ba601f5
|
Merge branch 'master' of cil.li:oc
|
2013-11-30 18:24:09 +01:00 |
|
Johannes Lohrer
|
3791bc34a8
|
made shears loose durability and return empty bottles if it's used in a crafting recipe
|
2013-11-30 18:23:49 +01:00 |
|
Florian Nücke
|
d990618de6
|
cleaned up item delegator/delegate; marked things in delegates as client only where appropriate (i.e. where they are in their "real" counterparts - block and item)
|
2013-11-30 13:01:11 +01:00 |
|
Florian Nücke
|
e05a26c73d
|
moved config loading into the try-catch in which it was supposed to be in all along...
|
2013-11-30 12:33:42 +01:00 |
|
Florian Nücke
|
b2b56419c9
|
cleaned up block delegate a bit, since its probably here to stay after all (mostly naming stuff and sorting)
|
2013-11-30 01:51:17 +01:00 |
|
Florian Nücke
|
dddf238a3b
|
suppressing analyzer results for some more blocks where it is meaningless to get the address and that have nothing to say for themselves (yet)
|
2013-11-29 23:13:08 +01:00 |
|
Florian Nücke
|
0ef8577624
|
fixed charges not forgetting their robots
|
2013-11-29 23:01:05 +01:00 |
|
Florian Nücke
|
083e7c2c66
|
added setting for size of tmpfs; enabled tag sharing for items after all, it's impossible/way too painful to get the tags and labels to display on the client reliably otherwise. fixed disks saving their content in their item nbt to make this not a huge problem (kinda hacky, but whatever)
|
2013-11-29 22:30:10 +01:00 |
|
Florian Nücke
|
e837c43cf6
|
lua program to change screen resolution
|
2013-11-29 21:35:38 +01:00 |
|
Florian Nücke
|
40755b9279
|
fixed keyboard detection on multiblock screens; fixed screen gui not being centered
|
2013-11-29 21:34:51 +01:00 |
|
Florian Nücke
|
19c2f7db23
|
fixed the glitch with items flying towards the player when robots harvested blocks
|
2013-11-29 18:55:38 +01:00 |
|
Florian Nücke
|
b66223ce3e
|
note block driver (somehow my dev env doesn't want to make any sound whatsoever right now, but the note above the block pops up, so I assume it works); fixed robot picking on dedicated (player.raytrace *and* player.getPosition is client side... seriously?)
|
2013-11-29 18:03:37 +01:00 |
|
Florian Nücke
|
47e6d6a327
|
removed peripheral driver and component
|
2013-11-29 17:14:55 +01:00 |
|
Florian Nücke
|
27e205dc3c
|
made floppy size configurable
|
2013-11-29 16:14:27 +01:00 |
|
Florian Nücke
|
0c778af9f1
|
fixed a fix; fixed power updates sending every time in robot gui (forgot saving last sent state...)
|
2013-11-29 14:29:51 +01:00 |
|
Florian Nücke
|
3ac0d4a895
|
sending updates from server to client only when the client is nearby (i.e. we can assume the chunks are loaded on the client). this is somewhat experimental, since we cannot say with 100% certainty that the chunk isn't loaded on the client. will probably send "important" packets to all clients all the time (e.g. robot move) in the long run, but for now let's see how it turns out.
|
2013-11-29 14:16:58 +01:00 |
|