From 54a4143f82edada1115b5e9b02ba56d2d19fc162 Mon Sep 17 00:00:00 2001
From: Cubitect <cubitect@gmail.com>
Date: Thu, 21 Apr 2022 13:45:27 +0200
Subject: [PATCH] Updates for MC 1.19: 1) added deep_dark and mangrove_swamp
 biomes 2) added ancient_cities to map and search 3) renamed filter dialog to
 condition editor to improve naming consistency 3) fixed selection of filter
 preset

---
 cubiomes                                      |   2 +-
 cubiomes-viewer.pro                           |   6 +-
 rc/icons.qrc                                  |   2 +
 rc/icons/ancient_city.png                     | Bin 0 -> 5688 bytes
 rc/icons/ancient_city_d.png                   | Bin 0 -> 5232 bytes
 rc/icons/hut_d.png                            | Bin 489 -> 703 bytes
 rc/icons/igloo_d.png                          | Bin 433 -> 636 bytes
 rc/icons/ruins_d.png                          | Bin 417 -> 665 bytes
 rc/icons/shipwreck_d.png                      | Bin 387 -> 546 bytes
 src/aboutdialog.h                             |   4 +-
 src/aboutdialog.ui                            |  16 ++--
 src/{filterdialog.cpp => conditiondialog.cpp} |  69 +++++++++---------
 src/{filterdialog.h => conditiondialog.h}     |  18 ++---
 src/{filterdialog.ui => conditiondialog.ui}   |  36 ++++-----
 src/extgendialog.cpp                          |   1 +
 src/formconditions.cpp                        |   6 +-
 src/mainwindow.cpp                            |   3 +-
 src/mainwindow.ui                             |  44 +++++++++--
 src/presetdialog.cpp                          |   8 ++
 src/presetdialog.h                            |   1 +
 src/quad.cpp                                  |   6 ++
 src/quad.h                                    |   4 +
 src/search.h                                  |  40 ++++++----
 23 files changed, 165 insertions(+), 101 deletions(-)
 create mode 100644 rc/icons/ancient_city.png
 create mode 100644 rc/icons/ancient_city_d.png
 rename src/{filterdialog.cpp => conditiondialog.cpp} (94%)
 rename src/{filterdialog.h => conditiondialog.h} (91%)
 rename src/{filterdialog.ui => conditiondialog.ui} (97%)

diff --git a/cubiomes b/cubiomes
index 136e645..0933804 160000
--- a/cubiomes
+++ b/cubiomes
@@ -1 +1 @@
-Subproject commit 136e645ce9c54cb24c659b29a24fa6f8361a3fef
+Subproject commit 0933804f15f4de107f0a1703f508521625292f87
diff --git a/cubiomes-viewer.pro b/cubiomes-viewer.pro
index b9a31ac..00f5592 100644
--- a/cubiomes-viewer.pro
+++ b/cubiomes-viewer.pro
@@ -37,6 +37,7 @@ CONFIG += static
 SOURCES += \
         src/aboutdialog.cpp \
         src/collapsible.cpp \
+        src/conditiondialog.cpp \
         src/configdialog.cpp \
         src/extgendialog.cpp \
         src/formconditions.cpp \
@@ -45,7 +46,6 @@ SOURCES += \
         src/gotodialog.cpp \
         src/presetdialog.cpp \
         src/protobasedialog.cpp \
-        src/filterdialog.cpp \
         src/quadlistdialog.cpp \
         src/mapview.cpp \
         src/quad.cpp \
@@ -63,6 +63,7 @@ HEADERS += \
         $$CUPATH/util.h \
         src/aboutdialog.h \
         src/collapsible.h \
+        src/conditiondialog.h \
         src/configdialog.h \
         src/extgendialog.h \
         src/formconditions.h \
@@ -71,7 +72,6 @@ HEADERS += \
         src/gotodialog.h \
         src/presetdialog.h \
         src/protobasedialog.h \
-        src/filterdialog.h \
         src/quadlistdialog.h \
         src/mapview.h \
         src/quad.h \
@@ -86,6 +86,7 @@ HEADERS += \
 
 FORMS += \
         src/aboutdialog.ui \
+        src/conditiondialog.ui \
         src/configdialog.ui \
         src/extgendialog.ui \
         src/formconditions.ui \
@@ -94,7 +95,6 @@ FORMS += \
         src/gotodialog.ui \
         src/presetdialog.ui \
         src/protobasedialog.ui \
-        src/filterdialog.ui \
         src/quadlistdialog.ui\
         src/mainwindow.ui \
         src/rangedialog.ui
diff --git a/rc/icons.qrc b/rc/icons.qrc
index 58ce0c8..2f89bd9 100644
--- a/rc/icons.qrc
+++ b/rc/icons.qrc
@@ -63,5 +63,7 @@
         <file>icons/mineshaft_d.png</file>
         <file>icons/helper.png</file>
         <file>icons/reference.png</file>
+        <file>icons/ancient_city_d.png</file>
+        <file>icons/ancient_city.png</file>
     </qresource>
 </RCC>
diff --git a/rc/icons/ancient_city.png b/rc/icons/ancient_city.png
new file mode 100644
index 0000000000000000000000000000000000000000..76cceab2724d735886f87ac5a6b6e0a664342e31
GIT binary patch
literal 5688
zcmV-87RTv{P)<h;3K|Lk000e1NJLTq000yK000mO1^@s678qX}00009a7bBm000id
z000id0mpBsWB>pZ8+ue&bW&k=AaHVTW@&6?Aar?fWgumEX=VTbXo0PoX>ubuvV{NR
z6mtaZ%W<%p%?;l1=Zip6qExEt?wKc=L@E~`5R1D9l4k$kzmNGBKdI$vVk$MaoGm}G
z#pXL7s=Yr=|2iA>@BJq}=iJxh#^vXP=TP81+<!}duJ0UApEtbbaO3N7Q=c=wJ_9``
zUIPZ1+4Et&8_98hkH0K5ZQl>M)$(rY@b`VbmQp`|=hmUEdnS|r&HI5^@X|_L6};bp
z!}_;g3xfQ*(0R}IFW1Sdb2J*>e6WutIONOnUhl7;`W$_;d_S%+-@X6w>6`O?e~yQ5
zzRa(I^3Nw+`q}yF;<t&z^T}}d%L&&%65<yppR?*Y`>w9Xj7PJ*8D-7OJ8};f4qP7e
zw#=*WoA_Mx)p%9g?Ih&OPCIx_*PJIR$GGSgRvfqWeY%N>(QjXP_kI#6IaWjQ%}-)P
zgyiLpFQJ7MD#4n5n-DncKWuS2Z`1jvtIWI{mwLxwj$3~FGJiVxPhRGnDK2uhUO$l+
z*ySa2F+(CJf4Pc)xbws<se@myC;Xp364*clle)RGz;4GKVkGyOTS4O-xGwR2OURkB
zo&j(Xb0>^(fe6^_LUP&J;(c)rKUM<NvD}B~2N7^7`Gt`_2CBsrU%kxDJ;mv@KKbnB
zFxW&O5|vemO$(i1#hA#S5-T~>Q%EtTlv7F7q?URPIp&meE?GdXmr!C!C6`iaX{Fat
zV@);JQfqCsH{Svn2r#zNYHO``Z#olo#_C+(IWqhRBaSrkD5H)x`Xqg3oN4A+W}R*J
z<yTn1#LBCzy4vd7nGI6xxYN$N?7G|Thg>`1#FI`w<<!$o|A?A<%J%!~A4JVPQS%xp
zxvqRfjiaWN*APzNBuUJOn2(N#7l{A~?ImWmx){AgPGV-8rzn!g$Rx2b%SprtVcgEA
z<33{d8M(g|H<Rk$ikttd$QcRU|3~Buq5Cy%KSXT_&rOZktwQms4OAcJckRa4E~M7~
z*Z2Q!AnGr~x_hlXwFSraPG<Yq4#Ca`Glx4Vp3`k!yPS2Z9<|h5Ij7mRDo4wl{73!v
zlV%?^hE|vH&h8v${nIeX^^kjw8$KSTMmf5`^LzHB(aSX9?2&Rmiv)`&`!U*%3A!kK
zFc@5m!{r9INOE7#o?)ede_bg<&Q!ah7UR-hE~apD9HTOT-@DXNmp!TYVngg>2e~0{
zxxvN3MWIif1*0Tx)-@v^rXP!RIww`%=W=@{D(7S?=DGIcjrTrIxICc$ZCWam<*l_|
zL(bhjsj=<p-^TRr_e(avTl2GIMrv;(%@Wf}RL_FKY*|@7-XlJmW#J%(8AZ)4+l?cJ
z)s1V2wv$4`gEgsj8sI0qgzO{0Mn@#Res@YOH!8HSQkeDBRQg(}*08s`>uk0Rm)1Ni
zXwUez6mxVX@R=j$vd>+86<LX_-4<~~Ke==@>n*U8zz(7VJ4#^5qoZ+s4P`fW>ricM
z87e<Rol4wO?PUc`H!`Yk4XfsZ`H1VdF=!Hl2H_H&x<^lm=xiG}%~D5OskCrbc0E$_
z8?h0cc+TMILGI=2y0j!>&uzaCHffh@4^+cPwi&<caj`BpE6d&>9I%EEL74*Wplqjx
zG@g=0r1c)VC#^O+5w0DDH23u80z;IPiRkaNVBxc40QbrC6Xd@NN3Y@sk&oH6Rj5iZ
z4IIqj4q1~aT|PEa3LpeG<3RiRy64O(Y#FSNSYGEj1-3WjN~j&A?K3s%0G=_d2k7@v
zVv=ni0Zs^f*tUh4BI!mf@!ax&4m>0Ey(S6C`jFNK=j|3}GdVH^PMjx1WD*N(&A~TG
zaCs3@dv-v;q}s&VHStUgn@sFw57=?_0Rb*U#im}%BsdY9I=JOh^ir{uU3<Wl<$R=3
zL{-8z2(vK7&}+0&t9wQ2rnI$wATO%$!|ddO(33<OYin=}9PtN!LC^wS8dPt-#Po?M
zW>bliiiMITzfNzYQS|VtAI(uA7Pz_AVtv0XV*SbW$&|gq9o4_WT5vywwg2LZXp&ov
zypJL0n@hRp?G=ik_g8v-fA>zfIY9rD+hFQs5PGnyC>Om3Qfc}jxQayN?0Vf!7<UL4
z9dz05ec49WEoD$X%AmZLK^3R%NV!gXin@cEt}m(_qlaPR%4Sao7{ZTR((;TfAWIxp
zF9IN8DJnRyLrw&;=UNo^k_m?|lu=s8B&uSq=Eia*N1Qs&h<j3D1tWLh#_6e@Hs|Og
zorxGi9?dmsD`7a$lNj1&0vbi+K1C^zex^VO5grj|plj3*zHRcl*Bzk!w4Cc`9mv04
zK(x@fA(mxc{{*k^B(_)qN`pc3+>0q1efNDV!XwHD%fXnOR18d%zo3J^L=>qPh23_f
z{XkLiH)(h(m4%JrvTk!t-)o2Zqu{xLy_kduQp~{Jq50~c2LF9~%@>2i7jwghu`g5A
zP>I>Rlzol0Vy+pQU~2KT_tV;+jIF1BF5kW_-`w@*yMFh}`qTS}%(gStMt&k0WP$5h
zATaV4kLvb^U&2?vq}`>2NK*=Q_=DfRE#3Up+W+p-&9ipQaPQ_^W4?!oRM!RE=;Zh4
z7~<C|)j%?*^qw!@{WbkU(v%33)3<kk89zBkcLDtF3Haj*u6GnV^8y5x$UHC>0C7cu
zJn;lb0)oNyj1Jut*L)fdL>Lf~8DKA~jpJtQ#v1VH5yfXDKQ$C@6%7A(M8uHJvCtt^
z+6XjcLMyN67Cl7jI}3jRC4dx**`4*#cMZ+;E|@R@^~`mGPx&36%nP7ow(~2@By{a>
z&LBeRW_rt$e+j?hhPd@22V)9$2yzU%DUf2qxqTtjr#QGxN62=@cEZkZpcPHjF_yNd
z&cV3zl)>Va9R{M0`AeIN&Owt>Jodv;b>L3f5Ehq6sx_8a66VgzXb}Am$DnqEc)as{
z8P_oIPm{TB1MOjlQu0jzm|e5}gf@r(F%+fvanyVs21TJdTu;tWnBenio1PT0bY`wU
z9m6mAS(16#Pd)vxsxL>stn0fU&7U0kWp#HIKdnrUnXl^_(}(T7C<w067+j7=h@kw-
zkCu`cr5ac%!H15X*aZ*OrZETVdgCa>9W6T|m*P7@RTViT-ND?#;mV}L!Ddu|`LP7Z
z^I9~UWxR3gFrW(Ivqi7|s*NfeP9hAfGr2_V!J4HOQAp4&cuG;C>+SE)QK!RE()1Hl
z!t}{pxIlYLyKrvvkP)k$TWu4w=E+yAKT_EBhQ8l!!txE(j%KE!q-e($s{F5e{sDT=
z1Z5vFNTi-j8Eq2q>q0;-E8U#i$cZqd?Ht3pGb7>>*aeA8a9M^lAbB030!VO8^rdJ)
zBw4C#dEt6m3F-OUTGI2gOiCYJf)pXm=;W@5Gyd_v^;3XR#a56~Ac&11(lo9_gnxUk
z&w#@3CJhS^w{6{!^p^Y*xphLonM{rnLW%}QkQfZ<8Bjk3rqS$2hqs<2Po)(lZBN{}
zg*xIyHjW^nc!Y#zSdkX6-l(+?&O4H%!cfxq7$}Wi){iR5L90nGK?qNv`5I|lUS_}{
zKr1tcJ;zRT^8x<awE5l(9c@!wMfoAf`VjrHT@g#8*3)T01GeZn@%|3l9?r(tMLOtp
z^RD~Qk7*>tAqXB-DyAe|6clr#rzMN^q{qplZ}cw<sY{p{Bo}fF_%<LSW)LD8X_f|N
zl?KlQ-?5wspFzw6#*(sK`qkB*f$4(q+pzR7>cwEP7yeo})YXvb>!Cc!nC;x-XhED>
z?pBX<I!>K^`fVBY6eo=Au8g@YS(d#tz8V|dVbgNGHysrd;rc{QwI`k@4SGSa)8LnM
zg{Zh1G81mqi$ELDa(i2@OGx+9?c)+Wy)#Cvmq$#3)Ph%+Ak~Msgb-D6i<Paua2=w{
z5tqoOSjd0_O}<TmXh#WBF=Fz*z$VR!ltEz$BT2VyhX^MTBpP<<2Ud~(5ac9D1dOvd
zr6Aamdu`;qxLHU)n(U)ubBNLdBj|;506E9VqO$1tG6jp}0sG_Cpa;sfpLtGEkmzn~
zMKsAfs}v{jLZ6PyiSsQ0jc%(inNNu{*%a|N1{u-mX@R!XulN`Qx%E3qei|C;7i)k>
zsozzg0_oX-C$;Ek2@57)mn!uP*)n9ZPDhMr$rPDvDGQ$VNMB~Zqm+4IDz$fHOE-fr
zvds<qlu;kP`0V+@d+%m`QdK`Sc3*YX14y56l+Cjk1fW0~0Eb4TZ$^&bhajylT-zEA
z-IATuO6m->`^dS$MW>7EkbMcWosVN)A)2i0y9r_ECmu~Uq!9!+rbYBTGoZUC8Qu`c
ztvP@T+f8hi1!&Cnt*hjKn^_$)^_1GR!GHmmFxgmlNA48b7q~u@0r~`%Y#`KNBV|C_
zAo(Ya3!OYFUraegRXpi*Bg*VuvLj9rDgXgZ%97gC@S{9h0qrtXptT<}-N>@K+m?<M
z&I4P!+KracYqpR;JXJO>_eQV-bdm;4X~FG<n8%5&JG4!S&^*3w<hwW|3dbqYTYzhb
zN%d|!l(s*44Qv4$4|-1epyNUCEl(I_YizYV5XxQB*d0O-<`>z_;tJt};^?w*p+inh
zc>*K5oVn)Ag^_Sk41yLRNdlvd&`}=pN_XE<c2pTtQy0u0S{(Y^R06Jhb-Js5uc7F=
zg3P^y+qtB`u;fvd@NaCkQSwOQUsWUCO_Sv4fjact2>#`i=@Eoj9tl3HFDw)_f!E<c
zl$X>{F+OGrFbh>=iTrQUQ!-G*a7p2#;9r!j78@=3M{7!437dx7SJ@gP9q5!cfun(?
zbfzRWVv~H0A(U2#-U_v@sGBUFeiBvd{cgxdis`|N`hgc${(aRoUjf5>(L#Slj6XJE
z=1*ub)~3rKtH=()T-h?O1BFRi>?0f0Q&LQe$mAu63?h1phKNI^XnMpD1*J(_LHv&`
zHn2xH8t20o@RiK28)8j1#@(UglihfvZ$lbI0-NuuS_q$+FOLT>ENtlrrV~w0QD&h7
z^%3I?eR_cp8`RnBCiHrHuj8$PJgIg!7+BDKVv*-1_yqSCQlzvXou+ILh~Pu|Dd2Wb
z<1qpSATqY9hPA3;Wix{8e4_yKhlu_o3NXKq>0eWT2abG*t<brfUVNyt1N6a*$Y`RV
z(;v6(J{yPvbhV9Ek!O&%{k^-5g0tGtmD|v%@S_<Mv6s3w8?<GBjBFo`@U)7uM={N<
zNgQzd)vJ{R2wWEl<%(rtT9$WoX@o_PmCG|LHYb|h(j4asB{v^j1F|V@you6zH92p|
zXeSG_lZ@*zt{E*tz|)T`Ic;Ex#~g(Y$y)c(=YBC>Y$tp&4`lTHKJ&M3^dfig=tn=x
z+jS@qBOl~priZIGtEd!1kaqU&kK~ayXe}DnIn{q%x8h|hY(txUuL<&TnpA0ke_XpG
zd2WGrd3tPrZD_Tf{nIv3$)@;^-TSxaHBB%<GF;X|hKD0NH*^TKEazNCkI)BIRG{oS
z$=4`MSkYw|W(rM=C!<BhQRPdVFp_NPX9_cka8Q-9-LubrQdj*+o0V>xmE<{_f7-in
zd8^+3Ey<If)!m}{Hv)9{c<3=aog(U$VgavgF*V3OUF#)z+7L8zDk-vReFB4>!pGWe
zB@O8mWx<-`YZngQ(O?>m-(67W^{JzPmOPEap;Mdn0@BfuH|aFA1GqPSyU#xle3@=u
z?|e>p6RV?a?q;(*$dnzlrm8`{b@AM$H<@3}EZ=8yUu_K6#QN1l^W61u4-^?S^NIMw
zXW@AmjzWUkB%veT^Q34LMR6ZX8@=ytqR5>e_Z>8LNpj@O2jnE|7h{s-s#Bq#oe%W2
zvVjoF6`uD#+3=o9d3s+(1`+?eFXAM>eq*9}w^1q*{JRSqUlw+!8W)k;S)WsZp7O-g
ze8%KlCu&Ejy{J4_(Kwf{KKyYidAh!SabgmJEi-C71-5UuJ%pWsZS=+ZZln1$GS$*+
z8ZpR|9jF1Z-Do%G92KVL?k3;nD*81+@N&5dmCW4$OI%|>P-z1Oa8YGPf*RjbNJJ!X
zxmyGdId```-D{6amP^tPz)yChQxiHG0sZw`6?9f!F8d`9)atTX9(=KO8y0+UpCvY^
z#klVe6XALJ=A4RTd`~L$g929}A4Jij?HnTW7Glpb?V5LwtvlJJ2R&;KD7KD5er=Vl
z_yK#;D8<IF@HLtT6=2=#+}#)#RKy%<Q@W^4f?{i~@ot~j&+Ru9eNS+gyjl77&($n3
zmTHo08R*WR+g&r8o=AheQSOxgh~>8HveM_95NGIfN1&W)1}96XwCnrztny=Xvb$eg
zAm63A>p$pN-Bv(S2l*b%-twJ8W2XQFsC=KZhWng#F-Htl7AmcNC6_~?eHUaWbK7zQ
zM3NmR`3{tCEgHYUflVosTIeY1fpRQy^#rTDpF|10PGUWINOV81&*t+={FW0c?5A0g
zX+I5&Q>U;c*<$1y4TD}tM&+s`BY5!?dczk-`2CKjH^$l$duN~jt8`5AJz%j2%qBGv
zx^sE>C)_<5_zZKNuPI0wU=fr>Bd1?uXqx0+5c%z~u(=P@*WI-en0THklgIB5)5Blo
zzxlNQ4vGx%1Yb{b)OKVO{VmODLrShG-O=WPvgJ7)&6Ws^v5Y{YJ_pz1MRxrFVFsjm
zwNf){&;rru$+vSDI)c!&=>Gc|qk!o0_v4+ydY^$F-RaEB%hMTsG?|xd7CkeYUVl1%
zY?1HU9qV6b{IiC=qQAQm3lt^1Wn^I!b5D0!A^i!Es^bwjS^pn`ApGcZw&&?K%;*09
z|MqVF`Hix<h(P}j4MGQHxQWh-0005QNkl<ZIE}55OKaOe6oo&HUXEp_vE#(hf{9m7
zH!7Gki$X%y{vTa+-+g~h7yT8@&f7v`jNOtff{-FyKZvYHri&sW*-A=74-Cw?bI;+-
zy$VH0o(E;~@?4`WW38-e+kF5`Q>AKIJUoD|t3*+f^#u1ThQr~bQDtf*rKD2Pa2y9!
z)eu6UX)1<cWTNGAMXR-suA2y<aC!N4(+>$q+wMz1o}FLFPNyT&`sO(~c`MJ(FC-ub
zgF*fck&nB(Tj%uj9RP70KRGO2SF!CrH#fJBe>sJ1_nFN+!Z1V#fublFhRJ#z0MKYO
zs8*|GGgP!qvlQ)iJG)nQtgUp5`MgXfOSe3q-ywvC`{gr7trqVOn{<^rAJ@P5P}TW#
z)I-<JGAT-$@c8&O%jJSvtxm7kWi<Lx;J{Wb&#$h&1G%O2dR^YsR+%`@$Kwg(@#M*#
z6ooC1l2#%9RQWT<D2#~0h$K$<sl6)nOlTK)HpA()L!2Z`ubu4iejQ>Mm4YCN<3djm
zh6SD_^gS1={sP}~34#FMbJ^QJ;M-_IlNsvD;r4EUwb#V=TwWd?;Cn8*xr6Vy+e`Uh
e5Pxs^H~a?Z2fHP-LhnQX0000<MNUMnLSTaY6bXg^

literal 0
HcmV?d00001

diff --git a/rc/icons/ancient_city_d.png b/rc/icons/ancient_city_d.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecfd645693e944522fb176fe914d0af6a8550891
GIT binary patch
literal 5232
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

literal 0
HcmV?d00001

diff --git a/rc/icons/hut_d.png b/rc/icons/hut_d.png
index c910881212831829656b8fae6688a5596056dd4d..f02303c06686fccabdd0767793dacd6674bc843a 100644
GIT binary patch
delta 604
zcmV-i0;B!u1HT238Gi-<004a7uh;+p0Lp1YLr_C?b98TQ000=3V_;z1&Hw~V4h#&r
zc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMeuxqZS+BECN~xq(1<$NIIC!
z$O2*~LD&)?c6mub36QM=VkZ|Af!IJ7Gw>9J1UUoQK0vlWI)4&735lJOTAU1I#{k*U
z2*2geXJD}S!oa{h5h0c|je%i%I|GBnZG@Q0LIwu@RtAP`R}f;K1Ht}f6gyLrT2TTL
z@zZx?C`c?yg!_ug*a%`TER3iM0B6}THQeqQVgLXD32;bRa{vGf6951U69E94oEQKA
z03~!qSaf7zbd!bwS$_dJNkl<ZNQvc?y^e(-5QPsnl(ytHHa>%ejm8JF_Q8xc7RCp#
z(AL<}`NM4%0tmW$cQ@H&Pcvbd`8b0H;6qK*2tE4LG>y2cF^cc@*L4-cFnFO4y*N!%
zatEEJ>CzOj6M3F1U|E&`fTAei%T-lnFpPx_OOgcBG+~}+1Al5uhf)_Tj$;7kcrvG}
z>pImdp~MBtvJ3#g7y|$-%c3BRF}1GiT0x~#;(~F`oufrjgy-{#d7d$jBZ43}LFs2<
z05FcD5jp2-8VRL(LtWQim{i~Qm-`ABhT$#jN+*ZMaTo<c2oOS4)bqOZJp;J!`?nmP
zfZMhir|M3m3sKwMCGb}r{!O53Wcv%d@^;Nzcj!CF0LuT6QtB-9$-b&nciXmK0@}~o
q!&CRRjOR<2{j}Ti_5HZRf2bGGP{f*v-i9Io0000<MNUMnLSTaIpaSRs

delta 378
zcmdnb`jUBqWIY2AL~i-O0;E{d9eo`c7&i8E|4C#8@)eRjf_xbms?-=58d?|_egTCV
zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hsU*lRn1P{e@>vTIFUi~8h2ejD|C#+j9%q3^
zWHAE+w=f7ZGR&GI0Tg5}@$_|Ne^SpOD$1oCa{0M6Q0$zii(`n!`K1>(`Y|~Q9Q%0x
z)Gv-BPTW%S9&kyYw39I9FMBA}-OZoyu+$|}V+CJ<?l(Q9wj)Q@&zSkAJnd5|d#_ud
zu~^OK!`Yho8S~t3@me}0rA9j09ys!9V|DzrZL>TUT?%y6zS`un)nIGtuB~}1)jLzN
zHoh<4y>I{i)AFAWAImWc*8P@x``tHRd;1)hHSUM?o%?KltPFc1Z281N&c@A8Pt;P#
z$kDF(y48OU{|Sc$ig(<JoY!@}!mLVX!gJ$@sl|W7JRX-z^A)fCJpUKdjzTBl6W1*^
UPv&7v;bLI$boFyt=akR{04DB^R{#J2

diff --git a/rc/icons/igloo_d.png b/rc/icons/igloo_d.png
index 4f879f3ad4d1a7b4ae600df9fff57c22f104c2bc..92218e5104c5c36cb21edbd02592f47c7c335dc5 100644
GIT binary patch
delta 536
zcmV+z0_Xj)1N;P#8Gi-<0051N9Sr~g0Lp1YLr_C?b98TQ000=3V_;z1&Hw~V4h#&r
zc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMeuxqZS+BECN~xq(1<$NIIC!
z$O2*~LD&)?c6mub36QM=VkZ|Af!IJ7Gw>9J1UUoQK0vlWI)4&735lJOTAU1I#{k*U
z2*2geXJD}S!oa{h5h0c|je%i%I|GBnZG@Q0LIwu@RtAP`R}f;K1Ht}f6gyLrT2TTL
z@zZx?C`c?yg!_ug*a%`TER3iM0B6}THQeqQVgLXD32;bRa{vGi!~g&e!~vBn4jTXf
z03~!qSaf7zbdyd2T7ULQL_t(Ijop+z4udcZg&(N0<S8fO25hVxk2O=c0Vm32DN8%q
zG6^(dtNJ9Q1lyng1i-IrxHHW2{QefW@B3wJ^Rfr(flrqjmQq5_86gCeQUCxVf^}VQ
zp?2`F7$ZakAp{G`IfI!YA^-qp#<DC8bgW_9wi&FHf}FDjDSu28#Tc9J1`kUqS!-Ut
zT20``;42;PU?O6Vf_$|AKt$G+>ZJz{BO(w{1E_UnH=t(oj?8?r`AzGR^xgpPGWO(Q
zCtxYX2CYt7*>M~IfN7dekQ&xhc(vhg@|#xKmbDr`%bxs98{kuzs{W#er$2+9#=gtH
a=>wJHq51miX$^n?0000<MNUMnLSTYH#@XQj

delta 321
zcmeyvvXOa$WIY2Ata#*f5lFG5JNh~@Fl_AS{*%ZG<SQh51o<*BRH-pAG_)`<`~nI!
zykKA`HDF+PmB7GYHG_dcykO3*KpUV0Q%R6tFatx`<g*qaUXr)F3&a2R{xkc5JkA1-
z$YKTtz9S&aI8~cZ8YswK;_2(k{-mBmR8(8VO(VS;C^pU0#W6(Ua_<GhRfipTTrVak
zv&Ee4`p37-d-l_%zM}6Hw1ZRwzH;9_;@Wk`?Zqq3#vfBN^&e+!@0Xc=rR+pw_?JoF
z@A~n~yV+^F*4%9KLFH=JmDNT*&Ebw^3#UteerFWSGK-ztHM>xTKO&<gG}tKYWRZ@a
zf02LK`YU_>dRDGk?Y%)fZPvGmsxx<5Z8DCXUug9I&y)3km}jyZ=YHk#O`FWan99lE
M>FVdQ&MBb@07sZ~ZvX%Q

diff --git a/rc/icons/ruins_d.png b/rc/icons/ruins_d.png
index a4d9b47d0433308b2fb0aae520790dab7d3d915e..1cb68852b030f7e9aa6c6f67466fb48c772f8a68 100644
GIT binary patch
delta 566
zcmV-60?GZM1DOSo8Gi-<0051N9Sr~g0Lp1YLr_C?b98TQ000=3V_;z1&Hw~V4h#&r
zc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMeuxqZS+BECN~xq(1<$NIIC!
z$O2*~LD&)?c6mub36QM=VkZ|Af!IJ7Gw>9J1UUoQK0vlWI)4&735lJOTAU1I#{k*U
z2*2geXJD}S!oa{h5h0c|je%i%I|GBnZG@Q0LIwu@RtAP`R}f;K1Ht}f6gyLrT2TTL
z@zZx?C`c?yg!_ug*a%`TER3iM0B6}THQeqQVgLXD32;bRa{vGi!T<mc!T}X1N`L?W
z03~!qSaf7zbdx>-S$_c&Nkl<ZIF0R+F>V4e5JlhEULku|;$R$zb5U>-#0ltVC|DM)
zy&h9UqDX9#C{-kWWsUrw|F;I-`m5ygV6)kjpPKjk{TIKhUEFTBhzKbqy!WUoAq3`m
zCg;rYcx1QRRUfGWjWL`~CqzC1s4CW4j4`B?7{{@h+SG<3!hd?b#(NLIG)>%YH*(H|
z5Qs50fz^aDMlP2N%d*gQ9U+8gIsoUYwl>f?hjZ>(*?W(*mizsVsy1QJs5}e<DJ4oN
z7-N{{ne+KfDc>(Z6*!I~(==hNMODc;)Av2b7(|4e^Y4JpIfh|)p8LK>L|B#uRi*2?
zCb0U4hr@yE^(#tBiPdUFDTNp#*4h_kUjSQ6`_@0z17R+72@-p=b^rhX07*qoM6N<$
Ef^MPe2mk;8

delta 306
zcmbQqx{!H-WIY2Ata#*f5lFG5JNh~@Fl_AS{*%ZG<SQh51o<*BRH-pAG_)`<`~nI!
zykKA`HDF+PmB7GYHG_dcykO3*KpUV0Q%R6tFatx`<g*qaUXr)F3&a2R{xkc5JkA1-
z$YKTtzC$3)D5~Mr02E{|@$_|Ne^SpODyGQN`d%;rDAwlb;us=vdFup2zC#8AEYEY?
zPxz_G9c!)#@7lxik;zJm%PHW^jb#M^KJJXS=ag;Pee~daRfhJn{0wXji&<vhkvVTG
z9U`unDSAvOJT)bMrrgEKRZI5k_68@GzBY8*@N4FZ*RdzE_NCc9uy`pFt-7&o*<qP2
xo0crQXLI+kUiIH~;y3<348Q+^^^ulZzJ=C~1Cx0eQ@9uyJYD@<);T3K0RW{)Y-Rue

diff --git a/rc/icons/shipwreck_d.png b/rc/icons/shipwreck_d.png
index 46f547439e71b9dfb30c08b2398087e324b410fb..3f8f0e1f7f8bd139fcd519549b6bb01dca7f4198 100644
GIT binary patch
delta 445
zcmV;u0Yd(R1EK_w8Gi-<0051N9Sr~g0Lp1YLr_C?b98TQ000=3V_;z1&Hw~V4h#&r
zc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMeuxqZS+BECN~xq(1<$NIIC!
z$O2*~LD&)?c6mub36QM=VkZ|Af!IJ7Gw>9J1UUoQK0vlWI)4&735lJOTAU1I#{k*U
z2*2geXJD}S!oa{h5h0c|je%i%I|GBnZG@Q0LIwu@RtAP`R}f;K1Ht}f6gyLrT2TTL
z@zZx?C`c?yg!_ug*a%`TER3iM0B6}THQeqQVgLXD32;bRa{vGi!T<mc!T}X1N`L?W
z03~!qSaf7zbdw+fT7R5LL_t(IjpbB94uBvG8^(w20X&xn@H0J_nu=u*J+g~Q=W1Jq
zX3JHInmOmA#Y!pROt%R#cfYY(>yUJdz6LT7G5IG#Cd2bLAymz%GZPuM2ca@VsVw(M
zRfP8<kc92a?mnI2O~_W+N`#}w_~TGuNi8&&+R>Lnv&$;%DKb*VdNCw5(1wrUnOhUC
njk3h5)Y=U1vZ~P!VzD{_Sl(O?6hW<500000NkvXXu0mjfG?lM+

delta 276
zcmZ3)(#$+TvYr75Ry=aL2&7oj9eo`c7&i8E|4C#8@)eRjf_xbms?-=58d?|_egTCV
zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hsU*lRn1P{e@>vTIFUi~8h2ejD|C#+j9%q3^
zWHAE+-yslY6xHx*01C2~c>21sKdI*s6;t4R<Qg*vD3;;r;us=vdFh0MybOvQEXTWB
za~Y?2GfpYvcQ}71SZ-F&hSOZ(rmxHx>=!C_Ec3VRa<IKOLE(qv+hbQuJkEZab@kXY
zUgite<|I6LZDP|qW%c)6mU3L$`>#l7_a(Kyni^79m-76#a`{)Lj+0W-JX{LP85kz>
RF(z{|c)I$ztaD0e0sz{xTzdcj

diff --git a/src/aboutdialog.h b/src/aboutdialog.h
index 11f5e4d..e1e0956 100644
--- a/src/aboutdialog.h
+++ b/src/aboutdialog.h
@@ -5,8 +5,8 @@
 #include <QString>
 
 #define VERS_MAJOR 2
-#define VERS_MINOR 1
-#define VERS_PATCH 1   // negative patch number designates a development version
+#define VERS_MINOR 2
+#define VERS_PATCH -1   // negative patch number designates a development version
 
 // returns +1 if newer, -1 if older  and 0 if equal
 inline int cmpVers(int major, int minor, int patch)
diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
index d5e6f30..8a8ddf8 100644
--- a/src/aboutdialog.ui
+++ b/src/aboutdialog.ui
@@ -2,17 +2,13 @@
 <ui version="4.0">
  <class>AboutDialog</class>
  <widget class="QDialog" name="AboutDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>609</width>
-    <height>343</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>About</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../rc/icons.qrc">
+    <normaloff>:/icons/map.png</normaloff>:/icons/map.png</iconset>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="1">
     <widget class="QDialogButtonBox" name="buttonBox">
@@ -30,7 +26,7 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../icons.qrc">:/icons/map.png</pixmap>
+      <pixmap resource="../rc/icons.qrc">:/icons/map.png</pixmap>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -47,7 +43,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../icons.qrc"/>
+  <include location="../rc/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/filterdialog.cpp b/src/conditiondialog.cpp
similarity index 94%
rename from src/filterdialog.cpp
rename to src/conditiondialog.cpp
index 99b1c1f..9f0fc70 100644
--- a/src/filterdialog.cpp
+++ b/src/conditiondialog.cpp
@@ -1,5 +1,5 @@
-#include "filterdialog.h"
-#include "ui_filterdialog.h"
+#include "conditiondialog.h"
+#include "ui_conditiondialog.h"
 
 #include "mainwindow.h"
 #include "cutil.h"
@@ -32,7 +32,7 @@ static QString getTip(int mc, int layer, int id)
 {
     uint64_t mL = 0, mM = 0;
     genPotential(&mL, &mM, layer, mc, id);
-    QString tip = FilterDialog::tr("Generates any of:");
+    QString tip = ConditionDialog::tr("Generates any of:");
     for (int j = 0; j < 64; j++)
         if (mL & (1ULL << j))
             tip += QString("\n") + biome2str(mc, j);
@@ -42,7 +42,7 @@ static QString getTip(int mc, int layer, int id)
     return tip;
 }
 
-void FilterDialog::addVariant(QString name, int biome, int variant)
+void ConditionDialog::addVariant(QString name, int biome, int variant)
 {
     VariantCheckBox *cb = new VariantCheckBox(name, biome, variant);
     ui->gridLayoutVariants->addWidget(cb, variantboxes.size(), 0);
@@ -51,9 +51,9 @@ void FilterDialog::addVariant(QString name, int biome, int variant)
 
 #define WARNING_CHAR QChar(0x26A0)
 
-FilterDialog::FilterDialog(FormConditions *parent, Config *config, int mcversion, QListWidgetItem *item, Condition *initcond)
+ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcversion, QListWidgetItem *item, Condition *initcond)
     : QDialog(parent, Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint)
-    , ui(new Ui::FilterDialog)
+    , ui(new Ui::ConditionDialog)
     , config(config)
     , item(item)
     , mc(mcversion)
@@ -204,6 +204,9 @@ FilterDialog::FilterDialog(FormConditions *parent, Config *config, int mcversion
     SETUP_BIOME_CHECKBOX(jagged_peaks);
     SETUP_BIOME_CHECKBOX(frozen_peaks);
 
+    SETUP_BIOME_CHECKBOX(deep_dark);
+    SETUP_BIOME_CHECKBOX(mangrove_swamp);
+
     memset(tempsboxes, 0, sizeof(tempsboxes));
 
     SETUP_TEMPCAT_SPINBOX(Oceanic);
@@ -265,7 +268,7 @@ FilterDialog::FilterDialog(FormConditions *parent, Config *config, int mcversion
 
         QCheckBox *all = new QCheckBox(this);
         all->setFixedWidth(20);
-        all->setToolTip(tr("Require the complete range"));
+        all->setToolTip(tr("Require full range instead of intersection"));
         connect(all, SIGNAL(stateChanged(int)), this, SLOT(onClimateLimitChanged(void)));
         climatecomplete[climates[i].idx] = all;
 
@@ -438,14 +441,14 @@ FilterDialog::FilterDialog(FormConditions *parent, Config *config, int mcversion
     updateMode();
 }
 
-FilterDialog::~FilterDialog()
+ConditionDialog::~ConditionDialog()
 {
     if (item)
         delete item;
     delete ui;
 }
 
-void FilterDialog::setActiveTab(QWidget *tab)
+void ConditionDialog::setActiveTab(QWidget *tab)
 {
     ui->tabWidget->setEnabled(true);
     ui->tabWidget->setCurrentWidget(tab);
@@ -455,7 +458,7 @@ void FilterDialog::setActiveTab(QWidget *tab)
     ui->tabVariants->setEnabled(ui->tabVariants == tab);
 }
 
-void FilterDialog::updateMode()
+void ConditionDialog::updateMode()
 {
     int filterindex = ui->comboBoxType->currentData().toInt();
     const FilterInfo &ft = g_filterinfo.list[filterindex];
@@ -581,7 +584,7 @@ void FilterDialog::updateMode()
     textDescription->setText(ft.description);
 }
 
-void FilterDialog::enableSet(const int *ids, int n)
+void ConditionDialog::enableSet(const int *ids, int n)
 {
     for (int i = 0; i < 256; i++)
     {
@@ -595,7 +598,7 @@ void FilterDialog::enableSet(const int *ids, int n)
         biomecboxes[ids[i]]->setEnabled(true);
 }
 
-void FilterDialog::updateBiomeSelection()
+void ConditionDialog::updateBiomeSelection()
 {
     int filterindex = ui->comboBoxType->currentData().toInt();
     const FilterInfo &ft = g_filterinfo.list[filterindex];
@@ -692,7 +695,7 @@ void FilterDialog::updateBiomeSelection()
     }
 }
 
-int FilterDialog::warnIfBad(Condition cond)
+int ConditionDialog::warnIfBad(Condition cond)
 {
     const FilterInfo &ft = g_filterinfo.list[cond.type];
     if (ui->scrollVariants->isEnabled())
@@ -740,12 +743,12 @@ int FilterDialog::warnIfBad(Condition cond)
     return QMessageBox::Ok;
 }
 
-void FilterDialog::on_comboBoxType_activated(int)
+void ConditionDialog::on_comboBoxType_activated(int)
 {
     updateMode();
 }
 
-void FilterDialog::on_comboBoxRelative_activated(int)
+void ConditionDialog::on_comboBoxRelative_activated(int)
 {
     QPalette pal;
     if (ui->comboBoxRelative->currentText().contains(WARNING_CHAR))
@@ -753,7 +756,7 @@ void FilterDialog::on_comboBoxRelative_activated(int)
     ui->comboBoxRelative->setPalette(pal);
 }
 
-void FilterDialog::on_buttonUncheck_clicked()
+void ConditionDialog::on_buttonUncheck_clicked()
 {
     for (int i = 0; i < 256; i++)
     {
@@ -763,7 +766,7 @@ void FilterDialog::on_buttonUncheck_clicked()
     }
 }
 
-void FilterDialog::on_buttonInclude_clicked()
+void ConditionDialog::on_buttonInclude_clicked()
 {
     for (int i = 0; i < 256; i++)
     {
@@ -773,7 +776,7 @@ void FilterDialog::on_buttonInclude_clicked()
     }
 }
 
-void FilterDialog::on_buttonExclude_clicked()
+void ConditionDialog::on_buttonExclude_clicked()
 {
     for (int i = 0; i < 256; i++)
     {
@@ -783,7 +786,7 @@ void FilterDialog::on_buttonExclude_clicked()
     }
 }
 
-void FilterDialog::on_buttonAreaInfo_clicked()
+void ConditionDialog::on_buttonAreaInfo_clicked()
 {
     QMessageBox mb(this);
     mb.setIcon(QMessageBox::Information);
@@ -811,22 +814,22 @@ void FilterDialog::on_buttonAreaInfo_clicked()
     mb.exec();
 }
 
-void FilterDialog::on_checkRadius_toggled(bool)
+void ConditionDialog::on_checkRadius_toggled(bool)
 {
     updateMode();
 }
 
-void FilterDialog::on_radioSquare_toggled(bool)
+void ConditionDialog::on_radioSquare_toggled(bool)
 {
     updateMode();
 }
 
-void FilterDialog::on_radioCustom_toggled(bool)
+void ConditionDialog::on_radioCustom_toggled(bool)
 {
     updateMode();
 }
 
-void FilterDialog::on_lineSquare_editingFinished()
+void ConditionDialog::on_lineSquare_editingFinished()
 {
     int v = ui->lineSquare->text().toInt();
     int area = (v+1) * (v+1);
@@ -837,12 +840,12 @@ void FilterDialog::on_lineSquare_editingFinished()
     }
 }
 
-void FilterDialog::on_buttonCancel_clicked()
+void ConditionDialog::on_buttonCancel_clicked()
 {
     close();
 }
 
-void FilterDialog::on_buttonOk_clicked()
+void ConditionDialog::on_buttonOk_clicked()
 {
     Condition c = cond;
     c.type = ui->comboBoxType->currentData().toInt();
@@ -926,20 +929,20 @@ void FilterDialog::on_buttonOk_clicked()
     close();
 }
 
-void FilterDialog::on_FilterDialog_finished(int result)
+void ConditionDialog::on_ConditionDialog_finished(int result)
 {
     if (item)
         emit setCond(item, cond, result);
     item = 0;
 }
 
-void FilterDialog::on_comboBoxCat_currentIndexChanged(int idx)
+void ConditionDialog::on_comboBoxCat_currentIndexChanged(int idx)
 {
     ui->comboBoxType->setEnabled(idx != CAT_NONE);
     ui->comboBoxType->clear();
 
     int slot = 0;
-    ui->comboBoxType->insertItem(slot, tr("Select filter"), QVariant::fromValue((int)F_SELECT));
+    ui->comboBoxType->insertItem(slot, tr("Select type"), QVariant::fromValue((int)F_SELECT));
 
     const FilterInfo *ft_list[FILTER_MAX] = {};
     const FilterInfo *ft;
@@ -974,12 +977,12 @@ void FilterDialog::on_comboBoxCat_currentIndexChanged(int idx)
     updateMode();
 }
 
-void FilterDialog::on_checkStartPiece_stateChanged(int state)
+void ConditionDialog::on_checkStartPiece_stateChanged(int state)
 {
     ui->scrollVariants->setEnabled(state);
 }
 
-void FilterDialog::getClimateLimits(int limok[6][2], int limex[6][2])
+void ConditionDialog::getClimateLimits(int limok[6][2], int limex[6][2])
 {
     getClimateLimits(climaterange[0], limok);
     getClimateLimits(climaterange[1], limex);
@@ -1006,7 +1009,7 @@ void FilterDialog::getClimateLimits(int limok[6][2], int limex[6][2])
     }
 }
 
-void FilterDialog::getClimateLimits(LabeledRange *ranges[6], int limits[6][2])
+void ConditionDialog::getClimateLimits(LabeledRange *ranges[6], int limits[6][2])
 {
     for (int i = 0; i < 6; i++)
     {
@@ -1025,7 +1028,7 @@ void FilterDialog::getClimateLimits(LabeledRange *ranges[6], int limits[6][2])
     }
 }
 
-void FilterDialog::setClimateLimits(LabeledRange *ranges[6], int limits[6][2], bool complete)
+void ConditionDialog::setClimateLimits(LabeledRange *ranges[6], int limits[6][2], bool complete)
 {
     for (int i = 0; i < 6; i++)
     {
@@ -1050,7 +1053,7 @@ void FilterDialog::setClimateLimits(LabeledRange *ranges[6], int limits[6][2], b
     }
 }
 
-void FilterDialog::onClimateLimitChanged()
+void ConditionDialog::onClimateLimitChanged()
 {
     int limok[6][2], limex[6][2];
     char ok[256], ex[256];
diff --git a/src/filterdialog.h b/src/conditiondialog.h
similarity index 91%
rename from src/filterdialog.h
rename to src/conditiondialog.h
index 5f9d043..4064fe6 100644
--- a/src/filterdialog.h
+++ b/src/conditiondialog.h
@@ -1,5 +1,5 @@
-#ifndef FILTERDIALOG_H
-#define FILTERDIALOG_H
+#ifndef CONDITIONDIALOG_H
+#define CONDITIONDIALOG_H
 
 #include <QDialog>
 #include <QCheckBox>
@@ -16,7 +16,7 @@
 class MainWindow;
 
 namespace Ui {
-class FilterDialog;
+class ConditionDialog;
 }
 
 class SpinExclude : public QSpinBox
@@ -113,14 +113,14 @@ public:
     }
 };
 
-class FilterDialog : public QDialog
+class ConditionDialog : public QDialog
 {
     Q_OBJECT
 
 public:
 
-    explicit FilterDialog(FormConditions *parent, Config *config, int mc, QListWidgetItem *item = 0, Condition *initcond = 0);
-    virtual ~FilterDialog();
+    explicit ConditionDialog(FormConditions *parent, Config *config, int mc, QListWidgetItem *item = 0, Condition *initcond = 0);
+    virtual ~ConditionDialog();
 
     void addVariant(QString name, int biome, int variant);
     void setActiveTab(QWidget *tab);
@@ -158,7 +158,7 @@ private slots:
 
     void on_buttonOk_clicked();
 
-    void on_FilterDialog_finished(int result);
+    void on_ConditionDialog_finished(int result);
 
     void on_comboBoxCat_currentIndexChanged(int index);
 
@@ -167,7 +167,7 @@ private slots:
     void onClimateLimitChanged();
 
 private:
-    Ui::FilterDialog *ui;
+    Ui::ConditionDialog *ui;
     QTextEdit *textDescription;
 
     QCheckBox *biomecboxes[256];
@@ -184,4 +184,4 @@ public:
     int mc;
 };
 
-#endif // FILTERDIALOG_H
+#endif // CONDITIONDIALOG_H
diff --git a/src/filterdialog.ui b/src/conditiondialog.ui
similarity index 97%
rename from src/filterdialog.ui
rename to src/conditiondialog.ui
index 8aff9a6..e91438c 100644
--- a/src/filterdialog.ui
+++ b/src/conditiondialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>FilterDialog</class>
- <widget class="QDialog" name="FilterDialog">
+ <class>ConditionDialog</class>
+ <widget class="QDialog" name="ConditionDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,11 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>New Filter</string>
+   <string>Condition Editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../rc/icons.qrc">
+    <normaloff>:/icons/map.png</normaloff>:/icons/map.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
@@ -74,7 +78,7 @@
        </item>
        <item>
         <property name="text">
-         <string>Biome filter</string>
+         <string>Biomes</string>
         </property>
         <property name="icon">
          <iconset resource="../rc/icons.qrc">
@@ -135,7 +139,7 @@
        </property>
        <item>
         <property name="text">
-         <string>Select filter</string>
+         <string>Select type</string>
         </property>
        </item>
       </widget>
@@ -143,7 +147,7 @@
      <item row="0" column="1">
       <widget class="QLabel" name="labelFilterType">
        <property name="text">
-        <string>Filter type:</string>
+        <string>Condition type:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -412,8 +416,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>648</width>
-                <height>377</height>
+                <width>640</width>
+                <height>362</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -696,8 +700,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>648</width>
-                <height>333</height>
+                <width>640</width>
+                <height>316</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -745,8 +749,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>648</width>
-                <height>413</height>
+                <width>640</width>
+                <height>395</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -787,8 +791,7 @@
        </property>
        <property name="icon">
         <iconset theme="dialog-cancel">
-         <normaloff/>
-        </iconset>
+         <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
      </item>
@@ -799,8 +802,7 @@
        </property>
        <property name="icon">
         <iconset theme="dialog-ok">
-         <normaloff/>
-        </iconset>
+         <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
      </item>
@@ -818,7 +820,7 @@
   <customwidget>
    <class>SpinInstances</class>
    <extends>QSpinBox</extends>
-   <header>src/filterdialog.h</header>
+   <header>src/conditiondialog.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/extgendialog.cpp b/src/extgendialog.cpp
index c909f3f..be01580 100644
--- a/src/extgendialog.cpp
+++ b/src/extgendialog.cpp
@@ -24,6 +24,7 @@ ExtGenDialog::ExtGenDialog(QWidget *parent, ExtGenSettings *extgen)
         Monument,
         Mansion,
         Outpost,
+        Ancient_City,
         Ruined_Portal,
         Ruined_Portal_N,
         Treasure,
diff --git a/src/formconditions.cpp b/src/formconditions.cpp
index 85c6e43..c30f965 100644
--- a/src/formconditions.cpp
+++ b/src/formconditions.cpp
@@ -1,7 +1,7 @@
 #include "formconditions.h"
 #include "ui_formconditions.h"
 
-#include "filterdialog.h"
+#include "conditiondialog.h"
 #include "mainwindow.h"
 
 #include <QMessageBox>
@@ -165,7 +165,7 @@ void FormConditions::editCondition(QListWidgetItem *item)
         return;
     WorldInfo wi;
     parent->getSeed(&wi);
-    FilterDialog *dialog = new FilterDialog(this, &parent->config, wi.mc, item, (Condition*)item->data(Qt::UserRole).data());
+    ConditionDialog *dialog = new ConditionDialog(this, &parent->config, wi.mc, item, (Condition*)item->data(Qt::UserRole).data());
     QObject::connect(dialog, SIGNAL(setCond(QListWidgetItem*,Condition,int)), this, SLOT(addItemCondition(QListWidgetItem*,Condition,int)), Qt::QueuedConnection);
     dialog->show();
 }
@@ -224,7 +224,7 @@ void FormConditions::on_buttonAddFilter_clicked()
         return;
     WorldInfo wi;
     parent->getSeed(&wi);
-    FilterDialog *dialog = new FilterDialog(this, &parent->config, wi.mc);
+    ConditionDialog *dialog = new ConditionDialog(this, &parent->config, wi.mc);
     QObject::connect(dialog, SIGNAL(setCond(QListWidgetItem*,Condition,int)), this, SLOT(addItemCondition(QListWidgetItem*,Condition)), Qt::QueuedConnection);
     dialog->show();
 }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 15793fc..2224420 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -5,7 +5,7 @@
 #include "quadlistdialog.h"
 #include "presetdialog.h"
 #include "aboutdialog.h"
-#include "filterdialog.h"
+#include "conditiondialog.h"
 #include "extgendialog.h"
 
 #if WITH_UPDATER
@@ -123,6 +123,7 @@ MainWindow::MainWindow(QWidget *parent)
     addMapAction(D_SHIPWRECK, "shipwreck", tr("Show shipwrecks"));
     addMapAction(D_TREASURE, "treasure", tr("Show buried treasures"));
     addMapAction(D_OUTPOST, "outpost", tr("Show illager outposts"));
+    addMapAction(D_ANCIENTCITY, "ancient_city", tr("Show ancient cities"));
     addMapAction(D_PORTAL, "portal", tr("Show ruined portals"));
     ui->toolBar->addSeparator();
     addMapAction(D_FORTESS, "fortress", tr("Show nether fortresses"));
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 193fc90..f577ef8 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -26,7 +26,16 @@
       </property>
       <widget class="QFrame" name="controlFrame">
        <layout class="QVBoxLayout" name="verticalLayout_5">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -107,6 +116,11 @@
               <height>16</height>
              </size>
             </property>
+            <item>
+             <property name="text">
+              <string>1.19</string>
+             </property>
+            </item>
             <item>
              <property name="text">
               <string>1.18</string>
@@ -294,7 +308,16 @@
             <string>Search</string>
            </attribute>
            <layout class="QGridLayout" name="gridLayout">
-            <property name="margin">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
              <number>0</number>
             </property>
             <item row="0" column="0">
@@ -340,8 +363,8 @@ QToolButton {
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>1233</width>
-                 <height>676</height>
+                 <width>1232</width>
+                 <height>669</height>
                 </rect>
                </property>
                <property name="sizePolicy">
@@ -666,7 +689,16 @@ QSplitter {
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QGridLayout" name="gridLayout_4">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item row="0" column="0">
@@ -733,7 +765,7 @@ QToolButton:checked {
      <x>0</x>
      <y>0</y>
      <width>1280</width>
-     <height>23</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuMap">
diff --git a/src/presetdialog.cpp b/src/presetdialog.cpp
index 4806b49..d172de2 100644
--- a/src/presetdialog.cpp
+++ b/src/presetdialog.cpp
@@ -198,6 +198,14 @@ void PresetDialog::updateSelection()
     }
 }
 
+void PresetDialog::on_tabWidget_currentChanged(int)
+{
+    if (ui->tabWidget->currentWidget() == ui->tabFilters)
+        ui->listExamples->clearSelection();
+    else
+        ui->listFilters->clearSelection();
+}
+
 void PresetDialog::on_listFilters_itemSelectionChanged()
 {
     updateSelection();
diff --git a/src/presetdialog.h b/src/presetdialog.h
index cca3e07..e63c443 100644
--- a/src/presetdialog.h
+++ b/src/presetdialog.h
@@ -38,6 +38,7 @@ public:
     void updateSelection();
 
 private slots:
+    void on_tabWidget_currentChanged(int idx);
     void on_listFilters_itemSelectionChanged();
     void on_listExamples_itemSelectionChanged();
 
diff --git a/src/quad.cpp b/src/quad.cpp
index 841b9e5..11e112e 100644
--- a/src/quad.cpp
+++ b/src/quad.cpp
@@ -81,6 +81,10 @@ void getStructs(std::vector<VarPos> *out, const StructureConfig sconf,
                 {
                     sv = getBastionType(wi.mc, wi.seed, p.x, p.z);
                 }
+                else if (sconf.structType == Ancient_City)
+                {
+                    sv = getAncientCityType(wi.mc, wi.seed, p.x, p.z);
+                }
                 else if (sconf.structType == Outpost && wi.mc >= MC_1_18)
                 {
                     sv.sx = sv.sz = 16;
@@ -346,6 +350,7 @@ QWorld::QWorld(WorldInfo wi, int dim)
     lvs[D_SHIPWRECK]    .init4struct(this, 0, 2048, D_SHIPWRECK, 1);
     lvs[D_TREASURE]     .init4struct(this, 0, 2048, D_TREASURE, 1);
     lvs[D_OUTPOST]      .init4struct(this, 0, 2048, D_OUTPOST, 2);
+    lvs[D_ANCIENTCITY]  .init4struct(this, 0, 2048, D_ANCIENTCITY, 2);
     lvs[D_PORTAL]       .init4struct(this, 0, 2048, D_PORTAL, 1);
     lvs[D_PORTALN]      .init4struct(this,-1, 2048, D_PORTALN, 1);
     lvs[D_FORTESS]      .init4struct(this,-1, 2048, D_FORTESS, 1);
@@ -368,6 +373,7 @@ QWorld::QWorld(WorldInfo wi, int dim)
     icons[D_TREASURE]   = QPixmap(":/icons/treasure.png");
     icons[D_MINESHAFT]  = QPixmap(":/icons/mineshaft.png");
     icons[D_OUTPOST]    = QPixmap(":/icons/outpost.png");
+    icons[D_ANCIENTCITY]= QPixmap(":/icons/ancient_city.png");
     icons[D_PORTAL]     = QPixmap(":/icons/portal.png");
     icons[D_PORTALN]    = QPixmap(":/icons/portal.png");
     icons[D_SPAWN]      = QPixmap(":/icons/spawn.png");
diff --git a/src/quad.h b/src/quad.h
index 9597f34..06ea197 100644
--- a/src/quad.h
+++ b/src/quad.h
@@ -30,6 +30,7 @@ enum {
     D_TREASURE,
     D_MINESHAFT,
     D_OUTPOST,
+    D_ANCIENTCITY,
     D_PORTAL,
     D_PORTALN,
     D_FORTESS,
@@ -60,6 +61,7 @@ inline const char *mapopt2str(int opt)
     case D_TREASURE:    return "treasure";
     case D_MINESHAFT:   return "mineshaft";
     case D_OUTPOST:     return "outpost";
+    case D_ANCIENTCITY: return "ancient_city";
     case D_PORTAL:      return "portal";
     case D_PORTALN:     return "portaln";
     case D_SPAWN:       return "spawn";
@@ -88,6 +90,7 @@ inline int str2mapopt(const char *s)
     if (!strcmp(s, "treasure"))     return D_TREASURE;
     if (!strcmp(s, "mineshaft"))    return D_MINESHAFT;
     if (!strcmp(s, "outpost"))      return D_OUTPOST;
+    if (!strcmp(s, "ancient_city")) return D_ANCIENTCITY;
     if (!strcmp(s, "portal"))       return D_PORTAL;
     if (!strcmp(s, "portaln"))      return D_PORTALN;
     if (!strcmp(s, "spawn"))        return D_SPAWN;
@@ -115,6 +118,7 @@ inline int mapopt2stype(int opt)
     case D_TREASURE:    return Treasure;
     case D_MINESHAFT:   return Mineshaft;
     case D_OUTPOST:     return Outpost;
+    case D_ANCIENTCITY: return Ancient_City;
     case D_PORTAL:      return Ruined_Portal;
     case D_PORTALN:     return Ruined_Portal_N;
     case D_FORTESS:     return Fortress;
diff --git a/src/search.h b/src/search.h
index c0ce699..4aefce9 100644
--- a/src/search.h
+++ b/src/search.h
@@ -102,6 +102,7 @@ enum
     F_REFERENCE_4,
     F_FIRST_STRONGHOLD,
     F_CLIMATE_NOISE,
+    F_ANCIENT_CITY,
     // new filters should be added here at the end to keep some downwards compatibility
     FILTER_MAX,
 };
@@ -250,7 +251,7 @@ static const struct FilterList
         list[F_BIOME] = FilterInfo{
             CAT_BIOMES, 1, 1, 1, 0, L_VORONOI_1, 0, 1, 0, MC_1_0, MC_1_17, 0, 1, disp++, // disable for 1.18
             ":icons/map.png",
-            _("Biome filter 1:1"),
+            _("Biomes 1:1"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-).")
         };
@@ -258,28 +259,28 @@ static const struct FilterList
         list[F_BIOME_4] = FilterInfo{
             CAT_BIOMES, 1, 1, 1, 0, 0, 0, 4, 0, MC_1_0, MC_NEWEST, 0, 1, disp++,
             ":icons/map.png",
-            _("Biome filter 1:4"),
+            _("Biomes 1:4"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-).")
         };
         list[F_BIOME_16] = FilterInfo{
             CAT_BIOMES, 1, 1, 1, 0, 0, 0, 16, 0, MC_1_0, MC_NEWEST, 0, 1, disp++,
             ":icons/map.png",
-            _("Biome filter 1:16"),
+            _("Biomes 1:16"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-).")
         };
         list[F_BIOME_64] = FilterInfo{
             CAT_BIOMES, 1, 1, 1, 0, 0, 0, 64, 0, MC_1_0, MC_NEWEST, 0, 1, disp++,
             ":icons/map.png",
-            _("Biome filter 1:64"),
+            _("Biomes 1:64"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-).")
         };
         list[F_BIOME_256] = FilterInfo{
             CAT_BIOMES, 1, 1, 1, 0, 0, 0, 256, 0, MC_1_0, MC_NEWEST, 0, 1, disp++,
             ":icons/map.png",
-            _("Biome filter 1:256"),
+            _("Biomes 1:256"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-).")
         };
@@ -287,7 +288,7 @@ static const struct FilterList
         list[F_BIOME_4_RIVER] = FilterInfo{
             CAT_BIOMES, 1, 1, 1, 0, L_RIVER_MIX_4, 0, 4, 0, MC_1_13, MC_1_17, 0, 0, disp++,
             ":icons/map.png",
-            _("Biome filter 1:4 RIVER"),
+            _("Biomes 1:4 RIVER"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-) "
             "at layer RIVER with scale 1:4. "
@@ -296,7 +297,7 @@ static const struct FilterList
         list[F_BIOME_256_OTEMP] = FilterInfo{
             CAT_BIOMES, 0, 1, 1, 0, L_OCEAN_TEMP_256, 0, 256, 0, MC_1_13, MC_1_17, 0, 0, disp++,
             ":icons/map.png",
-            _("Biome filter 1:256 O.TEMP"),
+            _("Biomes 1:256 O.TEMP"),
             _("Only seeds with the included (+) biomes in the specified area and "
             "discard those that have biomes that are explicitly excluded (-) "
             "at layer OCEAN TEMPERATURE with scale 1:256. "
@@ -319,56 +320,56 @@ static const struct FilterList
         list[F_BIOME_NETHER_1] = FilterInfo{
             CAT_NETHER, 1, 1, 1, 0, 0, 0, 1, 0, MC_1_16, 0, -1, 1, disp++, // disabled
             ":icons/nether.png",
-            _("Nether biome filter 1:1 (disabled)"),
+            _("Nether biomes 1:1 (disabled)"),
             _("Nether biomes after voronoi scaling to 1:1.")
         };
         list[F_BIOME_NETHER_4] = FilterInfo{
             CAT_NETHER, 0, 1, 1, 0, 0, 0, 4, 0, MC_1_16, MC_NEWEST, -1, 0, disp++,
             ":icons/nether.png",
-            _("Nether biome filter 1:4"),
+            _("Nether biomes 1:4"),
             _("Nether biomes with normal noise sampling at scale 1:4.")
         };
         list[F_BIOME_NETHER_16] = FilterInfo{
             CAT_NETHER, 0, 1, 1, 0, 0, 0, 16, 0, MC_1_16, MC_NEWEST, -1, 0, disp++,
             ":icons/nether.png",
-            _("Nether biome filter 1:16"),
+            _("Nether biomes 1:16"),
             _("Nether biomes, but only sampled at scale 1:16.")
         };
         list[F_BIOME_NETHER_64] = FilterInfo{
             CAT_NETHER, 0, 1, 1, 0, 0, 0, 64, 0, MC_1_16, MC_NEWEST, -1, 0, disp++,
             ":icons/nether.png",
-            _("Nether biome filter 1:64"),
+            _("Nether biomes 1:64"),
             _("Nether biomes, but only sampled at scale 1:64.")
         };
         list[F_BIOME_NETHER_256] = FilterInfo{
             CAT_NETHER, 0, 1, 1, 0, 0, 0, 256, 0, MC_1_16, MC_NEWEST, -1, 0, disp++,
             ":icons/nether.png",
-            _("Nether biome filter 1:256"),
+            _("Nether biomes 1:256"),
             _("Nether biomes, but only sampled at scale 1:256.")
         };
 
         list[F_BIOME_END_1] = FilterInfo{
             CAT_END, 1, 1, 1, 0, 0, 0, 1, 0, MC_1_9, 0, +1, 1, disp++, // disabled
             ":icons/the_end.png",
-            _("End biome filter 1:1 (disabled)"),
+            _("End biomes 1:1 (disabled)"),
             _("End biomes after voronoi scaling to 1:1.")
         };
         list[F_BIOME_END_4] = FilterInfo{
             CAT_END, 0, 1, 1, 0, 0, 0, 4, 0, MC_1_9, MC_NEWEST, +1, 0, disp++,
             ":icons/the_end.png",
-            _("End biome filter 1:4"),
+            _("End biomes 1:4"),
             _("End biomes sampled at scale 1:4. Note this is just a simple upscale of 1:16.")
         };
         list[F_BIOME_END_16] = FilterInfo{
             CAT_END, 0, 1, 1, 0, 0, 0, 16, 0, MC_1_9, MC_NEWEST, +1, 0, disp++,
             ":icons/the_end.png",
-            _("End biome filter 1:16"),
+            _("End biomes 1:16"),
             _("End biomes with normal sampling at scale 1:16. ")
         };
         list[F_BIOME_END_64] = FilterInfo{
             CAT_END, 0, 1, 1, 0, 0, 0, 64, 0, MC_1_9, MC_NEWEST, +1, 0, disp++,
             ":icons/the_end.png",
-            _("End biome filter 1:64"),
+            _("End biomes 1:64"),
             _("End biomes with lossy sampling at scale 1:64. ")
         };
 
@@ -490,6 +491,13 @@ static const struct FilterList
             ""
         };
 
+        list[F_ANCIENT_CITY] = FilterInfo{
+            CAT_STRUCT, 1, 1, 1, 1, 0, Ancient_City, 1, 1, MC_1_19, MC_NEWEST, 0, 0, disp++,
+            ":icons/ancient_city.png",
+            _("Ancient City"),
+            ""
+        };
+
         list[F_PORTAL] = FilterInfo{
             CAT_STRUCT, 0, 1, 1, 1, 0, Ruined_Portal, 1, 1, MC_1_16, MC_NEWEST, 0, 0, disp++,
             ":icons/portal.png",