Commit Graph

16544 Commits

Author SHA1 Message Date
Anuken
58cd1852f1 Conduit junction replacement fix 2023-06-16 13:19:52 -04:00
Anuken
d4e7f4a2ee Merge remote-tracking branch 'origin/master' 2023-06-13 16:02:29 -04:00
Anuken
1928c6db83 Fixed #8710 2023-06-13 16:02:24 -04:00
BalaM314
c49075ff0d Correctly display ∞ unit cap in reconstructors (#8709)
* Correctly display ∞ in reconstructors

UnitFactory.java uses getStringCap, but Reconstructor uses getCap
this was probably missed in 8cabae1

* might as well fix formatting

same format as UnitFactory.java
2023-06-13 10:37:17 -04:00
Anuken
dbfd8a3ec1 Merge remote-tracking branch 'origin/master' 2023-06-13 09:29:26 -04:00
Anuken
1d358a3c84 Show locked item names 2023-06-13 09:29:21 -04:00
Даркнесс#3729
0f661444bd Update Darkdustry address 💀 (#8707) 2023-06-13 08:51:28 -04:00
Anuken
4721086a8e Fixed logic blocks making clicking noises when not accessible 2023-06-12 10:50:32 -04:00
Anuken
a07db8a08e Merge remote-tracking branch 'origin/master' 2023-06-12 10:35:36 -04:00
Anuken
a00b3a4670 Fixed objective flags not syncing 2023-06-12 10:35:31 -04:00
Github Actions
637bd4fc8f Automatic bundle update 2023-06-12 04:04:41 +00:00
Anuken
2b9ee88cc2 Merge remote-tracking branch 'origin/master' 2023-06-12 00:03:51 -04:00
Anuken
0006291631 e 2023-06-12 00:03:41 -04:00
WayZer
f1175b8735 Update servers_v7.json (#8702) 2023-06-11 23:46:12 -04:00
Anuken
8cb6f080f1 Merge remote-tracking branch 'origin/master' 2023-06-11 23:22:59 -04:00
Anuken
7389a5de7f Cleanup 2023-06-11 23:22:54 -04:00
Github Actions
5459322080 Automatic bundle update 2023-06-12 03:19:14 +00:00
Anuken
4b0824a20c Admin player team switch + more trace info 2023-06-11 23:18:04 -04:00
Anuken
0ec59691bf Merge remote-tracking branch 'origin/master' 2023-06-11 13:48:33 -04:00
Anuken
f00209ece7 Networking fix 2023-06-11 13:48:29 -04:00
NullReferenceExc
f05d1ebc78 Update Team.java (#8700) 2023-06-10 16:59:11 -04:00
Anuken
2dbbd62163 Merge remote-tracking branch 'origin/master' 2023-06-10 12:27:40 -04:00
Anuken
49168bb8f9 Fixed #8698 2023-06-10 12:27:36 -04:00
VaporSpace2
10c656bd16 GMS shutting down (removing GMS servers from server list) (#8696)
GMS is meeting its end so now is the time to remove the 2 servers from the server list, thanks
2023-06-09 21:53:35 -04:00
qwertystar
a8de7c17bd Update bundle_zh_CN.properties (#8692)
refer the Chinese translation of hint.rebuildSelect to provide that of hint.rebuildSelect.mobile
2023-06-09 09:26:21 -04:00
Anuken
ea8b2dea50 arc 2023-06-08 10:47:15 -04:00
Anuken
87348feab7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-06-08 10:01:48 -04:00
Anuken
8da8783331 arc 2023-06-08 10:01:45 -04:00
夜狐
603efd7653 Update bundle_de.properties (#8688) 2023-06-07 23:15:24 -04:00
Valera
a43d39597a fix a small mistake made by inattention (#8686) 2023-06-07 17:36:19 -04:00
Даркнесс#3729
376e5c0b29 💀 (#8685) 2023-06-07 14:13:41 -04:00
Anuken
f2cd506eb4 Merge remote-tracking branch 'origin/master' 2023-06-07 09:52:55 -04:00
Anuken
af76e889cf Closes Anuken/Mindustry-Suggestions/issues/4452 2023-06-07 09:52:50 -04:00
Даркнесс#3729
ef0efc84cb Map improvements (#8682)
* Update Map.java

* Update MapListDialog.java

* Update ServerControl.java
2023-06-07 09:35:57 -04:00
xem8k5
e02de8eab5 Update servers_v7.json (#8677) 2023-06-06 15:44:18 -04:00
Anuken
4d301ebdbf Merge remote-tracking branch 'origin/master' 2023-06-06 10:05:16 -04:00
Anuken
84817c0c24 Fixed #8680 2023-06-06 10:05:11 -04:00
bendn
e9dfd29dcd replace aa server (#8679) 2023-06-05 20:08:26 -04:00
Github Actions
d7a87f36b7 Automatic bundle update 2023-06-05 18:30:55 +00:00
Ninjdai
379875f591 Update bundle_fr.properties (#8678)
Translated new votekick strings
2023-06-05 14:30:07 -04:00
MEEPofFaith
38b2540677 Side-based liquid tile padding (#8676) 2023-06-05 10:37:26 -04:00
Github Actions
9ff10e9d16 Automatic bundle update 2023-06-05 00:51:34 +00:00
Даркнесс#3729
ebe965ef40 Better votekick reason input (#8673)
* Update bundle.properties

* Update PlayerListFragment.java

* Update bundle.properties

* Update bundle.properties
2023-06-04 20:50:48 -04:00
Alex Gusev
32c146cdf1 Adapt interface to display notch of mac laptops (#8666)
* Adapt interface to display notch of mac laptops

* `macNotchHeight` as a separate variable, and description for mac notch setting
2023-06-04 12:43:07 -04:00
Semetrix
97a603204b Remove the rulebreaker (#8672) 2023-06-04 10:59:43 -04:00
frieda666
70bb7aff54 Improvement on votekick (#8664)
* Add test case for achievement

* Allow admins to cancel votekick & allow players to change vote

* Require reason to start votekick

* Require reason to start votekick

* Update message sent by votekick button
2023-06-03 23:45:55 -04:00
Anuken
fc673de556 augh 2023-06-03 12:43:39 -04:00
Anuken
925d19d867 Merge remote-tracking branch 'origin/master' 2023-06-03 12:38:22 -04:00
Anuken
cda82e572f ServerConnectFilter 2023-06-03 12:38:18 -04:00
Github Actions
21f4efaddc Automatic bundle update 2023-06-03 15:48:18 +00:00