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
Brian Ricketts
f443184f8b
Updated UE API
...
Added RotateTo command
Added .fire(velocity) to CC peripheral
Added .rotateTo(yaw, pitch) to CC peripheral
Changed .rotate(yaw) to .rotateBy(yaw, pitch) in CC API
Fixed RETURN command (and other ROTATE commands) not waiting properly
2013-01-25 22:07:21 -06:00
Henry Mao
2cda43b63c
Manipulators now work with multiblocks
2013-01-25 19:35:56 +08:00
Brian Ricketts
179c92c3bb
Pushed another build
2013-01-21 23:27:39 -06:00
Brian Ricketts
d7b90682f8
Improvements to FIRE command and ArmBot in general
...
Fixed dupe bug
2013-01-21 19:47:06 -06:00
Brian Ricketts
2e1adab358
Pushed build
2013-01-21 15:57:27 -06:00
Brian Ricketts
0c6fde1912
Added FIRE command (throws things and fires arrows!)
...
Also fixed a manipulator bug (NULL CHECKS, CAL. NULL CHECKS!)
2013-01-21 15:53:02 -06:00
briman0094
feaf8d61c7
Armbot can now be pitched with ROTATE
2013-01-20 18:05:03 -06:00
Brian Ricketts
9a1aa77adf
Implemented Auto Crafting with ArmBot USE command
...
Also fixed some major crafting bugs in Imprinter
Did *NOT* add *ANY* easter eggs. None. Zero. Zip. Nada.
2013-01-20 02:51:24 -06:00
Brian Ricketts
76e81cf00a
Implemented "USE" command
2013-01-20 00:09:51 -06:00
Brian Ricketts
d043109284
Added IUseable and apparently updated some build things.
2013-01-19 23:30:13 -06:00
Brian Ricketts
b485454708
Build re-push
2013-01-18 22:26:14 -06:00
Brian Ricketts
62ab7843aa
Oops...forgot to revert from experimental crate renderer
2013-01-18 22:01:20 -06:00
Brian Ricketts
bedfe2f625
Pushed build
2013-01-18 21:57:39 -06:00
Brian Ricketts
7d90ae8ddf
Fixed more sounds -.-
2013-01-18 21:55:22 -06:00
Brian Ricketts
ef590bfa0b
Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git
2013-01-18 21:53:06 -06:00
Brian Ricketts
86fd779608
Finished implementing CC API for armbots
2013-01-18 21:51:38 -06:00
Rseifert
be0518f2bf
Fixed a SMP crash issue with sound for belts
...
Not sure if you guys are even bug testing on SMP but you need too every
so often. SMP lan, and SMP Dedicated are two diffrent server types. The
SMP lan can get away with something like playing sound. However, doing
anything client related on SMP Dedicated will cause a crash. Make sure
in the code anything client releated is only done on the client reguard
less of how small.
Also who every changed the rejector to use the paper item and display
the item name above it good job. Its a nice feature and better than the
GUI I had, however if there isn't a way alread we need to work in a way
to have several item on a rejector. Which we can either do with the
detector, another block, or the rejector itself.
On another note i turned down the AMP pull a little to make belt lines
easier to feed.
2013-01-18 22:47:33 -05:00
Rseifert
0873406e7f
.
2013-01-18 22:24:53 -05:00
Brian Ricketts
189fc9b857
Vastly improved Arm Bot (and added sounds! :O)
2013-01-18 17:55:43 -06:00
Brian Ricketts
b67b1d2bd3
Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git
2013-01-18 05:29:42 -06:00
Brian Ricketts
a68490ba6f
Added new conveyor belt state and attempted to fix crates
2013-01-18 05:28:35 -06:00
Rseifert
3dd7fdada1
Changed item render for rejector
...
Change out the item render for the rejector block. Also corrected a
minor model issue with the robotic arm but nothing major changed with
it.
2013-01-17 21:00:06 -05:00
Rseifert
c6e3320609
Changed out the model for the Block
...
*Still need to do the item view
*I also removed some unneeded textures
*Change gitignore to not include thumb.db files since they always seem
to change
2013-01-17 20:32:53 -05:00
Rseifert
9f48af67d2
Finished Rejector model
...
4th try to get this to push not sure whats happening
but anyways finished the rejector model so it can be used to replace the
temp one currently in use.
2013-01-17 20:12:26 -05:00
Brian Ricketts
787da0aeae
Changed sound length so it's more "responsive" in game
2013-01-16 03:41:03 -06:00
