Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,973 Commits 4 Branches 180 Tags
d1eb7743ad151adf296f07a43fb4851f34d104ea
Commit Graph

10973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
f16990edcb Reconstructors: Accept unit dropped payload when disabled 2021-01-24 20:20:03 -05:00
FrederickDoering
13896589c2 Made disabling payload conveyors output from routers more reliable. (#4433) 
Prevented reconstructors from being roughted to when disabled.

Co-authored-by: frederick_efd <frederick.doering@nordson.com>
 2021-01-24 20:18:09 -05:00
Anuken
8b5cf5309a Reactive effect flag 2021-01-24 15:22:41 -05:00
Anuken
baedba0d5b Mutual status effect transitions 2021-01-24 14:20:48 -05:00
Anuken
9f926ef71e Merge remote-tracking branch 'origin/master' 2021-01-24 13:08:05 -05:00
Anuken
18a3f8bb68 Fixed #4431 2021-01-24 13:08:01 -05:00
genNAowl
623b7ada11 Let Logic Sense Range (#4425) 
Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
 2021-01-24 09:23:12 -05:00
_owler_#0954
6b6d52e2fd Add new minigame (#4427) 
PvP version of tower defence
 2021-01-24 09:22:44 -05:00
MEEP of Faith
fc91b6b135 Colored construct (#4417) 2021-01-23 15:29:36 -05:00
Anuken
f9c33453f2 Merge remote-tracking branch 'origin/master' 2021-01-23 10:33:10 -05:00
Anuken
ad4650f408 Fixed #4420 / Fixed #4418 / Fixed #4416 2021-01-23 10:33:06 -05:00
Joshua Fan
8ca08a0f14 Make schematics build insulated blocks first, power nodes last (#4414) 
* Make schematics build insulated blocks first, power nodes last

* Add schematicPriority property to sort by

* Assign schematicPriority of 10 to power diode
 2021-01-23 10:28:26 -05:00
Anuken
792fdef95d Minor parse fix 2021-01-21 21:25:04 -05:00
Anuken
457514a2c8 Fixed #4407 2021-01-21 21:21:02 -05:00
Anuken
027d080c55 Fixed #4403 2021-01-21 16:10:16 -05:00
Anuken
bf8f059c25 Merge remote-tracking branch 'origin/master' 2021-01-21 14:45:51 -05:00
Anuken
a73165353f Fixed #4402 2021-01-21 14:45:43 -05:00
Nikopol
613b5a7703 Update servers_v6.json (#4401) 2021-01-21 10:54:24 -05:00
genNAowl
988791f18d Let Logic set (and read) Illuminator Color (#4374) 
* illluminator color logic control

* remove sense

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
 2021-01-21 09:30:36 -05:00
Patrick 'Quezler' Mounier
1fb608220f Make impact reactor warmup sensable as heat (#4399) 
* Make impact reactor warmup sensable as heat

* Update ImpactReactor.java
 2021-01-21 09:30:25 -05:00
키에르
56b87a2141 Add kr server (#4378) 
* Add kr server

* Update servers_v6.json

Co-authored-by: Blockzilla101 <48705529+Blockzilla101@users.noreply.github.com>

Co-authored-by: Blockzilla101 <48705529+Blockzilla101@users.noreply.github.com>
 2021-01-21 09:13:07 -05:00
Anuken
3aee9bddd4 Cleanup v123.1 2021-01-21 08:54:14 -05:00
Sunny Kim
65f97edbc5 Add search option for mod browser (#4391) 
* add search option

* mods.browser.sortdate

* mods.browser

* Update bundle_ko.properties

* oopsie

* clearPartiali

* half of my brain cells failed to boot
 2021-01-21 08:51:43 -05:00
Anuken
d393230add . 2021-01-21 08:50:25 -05:00
Anuken
75d2b0fb69 Fixed #4393 / Fixed #4398 2021-01-21 08:48:36 -05:00
Anuken
0cc9b0b0a3 Mod version parse fix 2021-01-20 16:44:04 -05:00
Anuken
9b6c125233 UI.formatAmount for negative numbers 2021-01-20 16:38:46 -05:00
Anuken
1f2b331bf6 Possible Android mod extension fix 2021-01-20 14:48:54 -05:00
Anuken
ec73426bbc Smaller 1x1 block status indicators v123 2021-01-20 13:52:14 -05:00
Anuken
770d8506c5 MoveLightning ability bullet support 2021-01-20 12:31:35 -05:00
Anuken
10cd15a088 Merge remote-tracking branch 'origin/master' 2021-01-20 10:51:06 -05:00
Anuken
481e19b1ec Balancing to counteract double-splash-damage bug 2021-01-20 10:51:01 -05:00
彭瑞暄
e326e3a273 Updated zh-TW Steam & Android (#4382) 
* removed "never", minor updates

* steam description

* translation moderation

* removed weird syntax

* Update full_description.txt

* Update full_description.txt
 2021-01-20 09:22:49 -05:00
rMuchan
d747b1d96a update zh-cn translation (#4244) 
* update zh-cn translation

* update zh-cn translation

* add missing item
 2021-01-20 09:18:13 -05:00
Anuken
f64cb3ad9a Fixed #4385 2021-01-20 09:11:32 -05:00
Anuken
c4ea5a8256 Merge remote-tracking branch 'origin/master' 2021-01-19 19:55:25 -05:00
Anuken
fa8d43bbc9 Misc cleanup 2021-01-19 19:55:21 -05:00
MEEP of Faith
77f31fd86c Movement Lightning Ability Improvements (#3901) 
* Movement Lightning Ability Improvements

* `Core.atlas.find` Might not always be avalable

* Default is null

* Fix
 2021-01-19 19:20:25 -05:00
end
18fe2a1737 Update achievements.vdf (#4358) 2021-01-19 18:52:09 -05:00
YellOw139
e816f6110d [Fastlane][RO] Steam Translation (#3958) 
* Create short-description.txt

* Add files via upload

* incomplete

* Update achievements.vdf

* finished

* import commit 032 b254

* [Steam] Update counts

Co-authored-by: Anuken <arnukren@gmail.com>
 2021-01-19 18:50:49 -05:00
YellOw139
632887ddd2 [Metadata] Android desc = Steam desc (#4370) 
Features:
- Kept the first 2 sentences intact. This means that roughly same text is displayed before clicking 'Read more'. 'Features include:' has been dropped for 'Gameplay Features', for Steam similarity.
- Steam-like formatting. I noticed that <h2> doesn't seem to do anything. Despite that, I've seen Gameloft using it. For something bigger, I'd recommend <big>.
- Updated blocks count. There's over 130 blocks. I triple checked.
- The old description still had 4 unique bosses. RIP.
- Steam Workshop & achievements and Android don't mix up.
- Checked against the character limit. It has less than 4000.
- Only cat-approved text.
 2021-01-19 18:39:09 -05:00
MEEP of Faith
c53a6a7c04 hitColor colored beam effects. (#3471) 
* hitColor colored beam effects.

* Same with lasers

* fix
 2021-01-19 17:46:02 -05:00
Nikolass1000
532a4bc140 Update bundle_pl.properties (#4377) 2021-01-19 17:33:42 -05:00
Arnyyx
88086f5ba9 Update bundle_vi.properties (#4333) 2021-01-19 17:32:15 -05:00
Molovtov
0be39d43a2 better_thai_translate.properties (#4314) 
* better_thai_translate.properties

Better thai translate but not done yet,by the red(need more blins)

* Better_thai_properties

Better thai by thai people,by the red(need more blins)
 2021-01-19 17:30:40 -05:00
rnarko
e9abe273c7 Update Polish translation to fix eye-hurting typos (#4310) 2021-01-19 17:30:30 -05:00
Thomas Widyantoko
775ebd6e94 more in_ID translation (#4286) 
* more in_ID translation

fixes, addition, etc

* changes to in_ID

translated rules.coreincinerates and removed waves.never to match up with the original bundle file
 2021-01-19 17:24:03 -05:00
Esculap
b86201ea9b Update bundle_pl.properties (#4326) 
Translated some tiles (not translated yet):
Dacite => Dacyt
Dacite Wall => Dacytowa Ściana
Dacite Boulder => Dacytowy Głaz
Stone Wall => Kamienna Ściana
Ice Wall => Lodowa Ściana
Snow Wall => Śnieżna Ściana
Dune Wall => Wydmowa Ściana
Dirt => Ziemia
Dirt Wall => Ziemna Ściana
Mud => Błoto
Basalt => Bazalt
 2021-01-19 17:23:44 -05:00
彭瑞暄
e3ccde31d8 removed "never", minor updates (#4363) 2021-01-19 17:21:41 -05:00
Vajda Simon
32d1d7264c bundle_hu.properties (#4181) 
Okay, so a lot of little ones go big.
 2021-01-19 17:08:22 -05:00