From 9e237b5086ffad92aebb544048ff3280b36740d0 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 7 Aug 2018 20:58:57 +0000
Subject: [PATCH] new hosts
---
.../net/i2p/router/web/helpers/HomeHelper.java | 2 ++
installer/resources/hosts.txt | 2 ++
.../themes/console/images/script_gear.png | Bin 0 -> 861 bytes
router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
4 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 installer/resources/themes/console/images/script_gear.png
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
index b51bf4c52f..dd555d18c3 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
@@ -53,6 +53,7 @@ public class HomeHelper extends HelperBase {
"anoncoin.i2p" + S + _x("The Anoncoin project") + S + "http://anoncoin.i2p/" + S + I + "anoncoin_32.png" + S +
_x("I2P Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S +
//"colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S +
+ _x("Dev Builds") + S + _x("Development builds of I2P") + S + "http://bobthebuilder.i2p/" + S + I + "script_gear.png" + S +
_x("Dev Forum") + S + _x("Development forum") + S + "http://zzz.i2p/" + S + I + "group_gear.png" + S +
//_x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "magnet.png" + S +
"echelon.i2p" + S + _x("I2P Applications") + S + "http://echelon.i2p/" + S + I + "box_open.png" + S +
@@ -72,6 +73,7 @@ public class HomeHelper extends HelperBase {
_x("Planet I2P") + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "world.png" + S +
_x("I2P Plugins") + S + _x("Add-on directory") + S + "http://i2pwiki.i2p/index.php?title=Plugins" + S + I + "info/plugin_link.png" + S +
//_x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "magnet.png" + S +
+ _x("PrivateBin") + S + _x("Encrypted I2P Pastebin") + S + "http://paste.crypthost.i2p/" + S + I + "paste_plain.png" + S +
_x("Project Website") + S + _x("I2P home page") + S + "http://i2p-projekt.i2p/" + S + I + "info_rhombus.png" + S +
//_x("lenta news [ru]") + S + _x("Russian News Feed") + S + "http://lenta.i2p/" + S + I + "lenta_main_logo.png" + S +
//"Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S +
diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt
index 0f6eacc14d..217fe6e64e 100644
--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@@ -370,3 +370,5 @@ tracker.crypthost.i2p=trpQW0FUpHOYshwhmf7OPQr4Pyqz8Sfgm85Fz5AzeE-BqLZPvJSQwRWEPG
i2pforum.i2p=Gw1kgEBbxZjENfiTdTQNRZYBwwyJVjXtF~t5D0-XMmeVeizW-s~90~XTtAqQ8n41roBCWtr9lrAhJ8S1drBivatp85G3bXH~eV0ZYhmcFTLd-6UUP2eFbG~0Fmmvf-Pb6UFH9J0yKBdkqLaQB82AHWbz9CTNIf~3xAMBit2AJ8XQZ8haLcIH1kxUYae1~mkgiFPPFXg1MxONOjjJ9vaTDLeYofyS8hG95s1hp60x5xNGG6gi2pmCGopQDX46ZrzpNcaZkGHey4uEZGcSiYTm7S1hycQApBYNvCv4QvV92E0eFYqCm6thUOV7K78mii5agaqpcumDBy2PXLnwR0XrqjZnKBxydCcS-HockXR7nVykJL3moQOKswoMEChXMzQqD~RUrrmzHE80oXwZjExGNnp1hI7jZevYg38voDE3TT-3IT84kuLeb-1yH0p-HbiKBk4VLOpRsFpLD9V-tl0w9j7GWOchWX78Xxq7NTWa~xaQdrrCw60Ztw4Zzu2taMekBQAEAAcAAA==
00.i2p=IjreUYXG-2~NgvI818-~m9ZKfOuS~Vs8RbBpkN38K5l8OZe1gJONuwEjMCT6z4wuvXs8bKPW6NC0r7BkRFkEzTAKfvrcpgBXuLjw20RNH~oy6gP1Paj8FhJ7GrN2xcE-TdT-nvhZ~3QZ5OUhctTMuHKByEfLZRsdoAuHkd3TJsmlIZkKKd7VsFzPpsRHc3dPI0QTDbtp-cJuijtv3PdkeIoBLywUYIQ8nb1pNq6sVUtaBfgVHOm1cs0yodhPaE0mP3vZNm8SnPkJ8UoCAc7Bkogyipo2iKYQ49twzrMPz~9o-ywb3XbLZRSjB2ciqVaFyyS0F5z~y5xRfxPlobNNmmvWAgyhBdGMrd2q13O~rA5VwH4Ybw0UwclZcTbBPg216I~OdhRy~fLbqXNrsgqexVSHl4ofonkGL5dDAE6G4K0qbOjXyJTGO8T6WXc-F0eMZiArHpmvDo02obqoauJ5dEyqbyBWn-eFYaNjpFrJEoLxL3qRo0s~f3DyzzSP7M0IBQAEAAcAAA==
irc.00.i2p=YE~zhkIoJuo3mfQUEY3XVLK9Quf2mSB~auQj13-pzWydzMbW0ZfN~tIoUTKJ-6YXX1YwuU-rB3k4v5a-WjRGxue2H0jhReGnvoY3eI~5RSvquM0rA9zpkaqYXSTlHMweSQCaAZdQdQ3pOZTq0xzFuuHBKwL~0F~-khPjXTxUrixvsXJsIeNuO2UPTSj5Jwm1J3uO4OCyoBhKn0~oIWwDnOQwm0TkVoZUT1QVwSzcW0H9O99XqtO6M4yLRMrX-Dvg7iGszoigzbdngQEil3ZibKYegv3tPnz8y80UzmI4VW5sqN35qZpkhz~IV5jvSQGs~LEQZoZ0qjFaYmYcUewsW9KYlRmvVhQ32YB-X4ZbZUNSz354uK65AhHW6khBb4koJZ3ZLuPKguH66JkH6SIbB67R3CH2JKyCTLyM100sJmUgdGy69nUg8ZOuGuvETNCus4t5pWaTCkjbixCletBorMEz5vSSjCVgk2MuyxaBqicxMZ-hj7UoXHFK9CnNEeadBQAEAAcAAA==
+bobthebuilder.i2p=~yWhEqNol7mlDs5PRH2QdfcNoeb8FmshlYrfJUhzxkFPndJPXU2EuR2nu9u1Lyfj7VU40VzcmKNgUFg-M~dPT25QZ6AQDwLUw8k4Om5qJALXkIsHx7Hh2Pe3orsySpOUX9gUlGn8kLP9uqrCwOt4Tr8b3UbCtZubC6KCVyUpxGnwKnjlPlCztInftwC~Sbn2Vi3IEXrq~bgN5Qq-n2fhDvOrJaTcJzP8Vy~avA4ZgPDuJZHCAkVFCcZxL~Khq6v~3mzq2uLybpf6ijcFSoVbORvI8Isk9OO-GYB4P7IaBb15S842s8dQ-NaCw1gbaCv-Ia6SUNdfwCnMey7qaBBqBlLrwTx4-Fr2efPL436hswSTPhiLAK-Z1RyfkWhLcSbYdWNzvWg18-x2N4~NylVqaWDMUGuGj1HyTCkWpQMWo5y7RnSbsNoCLLE9NIJnD-Fw6XBccM2~NgurS39AJUOb6M03~2O9rNBHrKDahgZxqJ4PqMIQhM9QIQBb~eeEfm2PBQAEAAcAAA==
+paste.crypthost.i2p=DzzIFJUnCrgt-GYpkDGWRr8-65x5V753ScVbSGhZAY2rE0ftFuo3t3mrQEakJ9~ustHTj8lsu7pGK4EolsIDGTknawp41yrTYSFr18~7iTyRJ9SU3OlKZUw2BlorQEHIfFho~V2w~aF97XDfYeW6qOqLa~REsTjKMwTnf1KF9Z6exNWGtcZ-GZePIxdK5w0wm12dbyJiuLWiamsorWuXLXAE7RCudZ1XuiF~RKoilOvWkEHmvwandk5ITLJx~cworAwBPZ0BrnkI5Y7g6nPwMZbMdbyIzYl9poq~a9OrQdokm5-EjPSw1fcV6b7sfKjI3HIXsi4tFKvKynOSY1OPNSQ47ZNHyXRUlDnfnvYJUhmlnrfDhMTPD5FRjfebfgSiaWmmjET28m~d1FMzxekahvhleOeaiiWVPDH4gDXi81hN~S-1gQGcEqr1rjD5WY4R81~241u8wHHL22LU~s9dZ5SoK16-zdQ2LPrQy7SuxUUQVLcOrAlx4S1VPxN9QCG6BQAEAAcAAA==
diff --git a/installer/resources/themes/console/images/script_gear.png b/installer/resources/themes/console/images/script_gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fcf84a8518f692988061347375c9f6ff8d0dae
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!?@2^KR2Ufr
z!A)q@1pol>-~Z!n@9pW{oO5sFQkR#oNEERoq9}~OLlE7(C>^?38iHU~FCGf)7!g^i
zr#b|KB0a>q#9E#VC2d>I$+ouU+sE5`|IdEEpe##p>ifB)xbn<E^;kPCw9`Ub6t=RW
zg>@_=$0}CvEq;yxiY$Ba;K;UP=U?3g05+4N(N2oSY9}8}Qr5e<+2svC{=In|=VE{&
z%bNW?0hoJ|s|0~KAd2a&g!c4?qA*m6I5b-GRHHul#pL5pLx4O@`|B}T!Fm#Cr9A1<
z>d@-2vc=Ly4lZ7Q=-61@^Fx(gF+iTCgWG#Tn_V_LxiAdGh$6y>NFWL*5aerqn_hMM
zVe4@WkS9sAQH!*;GVN|D3`<c+m<OVeNGXa?Mi$q)KD+r~4X0v&EJ^k@`zu<VQU)ba
z9tcb1Y(4lzmL{GXIU%p)vLqY(;iH%T3jy+^yLY6~YcnYYAyE(r)*ne`epPnXRC{~$
z_4WC8X~~-d54|%q`w0YPS$gZzPqjD-+uvO{Zt|a0p#<slgnj$=nV+B6Y&L~qXm)ni
z=;)~N@o_~_)MLoH$*y|6Dhw!~BnSw$@7C#bEH5vcn3zzj)f_l*K)c;muh+jibLLDt
zggoi?#R_pq6b1yLjeEB=qD{lY!|va|@AZ=xy?gq+NAvSWMn>%4zyI{*%a_aem2=mJ
zaOvo?dn~M#W*2kyDxFqK6h)fNrs3gXwJQC6lx1LjecjyLoayOlah@b^;KUzyXRL0;
zHoB!WFBREABOCJu2N#TujhP((+Eh^5^Ym^jD=Y5Yx$`A1#Ce(?e*3i-Y9F6`2>|3J
z*S?v;fQ5wxM-Cs<>2%D@%xE+k@LsJ}dq2+8bY@|><=V}=2Da4<^j8hkdo}941_p;*
zy?WILAD%V!`=rIiMayN=ty`a$S(e?rapOiF96EVr2<NaDJFycxumg>1Po+|=RvfC`
nv$VA2&+^D$IC=Zp*(vxR7Y$Nw@UeaB00000NkvXXu0mjf2&J7q
literal 0
HcmV?d00001
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 9319fc01c9..9535f12e9f 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 22;
+ public final static long BUILD = 23;
/** for example "-test" */
- public final static String EXTRA = "";
+ public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);
--
GitLab