Commit graph

608 commits

Author SHA1 Message Date
DarkGuardsman
dce6e49a69 Cleanup 2013-07-19 11:40:02 -04:00
DarkGuardsman
3933ce1179 Merge remote-tracking branch 'origin/master' into MC1.6 2013-07-16 19:10:25 -04:00
DarkGuardsman
2123d65cac Revert "Fixed config issue with multi-Block"
This reverts commit 0af366fb85.
2013-07-16 19:09:45 -04:00
DarkGuardsman
ebb0d0f43a Fixed multi block config 2013-07-16 19:08:51 -04:00
DarkGuardsman
0af366fb85 Fixed config issue with multi-Block 2013-07-16 19:06:15 -04:00
DarkGuardsman
9baa621c94 fixed error with computer craft api change 2013-07-14 10:54:43 -04:00
DarkGuardsman
9ce878400a Fixed Resource Location and asset loading
mod/assemblyline -> assets/al
2013-07-12 11:09:45 -04:00
DarkGuardsman
f749ddc7fa (untested) removed all red errors 2013-07-11 04:39:20 -04:00
DarkGuardsman
77183651d0 little cleanup and error killing 2013-07-10 04:33:31 -04:00
DarkGuardsman
ce11ee36cc Merge remote-tracking branch 'origin/master' into MC1.6 2013-07-08 05:44:44 -04:00
DarkGuardsman
2e1f2de9a6 Fixed NPE with setting filter 2013-07-08 05:44:00 -04:00
DarkGuardsman
a4435994e7 Init update to 1.6
Mostly done but just a few textures refs too go
2013-07-08 03:14:00 -04:00
DarkGuardsman
e1e5a4461f version++ 2013-07-08 01:39:06 -04:00
DarkGuardsman
6d8fc08fe1 updated build file 2013-07-08 01:38:24 -04:00
DarkGuardsman
e59dd6d7ea updated Dark-Lib 2013-07-08 01:31:06 -04:00
DarkGuardsman
0e24faf8d5 enabled de_DE lang 2013-07-08 01:30:17 -04:00
DarkGuardsman
b5dc2b3c71 Merge branch 'master' of https://github.com/DarkGuardsman/Assembly-Line 2013-07-08 01:09:41 -04:00
DarkGuardsman
00bd3a9e8e ... 2013-07-08 01:09:08 -04:00
DarkGuardsman
d08bb5c48e more work on network
resolved a few power issues though i'm running into mekanism energy
cubes self powering. As well energy cube, different one,  is request
power from the network but is never getting supplied any.
2013-07-07 09:26:00 -04:00
Robert WC Seifert
2674a4e586 Merge pull request #45 from Vexatos/patch-1
Created de_DE.properties
2013-07-07 04:07:05 -07:00
Vexatos
8f0085446c Update de_DE.properties
Also, removed Herobrine.
2013-07-07 13:01:36 +02:00
Vexatos
875d155e50 Create de_DE.properties
Also, added Cookies.
2013-07-07 12:58:12 +02:00
DarkGuardsman
88778499fb more work on assembly network
still buggy as in not working past powering assembly tiles. As well it
seems to be getting a 100W packet of power every 2 seconds from both
mekanism and buildcraft power pipes. It should not be storing anymore
than the internal battery size but its seem to be anyways. As well max
packet size should only be equal to the request which as well is not the
case.
2013-07-07 05:15:13 -04:00
DarkGuardsman
aade0001b4 Fixed infinite power issue 2013-07-06 02:17:11 -04:00
DarkGuardsman
202a775a6d Cleanup and fixed network split 2013-07-06 00:46:56 -04:00
DarkGuardsman
5113e5f660 Got network working on power now
Still need to fix what looks like an infinite power issue.
2013-07-05 23:21:32 -04:00
DarkGuardsman
b0b7ae3c06 Fixed slanted belt network connections 2013-07-05 22:32:47 -04:00
DarkGuardsman
4f4225d6f8 more work on assembly power network 2013-07-05 22:11:31 -04:00
DarkGuardsman
353333f80a cleaned up armbot 2013-07-05 22:11:15 -04:00
DarkGuardsman
1fc0664683 rejector cleanup 2013-07-05 20:12:23 -04:00
DarkGuardsman
0621433663 slight package change 2013-07-05 19:52:51 -04:00
DarkGuardsman
f9f985b468 removed basic components submodule
no longer needed
2013-07-04 22:56:48 -04:00
DarkGuardsman
976f382fbd general work on belt network 2013-07-04 22:55:41 -04:00
DarkGuardsman
6dc9cb3255 changed recipes 2013-07-01 19:41:54 -04:00
DarkGuardsman
e3816bb574 Changes for the dark-lib 2013-07-01 19:41:47 -04:00
DarkGuardsman
0d465abb7e working on belts 2013-06-30 22:35:01 -04:00
DarkGuardsman
c69ac743ee cleanup 2013-06-30 22:13:49 -04:00
DarkGuardsman
7de88e4d70 worked on packet handling and power
changed the packet handler to use a method allowing for super classes to
work with the packet. This is without losing the packet ID or needing to
reread the data from the packet again.

As well more improvement to how the tile understands how its powered
from the network. Added ways to detect if the tile was remove, no longer
connected, and a delay in case the power source missed a power cycle.
More improvement are to come especial with how much power is used by the
entire network.
2013-06-30 21:48:59 -04:00
DarkGuardsman
702e72227f updated subs 2013-06-30 19:26:51 -04:00
DarkGuardsman
12ea85d5b9 more work on tile network code 2013-06-30 19:25:37 -04:00
DarkGuardsman
1160213f47 more work on network code 2013-06-30 01:58:26 -04:00
DarkGuardsman
aca1e28a97 Changed how config file is handled 2013-06-27 13:39:31 -04:00
DarkGuardsman
bdd481f8c2 move TileEntity Registry to main file 2013-06-27 13:12:36 -04:00
DarkGuardsman
c479ce22ac changed base block file 2013-06-27 13:08:05 -04:00
DarkGuardsman
4e9da6a76f wrote a pathfinder to see if the tile has power
This path finder will track back to see if it can find a power source in
range to power it.
2013-06-25 23:29:31 -04:00
DarkGuardsman
f23892e224 Reworking assembly network
Changing the fake network like power system for the belts into a better
network. This way i can start to do more with the network and manage it
better.
2013-06-25 22:30:27 -04:00
DarkGuardsman
b5bb3e6316 Worked on Manipulator
This has not fixed issue with mekanism interaction yet. However, i am
still working on this though i don't think it just the manipulator
causing the issue.

Changes:
*Fixed: Filter not resetting for inventory helper
*Fixed: Manipulator consume items
*Fixed: Manipulator taking more items than existed
*General: Cleanup, docs, and minor corrections
2013-06-25 14:52:23 -04:00
DarkGuardsman
934814cfbf Fixed an error with give stack being null
All though this caused no crash it was still an issue
2013-06-22 23:00:23 -04:00
DarkGuardsman
0b64248a5a updated dark lib 2013-06-19 06:25:22 -04:00
DarkGuardsman
465a3093fe Made the give and take command use manipulator methods 2013-06-18 06:28:53 -04:00