diff --git a/.gitignore b/.gitignore index 13fb4f3..c892a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,5 @@ i2p.plugins.firefox/ /systray.running /.cache /.mozilla -/i2p.plugins.firefox.torrent.zip \ No newline at end of file +/i2p.plugins.firefox.torrent.zip +/plugin diff --git a/CHANGES.html b/CHANGES.html index 145afc1..b4a6829 100755 --- a/CHANGES.html +++ b/CHANGES.html @@ -468,8 +468,13 @@ diff --git a/LICENSE.html b/LICENSE.html index 6cbc35a..b328be4 100755 --- a/LICENSE.html +++ b/LICENSE.html @@ -1035,8 +1035,13 @@ diff --git a/README.md b/README.md index cd45875..2ae9d5e 100644 --- a/README.md +++ b/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 diff --git a/VERSION.html b/VERSION.html index 88e1305..3473b42 100644 --- a/VERSION.html +++ b/VERSION.html @@ -153,23 +153,28 @@ Firefox 
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
-https://addons.mozilla.org/firefox/downloads/file/4067473/noscript-11.4.16.xpi
+11.4.24
+https://addons.mozilla.org/firefox/downloads/file/4131645/noscript-11.4.24.xpi
 localcdn-fork-of-decentraleyes
-2.6.46
-https://addons.mozilla.org/firefox/downloads/file/4066709/localcdn_fork_of_decentraleyes-2.6.46.xpi
+2.6.52
+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
-https://addons.mozilla.org/firefox/downloads/file/3950710/javascript_restrictor-0.11.1.xpi
+0.13
+https://addons.mozilla.org/firefox/downloads/file/4131644/javascript_restrictor-0.13.xpi
 ublock-origin
-1.46.0
-https://addons.mozilla.org/firefox/downloads/file/4047353/ublock_origin-1.46.0.xpi
+1.50.0
+https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.50.0.xpi

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
@@ -198,8 +203,13 @@ https://clients2.google.com/service/update2/crx diff --git a/build.xml b/build.xml index e1129b1..1ceed90 100755 --- a/build.xml +++ b/build.xml @@ -327,7 +327,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + diff --git a/docs/BUILD.html b/docs/BUILD.html index f18bf40..04693d7 100644 --- a/docs/BUILD.html +++ b/docs/BUILD.html @@ -542,8 +542,13 @@ if (i2pIsRunning()) { diff --git a/docs/I2PBrowser.html b/docs/I2PBrowser.html index fd33791..cd0983c 100644 --- a/docs/I2PBrowser.html +++ b/docs/I2PBrowser.html @@ -1191,8 +1191,13 @@ diff --git a/docs/I2PChromium.html b/docs/I2PChromium.html index 44c924c..f36e496 100644 --- a/docs/I2PChromium.html +++ b/docs/I2PChromium.html @@ -1041,8 +1041,13 @@ diff --git a/docs/I2PChromiumProfileBuilder.html b/docs/I2PChromiumProfileBuilder.html index b2f4e2e..bde6803 100644 --- a/docs/I2PChromiumProfileBuilder.html +++ b/docs/I2PChromiumProfileBuilder.html @@ -375,8 +375,13 @@ diff --git a/docs/I2PChromiumProfileChecker.html b/docs/I2PChromiumProfileChecker.html index f14e924..6e3420c 100644 --- a/docs/I2PChromiumProfileChecker.html +++ b/docs/I2PChromiumProfileChecker.html @@ -348,8 +348,13 @@ diff --git a/docs/I2PChromiumProfileUnpacker.html b/docs/I2PChromiumProfileUnpacker.html index 606b449..cc228ee 100644 --- a/docs/I2PChromiumProfileUnpacker.html +++ b/docs/I2PChromiumProfileUnpacker.html @@ -266,8 +266,13 @@ diff --git a/docs/I2PCommonBrowser.html b/docs/I2PCommonBrowser.html index 26125a3..e6f46fd 100644 --- a/docs/I2PCommonBrowser.html +++ b/docs/I2PCommonBrowser.html @@ -960,8 +960,13 @@ diff --git a/docs/I2PFirefox.html b/docs/I2PFirefox.html index 17d8056..907c41f 100644 --- a/docs/I2PFirefox.html +++ b/docs/I2PFirefox.html @@ -1132,8 +1132,13 @@ diff --git a/docs/I2PFirefoxProfileBuilder.html b/docs/I2PFirefoxProfileBuilder.html index a60b797..530e8fa 100644 --- a/docs/I2PFirefoxProfileBuilder.html +++ b/docs/I2PFirefoxProfileBuilder.html @@ -473,8 +473,13 @@ diff --git a/docs/I2PFirefoxProfileChecker.html b/docs/I2PFirefoxProfileChecker.html index 5d8ec79..59b9876 100644 --- a/docs/I2PFirefoxProfileChecker.html +++ b/docs/I2PFirefoxProfileChecker.html @@ -480,8 +480,13 @@ diff --git a/docs/I2PFirefoxProfileUnpacker.html b/docs/I2PFirefoxProfileUnpacker.html index 85154f1..4a236a9 100644 --- a/docs/I2PFirefoxProfileUnpacker.html +++ b/docs/I2PFirefoxProfileUnpacker.html @@ -270,8 +270,13 @@ diff --git a/docs/I2PGenericUnsafeBrowser.html b/docs/I2PGenericUnsafeBrowser.html index debe4f5..74a09b3 100644 --- a/docs/I2PGenericUnsafeBrowser.html +++ b/docs/I2PGenericUnsafeBrowser.html @@ -669,8 +669,13 @@ diff --git a/docs/LINUX.html b/docs/LINUX.html index 04afc84..875e396 100644 --- a/docs/LINUX.html +++ b/docs/LINUX.html @@ -166,7 +166,11 @@ 

mkdir ~/tmp-i2pbrowser && 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 && 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 && cd i2pbrowser
         
         
diff --git a/docs/LINUX.md b/docs/LINUX.md
index 78c2836..f00e789 100644
--- a/docs/LINUX.md
+++ b/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.
diff --git a/docs/OSX.html b/docs/OSX.html
index 7715c0a..d66ae84 100644
--- a/docs/OSX.html
+++ b/docs/OSX.html
@@ -159,7 +159,11 @@
         file with any Java greater than Java 8.
       

       
mkdir ~/tmp-i2pfirefox && 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`
         
         
diff --git a/docs/OSX.md b/docs/OSX.md
index 1be421d..d297d6a 100644
--- a/docs/OSX.md
+++ b/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
 
diff --git a/docs/WINDOWS.html b/docs/WINDOWS.html
index 83cb6e5..14f891e 100644
--- a/docs/WINDOWS.html
+++ b/docs/WINDOWS.html
@@ -278,8 +278,13 @@
         
         
diff --git a/i2p.plugins.firefox.torrent b/i2p.plugins.firefox.torrent
index 1bd6e89..f04860b 100644
Binary files a/i2p.plugins.firefox.torrent and b/i2p.plugins.firefox.torrent differ
diff --git a/index.html b/index.html
index e4f1c86..34a5d90 100755
--- a/index.html
+++ b/index.html
@@ -305,7 +305,11 @@
         and a non-bundled Java
       
       
mkdir ~/tmp-i2pfirefox && 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
         
         
diff --git a/scripts/build.number b/scripts/build.number
index 17cfe69..1e446e7 100644
--- a/scripts/build.number
+++ b/scripts/build.number
@@ -1,3 +1,6 @@
 #Build Number for ANT. Do not edit!
-#Thu Jul 06 15:07:23 EDT 2023
-build.number=502
+#Thu Jul 06 15:11:32 EDT 2023
+build.number=500
+>>>>>>>=7cdf84bb265e7fda5b98d2386dab1855de8383eb
+=\=\=\=\=\=\=
+<<<<<<<=HEAD