Merge branch 'master' into matrix

2019-09-08 18:31:39 +02:00
parent b29c37eb25 87ce6df145
commit 50d49e47e7
215 changed files with 196355 additions and 163383 deletions
@@ -57,7 +57,7 @@ install:
    tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
    tar -zxf android-sdk_r24.3.4-linux.tgz &&
    $ANDROID list sdk --extended -a &&
-    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https;
+    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
  fi
 - sudo python -m easy_install --upgrade pyOpenSSL
 - sudo pip install pyjavaproperties
@@ -474,7 +474,7 @@
 #ifndef PNG_VERSION_INFO_ONLY
 /* include the compression library's header */
-#include "zlib.h"
+#include "../include/zlib.h"
 #endif
 /* include all user configurable info, including optional assembler routines */
@@ -394,6 +394,7 @@ class JGE
   void SetJNIEnv(JNIEnv * env, jclass cls);
   void sendJNICommand(std::string command);
   std::string getFileSystemLocation();
   std::string getFileUserFolderPath();
 #endif 
 protected:
@@ -131,10 +131,11 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
    systemPath = [[documentsDirectory  stringByAppendingString: @"/Res/"] cStringUsingEncoding:1];
 #elif defined (ANDROID)
-    userPath = JGE::GetInstance()->getFileSystemLocation();
+    userPath = JGE::GetInstance()->getFileUserFolderPath();
-    systemPath = "";
+    systemPath = JGE::GetInstance()->getFileSystemLocation();
-	DebugTrace("User path " << userPath);
+    DebugTrace("User path " << userPath);
    DebugTrace("System path " << systemPath);
 #elif defined (QT_CONFIG)
    QDir sysDir(RESDIR);
@@ -668,7 +668,7 @@ string JGE::getFileSystemLocation()
    if (env == NULL)
    {
        DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
    };
    jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
@@ -677,7 +677,36 @@ string JGE::getFileSystemLocation()
    if (methodId == 0)
    {
        DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
    };
    jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);
    // Now convert the Java String to C++ char array
 	const char* cstr = env->GetStringUTFChars(systemPath, 0); 
 	string retVal (cstr);
 	env->ReleaseStringUTFChars(systemPath, cstr); 
 	env->DeleteLocalRef(systemPath);
    return retVal;
 }
 string JGE::getFileUserFolderPath()
 {
    JNIEnv * env = getJNIEnv();
    if (env == NULL)
    {
        DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic");
        return "/mnt/sdcard/Wagic/User";
    };
    jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
    jmethodID methodId = env->GetStaticMethodID( jniClass, "getUserFolderPath", "()Ljava/lang/String;");
    if (methodId == 0)
    {
        DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic");
        return "/mnt/sdcard/Wagic/User";
    };
    jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0201" android:versionName="@string/app_version" package="net.wagic.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0211" android:installLocation="preferExternal" android:versionName="@string/app_version" package="net.wagic.app">
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.INTERNET"/>
@@ -9,8 +9,8 @@
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+	</intent-filter>
        </activity>
    </application>
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="13"/>
 </manifest>
@@ -8,4 +8,4 @@
 # project structure.
 # Project target.
-target=android-10
+target=android-23
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 # Project target.
-target=android-10
+target=android-23
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Wagic</string>
-    <string name="app_version">0.20.1</string>
+    <string name="app_version">0.21.1</string>
-    <string name="info_text">Wagic v0.20.1\\nAll Rights Reserved.</string>
+    <string name="info_text">Wagic v0.21.1\\nAll Rights Reserved.</string>
 </resources>
@@ -1,19 +1,19 @@
-#NAME:Herdsmen
+#NAME:Herdsmen
-Aurochs	 (ICE) *4
+Aurochs	 (ICE) *4
-Brushwagg	 (MIR) *2
+Brushwagg	 (MIR) *2
-Birds of Paradise	 (7ED) *4
+Birds of Paradise	 (7ED) *4
-Snorting Gahr	 (MRQ) *1
+Snorting Gahr	 (MRQ) *1
-Aggressive Urge	 (INV) *4
+Aggressive Urge	 (INV) *4
-Blanchwood Armor	 (8ED) *4
+Blanchwood Armor	 (8ED) *4
-Bull Aurochs	 (CSP) *4
+Bull Aurochs	 (CSP) *4
-Boreal Druid	 (CSP) *4
+Boreal Druid	 (CSP) *4
-Aurochs Herd	 (CSP) *4
+Aurochs Herd	 (CSP) *4
-Timbermaw Larva	 (ZEN) *4
+Timbermaw Larva	 (ZEN) *4
-Bramble Creeper	 (M10) *2
+Bramble Creeper	 (M10) *2
-Awakening Zone	 (ROE) *4
+Awakening Zone	 (ROE) *4
-Beastmaster Ascension	 (ZEN) *4
+Beastmaster Ascension	 (ZEN) *4
-Forest	 (M11) *4
+Forest	 (M11) *4
-Forest	 (SOM) *4
+Forest	 (SOM) *4
-Forest	 (SOM) *4
+Forest	 (SOM) *4
-Forest	 (SOM) *4
+Forest	 (SOM) *4
-Forest	 (SOM) *4
+Forest	 (SOM) *4
@@ -1,26 +1,26 @@
-#NAME:The KOR
+#NAME:The KOR
-#DESC:The Kor never stand down.Golem-Skin Gauntlets	 (MRD) *1
+#DESC:The Kor never stand down.Golem-Skin Gauntlets	 (MRD) *1
-Plains	 (8ED) *4
+Plains	 (8ED) *4
-Plains	 (8ED) *4
+Plains	 (8ED) *4
-Bonesplitter	 (MRD) *2
+Bonesplitter	 (MRD) *2
-Vulshok Battlegear	 (MRD) *1
+Vulshok Battlegear	 (MRD) *1
-Plains	 (MRD) *4
+Plains	 (MRD) *4
-Plains	 (MRD) *4
+Plains	 (MRD) *4
-Plains	 (MRD) *4
+Plains	 (MRD) *4
-Cranial Plating	 (5DN) *2
+Cranial Plating	 (5DN) *2
-Skyhunter Skirmisher	 (5DN) *2
+Skyhunter Skirmisher	 (5DN) *2
-Paradise Mantle	 (5DN) *2
+Paradise Mantle	 (5DN) *2
-Shuko	 (BOK) *2
+Shuko	 (BOK) *2
-Umezawa's Jitte	 (BOK) *2
+Umezawa's Jitte	 (BOK) *2
-Kor Duelist	 (ZEN) *2
+Kor Duelist	 (ZEN) *2
-Spidersilk Net	 (ZEN) *1
+Spidersilk Net	 (ZEN) *1
-Bone Saw	 (CFX) *2
+Bone Saw	 (CFX) *2
-Armament Master	 (ZEN) *3
+Armament Master	 (ZEN) *3
-Lone Missionary	 (ROE) *2
+Lone Missionary	 (ROE) *2
-Pennon Blade	 (ROE) *1
+Pennon Blade	 (ROE) *1
-Kor Line-Slinger	 (ROE) *2
+Kor Line-Slinger	 (ROE) *2
-Kitesail Apprentice	 (WWK) *2
+Kitesail Apprentice	 (WWK) *2
-Stoneforge Mystic	 (WWK) *2
+Stoneforge Mystic	 (WWK) *2
-Accorder's Shield	 (SOM) *2
+Accorder's Shield	 (SOM) *2
-Swords to Plowshares	 (EVT) *2
+Swords to Plowshares	 (EVT) *2
-Kor Hookmaster	 (EVT) *2
+Kor Hookmaster	 (EVT) *2
@@ -1,37 +1,37 @@
-#NAME:Smoke and mirrors
+#NAME:Smoke and mirrors
-Order of the Ebon Hand	 (FEM) *2
+Order of the Ebon Hand	 (FEM) *2
-Combat Medic	 (FEM) *1
+Combat Medic	 (FEM) *1
-Combat Medic	 (FEM) *1
+Combat Medic	 (FEM) *1
-Combat Medic	 (FEM) *1
+Combat Medic	 (FEM) *1
-Sanctum Custodian	 (USG) *2
+Sanctum Custodian	 (USG) *2
-False Prophet	 (UDS) *1
+False Prophet	 (UDS) *1
-Revered Elder	 (MRQ) *1
+Revered Elder	 (MRQ) *1
-Hallowed Healer	 (ODY) *1
+Hallowed Healer	 (ODY) *1
-Beloved Chaplain	 (ODY) *2
+Beloved Chaplain	 (ODY) *2
-Ancestor's Chosen	 (JUD) *1
+Ancestor's Chosen	 (JUD) *1
-Battlefield Medic	 (ONS) *1
+Battlefield Medic	 (ONS) *1
-Rotlung Reanimator	 (ONS) *4
+Rotlung Reanimator	 (ONS) *4
-Doubtless One	 (ONS) *2
+Doubtless One	 (ONS) *2
-Glowrider	 (LGN) *2
+Glowrider	 (LGN) *2
-Aven Redeemer	 (LGN) *1
+Aven Redeemer	 (LGN) *1
-Edgewalker	 (SCG) *2
+Edgewalker	 (SCG) *2
-Vile Deacon	 (LGN) *2
+Vile Deacon	 (LGN) *2
-Master Healer	 (8ED) *1
+Master Healer	 (8ED) *1
-Auriok Champion	 (5DN) *2
+Auriok Champion	 (5DN) *2
-Swamp	 (UNH) *3
+Swamp	 (UNH) *3
-Master Healer	 (9ED) *1
+Master Healer	 (9ED) *1
-Godless Shrine	 (GPT) *3
+Godless Shrine	 (GPT) *3
-Disciple of Tevesh Szat	 (CSP) *2
+Disciple of Tevesh Szat	 (CSP) *2
-Blightspeaker	 (PLC) *2
+Blightspeaker	 (PLC) *2
-True Believer	 (10E) *1
+True Believer	 (10E) *1
-Soul Warden	 (10E) *1
+Soul Warden	 (10E) *1
-Icatian Priest	 (10E) *1
+Icatian Priest	 (10E) *1
-Platinum Angel	 (10E) *1
+Platinum Angel	 (10E) *1
-Soul's Attendant	 (ROE) *1
+Soul's Attendant	 (ROE) *1
-Plains	 (ZEN) *3
+Plains	 (ZEN) *3
-Plains	 (ZEN) *2
+Plains	 (ZEN) *2
-Plains	 (ZEN) *2
+Plains	 (ZEN) *2
-Plains	 (ZEN) *3
+Plains	 (ZEN) *3
-Swamp	 (ZEN) *3
+Swamp	 (ZEN) *3
-Swamp	 (ZEN) *3
+Swamp	 (ZEN) *3
-Shepherd of Rot	 (HOP) *2
+Shepherd of Rot	 (HOP) *2
@@ -1,29 +1,29 @@
-#NAME:Kill by Numbers
+#NAME:Kill by Numbers
-#DESC:They just keep multiplying.
+#DESC:They just keep multiplying.
-#HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
+#HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
-#HINT:dontattackwith(Rhys the Redeemed)
+#HINT:dontattackwith(Rhys the Redeemed)
-#HINT:dontblockwith(Rhys the Redeemed)
+#HINT:dontblockwith(Rhys the Redeemed)
-#HINT:dontattackwith(Kazandu Tuskcaller)
+#HINT:dontattackwith(Kazandu Tuskcaller)
-#HINT:dontblockwith(Kazandu Tuskcaller)
+#HINT:dontblockwith(Kazandu Tuskcaller)
-
+
-Mox Emerald	 (LEA) *2
+Mox Emerald	 (LEA) *2
-Mox Pearl	 (LEA) *2
+Mox Pearl	 (LEA) *2
-Forest	 (LEA) *15
+Forest	 (LEA) *15
-Plains	 (LEA) *8
+Plains	 (LEA) *8
-Marble Diamond	 (MIR) *2
+Marble Diamond	 (MIR) *2
-Blazing Archon	 (*) *2
+Blazing Archon	 (*) *2
-Serra's Sanctum	 (USG) *1
+Serra's Sanctum	 (USG) *1
-Gaea's Cradle	 (USG) *2
+Gaea's Cradle	 (USG) *2
-Rofellos, Llanowar Emissary	 (UDS) *2
+Rofellos, Llanowar Emissary	 (UDS) *2
-Beacon of Creation	 (5DN) *2
+Beacon of Creation	 (5DN) *2
-Honden of Life's Web	 (CHK) *2
+Honden of Life's Web	 (CHK) *2
-Kabira Vindicator	 (*) *2
+Kabira Vindicator	 (*) *2
-Rhys the Redeemed	 (SHM) *2
+Rhys the Redeemed	 (SHM) *2
-Fable of Wolf and Owl	 (EVE) *2
+Fable of Wolf and Owl	 (EVE) *2
-Murkfiend Liege	 (EVE) *2
+Murkfiend Liege	 (EVE) *2
-Creakwood Liege	 (EVE) *2
+Creakwood Liege	 (EVE) *2
-Spawnwrithe	 (SHM) *2
+Spawnwrithe	 (SHM) *2
-Awakening Zone	 (ROE) *3
+Awakening Zone	 (ROE) *3
-Kazandu Tuskcaller	 (ROE) *2
+Kazandu Tuskcaller	 (ROE) *2
-Conqueror's Pledge	 (ZEN) *2
+Conqueror's Pledge	 (ZEN) *2
-Bestial Menace	 (WWK) *2
+Bestial Menace	 (WWK) *2
@@ -1,28 +1,28 @@
-#NAME:Infected wounds
+#NAME:Infected wounds
-Forest	 (UGL) *4
+Forest	 (UGL) *4
-Forest	 (ALA) *1
+Forest	 (ALA) *1
-Forest	 (ALA) *1
+Forest	 (ALA) *1
-Forest	 (M10) *1
+Forest	 (M10) *1
-Forest	 (M10) *1
+Forest	 (M10) *1
-Necropede	 (SOM) *2
+Necropede	 (SOM) *2
-Contagious Nim	 (SOM) *2
+Contagious Nim	 (SOM) *2
-Blight Mamba	 (SOM) *2
+Blight Mamba	 (SOM) *2
-Ichor Rats	 (SOM) *2
+Ichor Rats	 (SOM) *2
-Ichorclaw Myr	 (SOM) *4
+Ichorclaw Myr	 (SOM) *4
-Blackcleave Goblin	 (SOM) *2
+Blackcleave Goblin	 (SOM) *2
-Corpse Cur	 (SOM) *2
+Corpse Cur	 (SOM) *2
-Forest	 (ZEN) *4
+Forest	 (ZEN) *4
-Forest	 (ZEN) *3
+Forest	 (ZEN) *3
-Forest	 (ZEN) *4
+Forest	 (ZEN) *4
-Forest	 (ZEN) *2
+Forest	 (ZEN) *2
-Swamp	 (HOP) *3
+Swamp	 (HOP) *3
-Cystbearer	 (SOM) *2
+Cystbearer	 (SOM) *2
-Tel-Jilad Fallen	 (SOM) *2
+Tel-Jilad Fallen	 (SOM) *2
-Swamp	 (ROE) *4
+Swamp	 (ROE) *4
-Swamp	 (ROE) *3
+Swamp	 (ROE) *3
-Swamp	 (ROE) *4
+Swamp	 (ROE) *4
-Putrefax	 (SOM) *2
+Putrefax	 (SOM) *2
-Plague Stinger	 (SOM) *2
+Plague Stinger	 (SOM) *2
-Relic Putrescence	 (SOM) *2
+Relic Putrescence	 (SOM) *2
-Skithiryx, the Blight Dragon	 (SOM) *2
+Skithiryx, the Blight Dragon	 (SOM) *2
-Hand of the Praetors	 (SOM) *2
+Hand of the Praetors	 (SOM) *2
@@ -1,18 +1,18 @@
-#NAME:Painful Dream
+#NAME:Painful Dream
-Traumatize	 (ODY) *2
+Traumatize	 (ODY) *2
-Island	 (UNH) *4
+Island	 (UNH) *4
-Followed Footsteps	 (RAV) *4
+Followed Footsteps	 (RAV) *4
-Howling Mine	 (10E) *4
+Howling Mine	 (10E) *4
-Dreamborn Muse	 (10E) *4
+Dreamborn Muse	 (10E) *4
-Forced Fruition	 (LRW) *4
+Forced Fruition	 (LRW) *4
-Memory Erosion	 (ALA) *4
+Memory Erosion	 (ALA) *4
-Hedron Crab	 (ZEN) *4
+Hedron Crab	 (ZEN) *4
-Font of Mythos	 (CFX) *4
+Font of Mythos	 (CFX) *4
-Tome Scour	 (M10) *4
+Tome Scour	 (M10) *4
-Island	 (ZEN) *4
+Island	 (ZEN) *4
-Island	 (ZEN) *4
+Island	 (ZEN) *4
-Island	 (ZEN) *4
+Island	 (ZEN) *4
-Island	 (ZEN) *4
+Island	 (ZEN) *4
-Platinum Angel	 (M11) *1
+Platinum Angel	 (M11) *1
-Sword of Body and Mind	 (SOM) *2
+Sword of Body and Mind	 (SOM) *2
-Seat of the Synod	 (EVT) *4
+Seat of the Synod	 (EVT) *4
@@ -1,109 +1,109 @@
-#NAME:Synthetic
+#NAME:Synthetic
-#DESC:Selesnya Guild
+#DESC:Selesnya Guild
-########################################
+########################################
-#    Creatures                         #
+#    Creatures                         #
-########################################
+########################################
-#1 x Giant Adephage (GTC), {5}{g}{g}, Creature Insect, 7/7, trample; 
+#1 x Giant Adephage (GTC), {5}{g}{g}, Creature Insect, 7/7, trample; 
-366394
+366394
-
+
-#2 x Rubblebelt Raiders (GTC), {1}{r/g}{r/g}{r/g}, Creature Human Warrior, 3/3, 
+#2 x Rubblebelt Raiders (GTC), {1}{r/g}{r/g}{r/g}, Creature Human Warrior, 3/3, 
-366462
+366462
-366462
+366462
-
+
-#4 x Voice of Resurgence (DGM), {g}{w}, Creature Elemental, 2/2, 
+#4 x Voice of Resurgence (DGM), {g}{w}, Creature Elemental, 2/2, 
-368951
+368951
-368951
+368951
-368951
+368951
-368951
+368951
-
+
-#4 x Trostani's Summoner (DGM), {5}{g}{w}, Creature Elf Shaman, 1/1, 
+#4 x Trostani's Summoner (DGM), {5}{g}{w}, Creature Elf Shaman, 1/1, 
-369072
+369072
-369072
+369072
-369072
+369072
-369072
+369072
-
+
-#4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
+#4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
-253587
+253587
-253587
+253587
-253587
+253587
-253587
+253587
-
+
-#2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
+#2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
-270792
+270792
-270792
+270792
-
+
-#4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
+#4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
-253539
+253539
-253539
+253539
-253539
+253539
-253539
+253539
-
+
-#1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
+#1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
-253575
+253575
-
+
-
+
-
+
-########################################
+########################################
-#    Spells                            #
+#    Spells                            #
-########################################
+########################################
-#4 x Advent of the Wurm (DGM), {1}{g}{g}{w}, Instant, 
+#4 x Advent of the Wurm (DGM), {1}{g}{g}{w}, Instant, 
-369036
+369036
-369036
+369036
-369036
+369036
-369036
+369036
-
+
-#2 x Selesnya Cluestone (DGM), {3}, Artifact, 
+#2 x Selesnya Cluestone (DGM), {3}, Artifact, 
-369060
+369060
-369060
+369060
-
+
-#2 x Chromatic Lantern (RTR), {3}, Artifact, 
+#2 x Chromatic Lantern (RTR), {3}, Artifact, 
-290542
+290542
-290542
+290542
-
+
-#4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
+#4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
-270957
+270957
-270957
+270957
-270957
+270957
-270957
+270957
-
+
-
+
-
+
-########################################
+########################################
-#    Lands                             #
+#    Lands                             #
-########################################
+########################################
-#4 x Forest (GVL), Basic Land Forest, 
+#4 x Forest (GVL), Basic Land Forest, 
-204967
+204967
-204967
+204967
-204967
+204967
-204967
+204967
-
+
-#4 x Selesnya Guildgate (DGM), Land Gate, 
+#4 x Selesnya Guildgate (DGM), Land Gate, 
-369018
+369018
-369018
+369018
-369018
+369018
-369018
+369018
-
+
-#4 x Forest (RTR), Basic Land Forest, 
+#4 x Forest (RTR), Basic Land Forest, 
-289326
+289326
-289326
+289326
-289326
+289326
-289326
+289326
-
+
-#4 x Plains (RTR), Basic Land Plains, 
+#4 x Plains (RTR), Basic Land Plains, 
-289310
+289310
-289310
+289310
-289310
+289310
-289310
+289310
-
+
-#2 x Temple Garden (RTR), Land Forest Plains, 
+#2 x Temple Garden (RTR), Land Forest Plains, 
-253681
+253681
-253681
+253681
-
+
-#4 x Plains (RTR), Basic Land Plains, 
+#4 x Plains (RTR), Basic Land Plains, 
-289309
+289309
-289309
+289309
-289309
+289309
-289309
+289309
-
+
-
+
-
+
--- a/Show More
+++ b/Show More