From d4d10083fbdd523621338e89d5c98a40de67b5f7 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 2 Nov 2018 10:21:53 +0200
Subject: [PATCH] Merge changes from the mlp skin pack

---
 .../textures/entity/pony/Blockwork.png           | Bin 0 -> 1493 bytes
 .../textures/entity/pony/bgponies.json           |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 src/main/resources/assets/minelittlepony/textures/entity/pony/Blockwork.png

diff --git a/src/main/resources/assets/minelittlepony/textures/entity/pony/Blockwork.png b/src/main/resources/assets/minelittlepony/textures/entity/pony/Blockwork.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d3751b0163506713e836bf8427df1490978e2d1
GIT binary patch
literal 1493
zcmV;`1uFW9P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000G?Nkl<Zc-rk-
zT}T{99RIDDf(NGF!hzNhtk(+ltBqW-pl`yVC{$1zp%tpdhL%RDwBSR<TJs>ZQ8Z6Q
z+9dSrViIbha&k1%8cTa1m-bGt^zew3s|}pplSs{jO{NcK#@Ws8y65frQTGROyR$R1
z^Z(8NYi38`*NZXoZ2JiT4>7tBComB$;-+eO*yqEds~$gpbDNb#vp3*ex3OygsJ!(u
zd%pR{JpjP5lUc0n!o@!Yz4x!ItPtgUi`{N^pZP@7RiJ&lLhqmt05H_&M!G<S?;Z4^
zvHWS>x>UfN&S6sYVg;P*Hh7okur}T!m@$?N$MLsi9c?_AM1yCN5s@zR4*Ib1U=q>n
z4K~|6s3w?Ayb_rJ@czx;iQO)uyVN1rG8)l<N$d$GCV&e+$b{z2fFh@Jm=u*&Fw>|j
zsD`(5m>AIlUg$+v{nmwVYMTJw=0_Leq^smj0Dvvc>JP6m4daF9QB+oehyfCq&>Cf#
ziG(D3XlrduyAPoK+giUwSyjGnJ*Dtwn?|PHE<Q4_y~0qR8(+*U8m`Zqh;!WrXF)Z-
zO4SJ_5)$~obb_gWiil=!z`HzW%9sSR<9@POI{%z3maEx(Bott#z-xhbd2Y)gYJ|nJ
z?fGQ%qn7{x-S14G>B&3*!1ddIftF`z4XnG=A^Y8Jon)XCJ`xHb5(;2#yhn(H0<vU@
z3ZGUDPzpA>5Z5hFRReeesNh##DP`k3lhwi6eSGgzoXP57B&cb@+4g+acJ-;R@%T(F
z0KilD9@_prZ_EVZ*BfxI-w#3v#uir@0fZ3reeePtP2Z+81Kp(#K}`#I0#1LvAOHX*
zgTJSwXqiGz=P;=&sAif&lP=nS<_?2H{O$<O_4^?Rf^4P*K|uWO2pq>9DQSQbYvVma
zgp$xXOipuJpiV^3mIibVle9ZQ8YPsW(@YKEXO0q*icg`l&pS{$`?^k0iRt+u>~;}$
zyNK!eVA`X@+IWv()`CY%c(xWWf?8KO6TH?{j)M+0+gA#|qX{Gu68zB^DxD_)0RCtU
z-dAe`wS5Ds%HLhOM2g*Rwg_qdQ34%EBosh+pcQ)S^Q+P^!}|+TJdSs7t*VZXVs>^G
z08mz5ChI2@3?-)lMnQ$ALWSKxalZ$31=Vnx5Vy@n(ge_%S2{#m9`;SiW>lHN?lqJ%
zuPis@1pUz%{Lz?dxuG?{Kr6h<b7|S+&>LUMVNh#v#D~Eaag*6QRe!AoPygs=s{Ww3
z-y<VS%{Qn)imT@zqGLN#U0PbwjU*Xn**$OjCG%5{)KQkz6;w09!vn3jRwd$Em58v<
zXGr+nn1R}F=3d%kc%YRzM5RA4Q{bfb1JV@%_!%#mp8_8m4-zuW?odlmv(<Xv!k|$S
z0I=OxdSBe{+1l7xhiX#vzac<R8zP~AEFs#-EYhttd+r4D^73GReS~SmKzEydqla2_
zN0N{$%2%OkWdLx8yMC;&@Zb=Tia8alJj*qf2OMq!W;~vh+Mjf}4mSaRyW4i$pwY`z
z*S^0300;(ys=pbqV8Ma~3l=O`uwcQ01q&7|SU6%3^v?HaoDTq?eKIVOkO;pcGd&;F
zI$xmLzUKZ4;rH}j^Zlm#{a@J+e}15=s|)`$yrDXNiX*=xw43t*Ogn(&4@{-neqRXC
z`u6UR#!%}L_pQBA=(XRG0BS!<*zF=Jom)1q*Iwm772(_0++Wds|0nKe<OSUS07>yU
zL~&E#ZN6n}Ot*bkb2G-cI!E3ISOi!ESOi!ESgEjHDy$a%6wirX9X%ux5~`y=$;y&B
z2LJ$X4Gn1?gCm4M5Cn5GL9>y2>XiH*^6&eA`q==Q2h7aO>}@J+Hh#HrBc=8qUcP*|
v30Qi*9;uj62X}rTk&x6(RJZ>l?*#t?h3fwS(#zvU00000NkvXXu0mjfdS%PR

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json b/src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json
index 5d26f08f..3f2726b8 100644
--- a/src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json
+++ b/src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json
@@ -17,6 +17,7 @@
         "Berry Punch",
         "Big Macintosh",
         "Big Wig",
+        "Blockwork",
         "Blueberry Muffin",
         "Bon Bon",
         "Braeburn",