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

7492 Commits

Author SHA1 Message Date
Anuken
6b56fef512 Merge pull request #2636 from genNAowl/wall-sound-effects 
Add sound variables for when a wall is releasing lightning/deflecting bullets
 2020-09-21 09:11:57 -04:00
Felix Corvus
1b38b2d2f9 Lyagushka just kva'd 2020-09-21 16:00:45 +03:00
Petr Gašparík
50960ff599 Update for Stream plus humble selfpromo 2020-09-21 11:08:46 +02:00
Petr Gašparík
c122d737c1 Czech translation - fixes 2020-09-21 11:01:53 +02:00
Petr Gašparík
3349764421 Czech translation - from 105 to 6.0 alpha 2020-09-21 10:59:02 +02:00
Leonwang4234
5eb722efee Update Wall.java 2020-09-20 20:25:18 -07:00
Anuken
63e35bd462 T4 air carrier unit (*unfinished*) 2020-09-20 19:34:12 -04:00
Anuken
401384ae5b Anuken/Mindustry-Suggestions/issues/548 2020-09-20 16:35:25 -04:00
DeltaNedas
f9a70b1190 typo 2020-09-20 20:35:44 +01:00
DeltaNedas
632322a2bc add even more info to crash logs 2020-09-20 20:25:57 +01:00
Anuken
b2d054c1f2 Merge remote-tracking branch 'origin/master' 2020-09-20 15:23:41 -04:00
Anuken
0a314e142e Fixed #2632 (among other things) 2020-09-20 15:23:34 -04:00
YellOw139
d6291ea6c5 Merge branch 'master' into patch-2 2020-09-20 17:47:32 +03:00
Felix Corvus
f7b320e838 Update bundle_ru.properties 2020-09-20 17:47:08 +03:00
YellOw139
c82455d994 #2628 2020-09-20 17:42:19 +03:00
Felix Corvus
dd32b4d39d Merge branch 'master' into master 2020-09-20 16:56:36 +03:00
Félix Córvus
0396cc6ec4 Update Control.java 2020-09-20 16:45:34 +03:00
Félix Córvus
e907d1a23f Updating bundles 2020-09-20 16:43:15 +03:00
Felix Corvus
86446f4f00 Update Control.java 2020-09-20 16:32:38 +03:00
YellOw139
9bdc81e728 Update contributors 2020-09-20 12:11:33 +03:00
YellOw139
a0d81eb18e [Bundle][RO] Translation Update 
This PR was tested in-game and it's ready to merge at any time (unless marked as draft).

Changelog:
- Changes as per commits c71be9ae32, f53af781ba, 68cf2af6e0, 0bcb48ca31, b4d83f33e9
- Changed Surge Alloy name to 'Supra Aliaj'. 
  The new name is closer to the original, shorter and easier to pronounce. Old name: 'Aliaj de Supratensiune'
- Changed Phase Fabric name to 'Fibră-Fază'.
  It's closer to the original and shorter. Old name: 'Material de Fază'
- Tweaked some stat names
- Tweaked some map editor button names
- Typo fixes & various other improvements
 2020-09-20 12:06:09 +03:00
Anuken
415380f25e Merge remote-tracking branch 'origin/master' 2020-09-19 21:54:18 -04:00
Anuken
b9fd38a76e Various tweaks and speculative changes 2020-09-19 21:54:08 -04:00
Anuken
b4d83f33e9 Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors 
F O R C E P R O J E C T O R S
 2020-09-19 21:15:45 -04:00
Anuken
3b8b762a1c Removed phase radius display *(see description)* 
Phased radius has been proposed in numerous PRs, but I don't know how to handle it properly yet. New players may be confused about the extra circle/hexagon indicator around blocks - it's not clear what it means. An extra radius easy to implement, so I'll leave it out of this PR and handle it later.
 2020-09-19 21:15:18 -04:00
Anuken
cdd1e90d1a Fixed #2622 2020-09-19 17:35:32 -04:00
Anuken
eb8658e140 Mud tweaks / Unit count tweaks 2020-09-19 16:04:50 -04:00
Anuken
84b1c0348d Merge remote-tracking branch 'origin/master' 2020-09-19 14:11:51 -04:00
Anuken
0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
Anuken
c470c0abe1 Merge pull request #2612 from sk7725/patch-17 
[KO] Update bundle_ko.properties
 2020-09-19 13:26:31 -04:00
Anuken
dcbfc2b7aa Storage team colors 2020-09-19 12:38:24 -04:00
Anuken
ce8e060f29 Merge remote-tracking branch 'origin/master' 2020-09-19 12:31:06 -04:00
Anuken
9b0947a6e5 Fixed #2607 / Fixed #2604 2020-09-19 12:30:58 -04:00
Anuken
c865dbb465 Merge pull request #2610 from DeltaNedas/pubtree 
make techtree funcs public
 2020-09-19 12:14:26 -04:00
Anuken
eb60b60b4a Merge pull request #2615 from Remint32/patch-4 
[Bundle] Missing keybind lines
 2020-09-19 12:12:52 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Felix Corvus
68cf2af6e0 missing keybind lines 2020-09-19 17:34:49 +03:00
Felix Corvus
db3eaf9a33 missing lines 2020-09-19 17:29:33 +03:00
Felix Corvus
48f6ed47a6 Merge branch 'master' into master 2020-09-19 17:01:57 +03:00
Felix Corvus
c1efb69a91 Update bundle_ru.properties 2020-09-19 16:58:22 +03:00
Vanguard
742b171d5c 2 new lines 
unit.sei.name
unit.omura.name
 2020-09-19 16:10:07 +03:00
Sunny Kim
8a4dd09137 Update bundle_ko.properties 
+ Lots of environmental blocks(reflects 74cefb3ec9)!
 2020-09-19 20:49:08 +09:00
DeltaNedas
435ef23eed Update CrashSender.java 2020-09-19 09:50:02 +00:00
DeltaNedas
cdc1337fcb make techtree funcs public 2020-09-19 10:00:33 +01:00
DeltaNedas
c324cf2c66 h 2020-09-19 09:56:05 +01:00
DeltaNedas
3894234578 more info in crash reports 2020-09-19 09:54:09 +01:00
Anuken
b29c0ab401 Unit production limit tweaks 2020-09-18 22:42:05 -04:00
Anuken
8a99a89f57 how many times do I neet to press refresh before IntelliJ sees the files that were there all along 2020-09-18 21:19:26 -04:00
Anuken
aae045b5dd Outline changes 2020-09-18 21:14:04 -04:00
Anuken
8dd1c5f1f8 hhhhh 2020-09-18 18:56:01 -04:00