Commit graph

3440 commits

Author SHA1 Message Date
Brian Ricketts
54aa4f2ee2 Manipulator mode fix - conflict with inversion 2012-12-29 22:13:43 -06:00
Brian Ricketts
f374e916b9 Fixed down-slope power transmission
(Off-by-one error, sir... XD)
2012-12-29 18:37:35 -06:00
Brian Ricketts
85cf225efb Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git
Conflicts:
	src/minecraft/assemblyline/client/render/RenderHelper.java
	src/minecraft/assemblyline/client/render/RenderImprintable.java
2012-12-29 18:24:45 -06:00
Brian Ricketts
f4e1576dbb Supposedly fixed Manipulators and Rejectors not powering adjacent belts
Fix was to deduct power requirement from wattsReceived instead of
setting it to "0". Rejector also wasn't calling super.onUpdate().
2012-12-29 18:15:12 -06:00
Brian Ricketts
3842d4a81e Globalized ability to invert filter
Globalized colored float text depending on inversion
2012-12-29 15:50:20 -06:00
Brian Ricketts
9fd9466457 Globalized ability to invert filter
Globalized colored float text depending on inversion
2012-12-29 15:38:08 -06:00
Henry Mao
800684f553 Build 2012-12-30 02:11:41 +08:00
Henry Mao
e12c9231e2 Renamed filter to imprint 2012-12-30 00:03:05 +08:00
Henry Mao
56a9ff0add Fixed textures 2012-12-29 23:58:16 +08:00
Henry Mao
9cc32fd692 Version Bump 2012-12-29 23:50:03 +08:00
Henry Mao
07d7759e8f Assembly Line 0.2.0 Release 2012-12-29 17:50:53 +08:00
Henry Mao
0d553f03ed Simplified code 2012-12-29 17:35:46 +08:00
Henry Mao
8c5d407ca1 Added un-imprinting feature 2012-12-29 17:05:40 +08:00
Brian Ricketts
008e22a35a Merge branch 'master' of https://github.com/calclavia/Assembly-Line 2012-12-29 01:16:48 -06:00
Brian Ricketts
6c0ad6cb20 Updated language file for Imprinter
Changed version number to 0.2.0
2012-12-29 01:15:21 -06:00
Brian Ricketts
5c03b2de3b Updated language file for Imprinter
Changed version number to 0.2.0
2012-12-29 01:14:09 -06:00
Brian Ricketts
95f27d5408 Implemented filter crafting in the Imprinter
(Renamed Stamper to Imprinter)
2012-12-29 01:03:48 -06:00
Henry Mao
5c42b9ae6a Attempt to fix packet issue 2012-12-29 13:04:51 +08:00
Henry Mao
585a2b9599 Removed unused inventory classes 2012-12-29 12:48:43 +08:00
Henry Mao
f6b4ce8f98 Made Manipulators accept filters 2012-12-29 12:07:08 +08:00
Henry Mao
c070788382 Made filter info render when looked at 2012-12-29 11:39:07 +08:00
Henry Mao
147ae58b4c Reformat and Reorganize 2012-12-29 11:25:11 +08:00
Henry Mao
142c25603a Empty commit 2012-12-29 11:10:16 +08:00
Brian Ricketts
88596a9361 Publish release 35 for 0.1.9
0.2.0 is coming later
2012-12-28 18:13:26 -06:00
Brian Ricketts
aa06a8b6c0 Revert "Published and updated info.txt"
This reverts commit aa8a1b5979.
2012-12-28 18:09:56 -06:00
Brian Ricketts
aa8a1b5979 Published and updated info.txt 2012-12-28 17:52:33 -06:00
Brian Ricketts
2a732328a1 Finished drawing labels over filter-supporting machines
Also cleaned up some packet code and modularized filters
2012-12-28 17:43:23 -06:00
Brian Ricketts
46c59251fc Mis-commit 2012-12-28 14:43:24 -06:00
Brian Ricketts
0bc33ea862 Finished the Rejector rendering code...now renders filter contents above
it when the player is within 5 blocks
2012-12-28 14:40:02 -06:00
Brian Ricketts
6cd86ee3c5 Starting to work on printing the filtered items above the rejector 2012-12-28 03:23:55 -06:00
Brian Ricketts
d1dfaad6dd Added missing belt textures 2012-12-28 03:13:37 -06:00
Brian Ricketts
b55ca97831 Animated the conveyor belts
To do: animate manipulators
2012-12-28 01:44:34 -06:00
Henry Mao
790fbb3e9c AS 0.1.9 Release 2012-12-28 14:30:11 +08:00
Henry Mao
c4105e06bf Attempted to make autocrafting 2012-12-27 20:05:15 +08:00
Henry Mao
91d48f4628 Made detectors use filters 2012-12-27 18:04:46 +08:00
Henry Mao
e88d2d9ee3 Made stamp work, changed detector to a block 2012-12-27 17:28:28 +08:00
Henry Mao
d4781ab3b0 Fixed detector and improved manipulator 2012-12-27 15:20:28 +08:00
Henry Mao
b867644894 API Update 2012-12-27 12:50:15 +08:00
Brian Ricketts
c11a15b6d5 Merged Item Sensor (Sensor) into Assembly Line
Some errors left to resolve
2012-12-26 22:10:05 -06:00
Henry Mao
44a84fddd4 Started working on stamper 2012-12-26 20:57:13 +08:00
Rseifert
e1a095be34 version change :p
nothing inportant just checking if everything is synced
2012-12-25 23:30:03 -05:00
Henry Mao
1be7f7c403 Crate Item Insert Improvement 2012-12-26 02:40:31 +08:00
Henry Mao
d8f3f065be Improved crate render 2012-12-26 01:50:28 +08:00
Henry Mao
ad0fb070ba Fixed wrong info file 2012-12-25 13:32:34 +08:00
Henry Mao
dbdf81601b Texture Update 2012-12-25 02:12:28 +08:00
Henry Mao
8988452c85 Assembly Line 0.1.8. Release 2012-12-24 15:59:22 +08:00
Rseifert
558ed1bda8 Face Lift
Added: Item Render for Pipe
Added: Item Render for Tank
Changed: Improve motor model
Changed: Tank vol to use global var
Disabled: Motor rotation( tempary)
Fixed: Pick Block for all blocks except pipe which picks to steam pipe
etc etc normal cleanup and derps
2012-12-24 00:20:30 -05:00
Rseifert
f2c04a007d update to 1.4.6 lol
Nothing really change for updating to 1.4.5 to 1.4.6 only had to fix 3
errors related to UE Vector3. However i did correct a config file bug as
well as fix pump wire connect to work better.
2012-12-23 07:27:58 -05:00
Rseifert
5787f65148 Reformating, and rebalance of tanks, Final 1.4.5
Did some file changes to make finding things easier
Added: Custom creative tab
Changed: File root system, :p to many files
Changed: Tank liquid trade method to balance out instead of full trade
Changed: the packet update rate of the Tank to try to fix Render Lag
Fixed: Tank Render so Liquid levels can be seen
BugIgnorable: uneven levels of liquid will not show up on tank render
but are present
BugIgnorable: eValve names sometime glitch and call all instances Empty
XXX
TODO: Fix Textures, and add model for eValve
TODO: Finish One way valve
TODO: Finish OIL,STEAM,FUEL liquid/gas blocks
2012-12-23 05:28:26 -05:00
Rseifert
b9b23fc63f Recipes,Names, and Liquid tank fixes
Fixed: the pipes having the same name as eValves
Fixed: Liquid tank trading system
Fixed: Tank being full and not filling next tank
Fixed: empty version of things showing up for Liquid type default
Added: eValve recipes
CleanedUP: Recipes, and convered most # to enum data to make things
easier to read
2012-12-23 04:26:36 -05:00