From dec4c417536d8b6f3ed824004154e6ac0368a22b Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 17 Nov 2023 00:20:30 +0500 Subject: [PATCH] Squashed commit of the following: commit b842b13abadfd0284698aa78f73a4867c34ff55d Author: Xikaro <0regon.end@gmail.com> Date: Fri Nov 17 00:17:34 2023 +0500 mods\defaultoptions --- config/craftpresence.json | 2 +- config/defaultoptions-common.toml | 6 ++++++ config/oculus.properties | 2 +- config/xaerominimap_entities.json | 6 +++--- knownkeys.txt | 0 manifest.json | 5 +++++ modlist.html | 1 + mods/defaultoptions-forge-1.20-18.0.1.jar | Bin 0 -> 87943 bytes 8 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 config/defaultoptions-common.toml create mode 100644 knownkeys.txt create mode 100644 mods/defaultoptions-forge-1.20-18.0.1.jar diff --git a/config/craftpresence.json b/config/craftpresence.json index 0b2d22d96..e9fcf676b 100644 --- a/config/craftpresence.json +++ b/config/craftpresence.json @@ -150,7 +150,7 @@ "stripTranslationColors": false, "stripExtraGuiElements": false, "renderTooltips": true, - "configKeyCode": 96 + "configKeyCode": -1 }, "displaySettings": { "presenceData": { diff --git a/config/defaultoptions-common.toml b/config/defaultoptions-common.toml new file mode 100644 index 000000000..0a458b348 --- /dev/null +++ b/config/defaultoptions-common.toml @@ -0,0 +1,6 @@ +#The default difficulty selected for newly created worlds. +#Allowed Values: PEACEFUL, EASY, NORMAL, HARD +defaultDifficulty = "NORMAL" +#Set to true if the difficulty for new world's should be locked to the specific default. This cannot be unlocked by players without external tools! Probably a bad idea. I don't recommend. Why am I adding this option? +lockDifficulty = false + diff --git a/config/oculus.properties b/config/oculus.properties index 97f47fef4..662a61fb3 100644 --- a/config/oculus.properties +++ b/config/oculus.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Thu Nov 16 23:11:50 YEKT 2023 +#Fri Nov 17 00:16:52 YEKT 2023 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 93efd9076..485d87e8f 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,20 +10,20 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayHeight": 0.0, "displayed": true, + "displayHeight": 0.0, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "startFadingAt": 0.0, "dotSize": 2.0, + "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, - "heightLimit": 20.0, "names": 0.0, + "heightLimit": 20.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/knownkeys.txt b/knownkeys.txt new file mode 100644 index 000000000..e69de29bb diff --git a/manifest.json b/manifest.json index b4929f49c..b701d8076 100644 --- a/manifest.json +++ b/manifest.json @@ -119,6 +119,11 @@ "fileID": 4870168, "required": true }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, { "projectID": 272335, "fileID": 4825638, diff --git a/modlist.html b/modlist.html index b6555c283..d40e56445 100644 --- a/modlist.html +++ b/modlist.html @@ -20,6 +20,7 @@
xXRkx)9)j;Tx+(CY__iGtaepWe{SrW|KX1K>771nzRUQt zE?E;3S9AN#J$rDnkx2L*#>mLPV2ZbpBoL+rCGkl`;4oeN>}e1K)6yq@_G~#*vUkdr zEk`cRne?Y=(wRSdlJ-tIGigqUsy3_Y|E9yI`SX2s!!$g6G_Cen#Cx)@x6`<;YOJek zEO}xD%S^^6jTV}nnk!wTCQqI}r#H*ZBQPm4X(H34KraR1EN~8&U$jX+je&vTI7)g) zPYmJ=3=F8LKsPfvKToe9Fa6A}(tw!Q4`v*k@8n|G%bRu|UXWN&zCA(Fg7cl#!Mn`N z2X!3^wjXTb(>r)Kv9f+^{MEYX-M_zoyRvqrrE%@^FPE49wmHAo{MF=HOlne^QZh0! zY5{>_EbQ#_f81|u`eG(@=cxU+Z*3_H*C=p*|8-w`|6-k|xh!8dFWSd0BNO(%p8d~) z?44I{D{N8^2<4M(>uNgFDd96YiiO>smwn3AOTTuNTuGdrv{hh3wf?5-&p6L9L~oyX z@Ze&B8OExD2Oh?Xo=!_iIA$18QT}Z{%OVyRyL%a+yxZ*U25YL$yf2#mzSQ5OV{76(k-zrcA1B0J zGBN&tKHzuNKjS?oHvI3AdtSdUe3{xW`QM5szuABDeP913_U-!rJO>~BfA#bKn_u;x z|J0ZLy>I(JKIVV<`TysC{?iAO^XL7qpY{IT{9~I+b4r-qS0t=Fu6p>G<=JD5#qRBe zn@+Z;tqr=*8?{ntrDn6yedawsY-e4F?@_-Y;dLfp*`e+C{p1VUznt14X~rynbko!W z%70I-Y SlUI4a=V?T&m_ f7`ZeaCuySP$rhsEyLwOh?SY*^;|d|;mKe989HyJK5r zFZrE1_g%MAliB&M_S&o5FAI|r {kIdE?i&Lz;P;e{K0B^>}x_#QP~HHqH6dKa*Fe z$>`Jade`p{UBA7bxMrPHy d*U7oc*^sJNAHBCi{^Ke20t;w(4ux9`M<@u4m1H4#5T|fwjk@PH4CD z SrCi(#v{!iSy^45+k? HK=V+1E|}-`Os{vr^Gt==539p)(|1^~OS#n)h<7 zhs7R?>`hE^&EMV4zg&L$#~FSS`IBcwOz!*2`-GMC_f72F+U!rQ z#b;j?wu?UY-h9Yx-5uG0s {%(?o7 !_?zv_n*)qWLiU{t1f2Z>pRU)fJp6g$ zmEt|x2lokl_ANeQHR;Lw;3X?Bg?UZ;ogG!A`YXm{$)q#3O}C%QUE;nsf60v9N_Emt zY_9$M8k!~h^}15TobBFD{`%%Zaf`#meU_eT3)cUVl{WKo1RF=Dz^ju}9nT#7yf)8y z#-vXTg4 *LhtHekmi!X_?6k;dR+y0AsuDwE{@6>;iUW7FY~lKQd4D-8!}g62|HPRGW_6r< z8r!z;qg%g2`hVj$g7;XT=l5Kd&N1fUY|C7B+uXXkS;6nE9&1&vR; |igB%SGiYUD;`M Cz9<3 *RW@=d;9pVc()WJg%B zqgTM%&wrJIxx=rwOqn9dJ2#WXsNFvA$?T@t?5UNr3z-@p9XFoy=tzLtiTTm<->S5( zZ@0W>@nR>7bkoy@-X@MyNjEZUt0&ytz41N! OrT-)?srMg)MykB6ix@~Ua+1uMo z%l+ wuxYPn%Q(K=ZD02LlmGVBw|PIbebebU^5*NV*RAU| zZTggXZpz)+Z@ 0vn-||y{aU>`J7oLkrVB5=b^MBX^wr4m{*9lD zI$rIZ`dcwe#j;yGLSkx@(AIkfn}eq)_^q|t%q+L3EaqiR75f_}_PXUkE0|v2IGeWc z!jwkkXUdFsrTBE>?sZu#a9-ZKL`8a~OwVnlEi*g ^f z8@$%x0c>}Ju5wOLDlw4ootRjGG0$Rw_su-yU4NCUP4{m zN_(%Wak#JO3%tlPe}&csj}|-Ib@Nr9H7}{LXkd}5c<;3(CZb}c?P5{R`_A9?Z#nzQ zV#@5pGc{6=W%|3e&sf4+xuf%`r|q&?c6ZrC h^6P%I2M$b8lOf?5E#94PE}NTOa=60~2$IB;$Sdy!*+CckirkPnfPRv*^N>il2YW zUpXzynGo`4+V97_yF2f1Eqng>Ri?o~ujs`woE>WO#C8>Wf5^MkE5ZEo#giX3%1vE* zC4Ya0C1r$ZOC8x$eeC(PJ$*v1rO)dP&Q|VwWLWu9wxqgh`UfkCEu7V{Z*RSFTXrf> z_SfrTpBo`}HMwnd-?UCY^>688j#Yvu3bt>yJgy}9=f}h5& Nnr zNEEbLW$WL4X0JUf%gJr499q}#>t7I6*VR`qe(mw+v)!xSJ(GeLpV}eu+r{ycMfarr zRrA!_wU%DXw5V$mi09zyzFqM4`t_@||3%(*PUgHfF?F)*&EsxGR<;Xu-#OR1A6VMK zepkWSdg|m%J_$>Ug(`EVXeXB`AD@2vua{lKr5o4YaxH^|)RO%y zcQ`)-SgBwc3k~WZ1m&sY_t15P>9)|zDf7uud6#Zs4Tb|yMg$Z7ZQbPF!! ztzq)&`v3Lx-`{!v^d{TRWmj2b!i}c>Y1NG`7F@r5YFUYa;Ea7XFXqjYU&-EUV>4k| z!=jj5$9M03$SZSF{MT{j&B=_}cGV);`=+nj`A>Z6(o+Y6=e<2PeM5HB;-_7Ir zwnT2 SbiXAtx_{Z<|9Ecd$qW1HW?wUwJMFvLYr=);r*9nCqHe>X!KV|gP-JuLow=F4 zx!1p6{%<}`S6tLO` dh;p&Icsjz14-FTne=I80yQ>s&u6x;y!}({(P_2k-7j7* zPHmbYbZ+jNoq}K8HJc7D@7}WRt XreVS$iMv{_0+6Z@+)> yF+L8>=kZ$rxaJ+^ln3ZvX cu(!0LVX2$_6TM|iK9_& 4|IB0EW~I#D1xFeEOpF(q z^v@~!k-K3149j!o=N}z?|Ke+PkKFa@mnW8FFR8v+`e|j9OG@OIJ^b?Z39Wn_y|*5{ zzc=~StR+>p{|z#VBqv;-z#&?DN>^Ju+n^z(`_%W3TNkskR;Kd?{j%&eoX555 |dY3d|f|1-RFDU`}+@CdWv?*-+O*D=W&+HAY{^MR|<}XvUbtk42Io*|rFxUO=F7$Q% z^vYEtlNq Gk#hyM$)AT`k`8rh`vc^?~ZqC*m7yje1UU?0@63 z%x6FUk^d7;{(sE8+|#iC*izPu%5v$~?1ay+EmJ;mM_J*3 R|n|2*7r>-3(P>uN)qCahZQtW$0Gnq&KuWxMY4$ws;jHzeQ$YlGP1WjZ E}fMUVgX_2D6Q)v@PG6pd$PueW|%E>*ivK=Xu6;jGGE<(@)26&=_(*+Qqg+@1gX zjp4F6bu+aWURk*6>o?o`T8)*~)>mY7E`3aV65N0Kx6SwV-i}I{|Bb!N({H>s&Z&Hs zvoZaK=(ciUW6QgO0s5Xl>s%JQ|2yuVI=70KuV8NE&j#}a#o6UD&!w0 hV zI_>-Io#j5cGc{kfN32-1bK;swi_=!W=qkSajD2ZSmAurHs!~o7HJ2*av+V+>1kEc# zUnu7Jy<66hn3c9Pw)3yf&DaGuci-)KSNW{}v8Khz-s>|K%<+Br>hr`$AI`rlYTDV% z% )~vUy6m_!%&1hfN{-|2_9NirluxS68DK1CA4L!ir${T z#WDJ%T`otGV@cACM|XRaW<27zsZDL%qp)fN!^Bq?Yi`_gJF*~c*^#>&UppQ*J!~I) zeG$81%bAX!m1$SD%-~l~VfwsRYpRd!fhX7gDS5A6{G-0nY%Y`Bw!DV{U0Wr(r+s{+ zaK|Nc&-yP>M{G3eUia7b^wi2uu`XQouWcj0Wa68K<*Sw)Jie}1_qM{+<8e3EZM reSI*?RGfq~uS% zAD7uLJU;K&vSlfjitbC4H!gAsdNzB?KINpUvYS SJ{nH>yby@JhL zo~P=*6zQ9u3fpdTyYzG9jq^pfV)^`9RJZ$I&0M?GOtab9QngdMU`OKKG>$9jZk2_F zhI BSPn!tC@`-{`6iQ@78axX> z@7z%lzVY*PX+56=iQ~O<`j~dMI4rr@8XYj_;RCZ?zS++%AHSR9ck$VVKkV{H_syy5 zWHtY7dFkf7E30#p3hoCU=bq(oPy2H**FNRTv$X;>zx=Z*Idke|o#`!`8LJZdgVR3+ zGncvu|DLrvc3t0`t{+N&ujth-pS-1c-@z2tNBoT2}9c<3Zl g8>*9~v8&;_b{r|4*yk``cT}y7O_%=QpyqYY+U1 z?+_GP|0~ Q@QAVJ=%Q;466d?##I+ z7xZ+mF#q~*@HM+i!bsKb<;P!FI%V~D>2wNSX*RC)YBTRycp)Pp`pPOd3+G>PL4C_^ zUNM(DbZX|Guq%K3v!W)dd0)G};;nPW! ?QDNKMQZ=trbw-KjiiwkdOo`@?j4OFHm$k}p zUI=e^ijGy;JKy*XS&9q4J-qeRU)t+U?pxMXHt$whY3*~}5_sXBomHN+iP^zj1q&}e zuntvQb)q j*s0KQ!jr@JEkl-p_b!?_Y~c8*H^B2 zzb5!siulBu$KS67-tWBfr!MRIlG=!3F?(OxsbX)dqs~Q^zphhUy|Q{wfL?iIMUd{y zw;XQve;TZkba&78NpP4h6tzbyUS@5G(%lt@pXan*2+|E^(qatVvoY@AUA3THEP}eP zeobD|8!!5nXUCQFe{5=#u2}?~{CV=F=DqCM(c9MlwF+JT@mb`VM&;jr=koHkX6|`> z^O(zIZsomfH8Z4&47D#Gc=nmIVeR}pc?*S{GtWGl*#fPFRTsQF+88s@hVSjI }e-6$$}Z@p}S+MbUWR(4A?{ZdtZ9U8JFgQwUp z`NK{2zbDl>?iE*C?dh!%**&|>*VeK7S@ahHeYwYZ3T^-V-8r51wO89E8wq~03(edm zVYjj4EY}^*uMfWzz7;6)?Oo3;8Y;$m%BXH<-nJF?4qGZLq&Uv2Wec71y6fe7nBPlt zLCUTE1s3*?&C^!COp _1&%7pj$)RobMVu#oI;kvQ-TL~7 zeY~A}l*uEeg`LMt`{%emR(5}6eQI6E)LVa+K5rAQo4z{EDEHddQ}#VOzyB;Pz2SZ* z+BNK@x%95ju8V)GOFKQ$J6*7v=}@1JR{v>(=!MJYe(SGG_`AK~&%WG)R_gukmiF-> zv)&c$*G%ON@ott4daZXcHNEPlX`=Q**;&CEiSHgTZ+N&RBV+O%@vA0<^SoU<0)C&- zFqs&h?kMy$E%M>2K)G11s;Ji=d!BvD-0Z% *sQX3d-yR1r<8!eAgwK72c3=NFK+tYdCfsn(&N8h_7whEyKirD2w!U& zYFi~x*!5mD>B)y*?5mgX<^C3%J@M3iAB$-jFYM0+8r=C(+{3n8M=)r9?Zl4y3tj6b zPf#j-7+9?G-S^vEb-#ZOSt)teGiIosWVx->Dk~6W^ESkKZFtC2&y~ynX zw&oS$M9*VKMIw0UYzHtwW2;;^T_o}-Q|HZw|eYof4#v*+dVob zg_l2NY3-tApU)WbE-f^E_wemLo`M<5y&WAJ-h7t$v-0e+U`gAz^CN_MBM+UP>#|AW z&@SgL&;HX9+twTPls>*&wRh3IM_ZlaPoyQM_U)>TRF?X2=9N-i_RcF`ZO&~uy?1@( zq6;5tGf&Js@2ebrv^{rC=91iXSF(1OWi8L2s&Ywv&b5#H@(kM-N4VTPSE>1Zm2ObM z4n4twzXv|4?N~GSdeE)c>L )6RRkmc=1B=Yjb@!<$YioDXhheaQ`xKKkd+k2m>NwFh!%q-B-uaN+1ZRO|o6 zImjmC_nuGR-mQ64nsdYS#bbZHRoc(8m$bd_7R`NkfQz%<)p;6oDwXN)A(`ti9C114nzWr9v&N|ty@N0|a zvC>nY3Oy^2{%;HXwxiSEs(z9+Zg@QP%+kkwf7bE{Yxvi#{QbaZv%|4tvnD0$ zYM3X_?(h^{|JG-n_`>KXQ=5zWH^1=Jd_U!d>gVodrxw2s4*b;J)?sb@P%K4csnxQj zvd6EV)8rO-vG(4yRQ^A?2ktF?loHluCV!YGO73yUnHx5qj%QT8og#EOS$2rdDqgYs z#yhcV8w} +V kg(n-ai)C(i8i#QZMEe`v9>fNPREi>2n&UODf-(h*xzSF`rarNu|7H$#N zu+}nAGB*1XX&+ 8c zDz8hs)kB}9F>deOB^;mgmRW7{)mnZP3%*$kW-2-|7RsjV>e{zD=ZNW ~;GFv&~u3p|Mv%b--lSR zV&tg`7ZkY{@H(@KaBW4dwN9Ei<1!z;Wr(#YmJyKyo9 z|AxmGPqtj)Pz}j=6@Bs8*~Ba+rN#H$JzdkPrTVtJX&FAQDc6vi=JN8Q7ZbzJT * bbHAEs*`s?X&-KZV ?4pGTAj=n6k{!CO{ySsemBU$a= zN4M<#o$Kr!ciBQ}^MTSsH_oN{HN^T{_ny+_5m;6{bFR;;fUxCS(`A!*Pyd*lC;n#R zqw !*b< zr*_ULJCP G7ZGM;|woC4EYMp4`CkmdX2( z%ES+!K6yQNUdX0e=Q?}wl<=3Vch==vF@}Dfv1`Sq^ZS0ehP+e%_-~I;vhmA=T}--_ z8;VxGDtO&hrx~vuFm*$h_}T8Vi|%XRoj?5NPCLKZwl{5G@9;gXtG+xhY3ajcgB1(T zK5j0XeDbd2ucJ4^UYO2M)SI^J;~XXDrI%V(G5oqBzSFbG{d+!#Oku={tiO>tT_R^D z*;uD-e{ewhZNxv-p72FiHh3$0*>N> Lr7glJzmov>j-8B13zt*-1 zhx3*8-t*$z=`cHa(yp&dwLKFHjNZPoT<60q#y4@3cJTAWQ+D0bdIc3Ry;Y};r`ra< zo5AzfL|4`S?&-g~#I@%HTrjuX^Yr2LwA!Gjeuw65o~)aAVfOn~937KRWhM2@7C+at zqVG$=Z7mBYUonAazMt)0c GLGytx+mNvev)jP3Oz1 zRu?@xzwqP3-*TE6j%+qvn vbJ$gU+d9v}B3)?H6;$!kL z?U<&T9(Lo`u^sQ!&&4U<)pB|}C&BTk&{l~LJ{6n4m2UN1Bld8StrO?_?o9XZZEI5R zb8I~tb9TmZ#f4vE6TOeL^gTV8x#-17$7RcugeB*-ePXfmjIK3lFf-Y|IXCJ1{0*jm zU8_{GrXG3l=g!i+(0eOlF1F8jRm_uibl!H3mIXPdy4DnRF7?}E_3i4pjpj>N2HJ)1 z>vYj(>|ke_`K5LGos);sFI(H_X6eN%Pmy5}T)y>Gj;hX|tG9x6`x0heiZ3ZB5O}e1 zgW=*o3*)vdvCk;{|K((k^~3jeUDneUG%kJP<(Vr|t2ryH$NU}3u2~cMH2(8=%!@EF zi{X=5_apCxbN$RZGoIC-uIA5DF8?1>ZY*xB;%t! @&loZ>wj!>4>z(=Jo`)a;WLIH{hYw?|Z_h%{K2dmS-4HeK|%`zsH# zEfW{2p6TeFfAmVw)#G92Sxa_HoSFIS?z%*?K&f`Y(f~)tFl7_dpXb-w>aSGV{3>j} za8L;U`sHEk@2FSqRbrBe+c#muhv@4k+l3C~soPEsKmMBY^o-h4mk;cV()Na#x~w&` z-}l_axa`O$;cVjtD^qqn{KvhyPNwtcuI6K1x>;h=9p|s`+gkOeM!3ZJ)TFK94I&G+ zXq~&a)TC#xx7CCCOMhz>cHB?gDt7a36VIXPhh2pCt42NAD>R?s>-MYrI_j6HC_m4Z z-EV$!5$kLIAm$9um6L5-Q^HnW`h4Jl)}i~8GWj@EC(52b_tCXJz4%1&xpU2O@iP;$ zQ~j+?uk3C~5pIcCd{*i53;m_h6YtL1aOgU_o$v2GkIVRe-A=2UW4UD0^YbffK8H*? ztLXgT;QEvxV lv;%F!6A0WNw5BtLx2^uifiS(v&)16$@Wo z<7zPRNO+F vKt?#zNtFKV!mFqzOwdQFth9B$44X-H6L_cS@YC>zWbY3Di=1f z B<)ez8_r?wd!Y;MwylJ9-S}d5%*Sfls$7>A}qLk{&`2kQyZ!aO=thr z{_8%MUHx+9>NMef?e*VdOq;~ot=G6WmPZ_TXmH_oKC_|NpSF}x-#=Q3YngQ)^}kom zyvM4!wI_R3?;WkKr!S|T$T}g!V9uKPI9c2BvF^e>tSlT&0dc-8q0O7q-^`kM{?FT! zSH33a{3x+FDEfo_hR4dq*H&7E=N{8Bs&G0LsQo4IsB-OE?a;sdQA_^0+_-%8)Sfj> zG91_Dq^ amKR-f&d zm$>ikWigiuw&=AxCD*EV-R_)JF}?AwuFht*l#VT29UILmckf&J?ULyRqkz&6f2OX# zA^n_5ZMnJOv!~%)tL8V~&E*R|!(V?Q@sb9+SCrbW^YfNPEOa;5$(ifO^2T+3Kv{{K z=WLfIL+;NX=2xc%{aWtt{EW4DgTYO0fwCxT+g;|t;XC!CJ|y;k-|75T+i>ptm3f=< zFFvpqURC 0w^9Z8h&M%ly4;_uiJx z_%FCLoaN)>P3cx?qCXioC1une{q^BO$i4m@PqRIjZ!)@K{on3K!iC%Y{|=`AefshJ z`}6mATxdASaQ$-DzG-*XWVh(dJ-A5OtfuB&m!F)Uu