mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 02:15:37 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,145 Commits 4 Branches 160 Tags 2.3 GiB
e234ac43a6
Commit Graph

13628 Commits

Author SHA1 Message Date
Anuken
e234ac43a6 Fixed keybind names 2023-02-25 11:38:18 -05:00
Anuken
a38351d41f isLogicControllable 2023-02-23 16:12:52 -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
Anuken
39e88ae614 Fixed #8328 2023-02-21 18:15:20 -05:00
Anuken
4410f31888 Merge remote-tracking branch 'origin/master' 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
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
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
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
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
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
Anuken
40ec7fd6fc Less Core.app.post for build events 2023-02-15 08:57:06 -05:00
Anuken
d17f0ebc51 Fixed #8297 2023-02-15 08:35:53 -05:00
Anuken
5027b70f5a Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-14 15:08:27 -05:00
Anuken
0b7c790777 turret status fix 2023-02-14 15:08:24 -05:00
Github Actions
5ac9e9f63c Automatic bundle update 2023-02-13 19:13:48 +00:00
Anuken
b08136e3ea Quell no longer targets flying units 2023-02-13 14:12:53 -05:00
Anuken
ec8262418f Basic unit boost command support 2023-02-11 17:40:57 -05:00
Anuken
946e36c66e Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-09 17:50:46 -05:00
Anuken
00f3518349 Fixed #8277 2023-02-09 17:50:43 -05:00
WayZer
53f410fee0
Fix Turret bug when cheat (#8273) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`
 2023-02-09 09:20:06 -05:00
Github Actions
66406806b7 Automatic bundle update 2023-02-09 03:49:19 +00:00
Anuken
3a6debfae6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-08 22:48:33 -05:00
Anuken
a093fa5718 Replaced #8035 2023-02-08 22:48:17 -05:00
Даркнесс#3729
9c1f17fbdd
Add pvpAutoPause rule (#8249) 
* Update Rules.java

* Update NetServer.java
 2023-02-08 22:44:07 -05:00
MEEPofFaith
ce3643f0b3
Make type not required if the template already provides one (#8257) 
Such as with missile units
 2023-02-08 22:35:13 -05:00
MEEPofFaith
f1fb7d8098
Fix modded payload conveyor icons (#8266) 2023-02-08 22:28:44 -05:00
Anuken
3d01eeaf1c Fixed #8251 2023-02-08 22:25:10 -05:00
Github Actions
be39c31865 Automatic bundle update 2023-02-01 20:22:46 +00:00
Phinner
0d2dfadba7
Mod dependency resolution improvements (#7972) 
* soft dependencies + better mod resolution algorithm

* update ModMeta#toString

* var

* add #7962 bugfix

* Use existing code to resolve

* add state text for mod dialog

* bugfix

* fix error text

* remove external resolver class

It's simpler like that :)
 2023-02-01 15:21:42 -05:00
Anuken
2dcab97b6d Merge remote-tracking branch 'origin/master' 2023-02-01 15:20:38 -05:00
Anuken
31cb169002 Random server order 2023-02-01 15:20:34 -05:00