diff --git a/Makefile.in b/Makefile.in index 9caafa91..c61b9ab9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -269,6 +269,7 @@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ WX_LIBS = @WX_LIBS@ WX_LIBS_STATIC = @WX_LIBS_STATIC@ +WX_RESCOMP = @WX_RESCOMP@ WX_VERSION = @WX_VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/configure b/configure index 8f5b4dd4..d2847524 100755 --- a/configure +++ b/configure @@ -698,6 +698,7 @@ WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION +WX_RESCOMP CC CFLAGS ac_ct_CC @@ -3195,6 +3196,22 @@ echo "${ECHO_T}yes" >&6; } fi fi + wx_has_rescomp="" + if test $wx_config_major_version -gt 2; then + wx_has_rescomp=yes + else + if test $wx_config_major_version -eq 2; then + if test $wx_config_minor_version -ge 7; then + wx_has_rescomp=yes + fi + fi + fi + if test "x$wx_has_rescomp" = x ; then + WX_RESCOMP= + else + WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp` + fi + if test "x$wx_has_cppflags" = x ; then WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` WX_CPPFLAGS=$WX_CFLAGS @@ -3228,6 +3245,7 @@ echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } WX_CXXFLAGS="" WX_LIBS="" WX_LIBS_STATIC="" + WX_RESCOMP="" : fi @@ -3238,6 +3256,8 @@ echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } WX_CXXFLAGS="" WX_LIBS="" WX_LIBS_STATIC="" + WX_RESCOMP="" + : fi @@ -3251,6 +3271,7 @@ echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } + if test "$wxWin" != 1; then { { echo "$as_me:$LINENO: error: wxWindows must be installed on your system @@ -6299,6 +6320,7 @@ WX_CXXFLAGS_ONLY!$WX_CXXFLAGS_ONLY$ac_delim WX_LIBS!$WX_LIBS$ac_delim WX_LIBS_STATIC!$WX_LIBS_STATIC$ac_delim WX_VERSION!$WX_VERSION$ac_delim +WX_RESCOMP!$WX_RESCOMP$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim ac_ct_CC!$ac_ct_CC$ac_delim @@ -6312,7 +6334,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index a0e7e156..08eee237 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -1,4 +1,5 @@ -mse version: 0.3.6 + +mse version: 0.3.6 short name: Magic full name: Magic the Gathering installer group: magic/game files @@ -187,6 +188,11 @@ init script: (if contains(card.shape, match:"split") then "S" else " ") + # split cards come after normal ones ":" } + # Process the name for sorting rules (specifically, remove "The", "A", and "And" at the beginning, and make lowercase) + sort_name := + replace_rule (match: "^(The|An?) ", replace: "") + + to_lower + is_multicolor := { chosen(choice: "multicolor") and input != "artifact, multicolor" } is_null_cost := { input == "" or input == "0" } basic_land_sort := { @@ -241,7 +247,7 @@ init script: position ( of: card in: set - order_by: { rarity_sort() + sort_index() + card.name } + order_by: { rarity_sort() + sort_index() + sort_name(card.name) } filter: set_filter() ) + 1 } diff --git a/src/resource/common/welcome_updates.png b/src/resource/common/welcome_updates.png index c67d9a6a..ae5e7056 100644 Binary files a/src/resource/common/welcome_updates.png and b/src/resource/common/welcome_updates.png differ