From ab1475b325a3bd4483f7fcfc03150d07037010fb Mon Sep 17 00:00:00 2001 From: BrainFart17 Date: Sun, 5 Apr 2026 21:07:28 -0700 Subject: [PATCH] Fix conflicts with new book & quil item --- .../Common/Media/MediaWindows64.arc | Bin 28556979 -> 28557355 bytes Minecraft.Client/Windows64Media/strings.h | 16 +++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index 0ccfd55c802d0d9cc314e4a74aaa4d83cd2aac90..34328525a0cb05eecbbaacb0952d22c2640af3f0 100644 GIT binary patch delta 4580 zcmZA4d0>p!8prW7ClU!+2H7Vwd1of8WKtm_mLiB)f~rg(^Lc7h=sop;iR7b-v1v9$SP`5#fAbzGOWi~}RVY6;QRq}E?r}~GQ-$+Xl`!FCwO-7{-x^nm?KteK z6kn($zJH*&fy04NArBAgdf+$4I%PAzOufl$(NESpulwsI+)1aQOzs?T-O06}d7>aZ zjHjOw)#1wI$|%gscrwp*U)Q!+7+Y|WM(kF@(+}%0F_fRJ?5$kt&7ozU@ST6wap6#c{8$Te*2*zIdn(?HO?f z=0-#o$bHad54D^HHG9<0MtW3KhLUKt{?Gzz|dzc6VeetEB0q>&<3GQ3u%>{i*GcMd``T0sEOk5SBnU(+T->JtXm_@+5j;@>&2t5i!!Z- zj~yizYPFtA@F`2W%)-Ts+79BF)|Ve$C(dhQJRh~j`72D}I4?!C;fXgze1w*l&+hKH!dk%(BHlP_*XMD&_>i?N>bac3?2eEMT>_mdiIM)vHW^O@Xz zR4cL~!+7Uu!W=2_5`5)Es-=4R#C*^EpT3;y19$IaviK@e!&}c0_i#vW5TQ|8UUy#f ziHhb&2Z_?C816n-EWyeCsiG-LnL4`^y9;Ci&dcQuru{j$aQ_hY*Hg&?pB;8R;rkC( ziGXMg@A8xA9ot;COUp?uj)@d$@= z>qJPrf@?n($?@TQ(pfPoUg8a&q6#M;^cBnFRlKi79Eewq?e~B&Ud{Y-?KZQ;s4ven zSJ*3@_uP}X91`SPKB2lO2w*y74PQyF?Br0{v0K;v^ z6}{3e`ifFxk+ne9xaK3V4HIxUu2b=bx5W)z1b;t%wtqsMe}W7+xIrs$2M=fsp5O&- zpe=ZV5BP!~$e|syhYsKm0T2j55DXy@3JM4VC8!`ABv69}v=9N25Czc?1F_H%;vgP$ zK>L0UIzb|IhAxleSg|}cGtcMM-5jMfwuo_-Vx?*wCM)tGTwDNbDyNw4asD@wuZTv znRP=kp}>c^SJ-s@@W)sU^QbP>^&gbWWVdaMF_{dPH0kp2b?;SGH@yAl@I}+`_Q(1y ztMwjbG1_bflhn^_E@NF%r9vDfD}Dwt6ibCwlC9Jr>Fu^svqg$2(wj_Xn^b6!rnW3H znqm`}FD;eyreZ0}ZY(cns#M3tuvBl8u;$qX3CwG_q0%O0;-^&Rv%YneEY24ANx$GSG*$%CK7u z_yONuR3@1xI_BjV^es=I`T5clII#H`9B(?X`NZYS6@BB6w_ma5{t0hcRo(XcC*aGb z?e|Y^Olck&k@yvj6eNBHr>Byzu0r&F`b*qASnV$yc6hlCM1P7VDVc zi&u5NyEH?6_y}2@LZEPp8>JP+o#H`hP4T37QQA=2QoJcX z6km!TMNVl)X;0}u@uvh(0x3b1U`hxjl%k-7QIr%FC7dEr)D#UxONpRFQlco)lo(1Z zr6VPd5>L@l5-876I#CiSohe-?NtCXXWJ)(m3Z*-x2c;*a7v*_MZ%Q9ZUrH*aAEiHK z040qwkdjUrL>WvOLK#ZQpbVo7r;MOvQnD!7lpIPfC66+aGK!K<8BG~Od4W;qAaE?p$N)S z$}-Aw$_mO#${Un7DXS>;l+~0ql(m$%DC;QeDH|voDVr#7Q#Mn!P_|OGQMOZdP8)d0&{}04{Ls0+# delta 4327 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 E58B;bM*si- diff --git a/Minecraft.Client/Windows64Media/strings.h b/Minecraft.Client/Windows64Media/strings.h index 4c4c51ec..1ed1b4be 100644 --- a/Minecraft.Client/Windows64Media/strings.h +++ b/Minecraft.Client/Windows64Media/strings.h @@ -1,7 +1,7 @@ #pragma once // Auto-generated by StringTable builder — do not edit manually. // Source language: en-US -// Total strings: 2416 +// Total strings: 2425 #define IDS_NULL 0 #define IDS_OK 1 @@ -2416,13 +2416,15 @@ #define IDS_DESC_LARGE_FERN 2410 #define IDS_DESC_ROSE_BUSH 2411 #define IDS_DESC_PEONY 2412 -#define IDS_ENDERMITE 2413 -#define IDS_ITEM_WRITTENBOOK 2414 -#define IDS_DESC_WRITTENBOOK 2415 -#define IDS_ITEM_WRITINGBOOK 2416 -#define IDS_DESC_WRITINGBOOK 2417 +#define IDS_ENDERMITE 2413 +#define IDS_ITEM_WRITTENBOOK 2414 +#define IDS_DESC_WRITTENBOOK 2415 +#define IDS_ITEM_WRITINGBOOK 2416 +#define IDS_DESC_WRITINGBOOK 2417 #define IDS_TOOLTIPS_NEXTPAGE 2418 #define IDS_TOOLTIPS_BACKPAGE 2419 #define IDS_TOOLTIPS_ADDPAGE 2420 #define IDS_TITLE_EXITBOOK 2421 -#define IDS_DESC_EXITBOOK 2422 \ No newline at end of file +#define IDS_DESC_EXITBOOK 2422 +#define IDS_ENCHANTMENT_LURE 2423 +#define IDS_ENCHANTMENT_LUCK_OF_THE_SEA 2424