Merge "Add Motorola Moto E5 Play (James)"
diff --git a/_google/androidonefifthgeneration.markdown b/_google/androidonefifthgeneration.markdown
new file mode 100644
index 0000000..9a1dec9
--- /dev/null
+++ b/_google/androidonefifthgeneration.markdown
@@ -0,0 +1,33 @@
+---
+layout: device
+title:  "Android One Fifth Generation"
+codename: gm9pro_sprout
+downloadfolder: gm9pro_sprout
+supportstatus: Current
+maintainer: oguzbakir
+oem: Google
+devicetree: https://github.com/TeamWin/android_device_google_gm9pro_sprout
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+
+<div class='page-heading'>Installation:</div>
+If you already have TWRP installed:
+Download the latest zip and install the zip using TWRP.
+
+If you do not already have TWRP installed:
+Download the img, move img to fastboot directory. You will need to have fastboot binaries and the correct drivers installed. Power off your device completely. Hold volume down and turn on the device. Your device should now be in the bootloader. Connect the device to your PC. Open a command window and run the following command from the proper location:
+
+fastboot boot path/to/twrp.img
+
+This will temporarily boot TWRP on your device. If you are using a lockscreen pin/pattern/password and do not get prompted to enter your passord, reboot to the bootloader and try again.
+
+If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
+
diff --git a/_google/googlepixel3xl.markdown b/_google/googlepixel3xl.markdown
index ce5f34a..ae68eda 100644
--- a/_google/googlepixel3xl.markdown
+++ b/_google/googlepixel3xl.markdown
@@ -12,7 +12,7 @@
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
-MTP does not work at this time. ADB only works on the flashed version of TWRP. Unfortunately it does not work on the fastboot version of TWRP. You may need to use a USB-OTG cable and a USB thumb drive to transfer files. TWRP may take a little longer than usual to boot on this device.
+TWRP may take a little longer than usual to boot on this device.
 
 {% include download.html %}
 
diff --git a/_htc/htconea9.markdown b/_htc/htconea9.markdown
index dc41359..f840be5 100644
--- a/_htc/htconea9.markdown
+++ b/_htc/htconea9.markdown
@@ -4,7 +4,7 @@
 codename: hiae
 downloadfolder: hiae
 supportstatus: Current
-maintainer: None
+maintainer: Captain_Throwback
 oem: HTC
 ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/teamwin/android_device_htc_hiae"
diff --git a/_htc/htcu12+.markdown b/_htc/htcu12+.markdown
index 1ad0de0..2995d9b 100644
--- a/_htc/htcu12+.markdown
+++ b/_htc/htcu12+.markdown
@@ -20,6 +20,7 @@
 Release 3.2.3-3 supports HTC´s firmware 1.53.xxx.y with security patch state of 1st December 2018.
 Release 3.2.3-4 supports HTC´s firmware 1.53.xxx.y with security patch state of 1st December 2018. Starting with 3.2.3-4 booting TWRP won´t mount system RW, therefore no longer impacting OTA functionality by solely booting TWRP.
 Release 3.2.3-5 supports HTC´s firmware 1.57.xxx.y with security patch state of 1st January 2019.
+Release 3.3.0-0 supports HTC´s firmware 1.62.xxx.y with security patch state of 1st February 2019.
 
 {% include download.html %}
 
@@ -30,6 +31,7 @@
 If you do not already have TWRP installed:
 Download both the img and the zip. Make sure you download the img, that matches your current firmware´s security patch date before booting it! As of HTC´s Software Update 1.30.xxx.y the security patch state changed to 1st September 2018.
 As of HTC´s Software Update 1.53.xxx.y the security patch state changed to 1st December 2018. As of HTC´s Software Update 1.57.xxx.y the security patch state changed to 1st January 2019.
+As of HTC´s Software Update 1.62.xxx.y the security patch state changed to 1st February 2019.
 To confirm which version to boot, take a look at the XDA thread! All the needed information is usually available there. You will need to have fastboot binaries and the correct drivers installed. Power off your device completely. Hold power button until device vibrates, when vibration kicks in let go of the power button and hit immediately volume down button. Your device should now be in the bootloader. Boot now to download mode. Connect the device to your PC. Open a command window and run the following command from the proper location:
 
 fastboot boot path/to/twrp.img
diff --git a/_htc/htcuultra.markdown b/_htc/htcuultra.markdown
index 19adf08..ac6daa9 100644
--- a/_htc/htcuultra.markdown
+++ b/_htc/htcuultra.markdown
@@ -4,7 +4,7 @@
 codename: oce
 downloadfolder: oce
 supportstatus: Current
-maintainer: None
+maintainer: TARKZiM
 oem: HTC
 ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_htc_oce"
diff --git a/_includes/footer.html b/_includes/footer.html
index b1497b0..b851909 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-    <p class="text">&copy; 2014 to 2018 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
+    <p class="text">&copy; 2014 to 2019 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
     <div class="footer-col-wrapper">
 
       <div class="footer-col  footer-col-2">
@@ -20,12 +20,6 @@
           </li>
           {% endif %}
 
-          <li>
-            <a href="https://plus.google.com/communities/106804207647688456928">
-
-              <span class="username">TWRP on G+</span>
-            </a>
-          </li>
         </ul>
       </div>
 
diff --git a/_includes/footer404.html b/_includes/footer404.html
index d8df263..002d977 100644
--- a/_includes/footer404.html
+++ b/_includes/footer404.html
@@ -1,7 +1,7 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-    <p class="text">&copy; 2014 to 2018 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
+    <p class="text">&copy; 2014 to 2019 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
     <div class="footer-col-wrapper">
 
       <div class="footer-col  footer-col-2">
@@ -20,12 +20,6 @@
           </li>
           {% endif %}
 
-          <li>
-            <a href="https://plus.google.com/communities/106804207647688456928">
-
-              <span class="username">TWRP on G+</span>
-            </a>
-          </li>
         </ul>
       </div>
 
diff --git a/_includes/samsungsystemasroot.html b/_includes/samsungsystemasroot.html
new file mode 100644
index 0000000..829de36
--- /dev/null
+++ b/_includes/samsungsystemasroot.html
@@ -0,0 +1,10 @@
+<div class='page-heading'>This device uses system-as-root in an A-only partition configuration.</div>
+<hr />
+
+<p class="text">If you intend to root your ({{ page.codename }}) device, be advised that Magisk will be installed to the <tt>recovery</tt> partition, not the usual <tt>boot</tt> partition. Both TWRP and Magisk-rooted Android boot using the recovery kernel, with the device's hardware keys used to choose between TWRP and Android at boot time.</p>
+
+<p class"text">You are therefore strongly advised to first root your device with Magisk and then pre-root a TWRP image before flashing it to recovery. The usual path of installing TWRP prior to rooting is problematic on this device, because the Magisk installer does not support installation to recovery from TWRP. Furthermore, prior rooting of the device with Magisk carries the significant advantage of disabling various device protection mechanisms that you will otherwise need to take care of manually.</p>
+
+<p class="text">If you wish to install TWRP without rooting, there are numerous pitfalls to consider. For example, a stock device is protected by Android Verified Boot. This is implemented as a <tt>vbmeta</tt> partition that contains cryptographic digests for verifying the integrity of <tt>boot.img</tt>, <tt>recovery.img</tt> and other partitions/images. Flashing TWRP without first flashing a <tt>vbmeta</tt> image with verity disabled will render your device unable to boot.</p>
+
+<p class="text">Please bear all of the above in mind when considering the installation methods listed below, and refer to the device's TWRP support thread on XDA for detailed information about installation and the associated hazards. Details of the firmware version(s) with which the current TWRP image's kernel is compatible can be found in the TWRP changelog for this device.</p>
diff --git a/_lenovo/lenovop2a42.markdown b/_lenovo/lenovop2a42.markdown
index 7b83614..6214e12 100644
--- a/_lenovo/lenovop2a42.markdown
+++ b/_lenovo/lenovop2a42.markdown
@@ -7,7 +7,7 @@
 supportstatus: Current
 maintainer: Celoxocis
 ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_lenovo_p2a42
+devicetree: https://github.com/TeamWin/android_device_lenovo_kuntao_row
 xdathread: "https://forum.xda-developers.com/android/development/recovery-unofficial-twrp-lenovo-p2-3-0-t3533659"
 fastbootunlock: true
 ---
diff --git a/_motorola/motorolamotoe5.markdown b/_motorola/motorolamotoe5.markdown
new file mode 100644
index 0000000..ea168b3
--- /dev/null
+++ b/_motorola/motorolamotoe5.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "Motorola Moto E5"
+codename: nora
+downloadfolder: nora
+supportstatus: Current
+maintainer: SamarV-121
+oem: Motorola
+devicetree: https://github.com/TeamWin/android_device_moto_nora
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include mtkinstall.html %}
diff --git a/_nokia/nokia61plus.markdown b/_nokia/nokia61plus.markdown
new file mode 100644
index 0000000..90eb73a
--- /dev/null
+++ b/_nokia/nokia61plus.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Nokia 6.1 Plus"
+codename: DRG
+downloadfolder: DRG
+supportstatus: Current
+maintainer: Raghu Varma
+devicetree: https://github.com/TeamWin/android_device_nokia_DRG
+oem: Nokia
+xdathread: https://forum.xda-developers.com/nokia-6-1-plus/development/recovery-twrp-3-2-3-0-team-win-recovery-t3893909
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_oneplus/oneplus6.markdown b/_oneplus/oneplus6.markdown
index 9298bc6..190784d 100644
--- a/_oneplus/oneplus6.markdown
+++ b/_oneplus/oneplus6.markdown
@@ -7,6 +7,7 @@
 maintainer: Dees_Troy, Mauronofrio
 oem: OnePlus
 devicetree: https://github.com/TeamWin/android_device_oneplus_enchilada
+xdathread: "https://forum.xda-developers.com/oneplus-6/development/recovery-unofficial-twrp-touch-recovery-t3860815"
 ---
 
 {% include disclaimer.html %}
diff --git a/_oneplus/oneplus6t.markdown b/_oneplus/oneplus6t.markdown
index 84d9d18..0258edf 100644
--- a/_oneplus/oneplus6t.markdown
+++ b/_oneplus/oneplus6t.markdown
@@ -7,6 +7,7 @@
 maintainer: Mauronofrio
 oem: OnePlus
 devicetree: https://github.com/TeamWin/android_device_oneplus_fajita
+xdathread: "https://forum.xda-developers.com/oneplus-6t/development/recovery-unofficial-twrp-touch-recovery-t3861482"
 ---
 
 {% include disclaimer.html %}
diff --git a/_oukitel/oukitelk10.markdown b/_oukitel/oukitelk10.markdown
new file mode 100644
index 0000000..c338467
--- /dev/null
+++ b/_oukitel/oukitelk10.markdown
@@ -0,0 +1,28 @@
+---
+layout: device
+title: "OUKITEL K10"
+codename: k10
+oem: Oukitel
+downloadfolder: k10
+supportstatus: Current
+maintainer: chankruze
+ddof: "/dev/block/platform/bootdevice/by-name/recovery"
+devicetree: https://github.com/TeamWin/android_device_oukitel_k10
+xdathread: "https://forum.xda-developers.com/android/development/recovery-twrp-3-3-0-0-oukitel-k10-t3925703"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_posts/2019-04-15-twrp-3.3.0-0-released.markdown b/_posts/2019-04-15-twrp-3.3.0-0-released.markdown
new file mode 100644
index 0000000..72202ed
--- /dev/null
+++ b/_posts/2019-04-15-twrp-3.3.0-0-released.markdown
@@ -0,0 +1,33 @@
+---
+layout: post
+title:  "TWRP 3.3.0-0 Released"
+date:   2019-04-15 09:39:42
+categories: site update
+version: 3.3.0-0
+---
+
+TWRP {{ page.version }} is out now for most currently supported devices.
+
+What's new in {{ page.version }}:
+
+	* Merge AOSP 9.0 r3 (Dees_Troy)
+	* Use ANDROID_ROOT variable instead of hard coding to /system (CaptainThrowback)
+	* Decrypt FBE on 9.0 and metadata decrypt (Dees_Troy)
+	* vold decrypt updates (CaptainThrowback and nijel8)
+	* Support vibration on LED class devices (notsyncing)
+	* Metadata decrypt support for Pixel 3 (Dees_Troy)
+	* Support rotating the display via build flag (vladimiroltean)
+	* Reboot to EDL mode button (mauronofrio)
+	* Support MTP on FFS devices (bigbiff)
+	* Update FDE decrypt to support keymaster 3 and 4 (Dees_Troy)
+	* Detect mkfs.f2fs version to properly format on f2fs partitions (Dees_Troy)
+	* Allow TWRP to use md5 and sha256 checksums for zip installs (bigbiff)
+	* TWRP can use /data/cache/recovery and /persist/cache/recovery on AB devices with no cache partition (bigbiff)
+	* Switch part of advanced menus in TWRP to use a listbox of options (Dees_Troy)
+	* Use magiskboot to allow repacking boot images for installing TWRP (Dees_Troy with thanks to topjohnwu of course)
+
+Want to get notifications when we release new versions of TWRP? [Install the TWRP app and select your device!](https://twrp.me/app)
+
+We need your help! The bulk of TWRP work is done by a handful of people on a volunteer basis. We have pushed most of our device files to [our github](http://github.com/TeamWin/) and we have [a gerrit instance](http://gerrit.twrp.me). If you have the ability, please help us maintain our official devices and/or add your device to our official device list. Thanks in advance!
+
+Head over to the [devices page](http://twrp.me/Devices) to find install instructions and download links.
diff --git a/_samsung/samsunggalaxys10.markdown b/_samsung/samsunggalaxys10.markdown
new file mode 100644
index 0000000..134b147
--- /dev/null
+++ b/_samsung/samsunggalaxys10.markdown
@@ -0,0 +1,28 @@
+---
+layout: device
+title: "Samsung Galaxy S10 (Exynos)"
+codename: beyond1lte
+downloadfolder: beyond1lte
+supportstatus: Current
+maintainer: ianmacd (credit to geiti94 for the initial unofficial release)
+devicetree: "https://github.com/TeamWin/android_device_samsung_beyond1lte"
+xdathread: "https://forum.xda-developers.com/s10-plus/development/recovery-twrp-3-3-0-galaxy-s10-exynos-t3924856"
+oem: Samsung
+ddof: "/dev/block/platform/13d60000.ufs/by-name/recovery"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include samsungsystemasroot.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_samsung/samsunggalaxys10plus.markdown b/_samsung/samsunggalaxys10plus.markdown
new file mode 100644
index 0000000..d6d01a9
--- /dev/null
+++ b/_samsung/samsunggalaxys10plus.markdown
@@ -0,0 +1,28 @@
+---
+layout: device
+title: "Samsung Galaxy S10+ (Exynos)"
+codename: beyond2lte
+downloadfolder: beyond2lte
+supportstatus: Current
+maintainer: ianmacd (credit to geiti94 for the initial unofficial release)
+devicetree: "https://github.com/TeamWin/android_device_samsung_beyond2lte"
+xdathread: "https://forum.xda-developers.com/s10-plus/development/recovery-twrp-3-3-0-galaxy-s10-exynos-t3924856"
+oem: Samsung
+ddof: "/dev/block/platform/13d60000.ufs/by-name/recovery"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include samsungsystemasroot.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_samsung/samsunggalaxys7.markdown b/_samsung/samsunggalaxys7.markdown
index 7993af6..8e0226e 100644
--- a/_samsung/samsunggalaxys7.markdown
+++ b/_samsung/samsunggalaxys7.markdown
@@ -4,7 +4,7 @@
 codename: herolte
 downloadfolder: "International &amp; Canada (SM-G930F, SM-G930FD, SM-G930X, SM-G930W8)|herolte|Korea (SM-G930K, SM-G930L, SM-G930S)|heroltekor"
 supportstatus: Current
-maintainer: jcadduono
+maintainer: ivanmeler
 devicetree: "https://github.com/TeamWin/android_device_samsung_herolte"
 xdathread: "http://forum.xda-developers.com/galaxy-s7/development/recovery-official-twrp-herolte-t3333770"
 oem: Samsung
diff --git a/_samsung/samsunggalaxys7edge.markdown b/_samsung/samsunggalaxys7edge.markdown
index 215b236..3a2bdcc 100644
--- a/_samsung/samsunggalaxys7edge.markdown
+++ b/_samsung/samsunggalaxys7edge.markdown
@@ -4,7 +4,7 @@
 codename: hero2lte
 downloadfolder: "International &amp; Canada (SM-G935F, SM-G935FD, SM-G935X, SM-G935W8)|hero2lte|Korea (SM-G935K, SM-G935L, SM-G935S)|hero2ltekor"
 supportstatus: Current
-maintainer: jcadduono
+maintainer: ivanmeler
 devicetree: "https://github.com/TeamWin/android_device_samsung_hero2lte"
 xdathread: "http://forum.xda-developers.com/s7-edge/development/recovery-official-twrp-hero2lte-3-0-0-0-t3334084"
 oem: Samsung