Commit Graph

10948 Commits

Author SHA1 Message Date
UnCaughT
0e078a9c60
Update servers_v6.json (#4452)
Русскоязычный сервер с Hex сражениями.
2021-01-31 15:57:08 -05:00
_owler_#0954
c0b1dfc55a
closed. (#4481) 2021-01-31 15:52:55 -05:00
Anuken
3d201f7042 Fixed #4474 / Fixed #4475 / Fixed #4476 / Fixed #4483 2021-01-31 15:51:42 -05:00
Anuken
f1a5aae30a Merge remote-tracking branch 'origin/master' 2021-01-29 12:02:36 -05:00
Anuken
9142da2b70 Stop shooting upon crawler death 2021-01-29 12:02:31 -05:00
Vajda Simon
022c76bf45
bundle_hu.properties (#4464)
They spoke on Discord because of an incorrect translation.
2021-01-29 09:40:07 -05:00
Patrick 'Quezler' Mounier
bc6db72df0
Make fillitems fill the core to the brim (#4462)
Instead of just setting all items to the capacity of the first found core.
2021-01-29 09:38:26 -05:00
Anuken
d512aa5b21 Fixed #4463 2021-01-29 09:32:29 -05:00
Anuken
7cdf7a21fe Minor power graph optimizations 2021-01-28 12:07:50 -05:00
Anuken
9a5a6e1ce2 Merge remote-tracking branch 'origin/master' 2021-01-28 10:23:07 -05:00
Anuken
5a258d2830 Fixed #4461 2021-01-28 10:23:02 -05:00
Patrick 'Quezler' Mounier
96ee32f8ed
Custom Game Underline 2: Electric Boogaloo (#4457)
* Update CustomGameDialog.java

* Remove .row() for consistensy
2021-01-28 09:06:30 -05:00
Joshua Fan
a667a94c8e
Draw plastanium conveyors on conveyors layer (#4446) 2021-01-27 12:08:51 -05:00
Anuken
d0572a2a0d Merge remote-tracking branch 'origin/master' 2021-01-27 11:49:08 -05:00
Anuken
47eea79b60 Fixed #4453 / Fixed #4450 2021-01-27 11:49:04 -05:00
Patrick 'Quezler' Mounier
03b37235b3
producer -> generator (#4441) 2021-01-26 11:35:48 -05:00
Patrick 'Quezler' Mounier
6969fbb1e7
Give tsunami the extinguisher flag as well (#4442) 2021-01-26 11:31:36 -05:00
Anuken
ccc59aa61b Minor wave task tweaks 2021-01-26 10:37:36 -05:00
Anuken
c658865907 Dynamic lightning damage tweaks 2021-01-25 17:21:12 -05:00
Sunny Kim
a13d51e09a
Charge stat for Item (#4392)
* Stat.discharge, discharge

* Update Items.java

* item.discharge

* full container = somewhat more than 4 full batteries

* Stat.discharge

* stat.discharge = Discharge

* Update core/src/mindustry/type/Item.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* removed dis

* oops

* unit zap

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
2021-01-25 17:10:34 -05:00
Anuken
f827337259 Merge remote-tracking branch 'origin/master' 2021-01-25 16:16:45 -05:00
Anuken
b83c76f728 Improved liquid bridge throughput 2021-01-25 16:16:38 -05:00
Thomas Widyantoko
5666fd4999
new update in_ID translation (#4437)
yes
2021-01-25 14:32:35 -05:00
Anuken
5930e3c350 Cleanup 2021-01-25 12:53:27 -05:00
Anuken
4630e5b3a4 Wave spawning improvements 2021-01-25 10:28:36 -05:00
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 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