From dda73fe1e59d84fccea14c5e6d07ce06c520de22 Mon Sep 17 00:00:00 2001
From: BenjaminGoGurts <benjamin.govaerts@hotmail.com>
Date: Sun, 28 Feb 2016 12:01:58 +0100
Subject: [PATCH 1/8] Reduced hopper crafting price

Changed it to Steel Ingot to make it more fair
---
 civcraft/data/materials.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civcraft/data/materials.yml b/civcraft/data/materials.yml
index 15ba88772..aeaba7104 100644
--- a/civcraft/data/materials.yml
+++ b/civcraft/data/materials.yml
@@ -4380,7 +4380,7 @@ materials:
               - name: 'AllowBlockPlace'
           ingredients:
               - type_id: 0
-                custom_id: 'mat_carbide_steel_ingot'
+                custom_id: 'mat_steel_ingot'
                 data: 0
                 letter: 's'
               - type_id: 54

From f051ea009ce70a4fb081709b648df5a1a1f21a98 Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Fri, 18 Mar 2016 11:53:59 -0500
Subject: [PATCH 2/8] Corrected the '/town info mine' command.

---
 .../command/town/TownInfoCommand.class        | Bin 30529 -> 30518 bytes
 civcraft/bin/plugin.yml                       |   2 +-
 civcraft/localization/default_lang.yml        |   2 +-
 .../command/town/TownInfoCommand.java         |   6 +++---
 civcraft/src/plugin.yml                       |   2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/civcraft/bin/com/avrgaming/civcraft/command/town/TownInfoCommand.class b/civcraft/bin/com/avrgaming/civcraft/command/town/TownInfoCommand.class
index af39a56ae94e37fdcb8253e8991d6202dfa80255..189b3ffd6db88609671b41f04963fcc990839f1a 100644
GIT binary patch
delta 3949
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

delta 4144
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

diff --git a/civcraft/bin/plugin.yml b/civcraft/bin/plugin.yml
index 2a057ad40..f7d9d4691 100644
--- a/civcraft/bin/plugin.yml
+++ b/civcraft/bin/plugin.yml
@@ -1,7 +1,7 @@
 name: CivCraft
 main: com.avrgaming.civcraft.main.CivCraft
 softdepends: [TitleAPI]
-version: 1.76.4
+version: 1.76.5
 
 commands:
     town:
diff --git a/civcraft/localization/default_lang.yml b/civcraft/localization/default_lang.yml
index 4ab219cf8..804719a3d 100644
--- a/civcraft/localization/default_lang.yml
+++ b/civcraft/localization/default_lang.yml
@@ -93,7 +93,7 @@ Temple: "Temple Rate:"
 baseCulture: "base Culture:"
 baseUpkeep: "Base Upkeep:"
 LastResult: "Last Result:"
-hammersPerTile: "hammers per tile:"
+hammersPerTile: "hammers added:"
 SubTotal: "Sub Total:"
 StructureUpkeep: "Structure Upkeep:"
 Civilization: "Civilization:"
diff --git a/civcraft/src/com/avrgaming/civcraft/command/town/TownInfoCommand.java b/civcraft/src/com/avrgaming/civcraft/command/town/TownInfoCommand.java
index 71de0c1fc..ed157b61e 100644
--- a/civcraft/src/com/avrgaming/civcraft/command/town/TownInfoCommand.java
+++ b/civcraft/src/com/avrgaming/civcraft/command/town/TownInfoCommand.java
@@ -513,10 +513,10 @@ public void mine_cmd() throws CivException {
 			out.add(color+CivSettings.localize.localizedString("cmd_town_info_mineName")+" ("+struct.getCorner()+")");
 			out.add(CivColor.Green+"    "+CivSettings.localize.localizedString("Level")+" "+CivColor.Yellow+mine.getLevel()+
 					CivColor.Green+" "+CivSettings.localize.localizedString("count")+" "+CivColor.Yellow+"("+mine.getCount()+"/"+mine.getMaxCount()+")");
-			out.add(CivColor.Green+"    "+CivSettings.localize.localizedString("hammersPerTile")+" "+CivColor.Yellow+mine.getHammersPerTile()+
-					CivColor.Green+" "+CivSettings.localize.localizedString("LastResult")+" "+CivColor.Yellow+mine.getLastResult().name());
+			out.add(CivColor.Green+"    "+CivSettings.localize.localizedString("hammersPerTile")+" "+CivColor.Yellow+mine.getBonusHammers());
+			out.add(CivColor.Green+"    "+CivSettings.localize.localizedString("LastResult")+" "+CivColor.Yellow+mine.getLastResult().name());
 			
-			total += mine.getHammersPerTile()*9; //XXX estimate based on tile radius of 1.
+			total += mine.getBonusHammers(); //XXX estimate based on tile radius of 1.
 			
 		}
 		out.add(CivColor.Green+"----------------------------");
diff --git a/civcraft/src/plugin.yml b/civcraft/src/plugin.yml
index 2a057ad40..f7d9d4691 100644
--- a/civcraft/src/plugin.yml
+++ b/civcraft/src/plugin.yml
@@ -1,7 +1,7 @@
 name: CivCraft
 main: com.avrgaming.civcraft.main.CivCraft
 softdepends: [TitleAPI]
-version: 1.76.4
+version: 1.76.5
 
 commands:
     town:

From 6bd63bfae99e451000edda5dea1b5ef3c1481659 Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Mon, 21 Mar 2016 07:28:26 -0500
Subject: [PATCH 3/8] Fix Notre Dame reduced anarchy buff.

---
 .../structure/wonders/NotreDame.class         | Bin 3403 -> 3594 bytes
 .../civcraft/structure/wonders/NotreDame.java |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/wonders/NotreDame.class b/civcraft/bin/com/avrgaming/civcraft/structure/wonders/NotreDame.class
index 4d79b101bffa154c63ab4a3ba74786da291c5374..35dc9ee32fd0319ef33857eb09573a8b5fa0eeab 100644
GIT binary patch
delta 1043
zcmY*ZZF3V<6n<`Yv$xsY%!E+-!YH&9+N4t(sXAk6LDRI@U=yGz#VA;|$!*w>WHH&6
ziegc#1yo+Vyep!D6kkxOGnteb9X{)4KkEm72lZ}bL_ghgpYxov=RD`!{cY{3$NaxO
zxc3Wyr?5ofBIpsDwZ?N30db6Y?hagc=~|ZCQFDf%TXbu!qTk~a0i~;9Rf!j@89p#Q
zHMPBD6>5w~P&}!vcPQ&da>k4i&Kt#SIBA#6Vzw_du7h9;Lm&FZAFgM}HgQ&I(;e`6
zh6n~kzmg<_qM`)XZ)bP`&k`^rlX1Q<X36{xGsdt(GXGLKJ#p-$NDyq01+VjrSx1Tt
zyRchqQ=?iEdnm?)pRN_%Diya?pE8cUqN;XzQh0^pWr9skpF(x}m3`PR8r>ZmCSXt;
zAgHgEK5d)%aMa4@dD=EDnR^mxalqZ)!jYwzA_zR9#cW<OY^%g@5T>~0Zcz^rbUJlO
zEm*6L9109Yv=QiLIg%-u#acf(9A<b8C9y_}du+^5Ogl1f*1G2yjyQBG>Gocu<fM3=
z;VAYK)X9N3?Uucmz?%%m@D_nuHji=wB^Zi%!Ev17?OOanqnzNgwvIU7Wthi%Qq&AT
zY?V!W%$VgF85tZ5jeD?wlN2WiLTRfIHbfI`S5Dyr5ut75Bf)9w(`N|$kA}K)GAD)6
zaSnpw<Nvt^t?9`;XE=`w;vU`DvVcnrmr+mPi|!d69ZEz~6NyNCNXJ!tO7V$!KpVE6
z$2Ee6U@Y{X#fcSdp5>)J9oO*%#peX8@>bf&%TB{14-JMdaYO8`+vWKRixjsA+MU7H
z7Ywr)mLkV_xol)*HMcSF)9-cM<?jt_t>C%N&I)=1QE7=C-o%=rf9}#V{I6$N-0}91
z7sa36=DFSqMx40Og<iFamzMFWTxGh5{${!iDdK(PwrI^-1^Fw`7O}}OtqRJuTjRV!
zI+|1mn_b2m1Ph1K!%pBF!PS-fP9+@`yyKipct7x=_A^eWl#VLSCR6GXE+$jV{dg5u
zk`;Vb#Z58K_O*VEZ{%}OaR%SwJ1AI<<G3R+6<v4&-{S{Cd`&$ZSV03c3Zf8&B1h$J
Uz_%jl4>8mbnd(RR4{+h`-zNkGtpET3

delta 885
zcmZXT?^9G&7{@<{d-tB*%V9!71)~yC!5w2~bed7r5?9hqSQ9W?qVNJYT)gfUdj&NM
zDvPwz^k}7}R#v>$W_F;N8eZ3n-Zb^1f1-b&=-idY7ri>)=lguW&pbcoTxj}bjr;RI
zKl}u2W$v!~N0pwlw(3W$q;~B?qC@{_wODa>>Os5Bc}np#+w>hfnb^Z#Nm{T@|K&WU
zciVPM(Zw_RZ#(Vm=UGWc|0>t$qp^DH0Nr{jwmFgIImto6hRe09^-LmOy)P&Zdx7E*
zz54f9>$-lPmmC(<k9(6|>SUM?Qt4t4_#<JySWq0{1^u|QaqR$uk{1Pa4`i9ppYX!s
zgyJP$*1ogWJ}O97T2q#4b{S$=F+z*L&6heyPvi^f{A5J?idPuZzd1dLJjW&Df_CF;
z&nbdPE{!}q;!Q+a(?gM7L43>)`-@YBQZ@a&rkJ24uuJ(fzQAhRl&NNblZwfT|Cm?G
z`lmvdJ)BaU=8V288=SMeDS5-JsNI@o=1ROpysg*Ao14xFYAa&}USTYCaCqDd@A4k+
zOJ=nfUum7^f<7HzKYf-D6(3PAs7W90?d{5@b3@tAo-UV5T$X$+Sn;4vrV#pLzS+)s
zt_W7OWj1yHFS*0zDxXNM8D~%&@d7hWs(TqIKIJpPL;od4byH$*;s#$xJ{N4ff6x`y
zO}2f1HQ`s)rs}qrc`}(Sld9WckWQ%V%3b$klUYV4vr7kRi`cDitH$Y6na;?!Z+5#q
zPtO8<f(|*y&PKUFPO!*Ohtuek@vh^{u_1z^WsX&%)#ohH+F(cAi3MI2%pM=v9~ncz
zjitq?lh!g*(R+{A>)vvH<ei+=I?ua(Ir|<T^yO6S(RnWRmC^HD*Xf$U=3Csx9M){~
zOTNP5VP^Q+a5kHHf;)Vp7i$`}48Rhra3sPKmSjkp^HZ~A<jWit#+3Tj{IV*(`xmI4
B+)n@i

diff --git a/civcraft/src/com/avrgaming/civcraft/structure/wonders/NotreDame.java b/civcraft/src/com/avrgaming/civcraft/structure/wonders/NotreDame.java
index 7fdeb1b2f..c44c171a5 100644
--- a/civcraft/src/com/avrgaming/civcraft/structure/wonders/NotreDame.java
+++ b/civcraft/src/com/avrgaming/civcraft/structure/wonders/NotreDame.java
@@ -60,14 +60,14 @@ public void onDestroy() {
 	
 	@Override
 	protected void removeBuffs() {
-		this.removeBuffFromTown(this.getTown(), "buff_notre_dame_no_anarchy");
+		this.removeBuffFromCiv(this.getCiv(), "buff_notre_dame_no_anarchy");
 		this.removeBuffFromTown(this.getTown(), "buff_notre_dame_coins_from_peace");
 		this.removeBuffFromTown(this.getTown(), "buff_notre_dame_extra_war_penalty");
 	}
 
 	@Override
 	protected void addBuffs() {
-		this.addBuffToTown(this.getTown(), "buff_notre_dame_no_anarchy");
+		this.addBuffToCiv(this.getCiv(), "buff_notre_dame_no_anarchy");
 		this.addBuffToTown(this.getTown(), "buff_notre_dame_coins_from_peace");
 		this.addBuffToTown(this.getTown(), "buff_notre_dame_extra_war_penalty");
 

From 251135b6d30a0f71487a55332699edec5f6dc063 Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Tue, 22 Mar 2016 17:20:03 -0500
Subject: [PATCH 4/8] Allow checking of wonders

---
 .../com/avrgaming/civcraft/object/Town.class  | Bin 85908 -> 85988 bytes
 .../com/avrgaming/civcraft/object/Town.java   |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Town.class b/civcraft/bin/com/avrgaming/civcraft/object/Town.class
index 4b5e33cf2b0b84e8fd638393680fddba65f98e6b..e3af90cb0bff19f02b0e3156cb7990b507b0e506 100644
GIT binary patch
delta 5248
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

delta 5216
zcmZ8kd3;XS)_&HJckgrdJ|QC#GLeWxf*6w+OF}{nF~%5)gd(PxwH36KR?)unRI5@o
z7Of%VHI|~PX4RUDTRP&Rr8V`sOZe`uzwe)St+VFm*~5FzwPM$TV%LUw+3p3|)#xMl
z9lv1rr)H>9qF8)vQ%|wX{UCdqSZj-Q;#2q30g=(`DO!pR1fP+GgX`pu8#Zjn*g8E&
z78c~0ViUnN;hDPGeRx2mD7A%0Y<1ro@OH#@TkOCNg5Ti$v0d^<j~h~$pVxiV;KH1|
zd{gWqM7r<igj9HLQAP`~+ZKD=r*a}_pZi`;%}QU|;(*~z&_l+&Fg|BUK~8P~CmwV+
z$gL-i*y5--<}S#s<8{IoC*8%lmFbjwYi_MZ-`V2y(=2<)nASOC#^n@r7@3!^Xqi{3
z0*Q0BIB$dy6wlOi<cPfd!ZF<0^;1c}z$Zi>mIUMvCB0o4^~CO{KVQ0M4~nHDC7TBg
z_6jVPxwcq@2t^HLp6z;*l9;lRy2FOLXj#bzqwbsK4wyaNqpHM|?4FbuL8|2b``bHN
z>tVnJAkn?!w?;)(*Rfg-!}&KD0uTW(L?A*%MZ}0oh-1Bx2*wEZ$HMDr8m*>JSh9v6
z*hXBgkywn1EJIP=7;cQ<dgs|62;&L-;gTRp(+ScrfXa;dLrUkgp&W8QjYqLq$%@@<
zEG!jE-iMBj-s07K6;h&~n_eH;u6&ZK?4jI|WOEgQgUoFP5%!4UWLeo2Bx6d&Qnz^{
zIwurLgrkCpfS;(25D|%RQ3Hu08m(D&5V7bg;?PsXm*HtpMnl&B@MMYQPsc+D<5|I4
zIfSFWSjn1;v1+kOtai`8QHwrt@4OLKv}T+5jNmUemKs02kANMx+-p<0yZ)l2)N8tj
zn(mH|i`^==B)ejRT%}@Lsq5rFgLXa-Dsz5bD!%xqbMJHK)5QJ%bbR$cM|?o4__|aa
zj@v4Z|1;v7=Mh`Qw~J5^TT0=j;><Q9l#nb}Au~umBMy`-f<&n}>n^?-OczSF-&{dO
z2~1i&R2L0VOEgAfk%%<W1l>ea<ck&<E?Q!WXpPrJD&~qdC>H5hA=+cF$iVla1AY}9
z@la%tmuOGrMK=l*-6=x!pbXKAx`;lMCHhi7(T^61Y$_H5Xt~ItD`F7+DhAW<;zfE`
zO$?<cVwhoy0>fL3Fk;1MBT0-gT8Xj7Ffq;;DaLQQ-Gf5^NuBij|J1q1-ie~GOWwb8
zor<Qw6jKo(rXfnah6FJKt;8&}6SL7r%t4-*ivlqZlf-;16$`LhEW~E<E-v$l`cZs<
z>%6CL^Hz-$D=9&&X2w3DR$>jc6>F)TSWjK~0?HDbX|&iv<5^A>9-1Y#(c5A>gWO3=
zV);thAwH*FVmIv-d+3zdM;FC@!zB(ez{5s>IAT;4M~z5vx}^5qX%uq~mbd^Pagi6{
zdp>!WkR+}kRs4WVag}%OkH{52@!Y?<&)$om#qNjq=7rpZx44BsaU0dd9Yl-Y5i9=S
z{d*Tp#9!`}f4<`T5W(URGw_(b4^dY<aVH$B?9TXWS)dn!r9haJs4gwuAYN!Kz1?2-
z-yt7oRCx+;uf0DvDgaUjqOz=vYBC6MG8oNd2vTGyy2>#0k>MC1Bi#KTq*Aea`GdMa
zkqDGg2$3~VLq;Q3)<i8Ci3YNk`{sj)a!-$t@52sM+nxRJ{iyoTvH_~fM1;#EM9O5u
z$R>!FO_3m*p`mP!HnOEV^wF%q)+jGi;3M0jqD(`COy`j^N_ISIO5HodkeN`jD>v@O
zMY<ze_T+|HNRqv{KyS2{{n1lqW01_jI5`m0WFB6V`B)+cVVxX|^{j7`!?0f#;G`Um
z({f}<#@~fT(HQPJ7JhOZs>tz-X9CYRk!PF4_$MP>zJv_<GBV{<=3*N9%GZ!BXW(V|
zI%djQcvH^CeE9~KpTXtl;VU^GN2D9a<pSK03&|zlC2#3afP9al<RXfb?^AuYH<Jsf
ztz1eOvGQZ;Etk_!xq?Q^RWw1arXsn9X2`Yly8Mh5%JuYt+(4`3#w~+sJNa&bDLqWX
zRs_i%%+OA!o<W^ldzhgwJTndQrpzx{KLAU91z&lP!w&KKA7<8$;01Y<*Z%~%$!{=1
zp2B$fEhfn`4CO3l%kx+$FJQ5}h>zv>_)K0#3CHb{*F4wCkw4Kd&V4UBopggIxW$Wc
zn-}2@TFT#%CjUSud6##|J-o=aLiW8ZA7QHe8*}A<;5G>#nua3<U5OVkOo<@VM7U|8
zI_q(!U3OQ8^KA^&etuUQd^#380g^`e`aqh#@HhQX(ey_(GthBMD)Oz&m4Xmz1|y1P
z9kZ%a-K5d3aJb9}_sPwboDC*rP-NLYcYH0X>uLepZ0YWQypq$;qR|npxj+hp*@j1H
zi`r%y8k*@yG~1yG+fvPr&Mk}f&{=1LqMk2w;pna$-JPR*aCA?O&f@4^9NnFx`yt!x
zkHKa(hMKvUXbwb?nTP3SK4!3Qo;k#mrl}l-3}-YWc#zQuFbkQ8aXkKbt~UY6=0xX3
zn>y1Jcfv;j&QY6UTr(KW%rZ27-jw8;4KMQzr?WQ=4SAdExKY7e06+6x1e*@R%nuN0
zE=EoBL+6Y)*ID|sjv>xF&C62)t?=-P??v4|;gV}%nd_j;^-SjmPT0sGHldGM!UJ!?
zT(cB!o7=I>+=12RPJGHf566CC?!_f@AFi^zX&xYDenk~n2APLEp+0ngqK@)19Ya0y
zII_%>$TPoTLQXRoXYh)7mTMow9P@(5@}oEkxx|BC=5@P*?&iPHpY_4!Rg5sNVVwDs
zr;9(?)bLlH^*YabgJ-?Pv)<-e?;xJ_#^ybAGyg;{mIKWPm})*`q8~8Pj~#aa6%(BL
zfi#0}K+_VaZb{U#OeC<LY-#6cAYF^`L9peE2+I#qmJe!M6_I9DLMN*-y0YHas)7Ml
zRpeP=p7RySq@-#vtm+U}6ql>PrJ|8&)kG632F=-)X2m1ls*N#L9Za_B;uR|aQ`z>0
z)zGO@nKoHT@U@cRZ#8vJSEk&cmQdCUu&op}r6SNuL#UOGa4W;f45IwN&Tv^>P{Hbo
z0IM6jyCcZz;T#U4S-c^;1=G)&eR!PyY|ZAR{)n*#qNSCGwk$haL($(FhLP5AOtD5_
zzBLNP)@ZD>3Q=l}!8U6wPFoZ3qcstKSd;OW^%5RgQ#^C3Fih|1C~v*W@MbWqna<Lx
z)SG5MJ48Mq6h#Z2Mj_Oi7P;4dR?(RsLQP#C@~BIklOa^-{V}V{80T`-uvR#oL)o;N
zO`ou74V%_JHN`mhLuqIF2DWcx4mNSSEzChFDp}hQW^G4fYX?KwiFVd5UWw1qn{9d4
zK1{Oq<5iY#SzqBD>mU|dhp@;x?D;#48dK0QCh0i$IKla+kY#;~vDSB(VV!Y0M9?tb
z^Slo(GTq<9$GXIvUU9yTpmhmXA+2k$te=_cUlD2jhB)gw>RA8gZE_3EtlyDh{eg7r
zF50udn|0r_vKm<wYCY!B|HETHK~)8WD?(#sAW;bnRMI(Gol1N)EM=pCs(@z72P2ig
z^L8Y)p-Oxz1D%_ZRMS-jE>-pE>GmW<Q2?cfp}Y!5OI00hRV2EqC=60HFj_@ptg4A=
zDh9JvEZ$bNuvpc`N>vAIRbA{=_3)*tj}xi^E~v)1tP-8MHE0MmDeL4N&7E3sr<P^+
zNM<yB7?lE3r6NqVMWjkYtV%~6eoj;!(M5Ga7Rwyf#qqC6_ab^gs-7I)8$qfM1MSNn
zBLh%F<#1Xq+N*(1Objgu90Y$g81d>wG*rXTR28sml=Dptec5mv3^g7~O@xn{#8oDv
zrg{mr)GKJDrXW=nAx*uC9_lp=Rx?nbW@3_B>Nyfi`;DR%%*aaksa2?=R&&=+5Tn*0
zL9IoKT8DJ?DKgY&$W)t{trGNArN~wuysWljCd>J1JC>*&Sf)N_wsvEm+JlSg3tUrs
zab4}hW3``z+Cx5SHwCLh6s8VSygEj8)i=~ooubx7>N{$qPSZejhF(@@={0qZ-c;vl
zvARIZ)J0mUF41S|GHp~>XtVkk?N>k0L3NEzsUPVQ=lsICzpLNqzPe6-s~d(^w+vr(
z+o+`O8e!^BBTD^cM5~8J1NF#AR*#J~>hH4u!b|+E1tXn2b8Ay0ucC4=wHK5Y2+|Uv
z+C)ulp@CLttTkF{8{M@x`s(t?))kPi129<!qDWW7936!BbTC%vDp;dKQKG}JRfpq%
zu7)Ez3g77(xTd3VUDv|DbsT9OPk}7MbRCM*btysDrv~kG1IpA5X{c^Qg}O0K(uwqj
zPND^DTf)B8x;cHSThMm>0`1YQXs=GCgSrhJ)otm#Zcjhy47#a1&_mtP^HzPD<yF)J
z<#kW^=`2*yy--8<MvU%*1l<=Yx*yVYe`M%vWa@$Fr3WEb7ht#^jzT>G6ZA+-(xWk5
z7vfDlhJlU49z6jE^(1_&U&2NG3NGuZ_?hi@*#Ah+Af;zgkba#a^(<<vXH%;pJ%=*%
zTQo$^rRjPegPBinX*Vs@3uv)kNNe@Gv_-#1JM|*ktryb~jyuiqSM)Oaw_Z;7^$Pl1
zuQZfiWBBW}Mm4?8h|wF2IK9zG*PD!7U1AK?n~l+Wi!oi78gtn8F8e;xJB$^2rxCqL
z?>4sTJ;pBmg|T1nHBRcUjWha?aZVpKe$>Z|>-xCymp<W1PNJ#h=!~<YDP?+J;9YPL
zKKc>@^<^ih8TF&9&o1USoAIl{&v5Bq_=s0@jyIzO*L8lp@qdq&6WN@i=~mf`#en7<
z{Rg}6mR$%dno}M6%SlL~K<77(68aJQ9+&xQx1idFe)7yYrUhRl<>0ct%6y&{l*k|c
z-nQwv+k!4rj?FG_el8Cmo8Q%Je^jvp5N-#ex?LGH?J8(&S4FZNf_`==2G|i8X;;HL
zb`+M{HORDMsFEE^E$nz|YuBbMyAF-D>(V5<K25P3(5rT1PlHxemqMCA+0D3SbJSwl
z&~Ay&b}MAD%(YXUX{~8Jr9YjxnX3a&)Uj;XH&Pg6<})0}Qy52gcJ(N8`KMAtS1+#F
z+v$)>9bEmO?f#zPRO(3Gb6C$sRXd;C4dQk~kZ2D@GkX|X*#+ook3@kz3bX97c*`CK
z#~zOl><L(BPezIT6876uaL6vg1$#QK+OOiSJ(Ilb*FCM;l0gw~F;#OBZO=m;dp;6a
zPqr7JxxJ8Uzl#)mk&~ZBe<m#9L5pG8A0gOYh6sB(V(b;DYp-VHYmj8G<CIT1Wj)&1
z8<Asga^|Gdg_u&9wg-{+R>axcP>=Pd_AVysbM&xxqmR7@dHg)W-s{Y7N2dZ0aF>JJ
z<q$&c!`$U4;_Va8#P&3TzAgI~dEA~!JIhh$%1CROL9YdV&j>D~vV8?j>>s%PRkXE#
zbk1eaB;ViIbsfI;4FuXZQOUmT4D3L|U3Vevd(ZaluN~-}_y-K?A#?DEr+myjJV6t0
wpt-k1nzxBA-WIaF6>paZ802j`t2<JuRRPM|2e!ALGq@AK<5qOGcA~id0=WV!T>t<8

diff --git a/civcraft/src/com/avrgaming/civcraft/object/Town.java b/civcraft/src/com/avrgaming/civcraft/object/Town.java
index bf624973d..c2e589fd1 100644
--- a/civcraft/src/com/avrgaming/civcraft/object/Town.java
+++ b/civcraft/src/com/avrgaming/civcraft/object/Town.java
@@ -1559,6 +1559,11 @@ public int getStructureTypeCount(String id) {
 				count++;
 			}
 		}
+		for (Wonder wonder : this.wonders.values()) {
+			if (wonder.getConfigId().equalsIgnoreCase(id)) {
+				count++;
+			}
+		}
 		return count;
 	}
 	

From a4474ecaab935fb9e46e98c2a03dd19c72e72528 Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Sun, 27 Mar 2016 14:23:07 -0500
Subject: [PATCH 5/8] Fix Taxation and Enlightenment Techs.

---
 civcraft/data/techs.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/civcraft/data/techs.yml b/civcraft/data/techs.yml
index 7fc96a3a0..bee74abbb 100644
--- a/civcraft/data/techs.yml
+++ b/civcraft/data/techs.yml
@@ -238,7 +238,7 @@ techs:
     - id: 'tech_taxation'
       name: 'Taxation'
       beaker_cost: 5000.0
-      cost: 40000.0
+      cost: 15000.0
       points: 2500
       require_techs: 'tech_sailing'
       era: 2
@@ -532,8 +532,8 @@ techs:
 #Information era
     - id: 'tech_enlightenment'
       name: 'Enlightenment'
-      beaker_cost: 7500000.0
-      cost: 50000000.0
+      beaker_cost: 3500000.0
+      cost: 15000000.0
       points: 375000
       require_techs: 'tech_military_science:tech_refrigeration:tech_plastics'
       era: 7

From 5aa38a2fc8242fc2f3172f04aaa5e843f7f850bf Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Sun, 27 Mar 2016 18:34:17 -0500
Subject: [PATCH 6/8] Strip out HTML from SLS

---
 civcraft/src/com/avrgaming/sls/SLSManager.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/civcraft/src/com/avrgaming/sls/SLSManager.java b/civcraft/src/com/avrgaming/sls/SLSManager.java
index 1920c7c08..ce577eae1 100644
--- a/civcraft/src/com/avrgaming/sls/SLSManager.java
+++ b/civcraft/src/com/avrgaming/sls/SLSManager.java
@@ -41,16 +41,25 @@ public static void init() throws CivException, InvalidConfiguration {
 		if (serverName.contains(";")) {
 			throw new CivException("Cannot have a server name with a ';' in it.");
 		}
+		if (serverName.contains("<") && serverName.contains(">")) {
+			serverName = serverName.replaceAll("[<>]", "");
+		}
 		
 		serverDescription = CivSettings.getStringBase("server_description");
 		if (serverDescription.contains(";")) {
 			throw new CivException("Cannot have a server description with a ';' in it.");
 		}
+		if (serverDescription.contains("<") && serverDescription.contains(">")) {
+			serverDescription = serverDescription.replaceAll("[<>]", "");
+		}
 		
 		serverAddress = CivSettings.getStringBase("server_address");
 		if (serverAddress.contains(";")) {
 			throw new CivException("Cannot have a server address with a ';' in it.");
 		}
+		if (serverAddress.contains("<") && serverAddress.contains(">")) {
+			serverAddress = serverAddress.replaceAll("[<>]", "");
+		}
 		
 		serverURL = CivSettings.getStringBase("server_url");
 		if (serverURL.contains(";")) {

From e15b4ef382fb656a3c9c666ec76f6f1b1cee4fcc Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Sun, 27 Mar 2016 18:34:35 -0500
Subject: [PATCH 7/8] Handle ClassCastException in Market

---
 .../avrgaming/civcraft/structure/Market.class | Bin 10640 -> 10839 bytes
 .../avrgaming/civcraft/structure/Market.java  |  15 +++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Market.class b/civcraft/bin/com/avrgaming/civcraft/structure/Market.class
index 3b067da7d76a08667e70ad36309b87b028bb497c..1559dae3135e596d74af42cce27174d6c61f345a 100644
GIT binary patch
delta 4670
zcma)933yXg7XD9?<|XN+O;;KyrR;6fLIK&zB8#9%DOd_viqz1CQX10QrU))XL_rZ1
zd7uJP7Ll+jEf7+6QS9hA3gd!`&ZwY{3otGtj4YjVUlX>$@1tMy?m6e3ckj99Kg+#~
z#vIGDzH@2!egNI6L4l6YNnK-Xu3Gih+FmP+dIi(fr$wTnoX|u4#CS_avIQ>OClHHD
zLR?DrG{+1_7nj3b(q)XNveaGDH+7r^1@H(|V}^P#vX6q9ctF9d#n!a;cn}W}3?)v_
z-2{C~>To&PYymGGAs8JM6;5}tdNeB8ibn~gE%lgu`?%UQDl^~0GtC!xA~c64SRn9J
zNH9T8_q4z>c$Q%Dls8#Kh)qfTe>*LB4yuC1gtpp_SL;j}+2thyOXSYNoRyX3mEjnU
z=LKHCiv(q=qbkQa)1w(aLBaCv4=SILag)GiY*7o$ZyR?A>|`>{vaD6Tz;0=T!duOo
zRpGQ?6!r?_VxM&Ix$xG}!`&WdiL<h=1#NLa;2>UCQ^NC&ZwS1J!|MF-cGRG54!5;_
z8-G>s4k5}_UgU6<KH%(<9V7(a#oyEu;r)&8<EVloi>)oxfg(!(cYL7ciJm=8_=sSg
z?x-wtdJ0S3Gx+P`;kQ|E44*3agkN0`owV;W^$TGScj0sC_Adw->X)K}x>_g`*wO<0
zQ{YRvFEj6JP?4v!+%4z(THu6~hI`7h%kOtq4slfRj*sCRfo~-?CU)J_A?3wR6aK|G
zPp+OdxwJ$o{2=fneo`BnwaeUW!cG(Z%`U5Qx?I|O!Y=}K*kA$SHvu0ugyVOdQ*f4$
zpgv<x=qm7EL=YmYD~cT+=WzE7r`uCrIZJx`yubx*?NYaAoWoVk1`#f)MG<*A(o0uG
zm?K-VjKT!M$;eTel3Fm_j45OiWG0JxF(O+bK@kcyQ%6Vk?@p0&I;Fg_xYX@%nJ9__
z;gHW^q8N=RGEtmHWOA5Nb3qAYQ#)JJj4i2^LW$}mYfF6+wN@XpcA+-v7HbQ3a*~<a
zQ%8k5s7I|feJ4s$Pg&binre+|ZV9JkN*9ztoz=3aPR%m~bwxT`>2^%#txTcrf^MN6
z>c*&~K4wg!UV?hd_sxck&CMN}GbFz-XVA!@Cdwkj&u~;02E(ALw8UNLm|kA(_9)a(
z&5VvSy-fo+lIT`-Wb}a8WEv!Bunc!&lTS@_o4P7GuGKL1^3`)NhSG{V1Px~^jz%Z+
z9zlq?PGfMjtIR?pX_P`a{Ps$`4V_u!tdP+oX!Q0rF;;4GH%(9|pOwlhOS(+1E-Neb
zbQ#H*R+c(kf(mG&nj72EIEn66s8F39o33}zWOZw72Xiq^QOGH?>S$!5dN#IM^AZgw
z4$#{i9*2b{QK_J5RHn9!>usDa$W7&He%yUVS;MGOJrXxDd=hyCl~6SyS?wB^ppJ?c
zhWiE0R14$dG9M81psWZSm%&snpoay`mNGNTLTOMyj|iGWkE-k92N@p|^f=8^e~iB~
z`7sObMiM`0fuN`G69<W-xY&Z0^t7O7=-KUKo9B?Xm{tgSNg}8el~14UaI?lSsu8qG
zCYFIq>vR*X;Z*7pOb-*i%yM?sEEB!L^-7bQ$j1{%At#WTifN;uO_<DvmN{o}0jPFX
znP8W|Z58yYggLylYK+HG)UM1i*(Fniwh0<b<IGIeabiGNNYD;JJISvOwT<Y-TtHAg
zS$G?R$L5=v-y>+R<dvMEWAkzcWlPz9K?kJFFlJ~rr_t-%8*FA>+!5$u;#N}^z<_!T
zCXDo9mHJJ~))sGu9}}{|d~m4|iEXCbX}1|{Mn9(daBG&b2d?~R_byb}41QGkalaoA
zN6+zNZjhgM9seZrek=@Nku9tqO9{&x7o`V@Nwr)C#-k9Eu}r-;v3pSsa<BonqZSho
z!?q28QCbK)EIh_zF;*ajzv+OvcnK?c2ZL}AYOo3hE|=L@jWzs5F|x20FGImP{z_cd
ze}(netG_4a8J0DoubR`Ujh@Sx`hBZ5v{7BsDm`^8US(y#jMuOYI*qF3rS%#mCpYkW
zE`r)O+tu)-oBhU*UFy9_tqg$x_Na4`Vu$U|GTMv{u-fZzDEciw{u01@wYIPZw6#kQ
zOX-K2^y8qbk84hRuQuI}fB5lLewO0LN%eSAXYY4@e7_vyd?>Uj(Wf+~pAWgroYt7O
zJ`82%jK&y!=$&S_8S7xRh57Nb52=zh1ewIk%&$H~UZwb}y&nG|NRa;s;9@O%M2~2G
z=BiJ$F7*aIM+OZH_8e1<>`FcR@;vOs!G{F=qyZF$B<@7g!$z#<8CoO!5;7HxQoz+i
z*X{y(DL5whFG7evIP3}2P{we?v$6zW86uh3!_mvpq3<0agExH#DSis?yopuX@lRqW
zQH$eWVhmYxe29plXdaXpip{ZyoX9RXxtY~Zvz}q=$&}qZrh;bA<FO}tyr0YCkm?_n
zxOp6H3yao#t!v@a9cD)JHBIyB0$%2toW0wp+ssVJ*}58Ds>)CC_0)p!IwddDExcNC
zkdm_uHiKSbzKhz{Q9D15Gx#x-%II@eG3xbX*R$gdyvHs<I!x+k1R#SWouTylsaq)T
z>Zs>6-!arYT_3|f>YJ};-2igN_^E$zrg|F4Dd?lKS6e0Rq;Ia4{JEV&q@CWIGSqOh
zRvK<>W8T#kX*LcHO1zqT|J=x-H|<Qe@%EeY<TW;WZHAyDQG30SSar4J&uzT(rfp;p
zue0(R|KAkgu*kUcQ?@L@-SipyOd1)?==Gcdz(OSR(Y-yMMJGO++qv|1=EHb5Ea$@e
z64%L<IKa7nf=llitoBk1tl=}yS{jITGz9BuEPONt8)yMG((~9v2e6rrV+)<YtMo0l
z(K*!W%&604V7smlcIYN!r*1a<x_Jobp2Tk53hdEs!Cu`F?9+XY{e1N~pznZ#`V73O
z?}o$rUTDxdL<QFe=)Jw!$`rPm%YjybNTX!M*6|+nbQjWjclOIvH@z_^JAgTqOJiVQ
zb02P^*su__CG?gT4dd<QaRHJw>vlvY8;uvhb{%U(4=;=gNI`)tVSJR9KgbGp9_!Cz
zE&n%iKQdgSgTV@oH1Z{nJ3M2+C5;~E+08tAO$JvC*&ym@e1PuZ+Dt{y=>s%1BS5Y!
z#ileMVh;-PGtzcZh2(qLj9LZ+h-=LZo7SYcoN%v@ZNpEqY>M4a580G7KY7z^Tq@_<
zlmN|FZ|#r}_e7S-W|Fce$EWQ;>vWsRPYYF72b=dDF0k)%-F}ZN_WN8{k8lipfd2Rp
zqwx{O@g^tY6K>w0q6Ej`!RMHTFYqYeN*3TNEXCIxB_}kPCN}LWgc53K5hKDVF<P=a
z$a-Bv&(UJ7YS(Ce!r;|}DlK8x8~J>+lq1Q=raVF~aM&rlU>b+wO6~)pKHnsHg(VWC
zDCjPtvqCKym<t%A@X?RxMOxP6ZJmoJ;|4;xTv(TLOZC&r{H$O@;IC<rI=5rWu+>`I
z%=D4P78XNmHEyvF7bLe%<3{^%T5{_(Zj%pR@`M{=XmdS^bU27(vgiNYF`@mIWvEMw
zK9j-csq|g+nh)!4s2I~`c3Sl5D_Rvd&~kK&Pdar)rQZ!ye(o6Kjh89T%SNO{e;3le
z(z++1Iq&m(_T!J3&&_!$PH}pl=CjioY{f6!pnt;~e91eCv-lY27}7s*k}q;+agoAs
zi7edW<B0fjr6)TXs1JqF0KUBqBZclFffxy(mY|dyLY^~BqRhxMC85>v(y3Yu=y|a=
zLF#OXB0D+;WlPbrDK6Ncm?nzN2vL1FPMc0>68g?CH=<uCEoUlJjHaY)#(#agcW*>*
znY)~_P4BEGdGBlr3_f4zwb1NeN45EH!LW^!aQptfmJw-nw2My}VWWI7jAv#yGlmee
zj~QbVlfRv6xA7!pR@jh82hoZ*k;-Elx}ztLO-CoW9+0Ueh)e)!coLL56gt$%LiXYz
e`8bFXmmgd%-e4^qy-A08ly?Nd7l^k8+WrSrh=s!d

delta 4652
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
Nb^nR)2?uYm{|`rkfN1~#

diff --git a/civcraft/src/com/avrgaming/civcraft/structure/Market.java b/civcraft/src/com/avrgaming/civcraft/structure/Market.java
index 1ecfd2cab..a4a1130ac 100644
--- a/civcraft/src/com/avrgaming/civcraft/structure/Market.java
+++ b/civcraft/src/com/avrgaming/civcraft/structure/Market.java
@@ -81,7 +81,7 @@ public static void globalSignUpdate(int id) {
 					try {
 					market.setSignText(sign, item);
 					} catch (ClassCastException e) {
-						CivLog.error("Can't cast structure sign to sign for market update.");
+						CivLog.error("Can't cast structure sign to sign for market update. "+sign.getCoord().getX()+" "+sign.getCoord().getY()+" "+sign.getCoord().getZ());
 						continue;
 					}
 				}
@@ -134,7 +134,7 @@ public void processSignAction(Player player, StructureSign sign, PlayerInteractE
 		Market.globalSignUpdate(id);
 	}
 	
-	public void setSignText(StructureSign sign, ConfigMarketItem item) {
+	public void setSignText(StructureSign sign, ConfigMarketItem item) throws ClassCastException {
 
 		String itemColor;
 		switch (item.lastaction) {
@@ -153,36 +153,44 @@ public void setSignText(StructureSign sign, ConfigMarketItem item) {
 		Sign s;
 		switch (sign.getAction().toLowerCase()) {
 		case "sellbig":
+			if (sign.getCoord().getBlock().getState() instanceof Sign) {
 			s = (Sign)sign.getCoord().getBlock().getState();
 			s.setLine(0, ChatColor.BOLD+CivSettings.localize.localizedString("market_sign_sellBulk"));
 			s.setLine(1, item.name);
 			s.setLine(2, itemColor+item.getSellCostForAmount(BULK_AMOUNT)+" "+CivSettings.CURRENCY_NAME);
 			s.setLine(3, CivSettings.localize.localizedString("var_market_sign_amount",BULK_AMOUNT));
 			s.update();
+			}
 			break;
 		case "sell":
+			if (sign.getCoord().getBlock().getState() instanceof Sign) {
 			s = (Sign)sign.getCoord().getBlock().getState();
 			s.setLine(0, ChatColor.BOLD+CivSettings.localize.localizedString("market_sign_sell"));
 			s.setLine(1, item.name);
 			s.setLine(2, itemColor+item.getSellCostForAmount(1)+" "+CivSettings.CURRENCY_NAME);
 			s.setLine(3, CivSettings.localize.localizedString("var_market_sign_amount",1));
 			s.update();
+			}
 			break;
 		case "buy":
+			if (sign.getCoord().getBlock().getState() instanceof Sign) {
 			s = (Sign)sign.getCoord().getBlock().getState();
 			s.setLine(0, ChatColor.BOLD+CivSettings.localize.localizedString("market_sign_buy"));
 			s.setLine(1, item.name);
 			s.setLine(2, itemColor+item.getBuyCostForAmount(1)+" "+CivSettings.CURRENCY_NAME);
 			s.setLine(3, CivSettings.localize.localizedString("var_market_sign_amount",1));
 			s.update();
+			}
 			break;
 		case "buybig":
+			if (sign.getCoord().getBlock().getState() instanceof Sign) {
 			s = (Sign)sign.getCoord().getBlock().getState();
 			s.setLine(0, ChatColor.BOLD+CivSettings.localize.localizedString("market_sign_buyBulk"));
 			s.setLine(1, item.name);
 			s.setLine(2, itemColor+item.getBuyCostForAmount(BULK_AMOUNT)+" "+CivSettings.CURRENCY_NAME);
 			s.setLine(3, CivSettings.localize.localizedString("var_market_sign_amount",BULK_AMOUNT));
 			s.update();
+			}
 			break;
 		}
 		} catch (Exception e) {
@@ -190,8 +198,7 @@ public void setSignText(StructureSign sign, ConfigMarketItem item) {
 		}
 	}
 	
-	private void buildSign(String action, Integer id, BlockCoord absCoord, 
-			ConfigMarketItem item, SimpleBlock commandBlock) {
+	private void buildSign(String action, Integer id, BlockCoord absCoord, ConfigMarketItem item, SimpleBlock commandBlock) {
 		Block b = absCoord.getBlock();
 		
 		ItemManager.setTypeIdAndData(b, ItemManager.getId(Material.WALL_SIGN), (byte)commandBlock.getData(), false);

From 5f409e9dd9da998a73cabbfb7d4d4e7d468f428c Mon Sep 17 00:00:00 2001
From: Nathan Stoltenberg <ataranlen@gmail.com>
Date: Sat, 2 Apr 2016 18:29:27 -0500
Subject: [PATCH 8/8] Fix Global Trade's requirements

---
 civcraft/data/techs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civcraft/data/techs.yml b/civcraft/data/techs.yml
index bee74abbb..0814f6bdc 100644
--- a/civcraft/data/techs.yml
+++ b/civcraft/data/techs.yml
@@ -312,7 +312,7 @@ techs:
       beaker_cost: 10000.0
       cost: 40000.0
       points: 2500
-      require_techs: 'tech_commerce:tech_artillery'
+      require_techs: 'tech_commerce:tech_exploration'
       era: 2
 
     - id: 'tech_currency'