From b3a83b003d353675472cbefb8ecf65679b2332ae Mon Sep 17 00:00:00 2001
From: NormalFery <132052650+NormalFery@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:13:29 +0100
Subject: [PATCH] Added Pan axolotl and renamed self in credits.json (#16)

---
 .../joy/entity/ModAxolotlVariants.java           |   1 +
 .../joy/textures/entity/axolotl/axolotl_pan.png  | Bin 0 -> 1289 bytes
 .../assets/minecraft/texts/credits.json          |   4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/assets/joy/textures/entity/axolotl/axolotl_pan.png

diff --git a/src/main/java/gay/pridecraft/joy/entity/ModAxolotlVariants.java b/src/main/java/gay/pridecraft/joy/entity/ModAxolotlVariants.java
index a25c5f2..33c47d2 100644
--- a/src/main/java/gay/pridecraft/joy/entity/ModAxolotlVariants.java
+++ b/src/main/java/gay/pridecraft/joy/entity/ModAxolotlVariants.java
@@ -15,6 +15,7 @@ public class ModAxolotlVariants {
 		register("progress");
 		register("trans");
 		register("aroace");
+		register("pan");
 
 	}
 
diff --git a/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_pan.png b/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_pan.png
new file mode 100644
index 0000000000000000000000000000000000000000..1906ba88919a8a03abe09fbe32632d7fff4bf9b0
GIT binary patch
literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkSyGcYrRCt{2nN4ULM-<2ZtBBS~vx;Kbv1^&QcG4m!#Km<3{eVDA
zPOixz1ye#BNOKQ`^w4u}X$o}@y;MCUrY$WrB=is)YKTE`4=o1!By6RLOl8aZXjYO%
zWGHz(jAmz6UTIgdYwxQ212J#sW4-Uq%$xVd!2cY@tdf?}grvqE27;`VpTGSBc;P5}
zJ{e+VBG1Z4kD*MyYx-U%;;-8>5Cno9;yKt0XcZ>cD$nIaUbMLcU)>g2d9ylM`9^gP
z$J_vB%G+skA@#R_6@1Uv`T&=q&@XY?w%?mUs|W{~$O~Tp2>E0P%6P<)j?t$p&mCMd
zXcab=pA>*`CAeT!2p^Et0IdS$>==}@W1`31W%jG0x63mRG*;HZh7el-FrM}GwuG#>
zJkCN%<>NOUxdr_AHBsm6HZcNMo+~Q_KLFT!xXdxDa}c&?Ww}Vi<ye-LZ*`0Iu{mJq
zFc1kC$Hj}lpPRtSxZ=<iuuI6w4_9}_q9*EAntUG(UMK5bjZq$6wKTdR5Tf^fATzm^
zNMQR+bB2TFvQsgxfUs&V19*{c3i;^*6KF)Q`z&`6eLf(pK4%!0+AL!&2h8l!2k$mU
z1IW&>QBqTgva;iAy(;@Rm&yn~&y0{-FJmnuw>b~p0CXlwIR7%}c9bpss;taiw&lFK
zJAuAq(3J<cTyE{l?p|$eoJ_>Ji*5jA?y^E3Kv!6nYe}s$rNTX;&aErJ_R&PE8e17!
z1(<!nD&ILFVudeaY}?eP#EE=Mmn0O&&QF1ewSM*Q1DYjOVx?Iwz}p;1b8!HV1bJka
z)L@7hc|BhRJBR@1GoQ3PR`9uH4@Hjf<f9G%P&g;##WX8<%3CWB_lmwp?igOPqI_uk
zlV1w3h;i`F(;aVthv$4PY=O#xu>?e_Eaw2V`GA~Go4vz?+!p)oC%)X4i0x5XU}rop
zwF;Yg?(`Zl`+)V;D#mwIjS$NkmCbFjJRx4(UnBVAMHaIIz@fh;v6cZ|8;&BiUPicB
z&HV1KnrD1me)QPj=u&|)!ieJc#WMPiO(NF+rT#Y-HDKa6@Z%~|9$;bh#BuTLv4`kR
zqWild0l;9Fifb7K{sTZd3uv3bN73u7vyJS^ZRiU9v`X|!knP9UpSj8QZpR2KH$G*Z
zPxZE)0rXQKqB7;Xo`q5Qj*$k#-H&d7%ocM@u`EQk$4P4TP68LAM}qIqmN3|*;<p?y
zlqti1;3Cr1<MI6MXua{S$8t}PPK!t}nHNW0_Cla7{DEmMFgi_?%$G0_61PHMy$T%m
ztB9AFzc{sLpZMRR8(?&rC{=iZ@R5T6fcxXB?iA%Rq5_-$?A!P5I=T}~=1chb?SuIK
z4K~{VbBeVkcb4tKwm`^=fsl$+;R)6!4z-03@Q|T1-_%_NjoRFd@jhUv6Ljg;Hbv>u
zEy7Ueo_*B5LQ84VFF?UALuo19ma`84n7Y>d?Q1JzoQki%2e>z7U!i+bp#C1~ey)Nx
zt`HS&SQ>!}H;6W_w9V`ru%lR8DsMLc+UXdl;u{F5I6XtQ6*@gbBqvF2!F-lT{s&1t
zmWxF5S^LKF@bK{P@bK{P@bK{P@bK{Pa3KEzWd{l=@pEE*00000NkvXXu0mjfcLi@=

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/minecraft/texts/credits.json b/src/main/resources/assets/minecraft/texts/credits.json
index 2adb8a3..72a91c4 100644
--- a/src/main/resources/assets/minecraft/texts/credits.json
+++ b/src/main/resources/assets/minecraft/texts/credits.json
@@ -4376,9 +4376,9 @@
                         "Ampflower",
                         "amy",
                         "Blurryface",
-                        "Fery",
                         "Laxla",
                         "Lupancham",
+                        "NormalFery",
                         "polycord",
                         "rotgruengelb",
                         "Sake",
@@ -4429,7 +4429,7 @@
                     "title": "Translators",
                     "names": [
                         "Blurryface (ɥsᴉʅƃuƎ, Brazilian Portuguese)",
-                        "Fery (Spanish)",
+                        "NormalFery 'Fery' (Spanish)",
                         "Pufferbluh (Russian)",
                         "ThinkSeal (ɥsᴉʅƃuƎ)",
                         "Alice (Brazilian Portuguese)",