Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,912 Commits 4 Branches 180 Tags
ab54a144e99bb0746dc262bdccde87b2f97bfcbe
Commit Graph
18912 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MEEPofFaith 219084fe3c Don't generate edges if edges already exist (#8338) 2023-02-27 11:26:26 -05:00
Evgenij 4f314afe21 [RU] Small translation update (#8342) 
* [RU] Small translation update

* Update bundle_ru.properties
 2023-02-27 11:25:29 -05:00
OGalaxy 6750cfead8 Update servers_v7.json (#8349) 
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
 2023-02-27 11:25:12 -05:00
Anuken b569646310 fixed ignoreLiquidFullness 2023-02-26 23:03:03 -05:00
Anuken cc207d3d7c a 2023-02-26 15:36:28 -05:00
Anuken e234ac43a6 Fixed keybind names 2023-02-25 11:38:18 -05:00
Anuken 2388091ed6 Merge remote-tracking branch 'origin/master' 2023-02-23 16:12:57 -05:00
Anuken a38351d41f isLogicControllable 2023-02-23 16:12:52 -05:00
Tentyanuk 4d8de72a8e Update servers_v7.json (#8332) 2023-02-23 09:06:07 -05:00
Github Actions ab2138d8e7 Automatic bundle update 2023-02-22 18:03:15 +00:00
MonoDx 46c75af9e4 Updated and improved belarusian translation. (#8331) 
Edited by monodx.
 2023-02-22 13:02:09 -05:00
Gureumi 8eb3c16c50 Fix server always paused (#8330) 2023-02-22 13:02:04 -05:00
Anuken 39e88ae614 Fixed #8328 2023-02-21 18:15:20 -05:00
Anuken 4410f31888 Merge remote-tracking branch 'origin/master' v142 2023-02-21 10:55:01 -05:00
Anuken df11dd7a74 Fixed issues with #7972 2023-02-21 10:54:56 -05:00
MonoDx 804dd61cd9 Updated belarusian translate. (#8327) 
Edited by monodx.
 2023-02-21 10:26:04 -05:00
Anuken b00c5b4cab Merge remote-tracking branch 'origin/master' 2023-02-21 10:24:50 -05:00
Anuken e0d6cebb2e Fixed #8326 2023-02-21 10:24:45 -05:00
ulwepo ab772dccd4 Update bundle_ja.properties (#8324) 2023-02-21 09:55:55 -05:00
BotiHUN7 b244032328 Update servers_v7.json (#8320) 2023-02-21 09:55:33 -05:00
DikHalzandColaHz 421c5e2879 Update servers_v7.json (#8325) 
HUB

Co-authored-by: ColaHz <87813567+ColaHz@users.noreply.github.com>
 2023-02-21 09:52:55 -05:00
Anuken 1a8c4d8d8a Update deployment.yml 2023-02-20 14:19:36 -05:00
Tomoko 9efb1824af Update servers_v7.json (#8322) 2023-02-20 13:46:01 -05:00
Anuken 74de125700 githubImportMod old signature returned 2023-02-20 12:27:24 -05:00
Anuken 64cea34a98 Merge remote-tracking branch 'origin/master' 2023-02-20 12:20:01 -05:00
Anuken 9c4bdc213d Crash fix 2023-02-20 12:19:56 -05:00
Fischer1000 92c0552fd5 Update hungarian language file (#8315) 
Fine tune the file. I have made it to it's quarter today (line 537).
 2023-02-19 09:26:59 -05:00
OSP ff39e5f90d [XCore] Change ip (#8319) 2023-02-19 09:25:09 -05:00
Anuken 83c55fdbb4 Merge remote-tracking branch 'origin/master' 2023-02-18 23:12:52 -05:00
Anuken 7d300a273b added missing break 2023-02-18 23:12:47 -05:00
MEEPofFaith 29f36c1927 ClientServerConnectEvent (#8309) 2023-02-18 19:48:22 -05:00
ferrandusqui31 b65c3cd931 Missing translation and errors correction (#8312) 
On line 104 updated joingame from "Uneix-me a una partida" to "Unir-se a una partida".
On line 494 update editor.savemap from "Desa un mapa" to "Desa el mapa".
On line 1386 updated block.kiln.name from "Kiln" to "Forn de vidre".
On line 1468 updated block.reinforced.message  from "Missatge remarcat" to "Missatge reforçat".
 2023-02-18 19:48:08 -05:00
Anuken 7401e7fe31 Fixed #8316 2023-02-18 19:47:22 -05:00
Anuken 150215712b formatting 2023-02-17 09:18:08 -05:00
Gureumi f7ccf3c04a Add window size parameter (#8281) 
* Add window size parameter

* Formatting

* Java 8
 2023-02-17 09:13:59 -05:00
Evgenij ebb798cac3 Update servers_v7.json (#8307) 2023-02-17 09:03:44 -05:00
MEEPofFaith 348819d1ac connectedPower similar to conductivePower (#8306) 2023-02-15 23:22:05 -05:00
MEEPofFaith a8a3453632 Move core launch/landing to CoreBlock (#8055) 
* Move core launch/landing to CoreBlock

* Slight cleanup

* just gonna...
 2023-02-15 12:16:51 -05:00
FunnyCat 9b02a274f1 Update servers_v7.json (#8293) 
Explosive corp deleted
 2023-02-15 10:38:44 -05:00
Anuken f093360565 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-15 10:34:57 -05:00
Anuken d457901d2e Minor Conquer buff 2023-02-15 10:34:52 -05:00
Anuken 460dbff7d1 Fixed shield break effect 2023-02-15 10:33:36 -05:00
Anuken e564602fd1 Hide isHidden content in mod info 2023-02-15 09:59:32 -05:00
Baldur404andAnuken e029321e5b Update servers_v7.json (#8290) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2023-02-15 09:34:38 -05:00
Tentyanuk 87d7089df3 Update servers_v7.json (#8294) 
DNS doesn't work for everyone
 2023-02-15 09:02:46 -05:00
WayZer e4f929a851 Fix turret when cheating (#8291) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`

* Why `shouldConsume` cause `potentialEfficiency=0`
 2023-02-15 09:02:32 -05:00
MEEPofFaith 8726cde05d Return salvo and swarmer to how they were before shoot changes (#8278) 2023-02-15 09:01:03 -05:00
Bill Arndt a189ac8613 Update Team.java to increase dynamic range of team colors (#8279) 
I'm having a lot of trouble finding enough visually distinct team colors; In the worst case I need about 25 colors. I am manually excluded colliding team numbers I know about, but, I can only find about 14 easily distinguishable colors before everything is another bright magenta, or yellow, or cyan, or pale green.
 2023-02-15 09:00:34 -05:00
ulwepo 652aa4c456 Update bundle_ja.properties (#8300) 2023-02-15 09:00:10 -05:00
MEEPofFaith cc3ae2c66c Use setBars instead of overriding displayBars (#8296) 2023-02-15 08:59:57 -05:00