Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
391 commits 1 branch 0 tags 42 MiB
Commit graph

391 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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