Commit graph

532 commits

Author SHA1 Message Date
Brian Ricketts
7bf55f5cac Updated .gitignore again 2013-03-01 23:18:25 -06:00
Brian Ricketts
4789830fa5 Something. 2013-03-01 23:15:34 -06:00
Brian Ricketts
377262a19a Updated GitIgnore 2013-03-01 23:13:55 -06:00
Brian Ricketts
6eb4a93b88 Added separate recipes for IC2, vanilla, and BasicComponents
Fixed "buildlocal.bat". Dark, make a copy...
Tried fixing an imprinter bug; seems like a vanilla problem
2013-03-01 23:08:31 -06:00
Henry Mao
88c909c502 Update README.md 2013-02-27 21:41:50 +08:00
Henry Mao
bbe9c9b694 Update README.md 2013-02-27 21:41:05 +08:00
Brian Ricketts
5ebdfab827 Fixed thingies not being in the right creative tab 2013-02-27 01:29:12 -06:00
Brian Ricketts
43cf672769 Fixed block names and implemented BC wrench API 2013-02-27 00:54:42 -06:00
Brian Ricketts
394becf356 Push build 2013-02-26 20:28:13 -06:00
Brian Ricketts
f99ac5995b Removed Crane components from public view. They stay this way until
release! >:(
2013-02-25 19:56:03 -06:00
Rseifert
09f5353faa Fixed an item stacking issue with crates
Manipulators were not stacking items in crates above the items max stack
limit.
2013-02-22 13:16:00 -05:00
Rseifert
caf4f11c30 going to add a belt based sorter
The idea is to have a sorter arm on the belt to flip items to the left,
right or let them pass. Similar to a pinball table. This block will
allow player to create more complex sorters, as well as item
distrubuters if they set both outputs the same.
2013-02-21 20:43:16 -05:00
Rseifert
60fae11394 Done with crane model
Ok i'm done but non of the textures sheets are lined up. I'll do this
later or a texture artist is welcome to line the sheet up.

CraneArm is the arm this will be rendered where every the target is at.
There is a block in it that needs to be removed from the code when
added. IT is there just to help me model it. If anyone knows how it can
also be used to render the block texture on when the arm picks up a
block

craneArmHoist is were the arm connects to the craneMount point. Metal
cables need to be rendered from it to the craneArm. Look at Beacon code
for help or use Calclavia's Laser Fx with some tweaks.
2013-02-19 22:35:45 -05:00
Rseifert
dea769dde1 Model Cleanup and upload
Uploaded Crane Mount point
Moved Files around to help my eyes find things
2013-02-19 21:39:41 -05:00
Henry Mao
5e59176c41 Fixed crane frame recipe conflict with boots 2013-02-19 19:56:06 +08:00
Henry Mao
d9f4c6146c Fixed armbot and manipulator dupe bug 2013-02-18 23:06:27 +08:00
Rseifert
b75bf7d092 added stuff to GrabDictionary
I also adjusted some number in the belt in hope to fix and issue with
stuff getting caught on the edge of a belt when a slated belt is trying
to place an item on it.
2013-02-18 08:44:24 -05:00
Henry Mao
4fbea4c94e Fixed large crate bug 2013-02-18 19:49:41 +08:00
Rseifert
815e26818e fixed crash with last change
Also confirmed fix for grab command, Entities are now picked up and not
moved by the belt.
2013-02-17 05:10:31 -05:00
Rseifert
a69f2375a1 Re Added Ignore Entity to Belts
I ORIGINAL added this so that machine could take control of the Entity
without the belt trying to move the Entity. This should correct the
issue with the armbot trying to grab an Entity but it being ripped out
of its hands by the moving belt.
2013-02-17 04:55:14 -05:00
Henry Mao
a4ea8ed8b2 Briman you failed! 2013-02-17 15:54:10 +08:00
Henry Mao
496c13405f AS 0.2.6 Release 2013-02-15 16:32:17 +08:00
Henry Mao
9afab004ff Refined IC2 support, making it work. 2013-02-15 16:10:52 +08:00
Henry Mao
cad749fa5c Fixed detector emitting from front
This causes belts to stop.
2013-02-15 16:10:41 +08:00
Henry Mao
d3b8e7ab62 Updated UE API to 1.2.6 2013-02-15 15:49:12 +08:00
Rseifert
9e41c06f57 Fixed Grab command with new parms
You can now use the Entities name as well as say if you want to grab the
adult or child version of the Entity. The parms are reversable so the
user can use
grab Entity Child
grab child Entity
grab Entity
2013-02-14 05:12:24 -05:00
Henry Mao
d96d48ea2d Added laser drill model into code 2013-02-14 17:17:34 +08:00
Rseifert
29be8c5ce3 uploading <Comply_cat_Ed> Model for the lazer 2013-02-14 03:46:00 -05:00
Henry Mao
c9093d56e0 Added laser drill model by xiaoxiao 2013-02-13 23:04:51 +08:00
Rseifert
2afc52e5de removed player from being grabbed
Still need to make this possible but for some reason it errored out so i
readded the check for the player back to the Entity Checks
2013-02-13 01:03:49 -05:00
Rseifert
22915fbc26 fixed Entity IF checks for Grab cmd 2013-02-13 00:55:39 -05:00
Rseifert
00e1fb65e2 fixed null error
fixed it erroring out to debug but now it doesn't work at all
2013-02-13 00:17:57 -05:00
Rseifert
5714eb5f1f added child as an ult word for baby 2013-02-13 00:12:08 -05:00
Rseifert
663f4829f5 More work on grab command 2013-02-13 00:07:12 -05:00
Rseifert
e35eb3ab30 same as last 2013-02-12 23:37:01 -05:00
Rseifert
44d59abac5 improving grab command
Adding support to the command to specify what entity that it should
grab, as well as a way to register more Entities by name for the grab
command
2013-02-12 23:24:45 -05:00
Rseifert
c6e07dfc5a ;/ give up on the powerTo command for the moment 2013-02-12 22:50:35 -05:00
Rseifert
a9cdd654c4 more stuff for powerTo command
so far it doesn't work but with a little time and less of me beating my
head into the keyboard it will get done.
2013-02-12 22:26:31 -05:00
Rseifert
5330d60d8a Added method to armbot for PowerTo command
untested so far but just setting stuff up.
2013-02-12 22:15:24 -05:00
Rseifert
1b0a386f5c PowerTo command setup done
Now to just figure out how to actual apply power to a block and this
command will be done.

Also i still can't get 7zip cmd installed on my computer too use. So i
had to create my own include script for now.
2013-02-12 21:51:52 -05:00
Rseifert
7e869bb5c0 Worked on PowerTo command some more 2013-02-12 21:10:56 -05:00
Rseifert
cbf3a1848f added some method to ItemWorldHelper
I really need a better name for this collection of helper methods but
can't think of one. So if you guys have a more usable name i'm open to
suggestions.
2013-02-12 21:02:25 -05:00
Brian Ricketts
11a5b7315a Tweaked rendering of crane parts a bit 2013-02-12 11:42:16 -06:00
Henry Mao
0c68e19733 Added texture for crane frame 2013-02-12 19:29:47 +08:00
Brian Ricketts
ff3fa8a29e Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git 2013-02-12 00:47:46 -06:00
Brian Ricketts
ccaca0c92f Fixed some render craps 2013-02-12 00:47:28 -06:00
Henry Mao
156553a4f9 Fixed imprinter glitching client side 2013-02-12 14:44:26 +08:00
Henry Mao
b41b0f9d04 Fixed amrbot dupe 2013-02-12 14:26:24 +08:00
Henry Mao
475d0e494c Version Bump 2013-02-12 14:24:22 +08:00
Henry Mao
353f522cae Fixed imprinter dupe 2013-02-12 12:27:11 +08:00