From 6b938c1083456ac9fa8f0a852d9ca98d64e385f8 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Sun, 11 Oct 2020 12:25:39 +0200
Subject: [PATCH] Added new talisman and portable crafter

---
 .../textures/slimefun/gui/background.png       | Bin 188 -> 180 bytes
 .../slimefun/gui/background.png~RF627ae10b.TMP | Bin 0 -> 188 bytes
 .../textures/slimefun/portable_crafter.png     | Bin 0 -> 267 bytes
 .../slimefun/talismans/caveman_talisman.png    | Bin 0 -> 326 bytes
 .../talismans/ender_caveman_talisman.png       | Bin 0 -> 330 bytes
 src/models.json                                |  17 +++++++++++++++++
 6 files changed, 17 insertions(+)
 create mode 100644 assets/minecraft/textures/slimefun/gui/background.png~RF627ae10b.TMP
 create mode 100644 assets/minecraft/textures/slimefun/portable_crafter.png
 create mode 100644 assets/minecraft/textures/slimefun/talismans/caveman_talisman.png
 create mode 100644 assets/minecraft/textures/slimefun/talismans/ender_caveman_talisman.png

diff --git a/assets/minecraft/textures/slimefun/gui/background.png b/assets/minecraft/textures/slimefun/gui/background.png
index 686adb4351fd90dcc52f85daa9e6ecf080376008..4c222d78465bcb096a029152ad3b1eb3317ffea8 100644
GIT binary patch
delta 122
zcmdnPxP@_oW3f<xPl#(~X6C|$3!9pncJJOjapJ^Hn>INM%0FXZVBjq9h%9Dc;M)(v
zj25iHDnLPPPZ!4!iOb0iOkr$lss<cs2|_H4iOFng7XuVHma!g|V3LSP>`5?4&Ea8a
X(wE%+!ry}vsExtX)z4*}Q$iB}$YUii

delta 110
zcmV-!0FnQ+0lWc_K_M7WOjJdOhlk3_%B7{H>gwvZx3|;N)8F6U*x1-iiS{*-To^(v
zNkl<Z7}H~b0!9WVB`^?XU~&Ngw`2w;M?oMEqXi=k43ZfbVGLno5HL0d0F$8;>jr%;
QlmGw#07*qoM6N<$g1>w!NB{r;

diff --git a/assets/minecraft/textures/slimefun/gui/background.png~RF627ae10b.TMP b/assets/minecraft/textures/slimefun/gui/background.png~RF627ae10b.TMP
new file mode 100644
index 0000000000000000000000000000000000000000..686adb4351fd90dcc52f85daa9e6ecf080376008
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE08Y{;1lB7-rj!d)TyOQm%e)SYWw!>moHzwfB*iC8#jD9znKEna29w(7BevL
z?FV5-3)Wy2prEd&i(`ny<>Uq?H#Rj@1A(-JB1XpTDQs%)jtT;cS(SNtCP_*p@+2k;
c7?`m!OkODbnyprE3Q!}1r>mdKI;Vst0CVd&G5`Po

literal 0
HcmV?d00001

diff --git a/assets/minecraft/textures/slimefun/portable_crafter.png b/assets/minecraft/textures/slimefun/portable_crafter.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7c6b1cdeb2f3e546c894fc16b3e581dcf1d3f7c
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}T0G|+7AYHD{z1UG;nhk$}jZ&wVR+F1Xpelc#C10mGFHqJ|GioW2;w}mD
z3;quW3|{_>pMb)g1s;*b3=DjSK$uZf!>a)(7~|>U7@`r}+ULl3K!JmWJ4*21{|ASf
zZhg6QQm)`p*YsKsM+Rk<!eo9Qj#sV{;#b}WP82v&+jDA)z*;UpF1x9!Wv=zwJ0512
tvu4N3e>QG888Y`3zfK~P!Ll1OY_piyHfQ*Fg#zti@O1TaS?83{1OQ2yQvUz|

literal 0
HcmV?d00001

diff --git a/assets/minecraft/textures/slimefun/talismans/caveman_talisman.png b/assets/minecraft/textures/slimefun/talismans/caveman_talisman.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9b0d9fe8ce2821b462999943382af313b65db64
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G|;0G|+7Ag$HIcjBWTR~qZjzmMMhDCxeYoBicv=$$VcHf%qA`trg>D>^&-
z)~?&yXD?l3EV?H|dA*-vg0>J)<FA!-PXQ^Bk|4j}|CoTm-~YKFP@c2EBeIx*f$ty)
zGwzs}{T3)#?CIhdq7fW>HjwX#0td^5wHjdo8dd*yZ(F+i)|)>E_DuL7Sznp(`Nyjb
zto_~0EfT?88yE~(kBA@Xk@(F0NiO)FxJZ)T)~lROM|!#ZFDy1&v`W}#O+esmg}uee
xlQ|XC!sFxFX3VPk-&j)1x6k0gDcj=~jG<b5neo+ZD}mNCc)I$ztaD0e0st}%fyV#<

literal 0
HcmV?d00001

diff --git a/assets/minecraft/textures/slimefun/talismans/ender_caveman_talisman.png b/assets/minecraft/textures/slimefun/talismans/ender_caveman_talisman.png
new file mode 100644
index 0000000000000000000000000000000000000000..a444a0d5c41ec377f51f5169688fd54b7c7822ae
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}}0G|+7ARWMv&=&aKlEGz)^Zy>lKNY&yo;~_|d)lYd37<A>*nax-<%Nq@
zbawWwUAMK*Ub@IwbWe!#dOyVkZ6ToEuGt%^fs|-TkYDhBEPz4#X6-AW0?q=D$YKTt
zz5^i4n02j_6DU~h>Ealo5gdCqQ0TA%2g?PwDH4tgU;I6PYs!{cC;uJTm)Lf_;z`rl
z$Ey#E+34{JB>89_U^+5IAb&&p5!?F;@`g{79TlGiMbA}mxwGN}OYL>HkkY13QLQZD
zCFOZJMvO<Eym@_^AvpMb{e*Sb5Aw6k`FYOJ?vOOUgTlJPWkBm0JYD@<);T3K0RW8B
Bhd}@U

literal 0
HcmV?d00001

diff --git a/src/models.json b/src/models.json
index 9c29976..d2f0a52 100644
--- a/src/models.json
+++ b/src/models.json
@@ -1009,6 +1009,12 @@
 		"template": "ITEM",
 		"data": 4015
 	},
+	"CAVEMAN_TALISMAN": {
+	    "id": "talismans/caveman_talisman",
+		"item": "emerald",
+		"template": "ITEM",
+		"data": 4029
+	},
 	"ENDER_ANVIL_TALISMAN": {
 	    "id": "talismans/ender_anvil_talisman",
 		"item": "emerald",
@@ -1087,6 +1093,12 @@
 		"template": "ITEM",
 		"data": 4028
 	},
+	"ENDER_CAVEMAN_TALISMAN": {
+	    "id": "talismans/ender_caveman_talisman",
+		"item": "emerald",
+		"template": "ITEM",
+		"data": 4030
+	},
 	"DIAMOND_RING": {
 		"item": "gold_nugget",
 		"template": "ITEM",
@@ -1333,5 +1345,10 @@
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4077
+	},
+	"PORTABLE_CRAFTER": {
+		"item": "player_head",
+		"template": "SKULL",
+		"data": 4078
 	}
 }
\ No newline at end of file