From cb6ffd7810133182d6fe15f7f37f89d3587f38f5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 18 Jun 2019 18:30:43 -0400 Subject: [PATCH] Testing travis wiki building --- .travis.yml | 26 ++++++++++++------ core/assets/maps/craters.msav | Bin 2493 -> 3546 bytes .../io/anuke/mindustry/content/Blocks.java | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cf6a09aac..997046ee8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,18 @@ jdk: - - openjdk8 +- openjdk8 script: - - "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc" - - "./gradlew test" - - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}" - - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}" - +- git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc +- "./gradlew test" +- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}" +- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}" +- git clone --depth=1 --branch=master https://github.com/mindustrygame/wiki ../wiki +- git clone --depth=1 --branch=master https://github.com/Anuken/Mindustry-Wiki-Generator ../Mindustry-Wiki-Generator +- cd ../Mindustry-Wiki-Generator +- "./gradlew run" +- cd ../wiki +- git add . +- git commit -m "Update to match commit ${TRAVIS_COMMIT}" +- git push https://Anuken:${GH_PUSH_TOKEN}@github.com/mindustrygame/wiki deploy: provider: releases skip_cleanup: true @@ -13,8 +20,11 @@ deploy: api_key: secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg= file: - - "desktop/build/libs/desktop-release.jar" - - "server/build/libs/server-release.jar" + - desktop/build/libs/desktop-release.jar + - server/build/libs/server-release.jar on: repo: Anuken/Mindustry tags: true +env: + global: + secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8= diff --git a/core/assets/maps/craters.msav b/core/assets/maps/craters.msav index 01738f45b218ac6f043341178b1f86b24d892d57..08435d2896822d16c9183e57a43d28cfb3c1b489 100644 GIT binary patch literal 3546 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 literal 2493 zcmV;u2}1UGob6a!j~llYKD(>c>avp7S=(vTAibbXZ#%IxqxEHrv~gSbEiX0D0xgOK zHA6|XshKI~B5w@$rTu|T(|ei*K@bGVLtgS&8|fiALvpriTtBrB3kaO=oFTtM9`c;S z(d&0_{}ceW0Cujx5IQL*XE|F@*cwA;O-ibSo$)JU*v(LkU@$p8zA+u&x;ecuKE461 zm|%y!P>`I84BDi~mx(~iT{$}2dhr(z^RtwmV23rQ;wTFVXYu01e{|G*F{29>pBx`$ zDG5~v+x3X7k|NISn20PEW=QZf&dIUqG5LHdfBZBq|MR#6Eon^Ryq?%CvzY1F8Aj)G z8s;ZAAN>-2nv*<(?T3$GZ$(n=%ObuXC+iq?X9eRCYn`y>|yJ(BQlW%zhH9?My*V8*ELWAJHrnEX`RG<2i=W zsts@e?J!AGDxk$FiJ-fpIazR$Wzbm&k}g?Jp_P$1f>xLi4xOCkBxc15_GCavu#2=L zg}sb%79w{KgDtB%?WaqUQEyIWf`!n}3bCLb;XFBmZk8s3dTA2Da3)81VX{hby%C1% z8O9x&-rBkXJA?`3BqBfcrucJk;9%du6X@1>Y@ws|EetF))PZ9raLfdbnZPjLLhG2>e^{;8w&EetF))Dy?d#4$5*%uF0J6KiI2>S%on0}H1W z97`((1{V4jPH<;6w8%FoFsLS)Sk8&%oLJ6@<&?9ok=6MI1qRiWzGe3UpDj-mIRtpc_$|u4M_8byGeDIbm^5BTtK0BO>n0 z^x`%3J*CrlX!>Y*CnrKym?U-zbSqq!<>gbc#bXBDcE5lMZ%DJN^FOm&F2|bCZx)6f--w)+*0fv*-axHq~COF9m1%H zjTWsN$a9y`OBqh5rP_A36vZrq(ORZqFBg=0k<8LPtAK$X7V;ufZqAm3QzVlQO*~N8 znczLu$PjUay)~sXx{!4w*2PRBU7R|)1CHL8$P}@@lBz;B ztSg?E3ab24@SIh`s48z>wxV2mx^=^1J-nS~iu=Ux$q>Yg^jdsDQa_SI0Y!N_eqZPJ@O;GVN}(?jOsr>GK*v(Cs$cD)xu{?{4DhgN z>sqYNM{T}TbIhe4_GTnUduK4HK-K9o z2H*@27h3Zcv_AHi>ZQ19how9H9<^`Unb2 z)SeI73UBDSkq;cV%iP6bl*Y7JVaSJ-qL0}CS6>M_H&k6!0rcpDTxhmlC^J;4XPPkH zc%`x*R>er>1;lfCwJHYRNH`O5oyCEw3dYN>cgYWNgT?eO+<)2*F>yTl_I=MpfxWt?1CR9DVMeU zEaa-FXDJ4Zz#x&iFOuJkgGi8Kf!`5wZD%mdQYKh#YvIF#Inq{oM$}EElQ_FzCoy!DlH2VS*G{fVN;6(-}j8`g8ZnkpWFv67(EAQu| zaNZ^>x^Uhe+(Xylw;XOCOSJ}LI>N(gH6#2=lli7rY(ocngrg%A52h_+5tD9Z4GX2Q zgf|j7ML8b!U4u9|#~Ab-LoI047r9o($pUup(BZ+U>scE{u&cHT4};nwtk!yKpshWu zu58k?u&X=@o!XPIM@5mUD8mp*GLHyB&Y*{(7h$}}7j3<*cwLj*37vWy@#~f0irN@u zSVg+fhu%WS_z~U;IDG&x_-IT1 zA+-Xy3crzG;J=lPLa6(OL|utqlW0exo9vkZRzzkY<$nGV`Ox%X#zxFmb#WihsFnA zYT8h`J+lrlEGHXgdSKpu-`MzSbL_U$ufg~HhJO7Gc5iO5`<$`%s?oi?!NzEV?(zn^ zoBG`_=&arvpd zaFn0Ot5^B4Eac^f0AGOe16i5M_W@pn@;zCu%Xj59xcrA|-;rgu{JU!32KYLZe{2+c*D>=PkzyTKsn1>N)6H z{Y8FMH0J!av!ZvLmAA82V-T>i+ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 6db5e41e98..c4baff95cd 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1601,7 +1601,7 @@ public class Blocks implements ContentList{ }}; spiritFactory = new UnitFactory("spirit-factory"){{ - requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 80)); + requirements(Category.units, ItemStack.with(Items.metaglass, 70, Items.lead, 110, Items.silicon, 90)); type = UnitTypes.spirit; produceTime = 5700; size = 2;