resync

config.nano.js

@@ -77,8 +77,6 @@
 
             "./patches/30_0_link_resources.patch",
 
-            "./patches/90_0_temp_magic_override.patch",
-
             // ----------------------------------------------------------------------------------------------------- //
 
         ],

patches/20_0_configuration_tweaks.patch

@@ -21,7 +21,7 @@ index 77f92304..528adf09 100644
      updaterUpdated = [],
      updaterFetched = new Set(),
 diff --git a/src/js/background.js b/src/js/background.js
-index 0d9d5824..364468fa 100644
+index ea34a13c..edb59b16 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
 @@ -38,8 +38,8 @@ const µBlock = (function() { // jshint ignore:line

patches/README.MD

@@ -39,8 +39,3 @@ category because a pull request is opened upstream.
 ## Group `30`: User Interface Changes
 
 `30_0_link_resources.patch`: Link useful resources in the dashboard.
-
-## Group `90`: Other Changes
-
-`90_0_temp_magic_override.patch`: Temporary compile magic and selfie magic
-overrides.

patches/integration/10_0_load_scripts.patch

@@ -18,7 +18,7 @@ index 0f9b3707..26e5ff8a 100644
  <script src="js/hntrie.js"></script>
  <script src="js/strie.js"></script>
 diff --git a/src/js/background.js b/src/js/background.js
-index 82a2c8fe..39439363 100644
+index 4b2d3040..fac5b9db 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
 @@ -188,3 +188,7 @@ const µBlock = (function() { // jshint ignore:line

patches/integration/10_1_compile_flags.patch

@@ -1,5 +1,5 @@
 diff --git a/src/js/background.js b/src/js/background.js
-index 39439363..78d42308 100644
+index fac5b9db..a1959033 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
 @@ -49,6 +49,9 @@ const µBlock = (function() { // jshint ignore:line
@@ -34,7 +34,7 @@ index e805777d..4c41f7b1 100644
          if ( lpos === 0 ) {
              parsed.hostnames = emptyArray;
 diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index b71be872..be1211a0 100644
+index a153907d..a322fb23 100644
 --- a/src/js/static-net-filtering.js
 +++ b/src/js/static-net-filtering.js
 @@ -1963,6 +1963,10 @@ FilterParser.prototype.parseOptions = function(s) {

patches/integration/10_4_extended_options.patch

@@ -12,7 +12,7 @@ index 6e8cefd4..b94966c9 100644
 
  /******************************************************************************/
 diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index be1211a0..d0189b27 100644
+index a322fb23..0d326e2e 100644
 --- a/src/js/static-net-filtering.js
 +++ b/src/js/static-net-filtering.js
 @@ -1786,7 +1786,10 @@ FilterParser.prototype.toNormalizedType = {

patches/integration/10_6_lint_filters.patch

@@ -217,7 +217,7 @@ index 4c41f7b1..8ce6b22a 100644
          }
 
 diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index d0189b27..8fb880e4 100644
+index 0d326e2e..8cf12c68 100644
 --- a/src/js/static-net-filtering.js
 +++ b/src/js/static-net-filtering.js
 @@ -1842,6 +1842,10 @@ FilterParser.prototype.parseTypeOption = function(raw, not) {

patches/integration/30_1_editor_settings.patch

@@ -1,5 +1,5 @@
 diff --git a/src/js/background.js b/src/js/background.js
-index 78d42308..0d9d5824 100644
+index a1959033..ea34a13c 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
 @@ -87,6 +87,8 @@ const µBlock = (function() { // jshint ignore:line