mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 10:18:40 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,569 Commits 4 Branches 160 Tags 2.3 GiB
7e23272668
Commit Graph

16569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Даркнесс#3729
93788addf6
Update servers_v7.json (#8669) 2023-06-03 11:47:32 -04:00
Anuken
5515cd3187 Merge remote-tracking branch 'origin/master' 2023-06-03 11:47:24 -04:00
Anuken
038994a95f Fixed #8667 2023-06-03 11:47:19 -04:00
SITUVNgcd
d09f4c0db5
Update Vietnamese translation (#8663) 
* Update Vietnamese translation

- Fixed mistake in #8654: Changed new line to `\n` instead of `\r\n`.
- Update and translate new strings.

* Add SITUVNgcd as contributor
 2023-06-03 01:00:29 -04:00
Anuken
37daf0a871 Ignore processing players kicked in event 2023-06-03 00:58:22 -04:00
Anuken
e2f4dd1f4b Merge remote-tracking branch 'origin/master' 2023-06-03 00:30:34 -04:00
Anuken
88c201559f Fixed #8658 2023-06-03 00:30:29 -04:00
Brandons404
2dd59aaaff
Updated servers_v7.json - switching hosts (#8660) 
* added pvp server to fish

* updated servers_v7.json

* updated servers_v7
 2023-06-02 19:12:05 -04:00
Anuken
1266eb00ea Merge remote-tracking branch 'origin/master' 2023-06-02 19:11:54 -04:00
Anuken
174f0f2ffe Fixed #8659 2023-06-02 19:11:49 -04:00
Github Actions
798e442b2f Automatic bundle update 2023-06-02 16:06:53 +00:00
Anuken
dde7b77de6 Closes Anuken/Mindustry-Suggestions/issues/4457 2023-06-02 12:06:06 -04:00
Anuken
afee374a66 Merge remote-tracking branch 'origin/master' 2023-06-02 11:56:13 -04:00
Anuken
4dd414c22f Closes Anuken/Mindustry-Suggestions/issues/4456 2023-06-02 11:56:08 -04:00
Slotterleet
38b9027000
Dynamic selection of planet tech in rules dialog (#8487) 
* Dynamic selection of planets in rules dialog

* Code cleanup

* Do not let Anuken/Mindustry#8494 happen again

* Fixed inconsistency with campaign sectors
 2023-06-02 11:41:12 -04:00
Github Actions
4e0e48ea32 Automatic bundle update 2023-06-02 15:38:01 +00:00
JniTrRny
c84ec75c53
Improvements to the Schematics UI (#8605) 
* schematics UI improvements

* better edit tags UI

* visual tweaks

* cleanup

inline obsession
cleanup again...
another little bit of cleanup
a little bit of cleanup
minor cleanup
 2023-06-02 11:37:15 -04:00
ulwepo
bf51a01677
Update servers_v7.json (#8656) 
thanks
 2023-06-02 11:11:54 -04:00
Даркнесс#3729
94caca680a
Make PlayerInfo map public (#8655) 2023-05-31 18:26:04 -04:00
Anuken
2f675a3b75 Merge remote-tracking branch 'origin/master' 2023-05-31 08:53:26 -04:00
Anuken
9d986e1e8d Fixed #8653 2023-05-31 08:53:21 -04:00
MEEPofFaith
8e1e003ff2
Inversion option for payload router sorting (#8652) 2023-05-30 22:51:07 -04:00
Anuken
1a0edf80f1 Bugfixes for reconstructor config 2023-05-30 20:15:44 -04:00
Anuken
b97e6ef84c Merge remote-tracking branch 'origin/master' 2023-05-30 20:08:53 -04:00
Anuken
b6f5d424da Select command from reconstructor / Units save command when controlled 2023-05-30 20:08:48 -04:00