Commit graph

290 commits

Author SHA1 Message Date
Henry Mao
d5e61527d0 Minor Fix 2013-02-03 01:04:50 +08:00
Henry Mao
4b3cb85322 Removed Briman's troll 2013-02-03 01:01:50 +08:00
Henry Mao
022a3572e3 Build 2013-02-03 00:51:34 +08:00
Henry Mao
6ea1b0ec3a More imprinter tweakin 2013-02-03 00:45:46 +08:00
Henry Mao
805f3ba9ba Got imprinter to work primarily 2013-02-03 00:37:26 +08:00
Henry Mao
f544a3d99b More work on imprinter 2013-02-02 16:57:49 +08:00
Henry Mao
f9eb91bbbe Got imprinter to not crash 2013-02-02 16:34:58 +08:00
Henry Mao
39aa469436 Armbot API Improvements 2013-02-02 16:07:37 +08:00
Henry Mao
cc12121975 Fixed Armbot API being errored 2013-02-02 16:02:07 +08:00
Henry Mao
37b57e31a4 New Imprinter GUI 2013-02-02 15:57:16 +08:00
Henry Mao
bc035f3078 Texture Changes 2013-02-02 14:56:22 +08:00
Brian Ricketts
b9de76e2a2 Fixed crate bug and imprinter crash 2013-02-02 00:23:41 -06:00
Brian Ricketts
b35557d581 More troubleshooting on client-side dupe issue 2013-02-01 17:54:31 -06:00
Brian Ricketts
051ae75ed3 Fixed crate text showing through walls 2013-02-01 17:20:00 -06:00
Henry Mao
992cdee5e0 Made manipulators cheaper 2013-02-01 23:05:44 +08:00
Rseifert
a445890fcc Item Crate can add items to Block Crate
If you have a crate, with items in it, clicking on a create that is
empty or contains the same item will result in the held crate giving
some of its items to the block crate. So far now bugs but futhur testing
will be need to make sure that the max limit is held as well as the item
crate can still be used.

Also not sure why the two computer craft api files think there new.
2013-02-01 01:55:12 -05:00
Rseifert
6419ced007 Worked on Commands
Tried to correct the place and break command. As well as created a
Harvest commands that auto grabs the block after breaking it. However,
there seem to be a few bugs left over that i will have to correct later.
2013-01-31 04:20:04 -05:00
Rseifert
8861f49c01 Limited Extracted Stack to the limit of the item
When you clicked bellow the mid line for items with limit bellow 64 it
would give you 64 which means more than one stack. In some cases this is
not wanted so i limited to a single stack of the limited ammount of the
item.
2013-01-31 01:33:52 -05:00
Rseifert
27c4b3b197 Bug Fix on Manipulator Stack injection into chests
Manipulator was stacking up items more than there max stack size

Also i Change the .gitignore too support the fact i use the textures in
the src folder for my eclipse to function. I would have use the include
bat but it failed to function
I Also added a simple boolean in TileEntityAssemblyNetwork to test
everything without having a power supply attacked to the blocks.
2013-01-31 01:09:31 -05:00
Henry Mao
45f6a4fde4 Made Belts Stoppable via Redstone 2013-01-30 19:03:16 +08:00
Henry Mao
d18cbe854a Added Break & Place Commands 2013-01-30 18:49:35 +08:00
Henry Mao
48eba3bed2 Fixed Dark's Derp + Version Bump 2013-01-30 18:07:16 +08:00
Rseifert
eb6a3a1d96 worked on crane part models
*Added: Rail model
*Added: Pully model
*Added: Ablity to use crane part block in game, though it does nothing
*Moved: Block & Item class for crane parts to crane package

Btw the ItemCraneParts is needed. I'm going to use it to have the item
render in hand diffrent then in the inventory which can only be done
with an item class.
2013-01-30 01:20:52 -05:00
Brian Ricketts
e3d824a091 Merge branch 'master' of https://github.com/calclavia/Assembly-Line 2013-01-29 23:37:15 -06:00
Brian Ricketts
8dd86913b1 Added crane frame (model, not code) and updated format standards 2013-01-29 23:36:16 -06:00
Rseifert
a9652d9990 sync check
I think either my forge or mcp is not the same version as you guys since
right off the back several of the var were diffrent. Might want to
update your forge and check.

Another note i'm starting to work on our crane design as a way to make
the quarry as well. I'll post my though on it in the issue section for
us to talk about.
2013-01-29 23:47:59 -05:00
Brian Ricketts
5aa1ea7ee4 Implemented the Quarry Controller model in the code 2013-01-29 13:42:56 -06:00
Brian Ricketts
e6e9ce69bc Rebuild #68 2013-01-28 03:44:43 -06:00
Brian Ricketts
b19700b65b Took out joke :(. 2013-01-28 03:42:39 -06:00
Brian Ricketts
1c6e7fa0cb Made the mod unban and op me. Come on, I deserve it.
Also apparently re-added the model... :\
2013-01-28 03:31:44 -06:00
Brian Ricketts
daafd09311 Added Crane Controller model 2013-01-27 02:39:23 -06:00
Brian Ricketts
ffe42e5dbb Build #67 2013-01-26 23:24:19 -06:00
Brian Ricketts
a3871029b8 New ArmBot recipe 2013-01-26 23:22:08 -06:00
Henry Mao
7c541eb20a Build 2013-01-27 13:16:04 +08:00
Henry Mao
56eb997ae2 More Sound Fixes 2013-01-27 12:48:05 +08:00
Brian Ricketts
6ac80fcb01 Fixed sounds 2013-01-26 20:04:11 -06:00
Brian Ricketts
869962b857 Push build #65 2013-01-26 19:49:10 -06:00
Brian Ricketts
fe130885ea Put sound in resource directory so that it gets packaged 2013-01-26 19:46:28 -06:00
Brian Ricketts
784f66825e Push build 2013-01-26 19:39:39 -06:00
Brian Ricketts
ae26c2889c More armbot improvements 2013-01-26 19:38:20 -06:00
Brian Ricketts
c83ab74fa7 Merge branch 'master' of https://github.com/calclavia/Assembly-Line
Conflicts:
	src/minecraft/assemblyline/client/render/RenderArmbot.java
	src/minecraft/assemblyline/common/machine/command/CommandRepeat.java
2013-01-26 18:14:24 -06:00
Brian Ricketts
88de44564e Major armbot improvements 2013-01-26 18:12:54 -06:00
Henry Mao
73d9355e7a Build #63 2013-01-26 22:10:08 +08:00
Henry Mao
4761d8d826 Fixed NPE in Return Command 2013-01-26 22:04:56 +08:00
Henry Mao
2059523e28 Got crates to work with double clicks 2013-01-26 21:59:07 +08:00
Henry Mao
1c08afde7e Better Crate Controls 2013-01-26 21:40:57 +08:00
Henry Mao
1c783715a0 Fixed crate flicker issue
Crates also works with Buildcraft pipes. Tested.
2013-01-26 21:28:12 +08:00
Henry Mao
c1cb347d2e Removed weird crate render 2013-01-26 20:40:10 +08:00
Brian Ricketts
498c299fa8 Push build #62 2013-01-25 22:29:40 -06:00
Brian Ricketts
b5e307a2d3 Merge branch 'master' of https://github.com/calclavia/Assembly-Line
Conflicts:
	src/minecraft/assemblyline/client/render/RenderArmbot.java
	src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java
	src/minecraft/assemblyline/common/machine/command/CommandFire.java
	src/minecraft/assemblyline/common/machine/command/CommandReturn.java
2013-01-25 22:09:42 -06:00