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
Brian Ricketts
cac04ed7e4
Added sounds to the Conveyor Belts
2013-01-16 03:28:18 -06:00
Brian Ricketts
bf9f9d2392
Added conveyor sound resource
2013-01-16 02:34:54 -06:00
Brian Ricketts
7a048652ac
Tried fixing ArmBot again...
2013-01-15 03:40:17 -06:00
Brian Ricketts
5c5f4395bb
Started implementing a Lua API to act as a "wrapper" for the ArmBot.
2013-01-14 17:01:00 -06:00
Brian Ricketts
1fd05aade7
Improved armbot slightly
2013-01-14 15:35:29 -06:00
Henry Mao
e0ef452563
Rebuilt Recommended Build
2013-01-14 18:43:59 +08:00
Henry Mao
35a196701e
Removed Unused API
2013-01-14 18:29:27 +08:00
Brian Ricketts
7e38f9027f
First go at implementing the CC API for the ArmBot
2013-01-14 01:13:28 -06:00
Brian Ricketts
d89ad4a27f
Aaaaaaaand fixed the .gitignore file and added the CC API back in -.-
2013-01-14 00:38:18 -06:00
Brian Ricketts
c973254a98
Moved CC API (source was in wrong location)
2013-01-14 00:37:18 -06:00
Brian Ricketts
2bc5a107d8
Added ComputerCraft API (for ArmBot and future quarry)
2013-01-14 00:25:29 -06:00
Brian Ricketts
11014ae8f8
Push build
2013-01-13 03:29:03 -06:00
Brian Ricketts
fb4e53eb02
Fixed more armbot derpiness
2013-01-13 03:27:41 -06:00
Brian Ricketts
947d229057
New recommended build
2013-01-13 02:35:28 -06:00
Henry Mao
ceb784fa26
AL 0.2.3 Release!
2013-01-13 15:51:43 +08:00
Henry Mao
13cba0dbcd
Armbot Model Tweaks
2013-01-13 11:56:41 +08:00
Henry Mao
4a9d756946
Build Bump
2013-01-13 00:15:10 +08:00
Henry Mao
b8423ef4e8
Fixed Armbots not initiating properly
2013-01-13 00:02:51 +08:00
Henry Mao
f02f085599
Got Armbot working nicely
2013-01-12 23:55:12 +08:00
Henry Mao
eb323c77ec
Added Armbot recipe
2013-01-12 23:10:19 +08:00
Henry Mao
10312d6110
Finished Imprinter
2013-01-12 22:57:46 +08:00
Henry Mao
cab2361358
Briman, you do know about ItemStack.isItemEqual?
2013-01-12 22:38:34 +08:00
Henry Mao
bf481c0eca
Fixed BIG ISidedInventory Bug
2013-01-12 22:26:34 +08:00
Henry Mao
7f08eaa0ef
Removed weird extra function in manipulator
2013-01-12 22:23:35 +08:00
Henry Mao
055e7623b4
Weird Thumbs.db file appearing...
2013-01-12 22:22:29 +08:00
Henry Mao
09f519ede1
More work on the imprinter
2013-01-12 22:22:08 +08:00
Rseifert
899aaa0c52
Armbot model update
...
not done yet but since i won't work on it again til tommorrow i'll back
it up to github.
2013-01-12 00:13:18 -05:00
Henry Mao
8a561c5921
Reworked Imprinter to have an inventory
2013-01-12 12:41:01 +08:00
Henry Mao
f58b88d30e
Some work on imprinter
2013-01-12 12:12:07 +08:00
Brian Ricketts
09d4febe13
Some work on ArmBot (trying to smooth things up a bit)
2013-01-11 22:11:18 -06:00
Henry Mao
67a59a6af7
More work on Armbot
2013-01-11 23:56:36 +08:00
Henry Mao
f2a0867399
Fixed stacking glitch
2013-01-11 23:26:42 +08:00
Henry Mao
9b4665a6b5
Added repeat command
2013-01-11 22:41:57 +08:00
Henry Mao
b6bfa34561
Made grab and drop commmands work
2013-01-11 22:41:50 +08:00
Brian Ricketts
8668049be7
Some more work on the ArmBot and command handling
...
TODO: Make the client not "simulate smoothness" if the thing hasn't
received any power in a while (right now it twitches)
2013-01-10 13:02:08 -06:00
Henry Mao
60ec8b365e
Build Bump
2013-01-10 21:43:50 +08:00
Henry Mao
6521bfa305
Added command parameters
2013-01-10 21:41:12 +08:00
Henry Mao
e07b10b47f
Fixed command processing to work
2013-01-10 21:18:17 +08:00
Henry Mao
af74b4230b
Make disks work on Armbot
2013-01-10 21:04:20 +08:00