fix merge conflicts

.gitignore

@@ -35,4 +35,5 @@ i2p.plugins.firefox/
 /systray.running
 /.cache
 /.mozilla
-/i2p.plugins.firefox.torrent.zip
+/i2p.plugins.firefox.torrent.zip
+/plugin

CHANGES.html

@@ -468,8 +468,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

LICENSE.html

@@ -1035,8 +1035,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

README.md

@@ -55,7 +55,7 @@ For platform specific instructions, see
 
 ```sh
 mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
 unzip i2pfirefox.zip
 ./i2pfirefox.cmd
 

VERSION.html

@@ -153,23 +153,28 @@
         Firefox
       </h2>
       <pre><code class="language-md">i2p-in-private-browsing
+<<<<<<< HEAD
 1.44
 https://addons.mozilla.org/firefox/downloads/file/4020669/i2p_in_private_browsing-1.44.xpi
+=======
+1.48
+https://addons.mozilla.org/firefox/downloads/file/4123613/i2p_in_private_browsing-1.48.xpi
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
 noscript
-11.4.16
+11.4.24
-https://addons.mozilla.org/firefox/downloads/file/4067473/noscript-11.4.16.xpi
+https://addons.mozilla.org/firefox/downloads/file/4131645/noscript-11.4.24.xpi
 localcdn-fork-of-decentraleyes
-2.6.46
+2.6.52
-https://addons.mozilla.org/firefox/downloads/file/4066709/localcdn_fork_of_decentraleyes-2.6.46.xpi
+https://addons.mozilla.org/firefox/downloads/file/4129532/localcdn_fork_of_decentraleyes-2.6.52.xpi
 onion-in-container-browsing
 0.82
 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
 javascript-restrictor
-0.11.1
+0.13
-https://addons.mozilla.org/firefox/downloads/file/3950710/javascript_restrictor-0.11.1.xpi
+https://addons.mozilla.org/firefox/downloads/file/4131644/javascript_restrictor-0.13.xpi
 ublock-origin
-1.46.0
+1.50.0
-https://addons.mozilla.org/firefox/downloads/file/4047353/ublock_origin-1.46.0.xpi
+https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.50.0.xpi
 </code></pre>
       <h2>
         Chromium
@@ -178,16 +183,16 @@ https://addons.mozilla.org/firefox/downloads/file/4047353/ublock_origin-1.46.0.x
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.16
+11.4.18
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.45
+2.6.51
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.46.0
+1.50.0
 https://clients2.google.com/service/update2/crx
 JShelter
-0.11.1
+0.13
 https://clients2.google.com/service/update2/crx
 </code></pre>
       <div id="sourcecode">
@@ -198,8 +203,13 @@ https://clients2.google.com/service/update2/crx
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

build.xml

@@ -327,7 +327,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
 
     <target name="buildNum">
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="1.0.9" />
+        <property name="release.number" value="1.1.0" />
         <exec executable="echo" osfamily="unix">
             <arg value="${release.number}-${build.number}" />
         </exec>

docs/BUILD.html

@@ -542,8 +542,13 @@ if (i2pIsRunning()) {
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PBrowser.html

@@ -1191,8 +1191,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PChromium.html

@@ -1041,8 +1041,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PChromiumProfileBuilder.html

@@ -375,8 +375,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PChromiumProfileChecker.html

@@ -348,8 +348,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PChromiumProfileUnpacker.html

@@ -266,8 +266,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PCommonBrowser.html

@@ -960,8 +960,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PFirefox.html

@@ -1132,8 +1132,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PFirefoxProfileBuilder.html

@@ -473,8 +473,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PFirefoxProfileChecker.html

@@ -480,8 +480,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PFirefoxProfileUnpacker.html

@@ -270,8 +270,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/I2PGenericUnsafeBrowser.html

@@ -669,8 +669,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/LINUX.html

@@ -166,7 +166,11 @@
         </code>
       </h4>
       <pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser
+<<<<<<< HEAD
 wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pbrowser.tar.gz
+=======
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pbrowser.tar.gz
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
 tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
 ## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
 # This probably offers better security than vanilla Firefox.
@@ -256,8 +260,13 @@ tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/LINUX.md

@@ -7,7 +7,7 @@ Linux. These packages are for the **`amd64`** architecture.
 
 ```sh
 mkdir ~/tmp-i2pbrowser && cd ~/tmp-i2pbrowser
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pbrowser.tar.gz
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pbrowser.tar.gz
 tar xvzf i2pbrowser.tar.gz && cd i2pbrowser
 ## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
 # This probably offers better security than vanilla Firefox.

docs/OSX.html

@@ -159,7 +159,11 @@
         file with any Java greater than Java 8.
       </p>
       <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
+<<<<<<< HEAD
 wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
+=======
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
 unzip i2pfirefox.zip
 ./cmd/i2pfirefox.cmd
 
@@ -205,8 +209,13 @@ export JAVA_HOME=`/usr/libexec/java_home -v 17`
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

docs/OSX.md

@@ -7,7 +7,7 @@ packages. You can use the `.jar` file with any Java greater than Java 8.
 
 ```sh
 mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
 unzip i2pfirefox.zip
 ./cmd/i2pfirefox.cmd
 

docs/WINDOWS.html

@@ -278,8 +278,13 @@
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

index.html

@@ -305,7 +305,11 @@
         and a non-bundled Java
       </h4>
       <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
+<<<<<<< HEAD
 wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
+=======
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
 unzip i2pfirefox.zip
 ./i2pfirefox.cmd
 
@@ -321,8 +325,13 @@ unzip i2pfirefox.zip
         </span>
         <ul>
           <li>
+<<<<<<< HEAD
             <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
               Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
             </a>
           </li>
         </ul>

scripts/build.number

@@ -1,3 +1,6 @@
 #Build Number for ANT. Do not edit!
-#Thu Jul 06 15:07:23 EDT 2023
+#Thu Jul 06 15:11:32 EDT 2023
-build.number=502
+build.number=500
+>>>>>>>=7cdf84bb265e7fda5b98d2386dab1855de8383eb
+=\=\=\=\=\=\=
+<<<<<<<=HEAD