Merge branch 'zoffline:master' into master

README.md

@@ -96,10 +96,10 @@ zoffline can be installed on the same machine as Zwift or another local machine.
 <details><summary>Windows Instructions</summary>
 
 * Install Zwift
-  * If your Zwift version is 1.0.135093, you're all set.
+  * If your Zwift version is 1.0.135195, you're all set.
   * If Zwift is not installed, install it before installing zoffline.
-  * If your Zwift version is newer than 1.0.135093 and zoffline is running from source: copy ``C:\Program Files (x86)\Zwift\Zwift_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
-  * If your Zwift version is newer than 1.0.135093 and zoffline is not running from source: wait for zoffline to be updated.
+  * If your Zwift version is newer than 1.0.135195 and zoffline is running from source: copy ``C:\Program Files (x86)\Zwift\Zwift_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
+  * If your Zwift version is newer than 1.0.135195 and zoffline is not running from source: wait for zoffline to be updated.
 * __NOTE:__ instead of performing the steps below you can instead just run the __configure_client__ script from https://github.com/oldnapalm/zoffline-helper/releases/latest
 * On your Windows machine running Zwift, copy the following files in this repo to a known location:
   * [ssl/cert-zwift-com.p12](https://github.com/zoffline/zwift-offline/raw/master/ssl/cert-zwift-com.p12)
@@ -124,9 +124,9 @@ to generate your own certificates and do the same.
 <details><summary>macOS Instructions</summary>
 
 * Install Zwift
-  * If your Zwift version is 1.0.135093, you're all set.
+  * If your Zwift version is 1.0.135195, you're all set.
   * If Zwift is not installed, install it before installing zoffline.
-  * If your Zwift version is newer than 1.0.135093: copy ``~/Library/Application Support/Zwift/ZwiftMac_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
+  * If your Zwift version is newer than 1.0.135195: copy ``~/Library/Application Support/Zwift/ZwiftMac_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
 * On your Mac machine running Zwift, copy the file [ssl/cert-zwift-com.pem](https://github.com/zoffline/zwift-offline/raw/master/ssl/cert-zwift-com.pem) in this repo to a known location.
 * Open Keychain Access, select "System" under "Keychains", select "Certificates" under "Category"
     * Click "File - Import Items..." and import cert-zwift-com.pem
@@ -255,6 +255,7 @@ To obtain your current profile:
   <password>
   ```
   * Note: this is not secure. Only do this if you are comfortable with your login credentials being stored in a clear text file.
+* If testing, ride at least 300 meters, shorter activities won't be uploaded.
 
 </details>
 
@@ -298,10 +299,11 @@ To enable support for multiple users perform the steps below:
 * Copy ``zca-patched.apk`` to your phone and install it
 * Download and install ``app-Github-release.apk`` from [here](https://github.com/x-falcon/Virtual-Hosts/releases/latest)
 * Create a ``hosts.txt`` file to use with the app (you could use a text editor app or create it online with an online tool such as [this](https://passwordsgenerator.net/text-editor/)). The file must look like this (replace ``<zoffline ip>`` with the IP address of the machine running zoffline):
-```
-<zoffline ip> us-or-rly101.zwift.com
-<zoffline ip> secure.zwift.com
-```
+  ```
+  <zoffline ip> us-or-rly101.zwift.com
+  <zoffline ip> secure.zwift.com
+  ```
+  * Important: don't add ``cdn.zwift.com`` to ``hosts.txt``, Companion needs to download images from the official server
 * Run "Virtual Hosts", select the created ``hosts.txt`` file, fully close (touch the "overview" button and swipe up) the app and run it again
 * Optionally, instead of using the "Virtual Hosts" app, you can create a ``fake-dns.txt`` file in the ``storage`` directory and set the "DNS 1" of your phone Wi-Fi connection to the IP address of the PC running zoffline
 * Note: If you know what you're doing and have a capable enough router you can adjust your router to alter these DNS records instead of using the "Virtual Hosts" app or changing your phone DNS.
@@ -373,7 +375,19 @@ To enable support for multiple users perform the steps below:
 
 ### All-time leaderboards
 
-To enable all-time leaderboards (override 60 minutes live results and 90 days personal records), create a file ``all_time_leaderboards.txt`` in the ``storage`` directory.
+<details><summary>Expand</summary>
+
+* To enable all-time leaderboards (override 60 minutes live results and 90 days personal records), create a file ``all_time_leaderboards.txt`` in the ``storage`` directory.
+* Jerseys are still valid for 60 minutes but will be granted only when a new all-time record is set.
+</details>
+
+### Entitlements
+
+<details><summary>Expand</summary>
+
+* To unlock entitlements (special equipment), create a file ``unlock_entitlements.txt`` in the ``storage`` directory.
+* To unlock all equipment, create a file ``unlock_all_equipment.txt`` instead.
+</details>
 
 ## Community Discord server and Strava club
 

cdn/gameassets/Zwift_Updates_Root/ZwiftMac_ver_cur.xml

@@ -1 +1 @@
-<Zwift version="1.0.135093" sversion="1.73.2 (135093)" gbranch="rc/1.73.2" gcommit="283b33867cec38fd33e5528841fc9777fd2ba74b" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.135093_99217986_manifest.xml" manifest_checksum="940942822" ver_cur_checksum="-1495877667"/>
+<Zwift version="1.0.135195" sversion="1.74.0 (135195)" gbranch="rc/1.74.0" gcommit="42b97202573de98661f07d37a414d8ed7e05cb8d" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.135195_7180b684_manifest.xml" manifest_checksum="815712584" ver_cur_checksum="501495411"/>

cdn/gameassets/Zwift_Updates_Root/Zwift_ver_cur.xml

@@ -1 +1 @@
-<Zwift version="1.0.135093" sversion="1.73.2 (135093)" gbranch="rc/1.73.2" gcommit="283b33867cec38fd33e5528841fc9777fd2ba74b" GAME_URL="https://us-or-rly101.zwift.com" manifest="Zwift_1.0.135093_99217986_manifest.xml" manifest_checksum="232213262" ver_cur_checksum="-1874785425"/>
+<Zwift version="1.0.135195" sversion="1.74.0 (135195)" gbranch="rc/1.74.0" gcommit="42b97202573de98661f07d37a414d8ed7e05cb8d" GAME_URL="https://us-or-rly101.zwift.com" manifest="Zwift_1.0.135195_7180b684_manifest.xml" manifest_checksum="-1413227661" ver_cur_checksum="-670128982"/>

data/climbs.txt

@@ -107,6 +107,10 @@
     "name": "Mt Fuji (25.4 km / 1208 m)",
     "road": "10026"
   },
+  {
+    "name": "Mt. Hamilton (31.3 km / 1259 m)",
+    "road": "10036"
+  },
   {
     "name": "Old La Honda (5.6 km / 395 m)",
     "road": "10018"