From 4f8293ae0c6bcc4e6424b7784a308224522ad3d1 Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Wed, 2 Dec 2020 22:33:57 +0100
Subject: [PATCH] first tests for misc lang keys, more funny particles,
 extended hadron

---
 src/main/java/assets/hbm/lang/de_DE.lang      |  14 ++++++++++-
 src/main/java/assets/hbm/lang/en_US.lang      |  12 +++++++++
 .../textures/blocks/ore_coal_oil_burning.png  | Bin 724 -> 751 bytes
 .../hbm/textures/blocks/ore_nether_coal.png   | Bin 0 -> 966 bytes
 .../hbm/textures/gui/machine/gui_hadron.png   | Bin 6101 -> 6355 bytes
 .../textures/items/cell_anti_schrabidium.png  | Bin 247 -> 309 bytes
 .../hbm/textures/items/cell_antimatter.png    | Bin 255 -> 314 bytes
 .../hbm/textures/items/cell_deuterium.png     | Bin 254 -> 340 bytes
 .../assets/hbm/textures/items/cell_empty.png  | Bin 242 -> 262 bytes
 .../hbm/textures/items/cell_empty_alt.png     | Bin 0 -> 293 bytes
 .../assets/hbm/textures/items/cell_puf6.png   | Bin 247 -> 326 bytes
 .../assets/hbm/textures/items/cell_sas3.png   | Bin 247 -> 315 bytes
 .../hbm/textures/items/cell_tritium.png       | Bin 252 -> 312 bytes
 .../assets/hbm/textures/items/cell_uf6.png    | Bin 250 -> 363 bytes
 .../hbm/textures/items/grenade_aschrab.png    | Bin 348 -> 376 bytes
 .../hbm/textures/items/particle_copper.png    | Bin 0 -> 305 bytes
 .../hbm/textures/items/particle_dark.png      | Bin 247 -> 272 bytes
 .../hbm/textures/items/particle_digamma.png   | Bin 0 -> 288 bytes
 .../hbm/textures/items/particle_lead.png      | Bin 0 -> 296 bytes
 .../inventory/container/ContainerHadron.java  |  10 +++++---
 .../java/com/hbm/inventory/gui/GUIHadron.java |  13 +++++++---
 src/main/java/com/hbm/items/ModItems.java     |   9 +++++++
 .../com/hbm/items/tool/ItemOilDetector.java   |  23 ++++++++++--------
 .../tileentity/machine/TileEntityHadron.java  |   2 +-
 .../machine/TileEntityMachineReactor.java     |   1 -
 src/main/java/com/hbm/util/I18nUtil.java      |  14 +++++++++++
 26 files changed, 77 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/assets/hbm/textures/blocks/ore_nether_coal.png
 create mode 100644 src/main/java/assets/hbm/textures/items/cell_empty_alt.png
 create mode 100644 src/main/java/assets/hbm/textures/items/particle_copper.png
 create mode 100644 src/main/java/assets/hbm/textures/items/particle_digamma.png
 create mode 100644 src/main/java/assets/hbm/textures/items/particle_lead.png
 create mode 100644 src/main/java/com/hbm/util/I18nUtil.java

diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang
index eaef51e83..67e5e1281 100644
--- a/src/main/java/assets/hbm/lang/de_DE.lang
+++ b/src/main/java/assets/hbm/lang/de_DE.lang
@@ -274,7 +274,11 @@ hadron.analysis=Analysiere...
 hadron.buttonOn=Analysekammer (falls vorhanden) ist AN
 hadron.buttonOff=Analysekammer ist AUS
 hadron.error=Fehler!
+hadron.hopper0=§eNormalmodus:$Alle Items werden beschleunigt.
+hadron.hopper1=§eTrichtermodus:$Ein Item bleibt immer übrig.
 hadron.idle=Leerlauf
+hadron.modeCircular=§eRingbeschleuniger:$Magnete bilden eine Schleife.$Schaltet mehr Rezepte frei.
+hadron.modeLine=§eLinearbeschleuniger:$Beschleuniger ended mit Analysekammer.$Weniger Rezepte.
 hadron.progress=Verarbeite...
 
 hbmfluid.acid=Wasserstoffperoxid
@@ -1437,6 +1441,11 @@ item.nuke_electric_kit.name=Kit des Elektronikingenieurs
 item.nuke_starter_kit.name=Atomphysik Starterkit
 item.oil_canola.name=Rohes Canola-Öl
 item.oil_detector.name=Ölvorkommen-Detektor
+item.oil_detector.desc1=Rechtsklick sucht nach Öl.
+item.oil_detector.desc2=Detektor findet nur größere Vorkommen.
+item.oil_detector.bullseye=Ölvorkommen direkt untertage!
+item.oil_detector.detected=Ölvorkommen in der Nähe!
+item.oil_detector.noOil=Kein Öl gefunden.
 item.overfuse.name=Singularitätsschraubenzieher
 item.oxy_mask.name=Sauerstoffmaske
 item.paa_boots.name=PaA-"olle Latschen"
@@ -1455,10 +1464,13 @@ item.part_plutonium.name=Plutoniumstaubkiste
 item.particle_aelectron.name=Antielektronenkapsel
 item.particle_amat.name=Antimaterienkapsel
 item.particle_aproton.name=Antiprotonenkapsel
-item.particle_aschrab.name=Antischrabidiumkapseö
+item.particle_aschrab.name=Kupferionenkapsel
+item.particle_copper.name=Copper Ion Capsule
 item.particle_dark.name=Dunkle Materien Kapsel
+item.particle_digamma.name=§cDas Digamma-Teilchen§r
 item.particle_empty.name=Leere Partikelkapsel
 item.particle_higgs.name=Higgs Bosonen Kapsel
+item.particle_lead.name=Bleiionenkapsel
 item.particle_muon.name=Myonenkapsel
 item.particle_sparkticle.name=Sparktikelkapsel
 item.particle_strange.name=Strange Quark Capsule
diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang
index b4710e1da..a74ec520d 100644
--- a/src/main/java/assets/hbm/lang/en_US.lang
+++ b/src/main/java/assets/hbm/lang/en_US.lang
@@ -274,7 +274,11 @@ hadron.analysis=Analyzing...
 hadron.buttonOn=Analysis Chamber (if present) is ON
 hadron.buttonOff=Analysis Chamber is OFF
 hadron.error=Error!
+hadron.hopper0=§eNormal Mode:$All items will be used.
+hadron.hopper1=§eHopper Mode:$One item will always remain.
 hadron.idle=Idle
+hadron.modeCircular=§eCircular Accelerator Mode:$Magnets must loop back into core.$Unlocks more recipes.
+hadron.modeLine=§eLinear Accelerator Mode:$Accelerator ends with analysis chamber.$Fewer Recipes.
 hadron.progress=In Progress...
 
 hbmfluid.acid=Hydrogen Peroxide
@@ -1437,6 +1441,11 @@ item.nuke_electric_kit.name=Electronic Engineer's Kit
 item.nuke_starter_kit.name=Atomic Science Starter Kit
 item.oil_canola.name=Raw Canola Oil
 item.oil_detector.name=Oil Reservoir Detector
+item.oil_detector.desc1=Right-click to scan for oil.
+item.oil_detector.desc2=Detector will only find larger deposits.
+item.oil_detector.bullseye=Oil deposit directly below!
+item.oil_detector.detected=Oil detected nearby.
+item.oil_detector.noOil=No oil detected.
 item.overfuse.name=Singularity Screwdriver
 item.oxy_mask.name=Oxygen Mask
 item.paa_boots.name=PaA "good ol' shoes"
@@ -1456,9 +1465,12 @@ item.particle_aelectron.name=Antielectron Capsule
 item.particle_amat.name=Antimatter Capsule
 item.particle_aproton.name=Antiproton Capsule
 item.particle_aschrab.name=Antischrabidium Capsule
+item.particle_copper.name=Copper Ion Capsule
 item.particle_dark.name=Dark Matter Capsule
+item.particle_digamma.name=§cThe Digamma Particle§r
 item.particle_empty.name=Empty Particle Capsule
 item.particle_higgs.name=Higgs Boson Capsule
+item.particle_lead.name=Lead Ion Capsule
 item.particle_muon.name=Muon Capsule
 item.particle_sparkticle.name=Sparkticle Capsule
 item.particle_strange.name=Strange Quark Capsule
diff --git a/src/main/java/assets/hbm/textures/blocks/ore_coal_oil_burning.png b/src/main/java/assets/hbm/textures/blocks/ore_coal_oil_burning.png
index 75c3eb4be29376f4b5df1a5ef708ff071f6801e8..1c4e714842309fc6b84e1a5be8d445092e2bcf67 100644
GIT binary patch
delta 711
zcmV;&0yzED1@8rrG=HW^L_t(Ija8FRZxdG(M~~xiocUw>87Cc>XON9Bu2ly_snrEy
z!<XsD$d_mq-FC~SQWxE2K`YU!m5`MPYaj_0^$;9_@?w0!j6IqzCW*^iJ?ULtop*ls
z=C-!BQW4?ewCjhAPB&3XQCd6Y;P8O2g6}ZKAR@HuhX915n}4{jiv{4iE=nl?I?d-y
z)9haJ-jeE1OjA%wp_F2y^aRiI7@fL^NY-FH9&<r)|KImWX#hZR{W+axnO}a72sRb~
zY#i7mGl3FIf_A%&F@}nB#;->WZrCG~Qd9<c7IKWMdX$R00BjF60KtkZ8$gEW<#s7G
zK-VU~gg-2c{(rmM1O=h<?F@iv`jFvph}N1g46#In0!KKGL$hH3a0WJM9JAS3a571-
za!0H@o0G;dQ5;by6bQo*-}kY!)-={9OywA7kSC2}7PHKU`%l81P98{EyqJ(C3A&*#
z6AQx-%NRo`*r&7#KR&ritt`BsxB%R}^@dINHE|sC)PHm6?*{~hh>PTW-_IP_{e)yT
zqg*cY=z+)M-=^5M&HZmy&cBmq{d<RxNs;SyhYz#rC582c*}$X7pTG^O)hc#>pSeu3
z${nHJTqFH_hM09+)xj8ZPGH+~yIsT#@Se@-^?F%kf4|}D>#ryli&QEVy3H(!wY4ex
zN11SIJbxYoV2t6`wJA?in~x@YY_(e4yZMT$a+u9NkozlPAwu&JoP1K5MBn!j5k!QV
z`<hw{cKXZRxDu|CTb*OanWtPnPqK4NREU-mwbn#YbUt~4tFjbCgzcf`hm98i{PgZN
zwrvB@?dqjOV+^kAvi<U0W?@OtYPI-zWaD`ry+B@ry}doE)hbaGWuyH6RStrHvy)x4
t?p=BTsMqU^MkAsqqFK)a6Xsk4;6D%IBO>HD$>;z8002ovPDHLkV1f*6UN-;$

delta 684
zcmV;d0#p6(1=IzQG=GapL_t(Ija8FRPZL2H#($+-U^@%U3Z!PI8cM7cEkPxX2V-Kq
z_)+{Ad<i*t)T<Y7-Z-d<e-qP4Xcqa?z)np8!-^egmezWhmg0MwOlIEs&GS5OYGq}m
zXN+M`rTh-j@gh=60Kzb&R4Nh2F~%55`5n6-%_D@s0T4o*Uw>FAY|!f2_1sJiFLgw#
zS3*jOl#<zrH+Y^$bSyB&*appJlL5u@{!jFXwlp&vEEFbr^;RQ<0ATjerQ0?z!H{5p
z2=F{AbGx{Kl#;1hnvOX@$O?J?8vv`H6ac}988!frQsSlFlJ`MPp8zMka~!IN*9kI)
zg}ZG4TD=F<>wk5WQiNfMV~oKV+imftrO4J?dP&0KLWfQ5(rUFB`Fch#NzjQVlgSW<
zA-P-*M=8bJOpTUlkgcWZB?+Cj)kA#g^00CWoYL7mq1WxA=G3`kVHo1Xam+-p#l$E)
zeRG+MwREk)qSzxz65e}Rs#^g;#tJNiumk{ZwM)0%W`A;WlE?S|^73^H*L7LGHPZi1
znwfi98oy>yO8xhU1F%}}D;s!>@d3Ds@B6sbEzZn|J-KEm7si2o!e}0)6mcB)30#+Q
zxs28t@9P<rO2u0CxxtMqyNr#EF*P+sxnP|bA8)Yr!{)+iHk$y%am>=S2Jag#fBKmy
z7K_}O-+#rIS=#O2q&{}(7(?L^9GyxlVlJ0sVCA&fW4Z`y)!}Sh3P(wep5Z1|r&Kyk
zckKY3(L)iHQfRIF$ukIP@r*I7))h}?HvxEdcpcYu0VtQ%P{cTn5kj!~y)R~FNKh;m
zc@epIo=2rJ$NKs@zVD;8oe$^YC<j5n_V)I<RV9P@$mjD!QH0hS-}ldR0PqilU>V|9
SqM^Y60000<MNUMnLSTZ5woOd{

diff --git a/src/main/java/assets/hbm/textures/blocks/ore_nether_coal.png b/src/main/java/assets/hbm/textures/blocks/ore_nether_coal.png
new file mode 100644
index 0000000000000000000000000000000000000000..e00e124034633608a85dfe8d772163b2119d2b21
GIT binary patch
literal 966
zcmV;%13CPOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS000AhNkl<ZIE@9tX-r!M0KoBoFWT1&T3SklGTOq1Otx{9LB|Lt5R%1-W;1v!
z*)(f3cuoA^2Qxz=l6WTSqEYt&6Sw)n#F)%@kWA+`MI|s9tm}q@4d~i(v;r;fwe&rI
zKb6#p0?<9}=E-1?)&rZ2{yj&bJI?hR26}puSS5+&*{6xc<6N3baWj$Nn~De%6QJpg
zGw__I22J!HZl90&{Erknw&>bt#*~P2w_n6Jr||jK0^-6o5`V_9mzt^jFUiiGpdQ>-
zLsOZD(987<U%pIxQvrd>6vEIQyq$Ks+hBekYPV;o-Ys)c5Qwcvh$0*wD?wwBvIFUS
z9%t1w4ZbqGr()D9HZ<8yOuugs4#P~J4PSK{vs=TB@p4W)v7cY%SynYZv_E|MDtE@$
zC~p0X@a+xiGeu-$tB4|e*{r4Im=3?PNv<!C*_<b3jiR#Mrm;rkT0)Ix_WM5u^ez`W
zzPgIx(LAP~))^avf1j_Q(zj04hgqs_Z6V8$N<pf{g44Bz!N1Pwa~ZTIMM28t@OZ%f
zL54TW9UKg;V%0=x``L<8lH%g14!taK;bAWi)`++&Rx!OUW6osIx|^E;n4X3+Z4Qoh
zIWY|_Q{7yMtkZLTM9cZC#4mO`U(~A*ikAtT-D0s2yem4id0FPYkr9?3D&?_lN!&gi
zuDv$oyqeR)_ej3*0Ea75WX?G$_b*U&)(92_MYV=lTZz_cFc9>3c<~V%hGI3=k5h=5
z4ACfrdrNt0cMgLkNw8%f$!8{@P0!krL~mG6r4m7Vb#ak)Wu5{@lA?DKOijUX46+9c
zIn<;>G0vesDe+ywB&B`r@X2rd6Ef2>E>jQ)psw~CC_CDM<*fvf2+YRdTS4H!UOiTK
z9Cg1$b)bliTn<!IOoYrd?UMORmYG_+j`moWAB+(KlQwcH6*`*&qDX~*o&1R`jco!o
z7xdhhj<e@}1(hIR8C=4$!$wD=4Yl1J!|09^^m;iH3UMfxqqnY(+)JAX0`$z77;s3u
za^wiQ!3`YmF3~z^;PL$)tR+#@CU>0jkCwR<4iinKxSP!)snwh^>v%S1prKaJm@7?Q
zNHKKFK>LiF;~gD{rd!n2W>F=BC`KdHT@i3QoivoDxw5jsp6xo4kt`=)t43#m{x>AL
oca`(?=uNb0HSfQ@MEbbI|68tUc9WoPk^lez07*qoM6N<$f&xgy^Z)<=

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/gui/machine/gui_hadron.png b/src/main/java/assets/hbm/textures/gui/machine/gui_hadron.png
index f48793d5e8cc289634d05d3c2faea23a88a95dcc..e5f9bb84b28defbba887500507d4e9c3a506b88e 100644
GIT binary patch
literal 6355
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
E0aWv!4FCWD

literal 6101
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

diff --git a/src/main/java/assets/hbm/textures/items/cell_anti_schrabidium.png b/src/main/java/assets/hbm/textures/items/cell_anti_schrabidium.png
index 04263e8888a14ee9dfae3ca92c842680c333fb2d..6e55456bc22f53e494c2d0105bff4ad757ff376e 100644
GIT binary patch
delta 281
zcmV+!0p|Yq0kr~<C4X~5NmK|32nc)#WQYI&0PIObK~y-6wURMT!$1&4-vB4@8R%&C
z9zpRLaN)gx`y~DPFh(3AiWEBE!Od<><9r%BvO<Urh+mH8KYh&~_z#5;v~>6Ga?mu5
zvMgH+v1{g(5|8UOPiFR=@k@dbf?|xMlz853_%K7#Y>Ec}?|;2wi~zjs_nZLd9Pb0f
z79_!YuU3-EQj*j=r`|aoK}(XHHA33IKy(3-q$8;P4Mb(B-Z`}s$h6{{$B`tw2jFx#
z0PwckF}77z)%<m*kk{3U@lWzRHyCQXB{MTgs_U9;sCqO5+|L03x~|&}Fp8p>|A}kz
f-Y;+9C;9{<fD*4gKJ-fR00000NkvXXu0mjfSj&S4

delta 218
zcmdnW^qp~nYJIw+uOkD)#(wTUiL49^44efXk;M!Qd<Q|8amU2$w?ILO64!{5;QX|b
z^2DN4hJwV*yb`^<)Di^~Jp(<<9OF7apqf%o7sn6_|Fe@0axy6Lumn#EjhymcMB#e#
zdF_`sl2sYyzZ)Dp&Z{Fdl`-|HMKX_p*|8UUn>{&$LqvI4w{z$v#9xYHc0L$<%E#jo
z(-o`9lLX?HHN4)h5_4JT|72yMdcPGp@skQ}hILLq+xIQ<bXv4wOu}PLmpI#khsQRh
STK@&QfWgz%&t;ucLK6VtU{MSJ

diff --git a/src/main/java/assets/hbm/textures/items/cell_antimatter.png b/src/main/java/assets/hbm/textures/items/cell_antimatter.png
index 5f8476e21c1cf43091eb5c70fdcb37b2b1396a83..042e6399d4a80cbcf6f8dc37235a0921dfdfe638 100644
GIT binary patch
delta 287
zcmV+)0pR}s0lET^B!2{RLP=Bz2nYy#2xN!=008kxL_t(IjkS`oZG=D+MBm!Co9qP$
z2`X^r++`dkAd&2q;R2u%BCZ!Q7eE39Krjw`YoYU5aI!qn>TBoe>(9V{sIF`6{rhw~
z=(<j6n(l^}d**4HcsZSTHOBmAj5@?eUDq1N5rDERvDP9<W`6^600<#`o6qMn)>;7a
zJl_Q&LV8JnB*}ZPBuSKIne;W^rwHl)0?`dblCms|8$Jec&dGbPeg#=a{G$g^#uy`s
zd7fF8g}398Wm)*RTv+#H^Saj*aL&=TEwLv>Q5abDU}F<CO+$=2ngO1-006@<ykB8d
lRkhuTdkP`!PZ;14eF8b?m`G|{IsyOy002ovPDHLkV1g=hej)$>

delta 227
zcmdnR^q+BpN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3
z6)8Z$a!(h>5DWjalMJ~IC<w5uUAJ-L$IsX796qt%-+EH5JYk|zc|=M=r<81fS#J6{
zPPgTD$0QP*n(kRkaAmEvXm~&Anv?`r(K(H!KUCCq#Iy-aoYC^)+3yScRsOW8ep8E9
zDU%Jqc~9ltrnN%aw?7|07-bgwY2%b!b<Mf5v0IC4b_sR?-N4}K>gTe~DWM6-6fAL#
bDDlltNzGyKFUd$P(s#~CEiSouP(1+v!tq$d

diff --git a/src/main/java/assets/hbm/textures/items/cell_deuterium.png b/src/main/java/assets/hbm/textures/items/cell_deuterium.png
index 72e78b05d2b7e5b06ce349ed9493042b1f0a36e6..4728a70739fb58c0a65d747ede71363ed3ab3ec2 100644
GIT binary patch
delta 312
zcmV-80muIS0n`GJC4X~5NmK|32nc)#WQYI&0Sie)K~y-6wUV(;0zni-&maXQ*+xIW
z#@Ik*OREL6*wRdGAhCsxVm2lwnCxfp1=f53u{Rb&G1K?~*8+F55^$j4Rx>YiPu`pR
z;2d(!>Daf8-NJIYRF-8&L(D#NjFIbppIc+hA!Dg#d2r4tgnt0Q%f}s8UmGOJBp^)y
zYi(tI{d}O^0{;z<Z)r#apePCxW8{832H^eq68H;AjZ$eXsWbIjOX|(NdULPg!s{f6
zb|8{8Tx{<rLpsxK7wa0N9`V0FEJ@wj27q>JTYI`$5kerw$Ye4}=Uj)(x+}^(84Lyn
zYI|@<#uy_>c`=?7LIzNo0WMMi0Pp?u7shBbN_M?h*4pC}I7L4-F{uD)W_y|d0000<
KMNUMnLSTZI^@O|t

delta 225
zcmcb@^pA0ZYJIw+uOkD)#(wTUiL49^44efXk;M!Qd<Q|8amU2$w?ILO64!{5;QX|b
z^2DN4hJwV*yb`^<)Di^~Jp(<nKRwC!fof_zT^vI!{F4`0SyX*_Q7_O|<jE{;mh*%E
zP>SS+l#`SGEASX8B)#hXKl|T*^?MT{H>dq&Pn^IQ#V4zOV1|lw0-J=%9){#iJdBJJ
zk|r=JR24`vEjnq&BBmB%$ns2fl905Svxi^KiM9hm(ji?H4RdZRa9YARgE2sFD+4n#
Y!*Pk%KYg5Mf*iu&>FVdQ&MBb@0LcVU9RL6T

diff --git a/src/main/java/assets/hbm/textures/items/cell_empty.png b/src/main/java/assets/hbm/textures/items/cell_empty.png
index a6cca14fd7dcf16f18d6b394b71763d4d35053ed..3d8decb7a07956da799a6b7bf4f6a228582079b2 100644
GIT binary patch
delta 233
zcmV<F02cr90fqvQC4X~5NmK|32nc)#WQYI&0KG{>K~y-6wUWURf-n$8-y#)IgExDD
z9=L2977&VoUbtBRm!yUDLNpW6#BuzmB$NMUXa9$P$T?@Vf1CVao@eX2t{Ngo<`4qs
zzULw$?~GAxJUHjfdk?@c3<6+gCIv_XpsMD*Cxq}Y1Bi&2Sz_HjRMpn~b8f1J07S_8
z3&b)=e*X$`G+7$)OAn&*1;$8k%R<_dV$NxlX-{HW?PvRQl4+XAdjfDO0RXmbyY4W?
jaV$=KC{?Xb;2YfmS6+f+Yf#A900000NkvXXu0mjfu~B4&

delta 213
zcmZo;`ouUvwLaa^*O7r?V?XzwL{<g{2F?PH$YKTtzC$3)D5~Mr02Gucag8Vm&QB{T
zPb^AhC`ioAE78kKEm1JhGte_lZ8b^-swwbvaSXBWKRU^g>wp0V%isUPHqRL^**}S0
z#;sSO5z>93)zf2<GvBF-Z}<2f-RPca`9mcl+p@v$L0?S7s=!cofd&0jR7IYoUHZk@
zb+cveAN`ZnQ}(p`rnopo9sZ`0$sawf;Krks^K5bouX3{%&gnYAxU})xW~-y-20+Uh
NJYD@<);T3K0RYIKQKkR@

diff --git a/src/main/java/assets/hbm/textures/items/cell_empty_alt.png b/src/main/java/assets/hbm/textures/items/cell_empty_alt.png
new file mode 100644
index 0000000000000000000000000000000000000000..40a6374a78bb198640980b35243022679e0cc726
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<lpghaSXBO
z?VYqywAp~i#lO-gA<W~r*rImXj06eY0}>m!W5YIt1#}&;;W-vD_5Q-&5q6B7LW15e
zS60n!O^rNb8P3zma4_b&sh6S%pOVnbP|^46oSj`P9atG2Tg>`y_v^xUTgHZ&lBo)!
z#_?wk8@yptS|roL&@l7+>+_%I<kalqoN?34nEPzHF++~JZRBm=&w=*Kif=YQvoCgb
zarf|eym?*Vk?qDy)A*_vt@?1!Iketz*{eUllr}AYI*0j#_iM3&7N5&4yKPT0F)YZv
o{kMPNBHKzPhScgH7SEUQ@soO2o&2o1ALvg8Pgg&ebxsLQ00IeeApigX

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/items/cell_puf6.png b/src/main/java/assets/hbm/textures/items/cell_puf6.png
index 6a94824f875fec88f6d30b8cc4d891fa77bae6f5..6bac8a9e6111832edbfa1659216a87ba8c4e6308 100644
GIT binary patch
delta 298
zcmV+_0oDHZ0mcH5C4X~5NmK|32nc)#WQYI&0R2fsK~y-6wbC(egFqC7;r}^l-9QE1
zTInLeMIv(tH%sXw<N&z$HSkR+=v*TjXlUprO^A@~2$CpMu691H_C5HI6h)!6cQ>~O
zWmzf+g4KvUD))WQ%YM(RnSEEh1B#+h5Cnu_$nkh&yWLV%6@RvXYyiCX>bj1;@5%EV
zfMFO&(-cYT{=<8(T2d56k|gJxoO4Q&M5_^i390{r=mwFbBuP~N28p6b&N<aHWIp1%
zJ(yx<)-(+O<2drR+c69S*UN?Zo-EE;lHxc9;Cwza?Maqp2JpNDn3+k^>2#v&I)JY-
wz|#@{(6;USCnLt;a9Dix!+7u4Pv9r{06^}WZwQZOc>n+a07*qoM6N<$f^e*hP5=M^

delta 218
zcmX@c^qp~nYJIw+uOkD)#(wTUiL49^44efXk;M!Qe1|}oQB=dL0VpU@;u=vBoS#-w
zo>-L1P>`6JSE84fTB2a0XP{@A+G>;vR8#8d;uvD#e|FMAP6kCDmRx0jX^(^ZbRE{Q
zzrK~M$|(QcVA6439igd=soqw_eg<a8B$69;3VjK_cQ9bVs)~kU&um^E)~(m3PB_A<
zw5do{agPt<^?J`8ao&IYgH-;_3AnjW<>98cLi)31=Wd>Uc3aYp1IKi{Dj9_q?rZwX
S;ie9B0fVQjpUXO@geCx(OitYZ

diff --git a/src/main/java/assets/hbm/textures/items/cell_sas3.png b/src/main/java/assets/hbm/textures/items/cell_sas3.png
index 7fdf58c019334ebd35a56af96d8205f7f3e0163c..1e9981c8528661771a01c225b2cc8a1f2e7b0bdf 100644
GIT binary patch
delta 287
zcmV+)0pR}k0lNZ_C4X~5NmK|32nc)#WQYI&0P;yhK~y-6wUV)I!!Qs<-!bt5s$98B
zmnLukk6|GzsNn({AOlbX$V&v8glfEiD>dW_KZUJ8FziT1kXI1||HJX_;6Df<Xz5#b
zebIHDilSI7v0LGsGcWr+uV!{HIPyFmLI_GJ0r0We@CHbd&3{N7fcIW0C34P`!vH|v
z_q<;uOTL2lUPno^tt83CC>Nu)I<rUuFiMVpk?2YyNn7b$;iD4TRxU;zCz9!if9<d&
z+2H_y+wB1OI-M9BUf1>foTrj*y=L5#vMdcIdvFgkGf8TihO}A%{Dc9X<^%x4FnnHQ
lR8=)w^-a9@%NQr{2;Xs8uvO6Dn?e8p002ovPDHLkV1nCjeD?qV

delta 218
zcmdnZ^qp~nYJIw+uOkD)#(wTUiL49^44efXk;M!Qe1|}oQB=dL0VpU@;u=vBoS#-w
zo>-L1P>`6JSE84fTB2a0XP{^HrziP7P)(_)i(`m||Jg|gIS(iZu=G!vlJ_;2F^PYl
zZsy}tu^$9I{AyAX1#Be)!nQ5H#<eIqzUZ8Schi($Ar4mchD#SORwwl+h{&wvjS&*|
z;AmFmG}bF;yk76QL(lt-|2B^|mg_dzdfrK$tr}(~TYEmn%=Xh$z1#OXVip^}IDAN5
R<Uh~_44$rjF6*2UngDhVPjCPL

diff --git a/src/main/java/assets/hbm/textures/items/cell_tritium.png b/src/main/java/assets/hbm/textures/items/cell_tritium.png
index bd190a09adbb1ee2cff52328d6edfa56008ab827..aae6c926fc57b8a5fec2441a041527f09ace0725 100644
GIT binary patch
delta 284
zcmV+%0ptGs0k{H?C4X~5NmK|32nc)#WQYI&0PjgeK~y-6wURMT#4r#=-z=OU62<l?
z6dZv9PLNyxnl$DBS!!x<dhW1Q_AY5?Xw%qN_!Pz{TJ3HEh%Z?lTmDbunSuY1_g+ii
zuJ$kbzE@Eciy?N%9Ao6Ns<<|@W5%rW9C+^)LIB|LrJ~$|B!AfqWCh@yQwV_=BlV^N
z;Qa&c9uj29S8&d0kVGj-()uQ?+xv801Odp9;V%&FL8Js3egmOQkYNIuw)kX)CCRQ*
zyuL{L+tZF*@V0H|`#gp8uRHRb)OBqznS*08Gn1sQ>j<F$_%;Ka%>e+$aeV%Q(KO9$
i)(7RBTi$`6=oJ&R&8pqN|6vLM0000<MNUMnLSTZf_k||_

delta 223
zcmV<503iRk0{j7xC4Xl@O+f$vv5yP<VFdsH010qNS#tmY4!{5a4!{9w)`<xK000<t
zMObuGZ)S9NVRB^vaA9d~bS`dXbRaY?FfKW4Gk#70004SPL_t(IPtB6c3BVu_M7NDJ
zkS20SBdN@@1uW^ox+ade!9x!2;voYM@%KO(S)Nh~NT2$ms#qW)LCzV3g7X4yU|y0^
z0-<0#&~QmiAbY(~2}ziCxC%J_OTsZMu|HWNvFEtT_9bzbZIoEq`qq5Lvh^ij-m<NY
Z$O9#J-!uzCh-?4=002ovPDHLkV1jFqRx<zq

diff --git a/src/main/java/assets/hbm/textures/items/cell_uf6.png b/src/main/java/assets/hbm/textures/items/cell_uf6.png
index cab4d3d20aad494375d221cbdd99a6cd77b1152a..f4ab4474cd505a36f85538b9fb72a5bf57999d1b 100644
GIT binary patch
delta 335
zcmV-V0kHo10qX*gC4X~5NmK|32nc)#WQYI&0U}96K~y-6wUa$=!axv(zeys?MJg+z
zq=;NZgo2a69ccCf93TfUhv6nj!6<+g$*wSpT_ZOyjg1h$PLWrwRy&{Go0*0GP!vUK
z`}X1VVm6y82!hrSyHs43CE;+$yO~`pZ1mI|q9{^P6aWkcZ-4l^3`w#(kOu(goQk5L
zEK7R5R{-|=J-ZsxCJN3u#gaCgPf1dmu9T)L<$0=GkTZL+BrjP|g?*m0H2}Wv)9G}%
z7v~_=PU6~$B;|Rk_=1zOF#?#Gg<&5rSx{9KS+?e<)8%EC5lcEA@l8vTlq3rPJkJAQ
zKL4U=_+&D<pGfH#vRr=C?8#^}GC10UYceyFr0H}@5Ci~+Vt~hc0D$dw`%%LfkH_sM
haVqCr>ksxP{Q^EOsH^sQaXJ71002ovPDHLkV1l5UlX(CD

delta 221
zcmV<303!eE0{Q`vC4Xl@O+f$vv5yP<VFdsH010qNS#tmY4#EHc4#EKyC`y0;000<t
zMObuGZ)S9NVRB^vaA9d~bS`dXbRaY?FfKJ^g)(IT004MNL_t(IPtB6C2>>Aw1ns{B
z<10YEhpXVD$H>qs_F1_DgAY70_<==EWkA_<990ElV~kP?m{u);h=8G>_l65tm*kwm
zP|(^l5|X%})_Y`2LU@@1uK$v7-In;D9Fh2QLS_4sgv&Ndyli%~&RjOzis1qqPm$6K
X?@tU5yaqkH00000NkvXXu0mjf9d}ls

diff --git a/src/main/java/assets/hbm/textures/items/grenade_aschrab.png b/src/main/java/assets/hbm/textures/items/grenade_aschrab.png
index 55e1ec187dd47e7d239671ea4daa11e360e5e9d1..99a55435c353eeb57d05d5b8985cc8607a75d3e9 100644
GIT binary patch
delta 333
zcmV-T0kZzw0{8-uG=DEiL_t(Ijh&J`Zo)tig}+UZ=zRhgkzBahBhW@f_zXe9Zs<4w
zp+(Sfk|+nDL`a0nccAgsLHxWFV9Nr6O{Ut_=zV%KZ{SAxzAxYRb*oodWnmr2Q~6`9
z6+jRKnoK6O925X+t#-Q|&1RGBcFSxwqu=jW0!&%F-|rcZ$A5U9hjWgXPKVGKQ|TZV
z_j*0DEW<g++i=K_F-W>QN+W-?S}n3H1K@qJ;COPz_ZedTa8m4GKA+>9<8?4NHP-8V
zHwEPGGQu!a5Cj59B`J=TN;+7pgSA?L9)josB1tPy`X7kmSO;sBmLU0^+>I!QkR$*c
zmrDS?Mx!FFN=CpX<g?u_?j(vL)2Pq_V2m-6G@VZI&QV8EWB{J)001_d&Bqx=x7)4d
f{Hl^9xk}&{9SFj@|0*`000000NkvXXu0mjfGP9Za

delta 305
zcmV-10nYyT0^9<SG=CFGL_t(Ijm45NZo)tiMc=rzd;=88-4<@PqT~i3_o0RZP$O{-
z+~)$0asebaND;JjG^u=nAWVLW$dThX#$A55+Ie5|X9hYH$Fbr#R@dKMHNhb!LG$6g
z7l3n4MNtguz?$&&dZnr=E|&`c=kwYAB%20Jc)eZ|MG+5a%72^0%&gZW0I1>BY6ZY_
zv%!1M$c$X-jq*K%8h+gE2*%?&)*us-B$0DY0J$VB7Rn{vyw}Zpy@LMVB$ql(eoZ(@
z5>-{j>2$JO(sa25;A6k%<#1qR_G3GD_uMuCI3AC@7X{F|#4gRu?0LKWDsF72EX(c)
zLpphyOo*b0G%8K|udJ;s%LEXHA@lj%21V#n4Fh}vQ0uf`-T(JH00000NkvXXu0mjf
DDgKd1

diff --git a/src/main/java/assets/hbm/textures/items/particle_copper.png b/src/main/java/assets/hbm/textures/items/particle_copper.png
new file mode 100644
index 0000000000000000000000000000000000000000..f40f71644d6eddfcd1619ca389a3b6b0a4b4cc1f
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002!Nkl<ZIE~ekJr06E5QX0w3xx!T7m(V<J6L)NI06?ifg>0%zyVCy6A+G|
zwI+s!XoD+JEXTrN_}Mj5`jRbn_RW`>&0|m~3`45lUDstYU#D0#3L&Im&+{5R!?qzw
z5?Gc6+qN5Z&bbuY0aOw~G>%FG<;#zfehd*&5Cn}0q9_7mtmBuikP)z2j*!L|7&8q;
zK1N0|=a&`Icn@Qup~y=-@1=4DC1ARk0|1`)66fQoKj6AMpvd3Nq?`Q#)##*~V2_&;
zpiH9UIG>Lr0=AnqfF4O~hv(0d2mrqCQ+)!?xzzgtWcGy$M0{xA00000NkvXXu0mjf
DDMfa5

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/items/particle_dark.png b/src/main/java/assets/hbm/textures/items/particle_dark.png
index f94356d1b12745ff9b177fdfc358a8304a40d8f6..2f425d2ad02aa2d0735954201f611826c04c02ab 100644
GIT binary patch
delta 228
zcmV<A02}}J0gwWaG=IlQL_t(Ijn$IN4TCTcM4zJ+fM5&YPEk+-B|r&L8lZqkxC3Z{
z7C8Cf4mKwcA3F-lDI@vd_3U_eG=>PeuG8(kswxxWor+7N_dY0G*Y&RFek6?JNRlMv
zdA_S#YlEUEfd$_C-HG8AefbhWV^me!w%tw8_dUj#6F<1ZtX(h+1I{@BM1)yG%nu$o
z=a{AmfTAd(EBx$1bOI4se-@GJ0$G-^c$TJVR3MtfvMg8QRN?h}02h*Y49}k>5uj-r
e-A-Vw4RYVU3~REAb)7x{0000<MNUMnLSTY<!DUVW

delta 203
zcmV;+05t!Q0`~!sG=Hv1L_t(Ijnz`Y4FVw$9E=4}0-Zq#lmI0d8=wFaD1m15O$DwW
zF>tqw=hI1eu*^<&hfxraQljzhoKqZcSL}_gHCEVrKlPlqgjy@K)-c9Q^->Bex)bPV
ztxZS5Nqjj7))*q97~?cS&KXK6mcPUON#hR?Q~N;lpf`TQ%0z>4Tv6<Zi3);Oz+#0V
ziOW^QBwB0nc()P(x9bJK4@umH=g*P|03ie#Cn%+`+!v~5Y8FMUYiIxf002ovPDHLk
FV1n^4Rnh<e

diff --git a/src/main/java/assets/hbm/textures/items/particle_digamma.png b/src/main/java/assets/hbm/textures/items/particle_digamma.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0f621b807a1142559ddad289a4a9e9456a28ef6
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<X`u6aSXBO
zy&ANUx7k3z#$B?Zi7{i+B*q9fw*(dm#Zyen`di!=BsEO&oEsvdrx~E<>mcz*P_uZF
z>hIe6fA#a57}lCTf39<SO8<7QzRqh=>kH;R_d8eTnK6saQ9z+fNj<OUW7j$sw}|Yy
zs)_3Na$3p_R3fJ>4R(yZ9^h5^Q`;s^g&~CF<}uFa8_zQ3&MA0d%~yMzOHq}vknQ{H
z+*|UG9zQ$2oQq*WuW%U0{%s0%i?7W}=9LooEk1X~GR=AOO@wyL@n@(jcy!68{+SDd
iMpx5kt{%g<chX5cefb?#2hD(9WbkzLb6Mw<&;$T_x@xxo

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/items/particle_lead.png b/src/main/java/assets/hbm/textures/items/particle_lead.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d5f0153522547625259617205b53dad922f9c1
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<lpynaSXBO
zy&7c5)$AZJhdc99WTZFOL9_2t+O<vo7t~v74xCeaVC%ReYQyeRVIJiLTXVFUmzOI}
zlicyBEWQ0^s)Wso*R!tuw>dwvd%Lz?b5!>7f<TdLXDYp4?Ba72Q0P)xt=Ce}^^Qd>
zW9{1Khfm)ADR}O%fM957s%6G)v7U{x_g^L`DfHz_92Y<Ip{sIVf|B^>(_Frn6+DGB
zmL~LkT=ziK<FW`tLQmtAPdg46@C0}{dU2lnS=e~g>bXqq{c6@do@X|_DYj60@N);V
s#e^fd75{WP83LxMu9f9boO8!~c6ZZ*V_b=6fnH_sboFyt=akR{0Lip?6#xJL

literal 0
HcmV?d00001

diff --git a/src/main/java/com/hbm/inventory/container/ContainerHadron.java b/src/main/java/com/hbm/inventory/container/ContainerHadron.java
index 057d612bb..8829bdb7a 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerHadron.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerHadron.java
@@ -18,10 +18,12 @@ public class ContainerHadron extends Container {
 		
 		hadron = tedf;
 
-		//Input
-		this.addSlotToContainer(new Slot(tedf, 0, 26, 36));
-		//Output
-		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 134, 36));
+		//Inputs
+		this.addSlotToContainer(new Slot(tedf, 0, 17, 36));
+		this.addSlotToContainer(new Slot(tedf, 0, 35, 36));
+		//Outputs
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 125, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 143, 36));
 		//Battery
 		this.addSlotToContainer(new Slot(tedf, 2, 44, 108));
 		
diff --git a/src/main/java/com/hbm/inventory/gui/GUIHadron.java b/src/main/java/com/hbm/inventory/gui/GUIHadron.java
index f7810c8c1..460ed68b8 100644
--- a/src/main/java/com/hbm/inventory/gui/GUIHadron.java
+++ b/src/main/java/com/hbm/inventory/gui/GUIHadron.java
@@ -7,6 +7,7 @@ import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.machine.TileEntityHadron;
+import com.hbm.util.I18nUtil;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -33,8 +34,12 @@ public class GUIHadron extends GuiInfoContainer {
 		
 		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 71, guiTop + 108, 34, 16, hadron.power, hadron.maxPower);
 
-		//String text = "Magnets are " + ((iter.isOn && iter.power >= iter.powerReq) ? "ON" : "OFF");
-		//this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 76, guiTop + 94, 24, 12, mouseX, mouseY, new String[] { text });
+		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 142, guiTop + 89, 18, 18, mouseX, mouseY, I18nUtil.resolveKeyArray("hadron.hopper0"));
+		
+		if(hadron.analysisOnly)
+			this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 142, guiTop + 107, 18, 18, mouseX, mouseY, I18nUtil.resolveKeyArray("hadron.modeLine"));
+		else
+			this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 142, guiTop + 107, 18, 18, mouseX, mouseY, I18nUtil.resolveKeyArray("hadron.modeCircular"));
 	}
 
 	protected void mouseClicked(int x, int y, int i) {
@@ -47,7 +52,7 @@ public class GUIHadron extends GuiInfoContainer {
     	}
 		
     	//Toggle analysis chamber
-    	if(guiLeft + 142 <= x && guiLeft + 142 + 18 > x && guiTop + 89 < y && guiTop + 89 + 18 >= y) {
+    	if(guiLeft + 142 <= x && guiLeft + 142 + 18 > x && guiTop + 107 < y && guiTop + 107 + 18 >= y) {
 			mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
     		PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(hadron.xCoord, hadron.yCoord, hadron.zCoord, 0, 1));
     	}
@@ -71,6 +76,6 @@ public class GUIHadron extends GuiInfoContainer {
 			drawTexturedModalRect(guiLeft + 16, guiTop + 89, 206, 0, 18, 18);
 		
 		if(hadron.analysisOnly)
-			drawTexturedModalRect(guiLeft + 142, guiTop + 89, 206, 18, 18, 18);
+			drawTexturedModalRect(guiLeft + 142, guiTop + 107, 206, 18, 18, 18);
 	}
 }
diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java
index 61bf29fa3..d64c0184e 100644
--- a/src/main/java/com/hbm/items/ModItems.java
+++ b/src/main/java/com/hbm/items/ModItems.java
@@ -600,6 +600,8 @@ public class ModItems {
 	public static Item cell_anti_schrabidium;
 
 	public static Item particle_empty;
+	public static Item particle_copper;
+	public static Item particle_lead;
 	public static Item particle_aproton;
 	public static Item particle_aelectron;
 	public static Item particle_amat;
@@ -609,6 +611,7 @@ public class ModItems {
 	public static Item particle_strange;
 	public static Item particle_dark;
 	public static Item particle_sparkticle;
+	public static Item particle_digamma;
 	
 	public static Item pellet_antimatter;
 	public static Item singularity;
@@ -2469,6 +2472,8 @@ public class ModItems {
 		cell_anti_schrabidium = new ItemDrop().setUnlocalizedName("cell_anti_schrabidium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_anti_schrabidium");
 
 		particle_empty = new Item().setUnlocalizedName("particle_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":particle_empty");
+		particle_copper = new Item().setUnlocalizedName("particle_copper").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_copper");
+		particle_lead = new Item().setUnlocalizedName("particle_lead").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_lead");
 		particle_aproton = new Item().setUnlocalizedName("particle_aproton").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_aproton");
 		particle_aelectron = new Item().setUnlocalizedName("particle_aelectron").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_aelectron");
 		particle_amat = new Item().setUnlocalizedName("particle_amat").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_amat");
@@ -2478,6 +2483,7 @@ public class ModItems {
 		particle_strange = new Item().setUnlocalizedName("particle_strange").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_strange");
 		particle_dark = new Item().setUnlocalizedName("particle_dark").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_dark");
 		particle_sparkticle = new Item().setUnlocalizedName("particle_sparkticle").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_sparkticle");
+		particle_digamma = new Item().setUnlocalizedName("particle_digamma").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_digamma");
 		
 		singularity = new ItemDrop().setUnlocalizedName("singularity").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity");
 		singularity_counter_resonant = new ItemDrop().setUnlocalizedName("singularity_counter_resonant").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_alt");
@@ -4647,6 +4653,8 @@ public class ModItems {
 		
 		//Particle Containers
 		GameRegistry.registerItem(particle_empty, particle_empty.getUnlocalizedName());
+		GameRegistry.registerItem(particle_copper, particle_copper.getUnlocalizedName());
+		GameRegistry.registerItem(particle_lead, particle_lead.getUnlocalizedName());
 		GameRegistry.registerItem(particle_aproton, particle_aproton.getUnlocalizedName());
 		GameRegistry.registerItem(particle_aelectron, particle_aelectron.getUnlocalizedName());
 		GameRegistry.registerItem(particle_amat, particle_amat.getUnlocalizedName());
@@ -4656,6 +4664,7 @@ public class ModItems {
 		GameRegistry.registerItem(particle_strange, particle_strange.getUnlocalizedName());
 		GameRegistry.registerItem(particle_dark, particle_dark.getUnlocalizedName());
 		GameRegistry.registerItem(particle_sparkticle, particle_sparkticle.getUnlocalizedName());
+		GameRegistry.registerItem(particle_digamma, particle_digamma.getUnlocalizedName());
 		
 		//OMG how the hell is that even possible!?
 		GameRegistry.registerItem(singularity, singularity.getUnlocalizedName());
diff --git a/src/main/java/com/hbm/items/tool/ItemOilDetector.java b/src/main/java/com/hbm/items/tool/ItemOilDetector.java
index 755a75c55..ce1c5fa0c 100644
--- a/src/main/java/com/hbm/items/tool/ItemOilDetector.java
+++ b/src/main/java/com/hbm/items/tool/ItemOilDetector.java
@@ -4,10 +4,13 @@ import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
 
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
 public class ItemOilDetector extends Item {
@@ -15,8 +18,8 @@ public class ItemOilDetector extends Item {
 	@Override
 	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
 	{
-		list.add("Right click to scan for oil.");
-		list.add("Scanner can only detect larger deposits!");
+		list.add(I18n.format(this.getUnlocalizedName() + ".desc1"));
+		list.add(I18n.format(this.getUnlocalizedName() + ".desc2"));
 	}
 
 	@Override
@@ -73,14 +76,14 @@ public class ItemOilDetector extends Item {
 		if(direct)
 			oil = true;
 		
-		if(world.isRemote)
-		{
-			if(oil) {
-				player.addChatMessage(new ChatComponentText("Oil deposit detected!"));
-				if(direct)
-					player.addChatMessage(new ChatComponentText("Oil deposit directly below!"));
+		if(!world.isRemote) {
+			
+			if(direct) {
+				player.addChatMessage(new ChatComponentTranslation(this.getUnlocalizedName() + ".bullseye").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN)));
+			} else if(oil) {
+				player.addChatMessage(new ChatComponentTranslation(this.getUnlocalizedName() + ".detected").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD)));
 			} else {
-				player.addChatMessage(new ChatComponentText("No oil detected."));
+				player.addChatMessage(new ChatComponentTranslation(this.getUnlocalizedName() + ".noOil").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
 			}
 		}
 
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java
index 1884fa1de..f1c1a306f 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java
@@ -33,7 +33,7 @@ public class TileEntityHadron extends TileEntityMachineBase implements IConsumer
 	public boolean analysisOnly = true;
 	
 	public TileEntityHadron() {
-		super(3);
+		super(5);
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java
index f818b1ae2..c09c2b5f2 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactor.java
@@ -232,7 +232,6 @@ public class TileEntityMachineReactor extends TileEntityMachineBase {
 		charge = nbt.getShort("charge");
 		heat = nbt.getShort("heat");
 		progress = nbt.getShort("progress");
-		slots = new ItemStack[getSizeInventory()];
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/util/I18nUtil.java b/src/main/java/com/hbm/util/I18nUtil.java
new file mode 100644
index 000000000..6bca5c596
--- /dev/null
+++ b/src/main/java/com/hbm/util/I18nUtil.java
@@ -0,0 +1,14 @@
+package com.hbm.util;
+
+import net.minecraft.client.resources.I18n;
+
+public class I18nUtil {
+
+	public static String resolveKey(String s, Object... args) {
+		return I18n.format(s, args);
+	}
+
+	public static String[] resolveKeyArray(String s, Object... args) {
+		return resolveKey(s, args).split("\\$");
+	}
+}