Revert "betterrotation: Restore from old-patches"

This reverts commit a8c17e2032.

I am an idiot

.gitignore

@@ -1,2 +1,14 @@
 patches/*/*-custom.patch
 patches/*/*.patch-failed
+resources/distok/versionlogs/*
+!resources/distok/versionlogs/.gitkeep
+resources/fdroid/repo/icons/*.xml
+resources/fonts/*.ttf
+resources/fonts/*.otf
+resources/icons/others/*
+!resources/icons/others/.gitkeep
+resources/ringtones/*
+!resources/ringtones/.gitkeep
+resources/keystores/*
+!resources/keystores/.gitkeep
+*.apk

Dockerfile

@@ -3,6 +3,9 @@ FROM ubuntu:21.04
 # Install needed packages
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 android-sdk-build-tools wget unzip imagemagick git patch software-properties-common
+# Mirror is being weird currently so install this seperatly
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install zipmerge
 
 # Install fdroid
 RUN add-apt-repository ppa:fdroid/fdroidserver
@@ -20,6 +23,9 @@ RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/av
 # Grab xml-patch (https://github.com/dnault/xml-patch)
 RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar
 
+# Grab dex2jar (https://github.com/Aliucord/dex2jar)
+RUN wget -O ${CTC_FOLDER}/tools/dex2jar.jar https://github.com/Aliucord/dex2jar/releases/download/v19-fork2/dex2jar.jar
+
 # Grab emoji sets
 ENV EMOJI_PATH=${CTC_FOLDER}/emojis
 ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant

README.md

@@ -2,7 +2,9 @@
 
 Modular Client Mod for Discord's Android app.
 
-**THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!**
+**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!**
+
+Current state is good enough™ for an RC release, and there's currently RC releases in the repo. Update away!
 
 For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
 
@@ -10,7 +12,7 @@ For status updates and support on the project, join #cutthecord on https://liber
 
 New patch development will be done for the latest supported version.
 
-![A CutTheCord screenshot](https://elixi.re/t/mh3eirsy9.png)
+![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png)
 
 Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)!
 

resources/old-patches/README.md

@@ -13,4 +13,5 @@ Here's why these patches are no longer maintained in this form:
 - nonearby: Didn't add much anyways.
 - squareavatars: Moved to xml-patchs
 - betterrotation: Moved to xml-patchs
-- noblocked: Moved to xml-patchs
+- noblocked: Moved to xml-patchs
+- slashcommands: Moved to dynamic patch due to discord api supporting this now