From 3e03c3e49b6c4b381e505556300236d9af4f412d Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Sun, 1 Nov 2020 13:27:09 +0300 Subject: [PATCH 1/9] New Texture For Blast Mixer --- .../sprites/blocks/production/blast-mixer.png | Bin 744 -> 776 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/blast-mixer.png b/core/assets-raw/sprites/blocks/production/blast-mixer.png index 9effafb9c8d35e08409d59833189e1139e2b11e4..d46b5f09c8805cbb729b8cca6dc5a5dd04a507a1 100644 GIT binary patch delta 764 zcmaFC+QBwKqMn7Bfq@~yJ?AY00|R4mkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf@1 z2=EDU%`0el-CpskqhiLaB^!1f__w)%0WVnYW?9R?z`$AH5n0T@z;_sg8IR|$NMT@L zO7wJb45{}x-aFN?=!pW4>&qRR_^*n;P&#>!^9R$$&Hl&E{#|c$>Aw)$`9<#CY}@Vm z6*(=Ztc_f|Rr<`KFCG^ZpPa3|z3+TeX0-9L?4#O$pDv0~;80E8_S997>&C{Uvoo7I znJU+%z3pdme72c~`~G|12@jdwY|_|o%(ME%C%H{RVYjf_jQSn-1ZGGqI?x`;zsRgz zqs`ZNd+TJIj;I9+GCblI2UvI?Hg%pps%Nip}+3 zmj!$q+C$k`HJrW|t2=og)2Xvr{UH4kuWVw&p%jC=B{%tsWI9(~Xu7#sIm*m6fnkb_ zz_HUJy+h}NSjM&m!rUxP4z9J!UR~XrZWXV&W0Or#)lvrm4(V6y zKbs$DtL|48^P9rY68_hG>Fj$Gom#lWj)jUon#)w+E>qaK!$X5{Cewv?C(JMG=+a=E z`Hyiy>dtHN90FO6D;|hNg@`g9{QIA!e_O?iCk1B~T+gw2CZOSX!c>~sw7zB5*I)iC zqBrG*=sZt}Wd2!lQ zLhoFohEVsEdoH`Su?bYQv>B^@d2sWy)Ui6Hj_tXhw^^D9WP5ULP^%IXS^a}~!f~}} zZ_nM4UNGl&!o%Z-u9w@Ml3vMOBzJ2;sk`g{rUML*+h|u#atCT84}ay+sx)+vlshy`q*0b ujSd%;?8K&L%xAebaqczhW!0w@B)P(y6DbpUXO@geCw%;X^h6 delta 732 zcmeBRd%-$EqMn0|fq`LFX5l>s2B!6%E{-7;x1Qd%^^V0~a|xM+#bNkIWqc85ia zAKAz-1$4O{x$(F%|DV#*g6VU=)=YR)@n-7s=hNR`|K5M$KR+TiS<7Q%a=UcrYkjN?U$6+=La z>Vb{}K1aGA>`do4(Ady-^J~thc{{f-WEk3iIr- zG0$0sgs2#fCiVv%y7k!~JsK8oOaE0J#v=A0KSokqW%KMs9FLjWGxOdF+&Fq&BAC@d zV9Qjw+Z(=!c(49>fI*B!w=)0qT*nK~oEbAXracMgxb|O&-z$=;vpm6?7e zzn*(u=z)!<_JKFcJU-panmqTs*8Xm<35*>+c3cO!40K!fGDK#7lV#%C5W{`Pv{}k&b9Yk~@3{uvaotN5r{wo5AFgua=nUUyJFoS?v8`{smdj53$PjYOhdJSY z($tR$4LL2RBCZ(j^kI1|xp38!!~LhKCbBYOk8cm3WHCIE)!<@qUBTk8>#QEbmYpvpFMgI3 sTw+}LrC5^V(%c&JrWof>b2;p5Z_HB)>FIT1U|?YIboFyt=akR{028!BZ2$lO From e8cfd63bc415667608df973839b6e7388ef117ff Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Sun, 1 Nov 2020 14:12:52 +0300 Subject: [PATCH 2/9] Texture Fix --- .../sprites/blocks/production/blast-mixer.png | Bin 776 -> 770 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/blast-mixer.png b/core/assets-raw/sprites/blocks/production/blast-mixer.png index d46b5f09c8805cbb729b8cca6dc5a5dd04a507a1..ee96cbcb074dbda484396378ceae74a8f7736a90 100644 GIT binary patch delta 635 zcmeBRYhs%)sXp4%#WBR=c<)rlq9+PGt}l0N;=d~HG4abi&L2#f>GOTezwbZg@!xyX zN1duI1~+Qt6gVxnny&f2FZ;};FCH75Pn@WY-QVAoxi_q2y{z-ECrfTAc&uHt{hF&F z*N((vTf?~2xSs5teYBm;@#$_8?&JB2D{e4H?FnPQG3(YZF41ig^$UKf`4|-LQ@mj4 za#$|Sw&T{EO%h^jW5i}Zal9hLnwh-g0HYd53%8n|xb@RNkBo1rZFrf*^+9uS!{e3T zb1ynx@ThqAS6x8y!0AvaRt=}?pM95b9Mkz-5q9wW5^k$Q47~?CBF+>}cO3Cp9_5dqaycdVG33;3yQkkgxm#@7mfT&wSBc}s z^1a`A9yZ)PdQ;%7_woC#RlQ6TzH#i>ynyYz+;x*{!j5~^ubzH(VMByxP=n~j#S3oE zy}?kblXP|65nG105p2@+Vs`c6i}y^}wcy%9o|0YRUxZoMW~>o$cMWp>bs_Cvmw}n} zBWBJM`%(?mf14GR9eH!Lf9>A7fP#C=DooPNEUlCJtex}?+(kbWF&#Q*S84K+=bz4( zlZV!_8@gXKsuNqDv!BJsimQxwt*yY4m->O72?F|mFCS!JU|{fc^>bP0l+XkK)mtLHOsXo!u#WBR=c<)rlq9+PGt}l0N;=d~XLh0l^&L2!0H~Swu`**$3rT;=~ z=NGwmvu(HMSLC#uvNm$YBP4+6PO{f z=sda9j!iZ} zRZATNIHX^(|7?Dst-4=X%x?-mOZZ>&rL*r%bZX%eI~FSXXf9KMyG&u{4i62+nM@bn zoiM+!qf3Kv=0C;-sXMR5a|mQPu6Q686(Y)b@b78qk*Cz0MoZ`oN+3TD@ka+FMuddujg1wwCeoN(N zVW_?N`-}kJ3%zrV8baMu?z!yR#wJkJ(q^ps<-yI*Qpf6)I=1J2-ezecknPE}L9I$m zWc3f`3CGo@y*+nFdcmCA2@j7Sx?XO3N_u4#cahw!1@5l@n+`Bc-umd;#47=ITV~Ez z+A~}BVR z&0g%+>0@izH#%HYvJ;!0F`wn$#K{Y!GoCgo_|!A%{)(;0-Xf{bz`(%Z>FVdQ&MBb@ E0P&S2JOBUy From 692c4733e80b0565b2ce900144e1604efa63f513 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Sun, 1 Nov 2020 14:11:09 +0100 Subject: [PATCH 3/9] light translations from english to french keys --- core/assets/bundles/bundle_fr.properties | 10 +++++----- core/assets/bundles/bundle_fr_BE.properties | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 5a4641638d..307a8f586b 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -284,15 +284,15 @@ selectschematic = [accent][[{0}][] pour sélectionner et copier pausebuilding = [accent][[{0}][] pour mettre la construction en pause resumebuilding = [scarlet][[{0}][] pour reprendre la construction wave = [accent]Vague {0} -wave.cap = [accent]Wave {0}/{1} +wave.cap = [accent]Vague {0}/{1} wave.waiting = [lightgray]Vague dans {0} wave.waveInProgress = [lightgray]Vague en cours waiting = [lightgray]En attente... waiting.players = En attente de joueurs... wave.enemies = [lightgray]{0} Ennemis restants wave.enemy = [lightgray]{0} Ennemi restant -wave.guardianwarn = Guardian approaching in [accent]{0}[] waves. -wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave. +wave.guardianwarn = Gardien à l'approche dans [accent]{0}[] vagues. +wave.guardianwarn.one = Gardien à l'approche dans [accent]{0}[] vague. loadimage = Charger l'image saveimage = Sauvegarder l'image unknown = Inconnu @@ -331,7 +331,7 @@ editor.generation = Génération: editor.ingame = Éditer dans le jeu editor.publish.workshop = Publier sur le Workshop editor.newmap = Nouvelle carte -editor.center = Center +editor.center = Centrer workshop = Steam Workshop waves.title = Vagues waves.remove = Supprimer @@ -445,7 +445,7 @@ filter.option.amount = Quantité filter.option.block = Bloc filter.option.floor = Sol filter.option.flooronto = Sol en question -filter.option.target = Target +filter.option.target = Cible filter.option.wall = Mur filter.option.ore = Minerai filter.option.floor2 = Sol secondaire diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index 0ec65d8cc1..411f45a8e6 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -1066,7 +1066,7 @@ block.message.name = Message block.illuminator.name = Illuminator block.illuminator.description = A small, compact, configurable light source. Requires power to function. block.overflow-gate.name = Barrière de Débordement -block.underflow-gate.name = Underflow Gate +block.underflow-gate.name = Barrière de Refoulement block.silicon-smelter.name = Fonderie de silicium block.phase-weaver.name = Tisseur à phase block.pulverizer.name = Pulvérisateur @@ -1274,7 +1274,7 @@ block.inverted-sorter.description = Processes items like a standard sorter, but block.router.description = Accepte les éléments d'une direction et les envoie dans 3 autres directions de manière égale. Utile pour séparer les matériaux d'une source en plusieurs cibles. block.distributor.description = Un routeur avancé qui divise les articles en 7 autres directions de manière égale. [scarlet]Seule et unique ![] block.overflow-gate.description = C'est la combinaison entre un routeur et un diviseur qui peut seulement distribuer à gauche et à droite si le chemin de devant est bloqué. -block.underflow-gate.description = The opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. +block.underflow-gate.description = Le contraire d'une barrière de débordement.\nEnvoie les ressources vers l'avant si les chemins de gauche et de droite sont bloqués. block.mass-driver.description = Bloc de transport d'articles ultime.\nRecueille plusieurs objets et les envoie ensuite à un autre pilote de masse sur une longue distance. block.mechanical-pump.description = Une pompe bon marché avec un débit lent, mais aucune consommation d'énergie. block.rotary-pump.description = Une pompe avancée qui double la vitesse en utilisant l’énergie. From cda6a6973dc33d8ed3e0410e6112688bad31aeb9 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sun, 1 Nov 2020 19:35:22 +0000 Subject: [PATCH 4/9] make logic stuff public, cleanup --- core/src/mindustry/logic/LAccess.java | 4 +-- core/src/mindustry/logic/LAssembler.java | 6 ++-- core/src/mindustry/logic/LCanvas.java | 43 +++++++++++------------ core/src/mindustry/logic/LogicDialog.java | 10 +++--- core/src/mindustry/logic/LogicOp.java | 4 +-- 5 files changed, 31 insertions(+), 36 deletions(-) diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index 669e447a57..d8175053fa 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -39,9 +39,7 @@ public enum LAccess{ enabled("to"), //"to" is standard for single parameter access shoot("x", "y", "shoot"), shootp(true, "unit", "shoot"), - configure(true, 30, "to") - - ; + configure(true, 30, "to"); public final String[] params; public final boolean isObj; diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index 57c2004320..23293d6b14 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -17,9 +17,9 @@ public class LAssembler{ private int lastVar; /** Maps names to variable IDs. */ - ObjectMap vars = new ObjectMap<>(); + public ObjectMap vars = new ObjectMap<>(); /** All instructions to be executed. */ - LInstruction[] instructions; + public LInstruction[] instructions; public LAssembler(){ //instruction counter @@ -105,7 +105,7 @@ public class LAssembler{ if(index++ > max) break; line = line.replace("\t", "").trim(); - + try{ String[] arr; diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index e16aab6621..acc1732a00 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -21,10 +21,10 @@ public class LCanvas extends Table{ //ew static variables static LCanvas canvas; - DragLayout statements; - StatementElem dragging; - ScrollPane pane; - Group jumps; + public DragLayout statements; + public StatementElem dragging; + public ScrollPane pane; + public Group jumps; float targetWidth; public LCanvas(){ @@ -69,18 +69,18 @@ public class LCanvas extends Table{ } } - void add(LStatement statement){ + public void add(LStatement statement){ statements.addChild(new StatementElem(statement)); } - String save(){ + public String save(){ Seq st = statements.getChildren().as().map(s -> s.st); st.each(LStatement::saveUI); return LAssembler.write(st); } - void load(String asm){ + public void load(String asm){ jumps.clear(); Seq statements = LAssembler.read(asm); @@ -239,7 +239,7 @@ public class LCanvas extends Table{ } public class StatementElem extends Table{ - LStatement st; + public LStatement st; public StatementElem(LStatement st){ this.st = st; @@ -319,7 +319,7 @@ public class LCanvas extends Table{ marginBottom(7); } - void copy(){ + public void copy(){ LStatement copy = st.copy(); if(copy != null){ StatementElem s = new StatementElem(copy); @@ -345,15 +345,15 @@ public class LCanvas extends Table{ } public static class JumpButton extends ImageButton{ - Color hoverColor = Pal.place; - Color defaultColor = Color.white; - Prov to; - boolean selecting; - float mx, my; - ClickListener listener; - StatementElem hovered; + public Color hoverColor = Pal.place; + public Color defaultColor = Color.white; + public Prov to; + public boolean selecting; + public float mx, my; + public ClickListener listener; + public StatementElem hovered; - JumpCurve curve; + public JumpCurve curve; public JumpButton(Prov getter, Cons setter){ super(Tex.logicNode, Styles.colori); @@ -421,7 +421,7 @@ public class LCanvas extends Table{ } } - StatementElem hovered(){ + public StatementElem hovered(){ Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true); if(e != null){ while(e != null && !(e instanceof StatementElem)){ @@ -434,7 +434,7 @@ public class LCanvas extends Table{ } public static class JumpCurve extends Element{ - JumpButton button; + public JumpButton button; public JumpCurve(JumpButton button){ this.button = button; @@ -483,7 +483,7 @@ public class LCanvas extends Table{ } } - void drawCurve(float x, float y, float x2, float y2){ + public void drawCurve(float x, float y, float x2, float y2){ Lines.stroke(4f, button.color); Draw.alpha(parentAlpha); @@ -494,8 +494,7 @@ public class LCanvas extends Table{ x + dist, y, x2 + dist, y2, x2, y2, - Math.max(20, (int)(Mathf.dst(x, y, x2, y2) / 6)) - ); + Math.max(20, (int)(Mathf.dst(x, y, x2, y2) / 6))); } } } diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index ccc9690fc5..8a0dd896a9 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -11,7 +11,7 @@ import mindustry.ui.dialogs.*; import static mindustry.Vars.*; public class LogicDialog extends BaseDialog{ - LCanvas canvas; + public LCanvas canvas; Cons consumer = s -> {}; public LogicDialog(){ @@ -25,7 +25,7 @@ public class LogicDialog extends BaseDialog{ addCloseListener(); buttons.defaults().size(160f, 64f); - buttons.button("@back", Icon.left, this::hide); + buttons.button("@back", Icon.left, this::hide).name("back"); buttons.button("@edit", Icon.edit, () -> { BaseDialog dialog = new BaseDialog("@editor.export"); @@ -53,7 +53,7 @@ public class LogicDialog extends BaseDialog{ dialog.addCloseButton(); dialog.show(); - }); + }).name("edit"); buttons.button("@add", Icon.add, () -> { BaseDialog dialog = new BaseDialog("@add"); @@ -79,11 +79,11 @@ public class LogicDialog extends BaseDialog{ dialog.show(); }).disabled(t -> canvas.statements.getChildren().size >= LExecutor.maxInstructions); - add(canvas).grow(); + add(canvas).grow().name("canvas"); row(); - add(buttons).growX(); + add(buttons).growX().name("canvas"); hidden(() -> consumer.get(canvas.save())); diff --git a/core/src/mindustry/logic/LogicOp.java b/core/src/mindustry/logic/LogicOp.java index 40d02a8345..3d7d60a8d9 100644 --- a/core/src/mindustry/logic/LogicOp.java +++ b/core/src/mindustry/logic/LogicOp.java @@ -38,9 +38,7 @@ public enum LogicOp{ floor("floor", Math::floor), ceil("ceil", Math::ceil), sqrt("sqrt", Math::sqrt), - rand("rand", d -> Mathf.rand.nextDouble() * d), - - ; + rand("rand", d -> Mathf.rand.nextDouble() * d); public static final LogicOp[] all = values(); From 1f9ed90cc0ac2dc0a676fa610c96fbc1a4e89e34 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sun, 1 Nov 2020 19:35:46 +0000 Subject: [PATCH 5/9] remove unused DataType.java --- core/src/mindustry/logic/DataType.java | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 core/src/mindustry/logic/DataType.java diff --git a/core/src/mindustry/logic/DataType.java b/core/src/mindustry/logic/DataType.java deleted file mode 100644 index d216313ce0..0000000000 --- a/core/src/mindustry/logic/DataType.java +++ /dev/null @@ -1,24 +0,0 @@ -package mindustry.logic; - -import arc.graphics.*; -import mindustry.graphics.*; - -/** The types of data a node field can be. */ -public enum DataType{ - /** A double. Used for integer calculations as well. */ - number(Pal.place), - /** Any type of content, e.g. item. */ - content(Color.cyan), - /** A building of a tile. */ - building(Pal.items), - /** A unit on the map. */ - unit(Pal.health), - /** Java string */ - string(Color.royal); - - public final Color color; - - DataType(Color color){ - this.color = color; - } -} From 47844e020420b41e7527561980c6d23711b9b3fb Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sun, 1 Nov 2020 23:01:18 +0000 Subject: [PATCH 6/9] properly log logic build errors --- core/src/mindustry/world/blocks/logic/LogicBlock.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 4b8367d75e..982ac675e9 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -324,6 +324,8 @@ public class LogicBlock extends Block{ executor.load(asm); }catch(Exception e){ + Log.err("Failed to compile logic program @", code); + Log.err(e); e.printStackTrace(); //handle malformed code and replace it with nothing From fc94d68e100d8f85ed6ffcf6b178dc36e27fae71 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sun, 1 Nov 2020 23:16:41 +0000 Subject: [PATCH 7/9] remove redundant stack trace --- core/src/mindustry/world/blocks/logic/LogicBlock.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 982ac675e9..df469b8f7c 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -326,7 +326,6 @@ public class LogicBlock extends Block{ }catch(Exception e){ Log.err("Failed to compile logic program @", code); Log.err(e); - e.printStackTrace(); //handle malformed code and replace it with nothing executor.load("", LExecutor.maxInstructions); From 6e2f097803cb35da3743db9f87cfdb93f0c3406c Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Mon, 2 Nov 2020 22:16:46 +0300 Subject: [PATCH 8/9] Texture Fix --- .../sprites/blocks/production/blast-mixer.png | Bin 770 -> 725 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/blast-mixer.png b/core/assets-raw/sprites/blocks/production/blast-mixer.png index ee96cbcb074dbda484396378ceae74a8f7736a90..b9d5387892118d117e5471af3149983866c28443 100644 GIT binary patch delta 590 zcmZo-yUIFYQoWw1i(`n#@!qM9MTZr5Ts>#JIsAl4)_+qu`)?-Go7;VN{14T7sjPDO z+>)q<4ff~R>Yr?wBDXc{`c{sQQx7PovbQ^vm&M||qkr4a+}KpY5TKUK`k|-CkF}#dlu>H2g7yLKCcd;& z!mb6Ae`#4XaXPV!NS}=p5DmyV5^1rdgs(Q}wr3B^0gf*l8GRaFFT6Ibr-`*CcL`6epP}fqvDTWE*$e|$rNtsHXt3yZe3|zj<@^4u`5S)6vWBuw|Hfgb%q^f3 z@lhx2!eL2;bQi&PmD6I}0a^?;fy};{^-~Rqlp)tHA;fv%O@+4*XQ;*j67{E>w2>d{eZ@ xyEEx3J3KyZwov)2`e8}n1FIvSoCF^6Kg>(MmOEwX0R{#J22WQ%mvv4FO#pbP4DA2_ delta 635 zcmcc0+Qc?tQhl_ii(`n#@!qM9MNbrXTwm_k#D7)XW8#;4oIjW{)93q`f8T$~KFV{^D!vgr+C58 z<*;0uZO5%Sn+;&?@fH8Xj~0Y){B7H%~^aqFjl9vRx1UvhQ}+v z=U#NY;8F4JueyNZfzzQIHvQvBJAM#CEQkr7zW5}u7c2B=~a<|yDExEgVuM)?N z<$J&LJZ!jo^rpaD@8kDft9qFxeB;=$c>&vbx$7p^gdO*+Up@Wo!iEUXpa#*4ix=FS zdxN1=C+X_CBeo20BiN+t#q8?C7w?&{Yr(aJJSDrrzX-Fi%~&Ji?i%F$>q6SUE(0^` zN6efj_N5xA|28WsJM!jg|JuEE0R{J#RhXokSz0IcSv%<)xQl)$VmfrruF~Ws&p(|n zCl9SgTe~DWM4fk?|=k From cda8a9b3e9a5bba110b6f2b754aa791ce266dc27 Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Mon, 2 Nov 2020 23:02:56 +0300 Subject: [PATCH 9/9] Texture Fix --- .../sprites/blocks/production/blast-mixer.png | Bin 725 -> 743 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/blast-mixer.png b/core/assets-raw/sprites/blocks/production/blast-mixer.png index b9d5387892118d117e5471af3149983866c28443..52e7a3020e9b886bbbd5527eb9efd1686683d5cc 100644 GIT binary patch delta 608 zcmcc0`kZybqiIH8XaO>;e`8^gwTC4>v+Za<^E}g1pi7I1`n8|vQVQ<5l zjYTp$1I$;fb>iCDAf-^9{g(A0!_8=+i<-y6vzlM|WpOh&X2@zCV7=wP)%|zX!DTJp z=gi%oSdYSJpLc*NaSm|EPhaw$&qKZ!VmW6><4or?_GJy zoj}aS#^C)E8X}Sz373Q+~+oHB@WAp!AD%1Se2TpbiQg$`l7|v^t0k zdzVGM&+)rF!GasY@@J%3y3R?|-9BgbHBRsRsO`10n-#2Xf9Hs0Wj}nh@QC%a`oxzP z<89qDCNF(oxm2_9it;W+W{-Qk#Y`u^3an(~mrUDiz3}VAWh_C0@n74XD|T+3v*Pf>EpAimXH zwNC~N>(v!r{bRlDxpntHohK_htxw7>T<7vf$M0etr%{Gj$<%3YI~xw^ALEWx4s`i{ Rfq{X6!PC{xWt~$(697Nl6rKP8 delta 590 zcmaFPdX;s;qsY)VmG-;;2_ zIW5Q1SzvRD$vRyFWp8&TFN?)_NB_2;xv{B)AwVse^+QjOA8SW_D5KP31?>aeO?+vm zgk1|J|I)H(;&fsckv