Commit Graph

17826 Commits

Author SHA1 Message Date
Anuken
9de04a24fd Merge branch 'Leo-MathGuy-master' 2024-04-28 09:53:11 -04:00
Anuken
2b7117119c Load order fix 2024-04-28 09:52:46 -04:00
Anuken
83c0d2ff39 Merge remote-tracking branch 'origin/master' 2024-04-28 09:26:52 -04:00
Anuken
695e4fefc4 Merge branch 'master' of https://github.com/Leo-MathGuy/Mindustry into Leo-MathGuy-master 2024-04-28 09:26:12 -04:00
Anuken
a8da0bfcbf Re-added android module in IntelliJ 2024-04-28 09:26:02 -04:00
Brandons404
302a6d732c
update servers_v7 (#9789) 2024-04-27 21:52:05 -04:00
summoner001
5113f8770f
Update bundle_hu.properties (#9786)
Following the english bundle updates:

Logic
Code
Loop
2024-04-27 18:42:00 -04:00
Dyx175
182ee7bffe
Update servers_v7.json (#9783) 2024-04-26 10:15:39 -04:00
Anuken
d3dc934a74 Fixed #9784 2024-04-26 10:15:16 -04:00
Leo-MathGuy
0a7a3dc295 Revert 3 commits 2024-04-25 20:03:38 +05:00
Leo-MathGuy
d9cc2ef9a4 sorting may be the problem 2024-04-25 19:59:08 +05:00
Leo-MathGuy
56c68fef9c how did a format change make the test fail 2024-04-25 19:55:51 +05:00
Leo-MathGuy
617953dd89 format 2024-04-25 19:44:44 +05:00
Leo-MathGuy
1622ecd010 Fixed double seq 2024-04-25 19:41:05 +05:00
Anuken
a07d1f2c00 More cleanup 2024-04-25 10:36:41 -04:00
Anuken
be64defc37 Logic filter cleanup 2024-04-25 10:34:44 -04:00
Github Actions
304b62f0d5 Automatic bundle update 2024-04-25 14:24:03 +00:00
BlackDeluxeCat
bac6f7cfa9
Add logic filter (#7251)
* logic filter

* bundles

* available in map editor

* @this = null

* generating only

* ensure not using net

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2024-04-25 10:23:13 -04:00
Anuken
7fcde1e109 Fixed derelict blocks not repairing when resources are not present 2024-04-24 22:40:20 -04:00
Anuken
0eb7b72aa3 Merge branch 'master' of https://github.com/Anuken/Mindustry 2024-04-24 20:18:04 -04:00
Anuken
7c69e555fd Allow ram stance for any ground unit 2024-04-24 20:17:16 -04:00
Leo
81063cbc72
Merge branch 'Anuken:master' into master 2024-04-24 22:00:17 +05:00
TheRadioactiveBanana
c2c9905998
Eradication Mindustry finally getting stable UK nodes (#9776)
added new internet infrastructure and everything works flawlessly, also reserving ports for some new gamemodes that are planned
2024-04-24 12:50:27 -04:00
Leo-MathGuy
76f85df33f Added content order 2024-04-24 20:12:57 +05:00
NealRead
0a50e7dc48
Update servers_v7.json (#9774) 2024-04-23 19:20:26 -04:00
Anuken
7d3c94de9b Moved drawMining to UnitType 2024-04-23 09:42:05 -04:00
Anuken
9dd17ca16b Moved drawBuilding to UnitType 2024-04-23 09:32:46 -04:00
HubsvVN
60a8294694
Update servers_v7.json (#9772) 2024-04-23 09:19:40 -04:00
Anuken
3a91a8eb00 Fixed #9771 2024-04-23 09:17:38 -04:00
Anuken
31f4957657 Removed UnitComp#uiIcon() 2024-04-22 17:31:13 -04:00
Anuken
49489ffadc Don't rotate base shadow 2024-04-22 09:20:24 -04:00
Anuken
d7191e4f71 Fixed #9769 2024-04-22 08:43:25 -04:00
Anuken
14a155147d Item turret status fix 2024-04-21 19:17:14 -04:00
Ignacio
a62540ec7e
Update bundle_es.properties (#9756)
There was an ortographic mistake in the Spanish translation. Changed 2033 & 2034 "recive" for "recibe".
2024-04-21 11:02:04 -04:00
Anuken
430114d931 Possible building raycast damage fix 2024-04-21 10:46:50 -04:00
Anuken
a7a9a99780 More pathfinder tweaks 2024-04-21 10:19:39 -04:00
Anuken
022b3951d2 Fixed #9762 2024-04-21 10:16:07 -04:00
Anuken
caf9f2a6e3 Fixed #9761 2024-04-21 10:07:14 -04:00
Anuken
4c4476ae95 Fixed #9763 2024-04-21 10:05:05 -04:00
Anuken
bc2f344c52 Fixed #9765 2024-04-21 09:53:54 -04:00
Anuken
0cdbeef980 Fixed #9759 2024-04-20 19:13:12 -04:00
Anuken
d8c39089c6 Fixed #9760 2024-04-20 19:11:02 -04:00
Anuken
9859efb97f Pathfinder bugfixes 2024-04-20 18:59:40 -04:00
Anuken
066e18ae40 Coolant display fix 2024-04-20 11:36:31 -04:00
Anuken
169a186d63 Coolant display fix 2024-04-20 11:36:08 -04:00
Anuken
3a4f3e7fe7 Don't refund deconstruction in sandbox 2024-04-20 11:18:57 -04:00
Anuken
3595c350ab Respect particle effect aspect ratio 2024-04-20 10:25:43 -04:00
Anuken
a074c9f3f5 debug removed 2024-04-19 15:25:10 -04:00
Anuken
dd725d8613 Merge remote-tracking branch 'origin/master' 2024-04-19 15:24:44 -04:00
Anuken
a407d88e28 Hover pathfinding bugfixes 2024-04-19 15:24:36 -04:00