From 7d822b0ceecacfffaaa40bf64c6c22e3e81db1b8 Mon Sep 17 00:00:00 2001
From: Henry Mao <admin@calclavia.com>
Date: Thu, 10 Jan 2013 19:50:11 +0800
Subject: [PATCH] Fixed up slanted belt render

---
 .gitignore                                    |   1 +
 publish_obf.bat                               |  52 +++++++
 resources/Thumbs.db                           | Bin 12800 -> 0 bytes
 resources/assemblyline/textures/BeltMid.png   | Bin 373 -> 0 bytes
 .../assemblyline/textures/BeltSingle.png      | Bin 387 -> 0 bytes
 .../assemblyline/textures/ConveyorBelt.png    | Bin 401 -> 0 bytes
 .../assemblyline/textures/ConveyorBeltF.png   | Bin 402 -> 0 bytes
 .../assemblyline/textures/ConveyorBeltR.png   | Bin 397 -> 0 bytes
 .../assemblyline/textures/ConveyorBeltRF.png  | Bin 407 -> 0 bytes
 resources/assemblyline/textures/Thumbs.db     | Bin 3072 -> 0 bytes
 .../textures/slantedbelt/Upframe0.png         | Bin 1018 -> 0 bytes
 .../client/render/RenderConveyorBelt.java     | 142 +++++++++---------
 .../assemblyline/common/AssemblyLine.java     |   2 +-
 .../machine/belt/TileEntityConveyorBelt.java  |  57 +++++--
 14 files changed, 167 insertions(+), 87 deletions(-)
 create mode 100644 publish_obf.bat
 delete mode 100644 resources/Thumbs.db
 delete mode 100644 resources/assemblyline/textures/BeltMid.png
 delete mode 100644 resources/assemblyline/textures/BeltSingle.png
 delete mode 100644 resources/assemblyline/textures/ConveyorBelt.png
 delete mode 100644 resources/assemblyline/textures/ConveyorBeltF.png
 delete mode 100644 resources/assemblyline/textures/ConveyorBeltR.png
 delete mode 100644 resources/assemblyline/textures/ConveyorBeltRF.png
 delete mode 100644 resources/assemblyline/textures/Thumbs.db
 delete mode 100644 resources/assemblyline/textures/slantedbelt/Upframe0.png

diff --git a/.gitignore b/.gitignore
index a2391fdf..b7814c1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ CHANGELOG
 !/models/
 !info.txt
 !publish.bat
+!publish_obf.bat
 !include.bat
 !buildlocal.bat
 !/README
\ No newline at end of file
diff --git a/publish_obf.bat b/publish_obf.bat
new file mode 100644
index 00000000..9376fa50
--- /dev/null
+++ b/publish_obf.bat
@@ -0,0 +1,52 @@
+::ASSEMBLY LINE BUILDER
+@echo off
+echo Promotion Type? (Choose * for recommended, @ for stable and x for unstable)
+set /p PROMOTION=
+
+set /p MODVERSION=<modversion.txt
+set /p CurrentBuild=<buildnumber.txt
+set /a BUILD_NUMBER=%CurrentBuild%+1
+
+set NAME=AssemblyLine_v%MODVERSION%.%BUILD_NUMBER%
+set FILE_NAME=%NAME%.jar
+set TEMP_FILE=%NAME%_temp.jar
+set TEMP_FILE2=%NAME%_temp2.jar
+set TEMP_FOLDER=%NAME%_temp
+set API_NAME=%NAME%_api.zip
+set BACKUP_NAME=%NAME%_backup.zip
+
+echo Starting to build %NAME%
+
+::BUILD
+::runtime\bin\python\python_mcp runtime\recompile.py %*
+::runtime\bin\python\python_mcp runtime\reobfuscate.py %*
+
+::ZIP-UP
+cd reobf\minecraft\
+"..\..\..\7za.exe" a "..\..\builds\%TEMP_FILE_NAME%" "*"
+cd ..\..\
+cd resources\
+"..\..\7za.exe" a "..\builds\%FILE_NAME%" "*"
+"..\..\7za.exe" a "..\builds\%BACKUP_NAME%" "*" -pdarkguardsman
+cd ..\
+cd src\
+"..\..\7za.exe" a "..\builds\%BACKUP_NAME%" "*\assemblyline\" -pdarkguardsman
+"..\..\7za.exe" a "..\builds\%API_NAME%" "*\assemblyline\api\"
+cd ..\
+
+::Obfuscation
+echo Injector Minecraft Source
+cd obf_minecraft
+"..\..\7za.exe" a "..\builds\%TEMP_FILE_NAME%" "*"
+cd ..\
+echo Obfuscating...
+java -jar "retroguard.jar" "builds\%TEMP_FILE_NAME%" "builds\%TEMP_FILE2%" obf.rgs
+echo Repacking
+"..\7za.exe" x "builds\%TEMP_FILE_NAME%" "builds\%TEMP_FOLDER%"
+cd "builds\%TEMP_FOLDER%"
+"..\..\..\7za.exe" a "..\..\builds\%FILE_NAME%" "*"
+cd ..\..\
+
+echo Done building %NAME%
+
+pause
\ No newline at end of file
diff --git a/resources/Thumbs.db b/resources/Thumbs.db
deleted file mode 100644
index 0ef452b011a5832c1734f66db136eca9b8ff35a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12800
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

diff --git a/resources/assemblyline/textures/BeltMid.png b/resources/assemblyline/textures/BeltMid.png
deleted file mode 100644
index 36c17346f2d97d20645603abe9a702cb9c1bbf9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!octV$(qA@pf`q<$x;TbZ+<JS<
zkgv%=qV3`O7Uik)POM~4dgRh-{g=n9<!I|N-EXzRj~6&D>1W;QH}liI*<9OlXP@3U
z*YG-Dt3b#Ph7~KBCj?y*c4lA_XkcJbU|{5MaL{9X{p;?=%umyw|EXFNrgyz9smFCc
z&)Ls!X3b+hx43rQ)QRp6D>oldT)1_j`+-7+q@HO(K^%_d@7~XIDt_bqGWcVCYWEqj
z$o%)!FKQpKdw$z_a_>Efs!132He8%`+QwmT>Ao2oy4IhS2?%a5T_V8f!vFWrM!Sai
w)}Qep>ycanVm7pMtk`GQu$9pT3`B1+rty7Qr`sY^2MhoPPgg&ebxsLQ09#s-rvLx|

diff --git a/resources/assemblyline/textures/BeltSingle.png b/resources/assemblyline/textures/BeltSingle.png
deleted file mode 100644
index 953cfb33f0fd02496c046e3f051eb5bdae8bbcde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!octVO5`XtpyaJlS?CIhdQgQ3;
zOi#XM10Dw1Ba@xtt^~^+=@e)Em%^v36{9uL<irF?&ccN4>e6MCI={y~b()r1X!`E<
z^Ee5o3Ej*J%a|qvO;T@QlmH`Dwlkl<A8k7*f9_}L8Lpd?yCohk6<$~<Gxw!k!u+?k
zVaEN8TiqJZvb>&oyg`@2(9KuVlf&`c8}GLBbDlrt+r5?PyF|>%TmLvC3srM>F44U5
z>tJD(h(_-DYs<Dx==NJ=)w%84-PqTi?_FH%XYaTk-8Ri9<6cADa%X!6-*YVHjPEuH
zEav}FEOuo=s{}*&#r{tgt%6?35U0UObF+p|7Qo;D1CwK1lDBWYGw7cD0mS!o^>bP0
Hl+XkK12&Pe

diff --git a/resources/assemblyline/textures/ConveyorBelt.png b/resources/assemblyline/textures/ConveyorBelt.png
deleted file mode 100644
index 5666d206144b8bd6c5c5ff7b56627e217931d84e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!oE&UYT71)suL4aG^mK6yskrs_
zdSG9Zfk^Aa;K!3TXn$I{&V61)V5<Lh_TxQLM#9ltt^eYkd{`W-{7)a%47^^tjJ5ai
z3$HofXZ&)0zgJ9-A=H$?(CsZFrvjr&151kPgQ~Zxp3}W&*u2~SH(Ood=gnVlnDe&Z
zw=c6Q%|HHU>-uSS3O|=9vix52DSPSieWx#e-@Dp~G5BiT)aakSDhXPg#i4b^oIiXH
z#Z0{)!sMkjtwEsasKnE~*Ujf!_Me~fdZ}65Qnozvm~*@T%B^}-^sMMyh{o0xwRgFm
zpL>2QDtgH#$F$}(TYuYaiTly4^84nKbNvQernEd0F4*!gSJq+j+y}-C+Htc@6V9?k
ixN52}0s{sP4(xentu)iz(Moz6NX*mK&t;ucLK6Tuv!KNQ

diff --git a/resources/assemblyline/textures/ConveyorBeltF.png b/resources/assemblyline/textures/ConveyorBeltF.png
deleted file mode 100644
index 96aac9bf6e2b96da9195c48d14570235b33ac9d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!oE&UY@)0WAzX44V@^o<wskrs_
zx-Vaofk4|s&5s^i)r(l4H;SsSx|136Ls&(n?VrQa_nQp`MPAh8vMV><+7^2Aq5+TE
z@&9p7^)L2LH|CIIcz$P{xs~ta2@FCGOdbw}oICE%H!s_J>+0t^S$jvOW#^mAVt<$V
z-RD0kG+CSR;Mvx#VbeqBg;%}ZeS*=zmG{6V;W^>ec{95%Sshg2jPQ1PRT*EyG|kf^
z^yhvrhiAD4=TA@A8aB81(cbC0^9^sOKlr+3NuxEd@aH`FTYS?)M1_r~Cogka=bHOj
zO2B%4p_o<ID~+hz#pYYZ_f@`Kuceffci!O2l$KY*1s6YN%Q{S*`@oukJ#Mz?gA*(n
ij+!crz>t9hhbVqF{wXVt9y+%ZB<AVr=d#Wzp$Pz}JeaHi

diff --git a/resources/assemblyline/textures/ConveyorBeltR.png b/resources/assemblyline/textures/ConveyorBeltR.png
deleted file mode 100644
index 7e2c17ed5f24704c43e9e81cbd929c53a12656d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 397
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!oE)rHrXsOVZUar>^>lFzskrs_
znj>G6fk5lSl@C2`2=CN--YBZR>P}{i0!!z`3u0@&{1<X=n&|Z0vS*@0Y3yp53<<W)
z$4ggVkdMlK`ha)B8nXk{|G)kDYj^L(*QnF>9<v&@y^S+llo|7l(_m%QfsmhDLp)FH
zV%O2O53RMDuElv%Eg|w}=~nyN@<l8>#ZRy2F3fy0r{%_Ww{Nx$mJOB<>?bk^1ynHg
z6#MP{p0swV?(vA|>)dxgtb5(_;IxduFF$+d(4JzwiUplNwcnWD$jNIm<QKfm@jWYx
zW9i-%-xe*k{l4_ep?DXU`SOO_4S7^m7ye)gxwZcbqlhJ^ALEaQx4tyQt2r2ZDRKhC
c1OYBpF$8N&|8vpiKmbV4)78&qol`;+09U`B00000

diff --git a/resources/assemblyline/textures/ConveyorBeltRF.png b/resources/assemblyline/textures/ConveyorBeltRF.png
deleted file mode 100644
index 41768def747004b60d5655d0a611a36f4f251e39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 407
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!oE&WOicgH<B!H%fd%8G=RNQ)d
z-LvnIfk5lS^dl2{{EukOX<t*MG}$^-Kf{|RaQh0Lh>!nsl_XP(_U`bR5PZFK8SmFx
z`D;7gU93(z7g_yaUc;12Pkwy8<vmGndfr8L+2e&%ISY<!9sBW(^G@D*{z|K(s_F_M
za~pzwUgwO|;tW-Pu<_H<SHa1qY6ogBUSgHg{vY*rf8Fg^@g3nmYuBhOytdBJn(+<u
z4fdSmwR#Rr9uBWLI}D?|JT22}i{_jzv@cdu=lK7Id5`Vg-;!5CrW$-*pV!@5u(tQ?
z@$3V0rr$X2#NoNgF|B#c*6(&(;(i>?uQ&DNdR{FN<>mC5)8f{LEqn`3&Q0JvApZWW
o)Q7Vy5w4mljKI)=g9DrD7!IdRN{m~iY!4FjboFyt=akR{079Rl%K!iX

diff --git a/resources/assemblyline/textures/Thumbs.db b/resources/assemblyline/textures/Thumbs.db
deleted file mode 100644
index 3aff9ca510cb2bda88af4f045fa537428d255f09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3072
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW`V}#5OV&gQz;CAAclM(EMZV!aAn8?(nSoFu&hiJEylnK&-3uI0f){7
zY!&9e-koJ+2Ff1*5kO$XV9H>|5YJ%2kj!AnkiwA2U<{-!7?OZ&Q=ph7P=yJQ#s#z(
zm>5Ap04j?>G%j`M;s>CPh1s73v^SZ-9B7+45LyCVV98(r6iEZJQh;n+0BAql|HRtQ
z4m9jGp}@jrAr^6vy)b}98m|z@8KAHOMF%MVvjQ=w%m<YR96*{Ah`E568;E&;m=}oo
zfEXk{3Wk0NNC4v!6!$Bj>G7@dwSc5T^QoNye(t<nQlO~k_4IHF0@4m3%mGRqt1=7k
z0V&4fAa^H*b?0PW0y!+{j=qiz3>*8o|0Dtv5o3_2i(^Pd+}l}+LQM(+txJs;s=u1f
z{wZ8N=v~Ugl!?ZoPlF47%qsk)sPpOD#@`8sQ(vU7m33XV=#0g4pOC})y((^hByw-R
z<8ruOIw^m;#7Bk$3=$4J3TzsSiq`OMVu)mrRq%W$r2K+m%7b7|zUFF{PrJ71JN~`A
z`^F3V?aJIw=CL~Ex8IB1^eFuN;Rb7__M5!td;%)v*j7kB;5YiUZ~d%gE3f_ezk6Ek
z{;kRFf3MfL->g0EZTf4uiHP4)-wMlk{)X?ro>UgkixWTE@<=k_-rC>N(ka$QFHMiU
z_L+b0o^rMmO^HVuESXiFWCp2;oNs99OMjswFk!9zs>31eEBW4QE#WIx+Y!2CvEGF0
z*aYqK#ae6ZM8hh%WE=P#*cUK|d{jBcXT>0UK-chOSX|PP^^qk90!tlU{bszw+i|jT
z3nQZd0}3)^3U}Tq^VT_a_cdT>GkCiCxvX<aXoAJxVQBnif9qs$`kx_8as1`N;?I$<
zSwX;cX}XjDm8tASSA|!WZ#sIVZC1wN?HZ?yGk0BJto(o2qD%A0;VA2lg+USbzq@h$
z5mYgcy8d+?!>nZ!-<S3_-qGMYz_<no4a1%;H9N_)GOcmlYx_l0m;MzhcpI~#y1-!-
z-;60=u70~Zcehf=&zDs)6Lv8_^ZPOVlf?sHg(%$zU9-03cCT91HKD##ul?KO`1M~T
zx#tw=dmih#x*+PNW$6@U)zCB3cHQ%p{Ms?~n$!E^D_-sH3t``JV@iww*V|dw`TLU!
z_GkCyRfcT8!)7DDp7}wD{8aPrA4|ggPTXTm%e=S$j>3M!bG1=(v;OQmRh{0TB6Cd2
zAhm(Hwt9u|rt$-ghn8R5nzLWmb&AoKh^vcv61*kXGIWI6o?<9qn1B4I&A!)@m9rUU
zFS((jn!aZ17H#uW#SGG_H#K%<ODz%W*y`AH{;^l48xM;D10#n61Cu}l1A=*=lGBE9
TX507pWA*_vk)syGra1rrY<Dn4

diff --git a/resources/assemblyline/textures/slantedbelt/Upframe0.png b/resources/assemblyline/textures/slantedbelt/Upframe0.png
deleted file mode 100644
index e1e95bf1dfcb4dae7a1974efa3d8f91b11c3f0c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZuR2IhWG7srr_xVN)&{bmJ9xK!>|O9)=m?(6tH
z#a?K3+l^O?=Xm$q{xKAMe<$&oL8sfc<?s7tzgW!moABxMrstn4U)IilxT%-rL4n1d
z85h6)`uhAkfBWB9<2`Zf%dh^HKN7$Y)le_5DAI77wW99%{bNPzRWlf$9azY)h2gVP
z*n9`ZinxaR_kV7G|82jmIqzcD8EV^ZBP4%Z&S$*Rox}L-<RZ9+492kQmizfx7qHF{
z-}H-x%Yl2tu5&+YH5hac?3r*?9c1Cv(sS>f8G-h+uCZ%my1=w%U2&Z}P@#c-%2!U2
z2C;<Fxu1W76jmy(_Fn)rdG+f#_uGLA&u~Z9G67AFh<*OY4x}*d#4F+3b^GhB<ob7?
ze!6M*_v_#H&FKG8@qX_5xxd%^FY41fkiGERpU1*KK2>mAR-`cP7fZOkZK>S>eihwX
z*>9(#7^<7)zx;ok+h1$;LHAx%)Al7t{`znqNL?Mk$KdKa=On{}O`#g>4U5#yrPOmg
z0<yO=bj`Au%!pM5L%~h0Da;Om!s$i~J90!%F)moqX)MVQvyJO1L%@|IGkF;FqFaj?
zG_oG~urW+u>tx9wVp^!i+;BQ<q0FeULn07<N<V$@tCZ7cYZWlRGI+ZBxvX<aXaWG&
Ca+PQR

diff --git a/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java b/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java
index 06af259d..0b28d54c 100644
--- a/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java
+++ b/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java
@@ -16,86 +16,86 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class RenderConveyorBelt extends TileEntitySpecialRenderer
 {
-    private ModelConveyorBelt model = new ModelConveyorBelt();
-    private ModelAngledBelt model2 = new ModelAngledBelt();
+	public static final ModelConveyorBelt MODEL = new ModelConveyorBelt();
+	public static final ModelAngledBelt MODEL2 = new ModelAngledBelt();
 
-    private void renderAModelAt(TileEntityConveyorBelt tileEntity, double x, double y, double z, float f)
-    {
-        boolean mid = tileEntity.getIsMiddleBelt();
-        SlantType slantType = tileEntity.getSlant();
-        int face = tileEntity.getDirection().ordinal();
+	private void renderAModelAt(TileEntityConveyorBelt tileEntity, double x, double y, double z, float f)
+	{
+		boolean mid = tileEntity.getIsMiddleBelt();
+		SlantType slantType = tileEntity.getSlant();
+		int face = tileEntity.getDirection().ordinal();
 
-        GL11.glPushMatrix();
-        GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
-        GL11.glRotatef(180f, 0f, 0f, 1f);
+		GL11.glPushMatrix();
+		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
+		GL11.glRotatef(180f, 0f, 0f, 1f);
 
-        int frame = tileEntity.getAnimationFrame();
+		int frame = tileEntity.getAnimationFrame();
 
-        if (slantType != null && slantType != SlantType.NONE)
-        {
-            
-            switch (face)
-            {
-                case 2:
-                    GL11.glRotatef(180f, 0f, 1f, 0f);                    
-                    break;
-                case 3:
-                    GL11.glRotatef(0f, 0f, 1f, 0f);
-                    break;
-                case 4:
-                    GL11.glRotatef(90f, 0f, 1f, 0f);
-                    break;
-                case 5:
-                    GL11.glRotatef(-90f, 0f, 1f, 0f);
-                    break;
-            }
-            
-            if (slantType == SlantType.UP)
-            {                
-                this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "slantedbelt/Upframe0.png");
-                //GL11.glRotatef(-90f, 1f, 0f, 0f);
-                model2.render(0.0625F);
-            }
-            else if (slantType == SlantType.DOWN)
-            {
-                this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "slantedbelt/frame"+frame+".png");
-                GL11.glRotatef(180f, 0f, 1f, 0f);
-                model2.render(0.0625F);
+		if (slantType != null && slantType != SlantType.NONE)
+		{
+			switch (face)
+			{
+				case 2:
+					GL11.glRotatef(180f, 0f, 1f, 0f);
+					break;
+				case 3:
+					GL11.glRotatef(0f, 0f, 1f, 0f);
+					break;
+				case 4:
+					GL11.glRotatef(90f, 0f, 1f, 0f);
+					break;
+				case 5:
+					GL11.glRotatef(-90f, 0f, 1f, 0f);
+					break;
+			}
+			
+			this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "slantedbelt/frame" + frame + ".png");
 
-            }
-        }
-        else
-        {
-            switch (face)
-            {
-                case 2:
-                    GL11.glRotatef(0f, 0f, 1f, 0f);
-                    break;
-                case 3:
-                    GL11.glRotatef(180f, 0f, 1f, 0f);
-                    break;
-                case 4:
-                    GL11.glRotatef(-90f, 0f, 1f, 0f);
-                    break;
-                case 5:
-                    GL11.glRotatef(90f, 0f, 1f, 0f);
-                    break;
-            }
-            this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png");
-            model.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), tileEntity.getIsLastBelt(), tileEntity.getIsFirstBelt(), false);
+			if (slantType == SlantType.UP)
+			{
+				GL11.glTranslatef(0f, 0.8f, -0.8f);
+				GL11.glRotatef(180f, 0f, 1f, 1f);
+				MODEL2.render(0.0625F);
+			}
+			else
+			{
+				GL11.glRotatef(180f, 0f, 1f, 0f);
+				MODEL2.render(0.0625F);
+			}
+		}
+		else
+		{
+			switch (face)
+			{
+				case 2:
+					GL11.glRotatef(0f, 0f, 1f, 0f);
+					break;
+				case 3:
+					GL11.glRotatef(180f, 0f, 1f, 0f);
+					break;
+				case 4:
+					GL11.glRotatef(-90f, 0f, 1f, 0f);
+					break;
+				case 5:
+					GL11.glRotatef(90f, 0f, 1f, 0f);
+					break;
+			}
 
-        }
+			this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png");
+			MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), tileEntity.getIsLastBelt(), tileEntity.getIsFirstBelt(), false);
 
-        int ent = tileEntity.worldObj.getBlockId(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
+		}
 
-        GL11.glPopMatrix();
+		int ent = tileEntity.worldObj.getBlockId(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
 
-    }
+		GL11.glPopMatrix();
 
-    @Override
-    public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
-    {
-        this.renderAModelAt((TileEntityConveyorBelt) tileEntity, var2, var4, var6, var8);
-    }
+	}
+
+	@Override
+	public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
+	{
+		this.renderAModelAt((TileEntityConveyorBelt) tileEntity, var2, var4, var6, var8);
+	}
 
 }
\ No newline at end of file
diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java
index f71bd610..0fbf6fe0 100644
--- a/src/minecraft/assemblyline/common/AssemblyLine.java
+++ b/src/minecraft/assemblyline/common/AssemblyLine.java
@@ -144,7 +144,7 @@ public class AssemblyLine
 		GameRegistry.addRecipe(new ShapedOreRecipe(blockCrate, new Object[] { "TST", "S S", "TST", 'S', "ingotSteel", 'T', Item.stick }));
 
 		// Conveyor Belt
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockConveyorBelt, 8), new Object[] { "III", "WMW", 'I', "ingotSteel", 'W', Block.wood, 'M', "motor" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockConveyorBelt, 10), new Object[] { "III", "WMW", 'I', "ingotSteel", 'W', Block.wood, 'M', "motor" }));
 
 		// Rejector
 		GameRegistry.addRecipe(new ShapedOreRecipe(blockRejector, new Object[] { "WPW", "@R@", '@', "plateSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" }));
diff --git a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
index 9aa402af..a73a1f7d 100644
--- a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
+++ b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
@@ -32,7 +32,8 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
 		NONE, UP, DOWN
 	}
 
-	public static final int NUM_FRAMES = 13;
+	public static final int MAX_FRAME = 13;
+	public static final int MAX_SLANT_FRAME = 23;
 
 	/**
 	 * Joules required to run this thing.
@@ -41,14 +42,12 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
 	public final float maxSpeed = 0.1f;
 
 	public float wheelRotation = 0;
-	public int animFrame = 0; // this is from 0 to 15
+	private int animFrame = 0; // this is from 0 to 15
 	private SlantType slantType = SlantType.NONE;
 
 	public TileEntityConveyorBelt()
 	{
 		super();
-		// ElectricityConnections.registerConnector(this, EnumSet.of(ForgeDirection.DOWN,
-		// ForgeDirection.EAST, ForgeDirection.WEST, ForgeDirection.NORTH, ForgeDirection.SOUTH));
 		ElectricityConnections.registerConnector(this, EnumSet.of(ForgeDirection.DOWN));
 	}
 
@@ -120,18 +119,30 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
 
 		if (this.isRunning())
 		{
-			// System.out.println(FMLCommonHandler.instance().getEffectiveSide());
 			this.wheelRotation += 40;
 
 			if (this.wheelRotation > 360)
 				this.wheelRotation = 0;
 
 			float wheelRotPct = wheelRotation / 360f;
-			animFrame = (int) (wheelRotPct * NUM_FRAMES); // sync the animation
-			if (animFrame < 0)
-				animFrame = 0;
-			if (animFrame > NUM_FRAMES)
-				animFrame = NUM_FRAMES;
+
+			// Sync the animation. Slant belts are slower.
+			if (this.getSlant() == SlantType.NONE)
+			{
+				this.animFrame = (int) (wheelRotPct * MAX_FRAME);
+				if (this.animFrame < 0)
+					this.animFrame = 0;
+				if (this.animFrame > MAX_FRAME)
+					this.animFrame = MAX_FRAME;
+			}
+			else
+			{
+				this.animFrame = (int) (wheelRotPct * MAX_SLANT_FRAME);
+				if (this.animFrame < 0)
+					this.animFrame = 0;
+				if (this.animFrame > MAX_SLANT_FRAME)
+					this.animFrame = MAX_SLANT_FRAME;
+			}
 		}
 
 	}
@@ -263,15 +274,31 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
 	public int getAnimationFrame()
 	{
 		TileEntity te = null;
-		te = worldObj.getBlockTileEntity(xCoord - 1, yCoord, zCoord);
+		te = this.worldObj.getBlockTileEntity(this.xCoord - 1, this.yCoord, this.zCoord);
+
 		if (te != null)
+		{
 			if (te instanceof TileEntityConveyorBelt)
-				return ((TileEntityConveyorBelt) te).getAnimationFrame();
-		te = worldObj.getBlockTileEntity(xCoord, yCoord, zCoord - 1);
+			{
+				if (((TileEntityConveyorBelt) te).getSlant() == this.slantType)
+					return ((TileEntityConveyorBelt) te).getAnimationFrame();
+			}
+
+		}
+
+		te = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord - 1);
+
 		if (te != null)
+		{
 			if (te instanceof TileEntityConveyorBelt)
-				return ((TileEntityConveyorBelt) te).getAnimationFrame();
-		return animFrame;
+			{
+				if (((TileEntityConveyorBelt) te).getSlant() == this.slantType)
+					return ((TileEntityConveyorBelt) te).getAnimationFrame();
+			}
+
+		}
+
+		return this.animFrame;
 	}
 
 	/**