From 2bfe0c30ec3e552d1e2bdbf3c694c9a04773e66a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 Jun 2020 12:17:29 -0400
Subject: [PATCH] Cleanup

---
 .../sprites/blocks/units/resupply-point.png      | Bin 0 -> 1161 bytes
 core/src/mindustry/game/Rules.java               |   2 +-
 .../mindustry/ui/dialogs/CustomRulesDialog.java  |   6 ++----
 gradle.properties                                |   2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/units/resupply-point.png

diff --git a/core/assets-raw/sprites/blocks/units/resupply-point.png b/core/assets-raw/sprites/blocks/units/resupply-point.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6d9d52572356c942d652f248b4601d901f18197
GIT binary patch
literal 1161
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z~b!b
z;uumf=WVoY)@(-sSxv9Rq#jv;hy{ljmkVk#?QFQa!!vQR^9~ccrapm7N833HXS?lm
z*rmX+B0zD2gFt(Nlhtwq<*?N=Z_d0Md9rDbSH}Nmd;iY9nZKQptLERQuk*aE-|`&U
zblv>;EVYO!SL(}(u6SIXe@0=V`xT*si|<Y0NLtipb10hS{4W*38!X(FEz>WWx{0VW
z{ao%+XEm>bckk;u@yqtUaiO~V>o25U))1WaQC@ud-|D`Uu06*bIukT28E(3*N){K{
zx#P`w<1bb1+*w&C+BZ!4s37lTE%eOZ=@W;Dqj#N!%*>uMuItNJoLVlpkkMiCcC&3-
zpE&ddrDl7`Jybk&NhxD(P3#lhT<_o+A_>ALqH`a(WE`!pn9yH7VM_90#gd9;k2!BY
zE3gQ<X)EhLZ5gvQYmwk&_7k7)JTm&t9y>ARU4{wwhWZPsy$eq$>nIgeW_KhADX54`
zD^GOKaPfHhQEXx5KJ(zzB_|ddN`2z!Tu?TpqO;(Zq>WC~^J?QAyK=jErzylW+V{m9
zS&D!5e47;Y?obE!=Nhg8Wk(~X@MjMTj^r6%lQ<M)R<6>r`_dsPf$jy0@@8VvF-~#O
z?V&9d-f>YZ!GV%et}CUx9yr?N_&a&AupI5Z!>S^v($3N#$0?^F+W7cLUUN+26|U7^
zRf-n~Ha1;ZxNcs8?<bD;7q9NxmAl!xfmLpyW<#IC)635v{Cf5yk;TK#fyYZn|I;lS
zhAjcp7I4p9_fteeRFT!Y|LK=JzRHFS-W94&e2U&PV?Hq)QOdBaz1k6A6mFWT`$RME
ziQWTUC*3KN*afyZzP9|6+;-&XUzd!_AL1KIr8nfwNN)6Pu@u`dVfzohdmCi7tXk}t
z|H;(9h2fN|fPafhM3tR8i??Jq$D7Uo-A^3c3uO)#xn?j;nf(2SN9IXphutSFmA34O
zi9G#%XHdl)RtB4n2d~)IJj&iEUfE(P=JB=2SFp%`@|ledAr8eXvCb`5GK*hriIU~b
zT67?^yP>pDX~_xYNzWNSa_MXC(-M4Sl_VJSBw6~Vuwq_*{Bn*<?dM-sB&qdtxMnae
zk(GWaVfA(DG_S|o;?D0-x@vgc{CL4F$pe$Gz25%UVBy_5Kd~LZze;Z_FF&#6?OoX$
zRkxaMzDd7iaPob{=CADg{?<-g!~9;k;H}paXFmIPaX0=nTza{na92>}qtg;sd_}pZ
z<#jHdU@fa7r(T}eyt^~#kxXi3)3u2c9_JlT)wy1vqp<!|Ro$y7Rxc)vB9;ob@~weR
zat<??W-B;pRx%ua{b}_)KDj67{raSQ85;QC|9<m$<#7uk9e#@)d${@41mu(%H@;Ih
zPCS0pn&W2*+e1YsJxP7R6@lGKNA!<R6FYe6Wq{M7FP^duG7f>~pG9oC<ndraQN@;n
zec`r>JNiWDpNn$&V0LS>U1o^7ynnXKii^o{U%j3%iZC&pP`aY@KCr&ahT(ucW7oQW
Us-3<Z3=9kmp00i_>zopr0Q;c+(f|Me

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 0c47e1dea0..4848cf6013 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -73,7 +73,7 @@ public class Rules{
     /** Spawn layout. */
     public Seq<SpawnGroup> spawns = new Seq<>();
     /** Starting items put in cores */
-    public Seq<ItemStack> loadout = Seq.with(ItemStack.with(Items.copper, 100));
+    public Seq<ItemStack> loadout = ItemStack.list(Items.copper, 100);
     /** Weather events that occur here. */
     public Seq<WeatherEntry> weather = new Seq<>(1);
     /** Blocks that cannot be placed. */
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 2dfba3a9aa..0cb44eca5c 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -144,10 +144,8 @@ public class CustomRulesDialog extends BaseDialog{
 
         main.button("$configure",
             () -> loadoutDialog.show(Blocks.coreShard.itemCapacity, rules.loadout,
-                () -> {
-                    rules.loadout.clear();
-                    rules.loadout.add(new ItemStack(Items.copper, 100));
-                }, () -> {}, () -> {}
+                () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
+                () -> {}, () -> {}
         )).left().width(300f);
         main.row();
 
diff --git a/gradle.properties b/gradle.properties
index 0e60468f69..a4bf351bc2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=f76b0c94953c07ef2ac40858b3b615a34911bdf7
+archash=bae3e678b96297aed5ca6dbaabcc652da62fa904