Dockerfile

@@ -17,9 +17,6 @@ RUN mkdir ${CTC_FOLDER}
 RUN mkdir ${CTC_FOLDER}/tools
 RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/avepub/apktool-cli-all.jar
 
-# 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 emoji sets
 ENV EMOJI_PATH=${CTC_FOLDER}/emojis
 ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant
@@ -52,10 +49,14 @@ RUN keytool -genkey -alias test \
     -dname "CN=Test, OU=Test, O=Test, L=Test, S=Test, C=Test" \
     -storepass password -keypass password
 
+# Git will moan about this otherwise..
+RUN git config pull.rebase false
+
 # Make folder for git repo
 RUN mkdir ${CTC_FOLDER}/gitrepo
 WORKDIR ${CTC_FOLDER}/gitrepo
 
+
 # paths in ctcconfig in docker
 # container							fs
 # /opt/ctc/gitrepo					

resources/old-patches/README.md

@@ -11,6 +11,3 @@ Here's why these patches are no longer maintained in this form:
 - customdefaultemoji: There doesn't seem to be default emojis anymore?
 - noprofilestrip: UI changes removed the profile strip.
 - nonearby: Didn't add much anyways.
-- squareavatars: Moved to xml-patchs
-- betterrotation: Moved to xml-patchs
-- noblocked: Moved to xml-patchs

resources/patches/.gitignore

@@ -1,2 +0,0 @@
-*/*-custom.patch
-

resources/patches/customtheme/87202.patch

@@ -1,20 +0,0 @@
-diff -crB from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
-*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali	2020-12-13 04:52:13.078109887 +0000
---- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali	2020-12-13 04:52:26.076186978 +0000
-***************
-*** 82,88 ****
-      .line 3
-      iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
-  
-!     const v1, 0x7f0602e0
-  
-      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-  
---- 82,88 ----
-      .line 3
-      iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
-  
-!     const v1, 0x7f060024
-  
-      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-  

resources/patches/customversion/87202.patch

@@ -14,6 +14,6 @@ diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
 
       invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-!     const-string v1, " - 87.2 - Alpha (87202), with Cutthecord patches"
+!     const-string v1, " - 87.2 - Alpha (87202), With Cutthecord patches"
 
       invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;